From d328d77f6601645e15890a4e48431bec44c0716a Mon Sep 17 00:00:00 2001 From: Vincent Petithory Date: Sat, 1 Dec 2012 00:23:58 +0100 Subject: Update easter 2010 scripts / magic / warps for the map changes of 028-1. --- world/map/conf/magic.conf.template | 22 +++++++++++----------- world/map/npc/028-1/Portal.txt | 4 ++-- world/map/npc/028-3/_warps.txt | 2 +- world/map/npc/easter/2010/Blocker.txt | 2 +- world/map/npc/easter/2010/Doctor.txt | 2 +- world/map/npc/easter/2010/Doctor2.txt | 2 +- world/map/npc/easter/2010/Doctor3.txt | 2 +- world/map/npc/easter/2010/Doctor4.txt | 2 +- world/map/npc/easter/2010/helper.txt | 2 +- 9 files changed, 20 insertions(+), 20 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); ) ) diff --git a/world/map/npc/028-1/Portal.txt b/world/map/npc/028-1/Portal.txt index 7dbdff22..12ba62c9 100644 --- a/world/map/npc/028-1/Portal.txt +++ b/world/map/npc/028-1/Portal.txt @@ -1,6 +1,6 @@ -028-1.gat,63,68,0|script|Portal#_M|127,{ +028-1.gat,69,71,0|script|Portal#_M|127,{ - if (isin("028-1.gat",59,64,67,70)) goto L_Main; + if (isin("028-1.gat",65,67,73,73)) goto L_Main; mes "There is something there, but you aren't quite close enough to see exactly what it is."; close; diff --git a/world/map/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt index 0f8ddaf3..559eafd8 100644 --- a/world/map/npc/028-3/_warps.txt +++ b/world/map/npc/028-3/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Easter Island Cave warps -028-3.gat,33,78|warp|To Easter Island|-1,-1,028-1.gat,114,123 +028-3.gat,33,78|warp|To Easter Island|-1,-1,028-1.gat,120,126 diff --git a/world/map/npc/easter/2010/Blocker.txt b/world/map/npc/easter/2010/Blocker.txt index 64502411..491180a7 100644 --- a/world/map/npc/easter/2010/Blocker.txt +++ b/world/map/npc/easter/2010/Blocker.txt @@ -1,4 +1,4 @@ -028-1.gat,114,121,0 script #28Barrier#_M 127,1,1{ +028-1.gat,120,124,0 script #28Barrier#_M 127,1,1{ end; OnTouch: if (($Easter_2010_Npc_State2 >> E10_BARRIER_SHIFT) & E10_BARRIER_MASK == E10_BARRIER_ACTIVE) goto L_block; diff --git a/world/map/npc/easter/2010/Doctor.txt b/world/map/npc/easter/2010/Doctor.txt index 78097fd6..c6d20bfa 100644 --- a/world/map/npc/easter/2010/Doctor.txt +++ b/world/map/npc/easter/2010/Doctor.txt @@ -1,6 +1,6 @@ // Doctor 1, at the big tree. -028-1.gat,21,105,0 script Doctor#who1 184,{ +028-1.gat,27,108,0 script Doctor#who1 184,{ // States here callsub S_Helped_Count; if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) diff --git a/world/map/npc/easter/2010/Doctor2.txt b/world/map/npc/easter/2010/Doctor2.txt index 02a2e7f7..c98f71c2 100644 --- a/world/map/npc/easter/2010/Doctor2.txt +++ b/world/map/npc/easter/2010/Doctor2.txt @@ -1,6 +1,6 @@ // Doctor 2, at the island. -028-1.gat,83,34,0 script Doctor#who2 184,{ +028-1.gat,89,37,0 script Doctor#who2 184,{ // States here callsub S_Helped_Count; if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) diff --git a/world/map/npc/easter/2010/Doctor3.txt b/world/map/npc/easter/2010/Doctor3.txt index e0ee86bd..7d8bfa8c 100644 --- a/world/map/npc/easter/2010/Doctor3.txt +++ b/world/map/npc/easter/2010/Doctor3.txt @@ -1,6 +1,6 @@ // Doctor 3, at the stones. -028-1.gat,65,95,0 script Doctor#who3 184,{ +028-1.gat,71,98,0 script Doctor#who3 184,{ // States here callsub S_Helped_Count; if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) diff --git a/world/map/npc/easter/2010/Doctor4.txt b/world/map/npc/easter/2010/Doctor4.txt index fde80fca..3cb761e0 100644 --- a/world/map/npc/easter/2010/Doctor4.txt +++ b/world/map/npc/easter/2010/Doctor4.txt @@ -1,6 +1,6 @@ // Doctor 4, at the fruit trees. -028-1.gat,116,69,0 script Doctor#who4 184,{ +028-1.gat,122,72,0 script Doctor#who4 184,{ // States here callsub S_Helped_Count; if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) diff --git a/world/map/npc/easter/2010/helper.txt b/world/map/npc/easter/2010/helper.txt index 2dfccae1..aaa9b42e 100644 --- a/world/map/npc/easter/2010/helper.txt +++ b/world/map/npc/easter/2010/helper.txt @@ -1,4 +1,4 @@ -028-1.gat,130,47,0 script Control#Helper 127,{ +028-1.gat,136,50,0 script Control#Helper 127,{ close; OnBarrierEnable: -- cgit v1.2.3-60-g2f50