summaryrefslogtreecommitdiff
path: root/world/map/conf
diff options
context:
space:
mode:
authorVincent Petithory <vincent.petithory@gmail.com>2012-12-01 00:23:58 +0100
committerVincent Petithory <vincent.petithory@gmail.com>2012-12-01 00:23:58 +0100
commitd328d77f6601645e15890a4e48431bec44c0716a (patch)
tree67387a7063f5142960fed13423a3751d688ba794 /world/map/conf
parenta6aa02bb42c8742222e21e3e8901e126a99e99d8 (diff)
downloadserverdata-d328d77f6601645e15890a4e48431bec44c0716a.tar.gz
serverdata-d328d77f6601645e15890a4e48431bec44c0716a.tar.bz2
serverdata-d328d77f6601645e15890a4e48431bec44c0716a.tar.xz
serverdata-d328d77f6601645e15890a4e48431bec44c0716a.zip
Update easter 2010 scripts / magic / warps for the map changes of 028-1.
Diffstat (limited to 'world/map/conf')
-rw-r--r--world/map/conf/magic.conf.template22
1 files changed, 11 insertions, 11 deletions
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template
index 58975e5b..5f459fd1 100644
--- a/world/map/conf/magic.conf.template
+++ b/world/map/conf/magic.conf.template
@@ -1339,13 +1339,13 @@ CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
#NONMAGIC SILENT SPELL easter-invader-init : "#i" =
# (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-# EFFECT warp(caster, @("028-1.gat", 139, 46));
+# EFFECT warp(caster, @("028-1.gat", 145, 49));
# {
# gmcommand "@blvl -255";
# gmcommand "@blvl 199";
# gmcommand "@setmagic all 5 Xakelbael the Dark";
# gmcommand "@allstats";
-# savepoint "028-1.gat", 130, 46;
+# savepoint "028-1.gat", 136, 49;
# }
# create_item(caster, "DarkTalisman", 1);
@@ -1398,7 +1398,7 @@ CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
# { gmcommand "@jump"; }
# message(p, "A powerful force sends you flying!");
# )
-# warp(caster, @("028-1.gat", 130, 46));
+# warp(caster, @("028-1.gat", 136, 49));
#NONMAGIC SILENT SPELL easter-invader-attack-pulse : "#a" =
@@ -1452,8 +1452,8 @@ CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
# (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
# EFFECT IF not (status_option(caster, 4096)) THEN ( sfx(caster, 33, 0);
# WAIT 200; );
-# IF (t == "r") THEN ( warp(caster, @("028-1.gat", 129, 46)); )
-# ELSE IF (t == "s") THEN ( warp(caster, @("028-1.gat", 69, 96)); )
+# IF (t == "r") THEN ( warp(caster, @("028-1.gat", 135, 49)); )
+# ELSE IF (t == "s") THEN ( warp(caster, @("028-1.gat", 75, 99)); )
# ELSE IF (t == "c") THEN ( warp(caster, @("028-3.gat", 50, 58)); )
# ELSE IF (t == "t") THEN ( warp(caster, @("009-1.gat", 48, 35)); )
# ELSE { gmcommand "@jump"; };
@@ -1477,7 +1477,7 @@ NONMAGIC SILENT SPELL world-shift : "#S00" =
( (REQUIRE (count_item(caster, "DarkPetal")) && # Allow unlimited travel with the petal
(map_nr(location(caster)) != 5698) # Do not allow if player is in botcheck area
)
- => ((REQUIRE rdistance(location(caster), @("028-1.gat", 63, 67)) < 5) =>
+ => ((REQUIRE rdistance(location(caster), @("028-1.gat", 69, 70)) < 5) =>
EFFECT sfx(location(caster), SFX_TELEPORT, 200);
WAIT 8000;
{ savepoint "009-1", 52, 39; };
@@ -1490,11 +1490,11 @@ NONMAGIC SILENT SPELL world-shift : "#S00" =
IF (map_nr(location(caster)) == 9 || map_nr(location(caster)) == 1 || map_nr(location(caster)) == 21 || map_nr(location(caster)) == 20) THEN WAIT 8000;
ELSE WAIT 20000;
IF (hp(caster) < inithp) THEN ABORT; // Cancel teleport if the player took damage during channel time (hacky, but for most purposes should work.)
- { savepoint "028-1", 63, 68; };
- warp(caster, @("028-1.gat", 63, 67));
+ { savepoint "028-1", 69, 71; };
+ warp(caster, @("028-1.gat", 69, 70));
sfx(location(caster), SFX_TELEPORT, 200);
)
- | (REQUIRE (rdistance(location(caster), @("028-1.gat", 63, 67)) < 5 )
+ | (REQUIRE (rdistance(location(caster), @("028-1.gat", 69, 70)) < 5 )
=> EFFECT set_script_variable(caster, "Easter_2010_QuestState", script_int(caster, "Easter_2010_QuestState") | (1 << 17));
sfx(location(caster), SFX_TELEPORT, 200);
WAIT 8000;
@@ -1508,8 +1508,8 @@ NONMAGIC SILENT SPELL world-shift : "#S00" =
ELSE WAIT 20000;
IF (hp(caster) < inithp) THEN ABORT; // Cancel teleport if the player took damage during channel time (hacky, but for most purposes should work.)
set_script_variable(caster, "Easter_2010_QuestState", script_int(caster, "Easter_2010_QuestState") | (1 << 17));
- { savepoint "028-1", 63, 68; };
- warp(caster, @("028-1.gat", 63, 67));
+ { savepoint "028-1", 69, 70; };
+ warp(caster, @("028-1.gat", 69, 70));
sfx(location(caster), SFX_TELEPORT, 200);
)
)