Add basic quest vars support.

5 files changed, 29 insertions, 29 deletions

diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index c3212ddc..cf121931 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -16,7 +16,7 @@
 000-2-1.gat,33,32,0,1	script	AligeTrigger	0,1,1,{
 
 OnTouch:
-    if (geta2(ShipQuests, ShipQuests_Alige) > 0) close;
+    if (getq(ShipQuests_Alige) > 0) close;
     doevent "Alige::OnFirstEncounter";
 
     close;
@@ -46,13 +46,13 @@ OnTimer190:
 
 000-2-1.gat,33,31,0,1	script	Alige	301;2,{
 
-    set @q, geta2(ShipQuests, ShipQuests_Alige);
+    set @q, getq(ShipQuests_Alige);
     if (@q == 2) goto l_AskForFood;
 
     goto OnFirstEncounter;
 
 OnFirstEncounter:
-    seta2 ShipQuests, ShipQuests_Alige, 1;
+    setq ShipQuests_Alige, 1;
 
     mesn "Hidden Person";
     mesq l("Hey, psst! You're not a sailor, right?");
@@ -107,7 +107,7 @@ l_CanHelp:
     mesq l("Please don't tell people that you've seen me. I don't want to be thrown in the sea as food for sharks or decapitated. At least not again!");
     next;
 
-    if (geta2(ShipQuests, ShipQuests_Alige) == 2) goto l_SoAskForFood;
+    if (getq(ShipQuests_Alige) == 2) goto l_SoAskForFood;
     goto l_Accept;
 
 l_AboutReward:
@@ -132,7 +132,7 @@ l_Artis:
     goto l_Accept;
 
 l_Accepted:
-    seta2 ShipQuests, ShipQuests_Alige, 2;
+    setq ShipQuests_Alige, 2;
 
     mes "";
     mesn;
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index af90979a..4ef180c2 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -12,7 +12,7 @@
 //    3   Has and equipped the clothes.
 
 000-2-1.gat,39,36,0,1	script	LeftDoorCheck	0,0,0,{
-    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    set @q, getq(ShipQuests_Arpan);
     if (@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
@@ -20,7 +20,7 @@
 }
 
 000-2-1.gat,44,36,0,1	script	RightDoorCheck	0,0,0,{
-    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    set @q, getq(ShipQuests_Arpan);
     if (@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
@@ -28,7 +28,7 @@
 }
 
 000-2-1.gat,37,32,0,1	script	LeftBarrierCheck	0,0,2,{
-    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    set @q, getq(ShipQuests_Arpan);
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone;
     if (@q == 1) goto l_GetCloth;
@@ -46,14 +46,14 @@ l_GetCloth:
     close;
 
 l_EquipDone:
-    seta2 ShipQuests, ShipQuests_Arpan, 3;
+    setq ShipQuests_Arpan, 3;
 
     close;
 
 }
 
 000-2-1.gat,46,32,0,1	script	RightBarrierCheck	0,0,2,{
-    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    set @q, getq(ShipQuests_Arpan);
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone;
     if (@q == 1) goto l_GetCloth;
@@ -71,7 +71,7 @@ l_GetCloth:
     close;
 
 l_EquipDone:
-    seta2 ShipQuests, ShipQuests_Arpan, 3;
+    setq ShipQuests_Arpan, 3;
 
     close;
 
@@ -81,7 +81,7 @@ l_EquipDone:
 000-2-1.gat,39,33,0,1	script	Magic Arpan	307;5,{
 
 OnTalk:
-    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    set @q, getq(ShipQuests_Arpan);
 
     mesn;
 
@@ -89,7 +89,7 @@ OnTalk:
 
     mesq lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?");
     next;
-    seta2 ShipQuests, ShipQuests_Arpan, 1;
+    setq ShipQuests_Arpan, 1;
 
     menu
         lg("I only remember I was rescued by you."), l_Story,
@@ -135,7 +135,7 @@ l_Menu:
         lg("Could you tell me where I am?"), l_Where,
         lg("Where can I find Julia?"), l_Julia,
         l("Who are you?"), l_Who,
-        rif(geta(ShipQuests, ShipQuests_ArpanMoney) == 0, l("Where are my old clothes?")), l_WhereOldClothes,
+        rif(getq(ShipQuests_ArpanMoney) == 0, l("Where are my old clothes?")), l_WhereOldClothes,
         rif(!@equipped, lg("What should I do after taking these clothes?")), l_WhatCloth,
         rif(!@equipped, l("Thank you, I'll take them."), l("Nothing, sorry.")), l_Quit;
     close;
@@ -179,7 +179,7 @@ l_WhereOldClothes:
     mesq lg("We tried to clean them but the sea water mostly killed them. It's why we gave you these cloths, they are not very good but it's all that we got.");
     next;
     mes lg("Oh, now that I remember, we've also found some money in your pockets, here it is!");
-    seta ShipQuests, ShipQuests_ArpanMoney, 1;
+    setq ShipQuests_ArpanMoney, 1;
     set zeny, zeny+25;
     next;
 
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index a2c7b90c..130b2c1a 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -12,7 +12,7 @@
 
 000-2-1.gat,41,37,0	script	Chest#0	317;2,{
 
-    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    set @q, getq(ShipQuests_Arpan);
     if (getnpcdir ("") == 4) goto l_Give;
 
     setnpcdir 2;
@@ -22,7 +22,7 @@
 
 l_Give:
     if (@q > 1) goto l_Close;
-    seta2 ShipQuests, ShipQuests_Arpan, 2;
+    setq ShipQuests_Arpan, 2;
     getitem "WornShirt", 1;
     getitem "WornShorts", 1;
     message strcharinfo(0), l("You take the clothes from the chest.");
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index 37f342ca..c7ca1a55 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -11,7 +11,7 @@
 
 000-2-1.gat,40,24,0,2	script	#name	100;2,{
 
-    set @q, geta(ShipQuests, ShipQuests_Knife);
+    set @q, getq(ShipQuests_Knife);
     if (@q) close;
 
     mesn "Narrator";
@@ -25,7 +25,7 @@
     close;
 
 l_Give:
-    seta ShipQuests, ShipQuests_Knife, 1;
+    setq ShipQuests_Knife, 1;
     getitem "Knife", 1;
 
     mes "";
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 47c4c23a..e2821ba4 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -37,7 +37,7 @@
 OnTouch:
     if (BaseLevel < 5) goto L_Stop;
     if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
-    set @q, geta4(ShipQuests, ShipQuests_Peter);
+    set @q, getq(ShipQuests_Peter);
     if (@q < 1) goto L_Task;
     if (@q == 1 || @q == 2) goto L_Rfail;
     if (@q == 3 || @q == 4) goto L_Rwin;
@@ -74,11 +74,11 @@ L_Rwin:
 
 000-2-1.gat,60,35,0,1	script	Peter	303;3,{
 
-    set @q_julia, geta2(ShipQuests, ShipQuests_Julia);
+    set @q_julia, getq(ShipQuests_Julia);
     if (@q_julia == 0) goto L_TalkToJulia;
     if (BaseLevel < 5) goto OnTooWeak;
 
-    set @q, geta4(ShipQuests, ShipQuests_Peter);
+    set @q, getq(ShipQuests_Peter);
     if (@q == 1 || @q == 2) goto OnReturnFail;
     if (@q >= 3) goto OnReturnWin;
 
@@ -176,15 +176,15 @@ L_BonusTask:
         l("What? This reward is too small!"), L_Close;
 
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    if (@q == 0) seta4 ShipQuests, ShipQuests_Peter, 2;
-    if (@q == 3) seta4 ShipQuests, ShipQuests_Peter, 4;
+    if (@q == 0) setq ShipQuests_Peter, 2;
+    if (@q == 3) setq ShipQuests_Peter, 4;
 
     goto L_Start;
 
 L_Task:
     mes "";
     if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    if (@q == 0) seta4 ShipQuests, ShipQuests_Peter, 1;
+    if (@q == 0) setq ShipQuests_Peter, 1;
     goto L_Start;
 
 L_Start:
@@ -251,7 +251,7 @@ L_Dead:
 
 L_Done:
     warp "000-2-1", 61, 36;
-    set @q, geta4(ShipQuests, ShipQuests_Peter);
+    set @q, getq(ShipQuests_Peter);
     if (@q == 2 || @q == 4) goto L_Reward;
 
     goto L_Thanks;
@@ -285,15 +285,15 @@ L_Reward:
     mesq l("Good job!") + " " + l("Here's your reward!");
     getexp 100, 0;
     set zeny, zeny + 500;
-    seta4 ShipQuests, ShipQuests_Peter, 5;
+    setq ShipQuests_Peter, 5;
 
     goto L_CleaningClose;
 
 L_Thanks:
     mesn;
     mesq l("Thanks for helping me!");
-    set @q, geta4(ShipQuests, ShipQuests_Peter);
-    if (@q == 1) seta4 ShipQuests, ShipQuests_Peter, 3;
+    set @q, getq(ShipQuests_Peter);
+    if (@q == 1) setq ShipQuests_Peter, 3;
 
     goto L_CleaningClose;