Fix Furquest to use a callfunc

Add general debug to both scripts

1 files changed, 44 insertions, 12 deletions

diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index f10395a2..b8a00c28 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -1,3 +1,39 @@
+010-2.gat,83,85,0|script|Lora Tay Debug|151
+{
+    mes "[Lora Tay Debug]";
+    mes "What do you want to do?";
+    menu
+        "Show Quest State", L_ShowState,
+        "Set Quest State", L_SetState,
+        "Reset", L_Reset,
+        "Nothing.", L_Close;
+
+L_ShowState:
+    set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
+    mes "Current State is " + @wg_state;
+    goto L_Close;
+
+L_SetState:
+    mes "What state do you want?";
+    input @wg_state;
+    callfunc "setWGState";
+    mes "Set to " + @wg_state;
+    goto L_Close;
+
+L_Reset:
+    set @wg_state, 0;
+    callfunc "setWGState";
+    mes "Reset!";
+    goto L_Close;
+
+L_Close:
+    close;
+
+OnInit:
+    if (!debug)
+        disablenpc "Lora Tay Debug";
+    end;
+}
 010-2.gat,85,85,0|script|Lora Tay|151
 {
     set @ROBE_COCOONS_NR, 150; // must be multiple of ten
@@ -111,7 +147,7 @@ L_agostine_1:
 
 L_Next13:
     set @wg_state, 10;
-    callsub S_Update;
+    callfunc "setWGState";
     goto L_Close;
 
 L_agostine_menu:
@@ -215,7 +251,7 @@ L_give_water:
         goto L_no_water;
     delitem "BottleOfWater", 1;
     set @wg_state, 11;
-    callsub S_Update;
+    callfunc "setWGState";
 
     set @xpval, 50000;
 
@@ -302,7 +338,7 @@ L_Next2:
     mes "Go see Agostine, ask him what he's planning and I will think about it.\"";
 
     set @wg_state, 13;
-    callsub S_Update;
+    callfunc "setWGState";
     goto L_Close;
 
 L_proposal_intro:
@@ -353,7 +389,7 @@ L_proposal_search_items:
 
 L_Next5:
     set @wg_state, 15;
-    callsub S_Update;
+    callfunc "setWGState";
     goto L_Close;
 
 L_proposal_not_enough_items:
@@ -366,7 +402,7 @@ L_proposal_give_items:
         goto L_proposal_not_enough_items;
     delitem "SilkCocoon", @FINEDRESS_COCOONS;
     set @wg_state, 16;
-    callsub S_Update;
+    callfunc "setWGState";
 
     mes "[Lora Tay the Seamstress]";
     mes "\"Great, now I can spin the silk threading and fix this mess made of these fine materials.";
@@ -396,7 +432,7 @@ L_Next6:
     mes "I am done with the threading but I will now need to sew these materials together into the design.\"";
     next;
     set @wg_state, 18;
-    callsub S_Update;
+    callfunc "setWGState";
     goto L_proposal_wait_dress_finished;
 
 L_proposal_wait_dress_finished:
@@ -412,7 +448,7 @@ L_proposal_wait_dress_finished:
 
 L_proposal_dress_finished:
     set @wg_state, 19;
-    callsub S_Update;
+    callfunc "setWGState";
     mes "[Lora Tay the Seamstress]";
     mes "\"Well it was difficult seaming with such fragile materials.";
     mes "But I have done it. The design is finished except for one part of it.\"";
@@ -436,7 +472,7 @@ L_Next7:
 
 L_Next8:
     set @wg_state, 20;
-    callsub S_Update;
+    callfunc "setWGState";
     goto L_Close;
 
 L_proposal_deliver_dress:
@@ -1141,10 +1177,6 @@ L_CleanSorcererRobe:
     set @cotton_cloth_id, 0;
     goto L_Close;
 
-S_Update:
-    set QUEST_WG_state, (QUEST_WG_state & ~(BYTE_0_MASK) | (@wg_state << BYTE_0_SHIFT));
-    return;
-
 L_Close:
     set @wg_state, 0;
     close;