diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-09-14 03:05:25 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-09-14 03:05:25 -0300 |
| commit | 44af610f16d080a3886a8c943f8c62b9e840cbe7 (patch) | |
| tree | 9aa164ebd1703631ae8410978bea7fb5954265de /npc/018-6-1/main.txt | |
| parent | 01ef1ceb9e8598c10c3705754a4288da27404a7f (diff) | |
| download | serverdata-44af610f16d080a3886a8c943f8c62b9e840cbe7.tar.gz serverdata-44af610f16d080a3886a8c943f8c62b9e840cbe7.tar.bz2 serverdata-44af610f16d080a3886a8c943f8c62b9e840cbe7.tar.xz serverdata-44af610f16d080a3886a8c943f8c62b9e840cbe7.zip | |
Temporary state clean up should happen before, not after
Diffstat (limited to 'npc/018-6-1/main.txt')
| -rw-r--r-- | npc/018-6-1/main.txt | 10 |
1 files changed, 6 insertions, 4 deletions
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 { |