From 44af610f16d080a3886a8c943f8c62b9e840cbe7 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 14 Sep 2019 03:05:25 -0300 Subject: Temporary state clean up should happen before, not after --- npc/018-6-1/main.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'npc') diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt index 68702c548..22d4370e3 100644 --- a/npc/018-6-1/main.txt +++ b/npc/018-6-1/main.txt @@ -116,10 +116,6 @@ OnTouch: if (.@q > 2) enablenpc instance_npcname("#ToForgottenShrine", .@q2); if (.@q == 2) { - if (.@q3 == 5) - enablenpc instance_npcname("#ToForgottenShrine", .@q2); - if (.@q3 == 3) - enablenpc instance_npcname("#ToSouthHall", .@q2); // Note: state 64 and 128 are temporary and must be removed if (.@q3 & 64) setq3 LoFQuest_Barbara, .@q3^64; @@ -127,7 +123,13 @@ OnTouch: .@q3=getq3(LoFQuest_Barbara); if (.@q3 & 128) setq3 LoFQuest_Barbara, .@q3^128; + // Safety update + .@q3=getq3(LoFQuest_Barbara); + if (.@q3 == 5) + enablenpc instance_npcname("#ToForgottenShrine", .@q2); + if (.@q3 == 3) + enablenpc instance_npcname("#ToSouthHall", .@q2); } } else { -- cgit v1.2.3-60-g2f50