From 17c3637481b1255923f13f070108bcfa49a567f2 Mon Sep 17 00:00:00 2001 From: skyleo Date: Tue, 7 Jul 2020 15:40:02 +0200 Subject: Refactor scripts that use OnTouch Logic to use areawarp instead This fixes a few bugs and possible exploits, some OnTouch-Warp-NPCs didn't cover the entire area they intended to areawarp. If you have any NPC Dialogue open, you will not trigger the OnTouch and thus not get warped. Areawarp though will ensure that you are guaranteed to get warped. This also fixes some poor timer usage in juperos quest for example, where one of the NPCs just won't ever get enabled again. --- npc/jobs/2-1/wizard.txt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 3814e1880..3c779f188 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -1527,7 +1527,7 @@ OnTimer183000: end; OnTimer184000: - enablenpc "Room of Fire#Failed"; + areawarp("job_wiz", 30, 83, 62, 115, "geffen", 120, 110); end; OnTimer185000: @@ -1535,8 +1535,6 @@ OnTimer185000: end; OnTimer186000: - disablenpc "Room of Fire#Failed"; - donpcevent "Room of Fire::OnDisable"; donpcevent "Arena Assistant::OnStart"; end; } @@ -1604,7 +1602,7 @@ OnTimer120000: end; OnTimer121000: - enablenpc "Room of Fire#Failed"; + areawarp("job_wiz", 30, 83, 62, 115, "geffen", 120, 110); end; OnTimer122000: @@ -1612,21 +1610,10 @@ OnTimer122000: end; OnTimer123000: - disablenpc "Room of Fire#Failed"; donpcevent "Room of Fire#Door::OnDisable"; donpcevent "Arena Assistant::OnStart"; } -job_wiz,46,99,0 script Room of Fire#Failed FAKE_NPC,16,16,{ -OnInit: - disablenpc "Room of Fire#Failed"; - end; - -OnTouch: - warp "geffen",120,110; - end; -} - job_wiz,1,7,1 script Test Helper#wiz 1_F_01,{ end; -- cgit v1.2.3-70-g09d2