diff options
| -rw-r--r-- | npc/005-1/ayasha.txt | 16 | ||||
| -rw-r--r-- | npc/005-1/zegas.txt | 12 | ||||
| -rw-r--r-- | npc/005-3/barrel.txt | 6 |
3 files changed, 10 insertions, 24 deletions
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index 6789f42f8..54b249cdd 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -270,9 +270,9 @@ function script CheckEnfant { @count_tmp = 0; if ($@GM_OVERRIDE) npctalk3 l("Hello, I am K-@@, of the @@ order.", @kids, $@KidsBits[@kids]); - if (STARTAREA & $@KidsBits[@kids]) + if (getq2(CandorQuest_HAS) & $@KidsBits[@kids]) goto L_Already; - STARTAREA = STARTAREA | $@KidsBits[@kids]; + setq2 CandorQuest_HAS, getq2(CandorQuest_HAS) | $@KidsBits[@kids]; goto L_Loop; @@ -293,7 +293,7 @@ L_KidsTally: L_Loop: while (@count_tmp < 6) { - if (STARTAREA & $@KidsBits[@count_tmp]) + if (getq2(CandorQuest_HAS) & $@KidsBits[@count_tmp]) @kids_count = (@kids_count + 1); @count_tmp = (@count_tmp + 1); } @@ -411,18 +411,12 @@ OnInit: l("No."), L_Close; L_Reset: - setq CandorQuest_HAS, 0; - STARTAREA = STARTAREA &~ (1 << 10); - STARTAREA = STARTAREA &~ (1 << 11); - STARTAREA = STARTAREA &~ (1 << 12); - STARTAREA = STARTAREA &~ (1 << 13); - STARTAREA = STARTAREA &~ (1 << 14); - STARTAREA = STARTAREA &~ (1 << 15); + setq CandorQuest_HAS, 0, 0; mes l("Reset!"); goto L_Close; L_Charda: - STARTAREA = STARTAREA &~ (1 << 10); + setq2 CandorQuest_HAS, getq2(CandorQuest_HAS) &~ (1 << 10); mes l("Charda clean!"); goto L_Close; diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt index a623f3238..d41eaadf5 100644 --- a/npc/005-1/zegas.txt +++ b/npc/005-1/zegas.txt @@ -71,7 +71,7 @@ L_QuestEnd: getexp 63, 0; getitem CandorShorts, 1; Zeny = (Zeny + 350); - setq CandorQuest_Barrel, 4; + setq CandorQuest_Barrel, 4, 0; close; L_Thanks: @@ -120,15 +120,7 @@ OnInit: l("No."), L_Close; L_Reset: - setq CandorQuest_Barrel, 0; - STARTAREA = STARTAREA &~ (1 << 2); - STARTAREA = STARTAREA &~ (1 << 3); - STARTAREA = STARTAREA &~ (1 << 4); - STARTAREA = STARTAREA &~ (1 << 5); - STARTAREA = STARTAREA &~ (1 << 6); - STARTAREA = STARTAREA &~ (1 << 7); - STARTAREA = STARTAREA &~ (1 << 8); - STARTAREA = STARTAREA &~ (1 << 9); + setq CandorQuest_Barrel, 0, 0; mes l("Reset!"); close; diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt index 160e779e8..6f49589bc 100644 --- a/npc/005-3/barrel.txt +++ b/npc/005-3/barrel.txt @@ -18,9 +18,9 @@ function script CheckBarrel { @count_tmp = 0; if ($@GM_OVERRIDE) npctalk3 l("Hello, I am B-@@, of the @@ order.", @barrel, $@BarrelBits[@barrel]); - if (STARTAREA & $@BarrelBits[@barrel]) + if (getq2(CandorQuest_Barrel) & $@BarrelBits[@barrel]) goto L_Empty; - STARTAREA = STARTAREA | $@BarrelBits[@barrel]; + setq2 CandorQuest_Barrel, getq2(CandorQuest_Barrel) | $@BarrelBits[@barrel]; goto L_Loop; @@ -50,7 +50,7 @@ L_BarrelTally: L_Loop: while (@count_tmp < 8) { @count_tmp = (@count_tmp + 1); - if (STARTAREA & $@BarrelBits[@count_tmp]) + if (getq2(CandorQuest_Barrel) & $@BarrelBits[@count_tmp]) @barrel_count = (@barrel_count + 1); } goto L_BarrelTally; |