summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/magic.conf.template18
1 files changed, 11 insertions, 7 deletions
diff --git a/conf/magic.conf.template b/conf/magic.conf.template
index ddeac883..12621a34 100644
--- a/conf/magic.conf.template
+++ b/conf/magic.conf.template
@@ -1473,6 +1473,7 @@ NONMAGIC SILENT SPELL world-shift : "#S00" =
=> ((REQUIRE rdistance(location(caster), @("028-1.gat", 63, 67)) < 5) =>
EFFECT sfx(location(caster), SFX_TELEPORT, 200);
WAIT 8000;
+ { savepoint "009-1", 52, 39; };
warp(caster, @("009-1.gat", 55, 37));
sfx(location(caster), SFX_TELEPORT, 200);
|
@@ -1482,6 +1483,7 @@ 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));
sfx(location(caster), SFX_TELEPORT, 200);
)
@@ -1489,6 +1491,7 @@ NONMAGIC SILENT SPELL world-shift : "#S00" =
=> EFFECT set_script_variable(caster, "Easter_2010_QuestState", script_int(caster, "Easter_2010_QuestState") | (1 << 17));
sfx(location(caster), SFX_TELEPORT, 200);
WAIT 8000;
+ { savepoint "009-1", 52, 39; };
warp(caster, @("009-1.gat", 55, 37));
sfx(location(caster), SFX_TELEPORT, 200);
| (REQUIRE map_nr(location(caster)) != 28 && (script_int(caster, "Easter_2010_QuestState") >> 17) & 1 == 0) # Allow for one free warp home without the petal
@@ -1498,6 +1501,7 @@ 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));
sfx(location(caster), SFX_TELEPORT, 200);
)
@@ -1540,7 +1544,7 @@ NONMAGIC SILENT SPELL easter-set-flag (s : PC) : "#k" =
close;
}
-NONMAGIC SILENT SPELL easter-get-debug : "#e" =
+NONMAGIC SILENT SPELL easter-get-debug (p : PC) : "#e" =
(REQUIRE name_of(caster) == "Freeyorp" || name_of(caster) == "Xakelbael the Dark") =>
EFFECT { message strcharinfo(0), "Global state egg1: " + $Easter_2010_Egg_Loc_State1;
message strcharinfo(0), "Global state egg2: " + $Easter_2010_Egg_Loc_State2;
@@ -1550,12 +1554,12 @@ NONMAGIC SILENT SPELL easter-get-debug : "#e" =
message strcharinfo(0), "Global npc state1: " + $Easter_2010_Npc_State1;
message strcharinfo(0), "Global npc state2: " + $Easter_2010_Npc_State2;
};
- message(caster, "Local state egg1: " + script_int(caster, "Easter_2010_EggState1"));
- message(caster, "Local state egg2: " + script_int(caster, "Easter_2010_EggState1"));
- message(caster, "Local state egg3: " + script_int(caster, "Easter_2010_EggState1"));
- message(caster, "Local state egg4: " + script_int(caster, "Easter_2010_EggState1"));
- message(caster, "Local state egg5: " + script_int(caster, "Easter_2010_EggState1"));
- message(caster, "Local state quest: " + script_int(caster, "Easter_2010_QuestState"));
+ message(caster, "Local state egg1: " + script_int(p, "Easter_2010_EggState1"));
+ message(caster, "Local state egg2: " + script_int(p, "Easter_2010_EggState2"));
+ message(caster, "Local state egg3: " + script_int(p, "Easter_2010_EggState3"));
+ message(caster, "Local state egg4: " + script_int(p, "Easter_2010_EggState4"));
+ message(caster, "Local state egg5: " + script_int(p, "Easter_2010_EggState5"));
+ message(caster, "Local state quest: " + script_int(p, "Easter_2010_QuestState"));