diff options
| author | Haru <haru@dotalux.com> | 2020-07-26 19:53:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 19:53:35 +0200 |
| commit | 4edc4cd4f2f4d30e2f1142c2938aaa7d42fd40fe (patch) | |
| tree | d33bd048e9b74b104542b39b34fbff13ff5e078c /npc/quests/quests_juperos.txt | |
| parent | e523cc59ae44f38f2b48e7c610ec61b4bcba4e03 (diff) | |
| parent | 17c3637481b1255923f13f070108bcfa49a567f2 (diff) | |
| download | hercules-4edc4cd4f2f4d30e2f1142c2938aaa7d42fd40fe.tar.gz hercules-4edc4cd4f2f4d30e2f1142c2938aaa7d42fd40fe.tar.bz2 hercules-4edc4cd4f2f4d30e2f1142c2938aaa7d42fd40fe.tar.xz hercules-4edc4cd4f2f4d30e2f1142c2938aaa7d42fd40fe.zip | |
Merge pull request #2798 from skyleo/ontouch_areawarp_refactor
Refactor scripts that use OnTouch Logic to use areawarp instead
Diffstat (limited to 'npc/quests/quests_juperos.txt')
| -rw-r--r-- | npc/quests/quests_juperos.txt | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index d120bfc27..f9120796d 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -4914,7 +4914,7 @@ OnTouch: case 1: specialeffect(EF_LIGHTSPHERE, AREA, playerattached()); close2; - stopnpctimer; + stopnpctimer(1); warp "juperos_02",130,142; break; case 2: @@ -4922,7 +4922,7 @@ OnTouch: mes "Not now!"; mes "I can't leave yet!"; close2; - stopnpctimer; + stopnpctimer(1); warp "jupe_gate",50,168; break; } @@ -4930,23 +4930,7 @@ OnTouch: OnTimer10000: warp "juperos_02",128,278; - enablenpc "gate#start#2"; - disablenpc "gate#start"; - end; -} - -jupe_gate,50,171,0 script gate#start#2 FAKE_NPC,2,2,{ -OnInit: - disablenpc "gate#start#2"; - end; - -OnTouch: - warp "juperos_02",130,142; - end; - -OnTimer2000: - enablenpc "gate#start"; - disablenpc "gate#start#2"; + areawarp("jupe_gate", 48, 169, 52, 173, "juperos_02", 130, 142); end; } |