Replace temp variables into scope temp variables.

7 files changed, 127 insertions, 127 deletions

diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index ea04bf818..c5abf1d39 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -51,8 +51,8 @@ OnTimer190:
 // Size = 2
 // Gender = 1
 000-2-1,43,31,0	script	Alige	401,{
-    set @q, getq(ShipQuests_Alige);
-    if (@q > 1) goto L_AskForFood;
+    set .@q, getq(ShipQuests_Alige);
+    if (.@q > 1) goto L_AskForFood;
 
     goto OnFirstEncounter;
 
@@ -148,7 +148,7 @@ L_Artis:
     next;
     restorecam;
 
-    if (@q == 2) goto L_SoAskForFood;
+    if (.@q == 2) goto L_SoAskForFood;
     goto L_Accept;
 
 L_FirstAccepted:
@@ -184,17 +184,17 @@ L_GiveFood:
         rif(countitemcolor(516, 1), l(getitemname("PumpkinSeeds"))), 1,
         l("I don't have anything good for you today."), -1;
 
-    set @id, @menuret;
-    if (@id == -1) goto L_Quit; // Quit message.
-    if (@id == 0) goto L_NoReward; // In case of wrong food.
-    if (@id == 1) goto L_Poison; // In case of poisoned food.
-    if (@id == 2) goto L_NoMore; // In case of Piberries.
-    if (countitemcolor(@id) == 0) goto L_Quit;
-//  if (@id == item's ID) then food is correct.
+    set .@id, @menuret;
+    if (.@id == -1) goto L_Quit; // Quit message.
+    if (.@id == 0) goto L_NoReward; // In case of wrong food.
+    if (.@id == 1) goto L_Poison; // In case of poisoned food.
+    if (.@id == 2) goto L_NoMore; // In case of Piberries.
+    if (countitemcolor(.@id) == 0) goto L_Quit;
+//  if (.@id == item's ID) then food is correct.
 // Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion.
 
     callfunc "InventoryPlace", 507, 3;
-    delitem @id, 1;
+    delitem .@id, 1;
 
     setcamnpc;
     mes "";
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 40bf53ac2..8bc60a4cd 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -18,27 +18,27 @@
 
 // Gender = 1
 000-2-1,49,36,0	script	LeftDoorCheck	32767,0,0,{
-    set @q, getq(ShipQuests_Arpan);
-    if (@q == 0) doevent "Magic Arpan::OnTalk";
+    set .@q, getq(ShipQuests_Arpan);
+    if (.@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
 // Gender = 1
 000-2-1,54,36,0	script	RightDoorCheck	32767,0,0,{
-    set @q, getq(ShipQuests_Arpan);
-    if (@q == 0) doevent "Magic Arpan::OnTalk";
+    set .@q, getq(ShipQuests_Arpan);
+    if (.@q == 0) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
 // Gender = 1
 000-2-1,47,32,0	script	LeftBarrierCheck	32767,0,2,{
-    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 == 2) goto L_Equip;
-    if (@q == 1) goto L_GetCloth;
+    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 == 2) goto L_Equip;
+    if (.@q == 1) goto L_GetCloth;
 
     doevent "Magic Arpan::OnClothNotTaken";
 
@@ -62,11 +62,11 @@ L_EquipDone:
 
 // Gender = 1
 000-2-1,56,32,0	script	RightBarrierCheck	32767,0,2,{
-    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 == 2) goto L_Equip;
-    if (@q == 1) goto L_GetCloth;
+    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 == 2) goto L_Equip;
+    if (.@q == 1) goto L_GetCloth;
 
     doevent "Magic Arpan::OnClothNotTaken";
 
@@ -91,14 +91,14 @@ L_EquipDone:
 // Size = 5
 // Gender = 1
 000-2-1,49,33,0	script	Magic Arpan	407,{
-    set @q, getq(ShipQuests_Arpan);
-    set @q_julia, getq(ShipQuests_Julia);
-    if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
+    set .@q, getq(ShipQuests_Arpan);
+    set .@q_julia, getq(ShipQuests_Julia);
+    if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
 
 OnTalk:
     mesn;
 
-    if (@q > 0) goto L_Menu;
+    if (.@q > 0) goto L_Menu;
 
     mesq lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?");
     next;
@@ -136,7 +136,7 @@ L_Story:
     mes "";
     mesq lg("You were yaying sleeping for quite some time there, our shipkeeper, Julia, was here with you, she did her best to heal your injuries.");
     next;
-    if (@q_julia == 0) setq ShipQuests_Julia, 1;
+    if (.@q_julia == 0) setq ShipQuests_Julia, 1;
     mesq lg("Yaya, you should go see her! She'll be happy to see you.");
     next;
     mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside.");
@@ -147,15 +147,15 @@ L_Story:
 L_Menu:
     mesq l("What yeye could I do for you today?");
     next;
-    set @equipped, getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
+    set .@equipped, getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
 
     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(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 and put them on.")), -,
+        rif(!.@equipped, lg("What should I do after taking these clothes?")), L_WhatCloth,
+        rif(!.@equipped, l("Thank you, I'll take them and put them on.")), -,
         l("Nothing, sorry."), -;
 
     closedialog;
@@ -203,7 +203,7 @@ L_WhereOldClothes:
     next;
 
     setq ShipQuests_ArpanMoney, 1;
-    set @q, getq(ShipQuests_Arpan);
+    set .@q, getq(ShipQuests_Arpan);
     set Zeny, Zeny+10;
     message strcharinfo(0), l("You receive @@ E!", 10);
 
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index 530a59f42..8c7817e5a 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -19,21 +19,21 @@
 // Size = 2
 // Gender = 1
 000-2-1,27,28,0	script	Chef Gado	418,{
-    set @q, getq(ShipQuests_ChefGado);
-    set @n, getq(ShipQuests_Nard);
-    if (@q == 1) goto L_QuestAccepted;
-    if (@q == 2) goto L_PoisonAccepted;
-    if (@q == 3) goto L_PoisonJulia;
-    if (@q == 4) goto L_QuestComplete;
-    if (@q == 5 && countitemcolor("PoisonedDish") > 0) goto L_Aborting;
-    if (@q > 4) goto L_QuestAborted;
-    if (@n == 3) goto L_QuestStart;
-
-    mesn;
-    set @r, rand(3);
-    if (@r == 0) mesq l("What are you doing in my kitchen?! Get out, it's not a place for kids!");
-    if (@r == 1) mesq l("Where is the damn salt?! Give me the salt, I know you have it!");
-    if (@r == 2) mesq l("Are you going to stand here all day long? Do the dishes or go away.");
+    set .@q, getq(ShipQuests_ChefGado);
+    set .@n, getq(ShipQuests_Nard);
+    if (.@q == 1) goto L_QuestAccepted;
+    if (.@q == 2) goto L_PoisonAccepted;
+    if (.@q == 3) goto L_PoisonJulia;
+    if (.@q == 4) goto L_QuestComplete;
+    if (.@q == 5 && countitemcolor("PoisonedDish") > 0) goto L_Aborting;
+    if (.@q > 4) goto L_QuestAborted;
+    if (.@n == 3) goto L_QuestStart;
+
+    mesn;
+    set .@r, rand(3);
+    if (.@r == 0) mesq l("What are you doing in my kitchen?! Get out, it's not a place for kids!");
+    if (.@r == 1) mesq l("Where is the damn salt?! Give me the salt, I know you have it!");
+    if (.@r == 2) mesq l("Are you going to stand here all day long? Do the dishes or go away.");
 
     close;
 
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index ccc7b2b16..7f01c6af2 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -12,9 +12,9 @@
 
 // Size = 2
 000-2-1,51,37,0	script	Chest	417,{
-    set @q, getq(ShipQuests_Arpan);
+    set .@q, getq(ShipQuests_Arpan);
 
-    if (@q == 0) goto L_Talk;
+    if (.@q == 0) goto L_Talk;
     if (getnpcdir ("") == 4) goto L_Give;
 
     setnpcdir 2;
@@ -23,9 +23,9 @@
     close;
 
 L_Give:
-    if (@q > 1) goto L_Quit;
-    set @item, 1300;
-    set @count, 2;
+    if (.@q > 1) goto L_Quit;
+    set .@item, 1300;
+    set .@count, 2;
     callfunc "InventoryPlace", 1300, 2;
 
     setq ShipQuests_Arpan, 2;
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index e0aeb6507..c751cd62c 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -10,8 +10,8 @@
 // Gender = 1
 000-2-1,32,31,0	script	Dan	101,{
     mesn;
-    set @q, rand(3);
-    if (@q == 0) goto L_QuestStory;
+    set .@q, rand(3);
+    if (.@q == 0) goto L_QuestStory;
 
     mesq l("You see these pious around us?");
     next;
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index 2ed92c0be..d9d25a743 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -13,8 +13,8 @@
 // Size = 2
 // Gender = 2
 000-2-1,50,24,0	script	#knife	100,{
-    set @q, getq(ShipQuests_Knife);
-    if (@q) close;
+    set .@q, getq(ShipQuests_Knife);
+    if (.@q) close;
 
     mesn "Narrator";
     mes col(l("There are some knives on the table. Would you like to take one?"), 9);
@@ -29,8 +29,8 @@
 
 L_Give:
     mes "";
-    set @item, 3500;
-    set @count, 1;
+    set .@item, 3500;
+    set .@count, 1;
     callfunc "InventoryPlace", 3500, 1;
 
     setq ShipQuests_Knife, 1;
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 60238e127..6d0552f9e 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -21,13 +21,13 @@
 //    5   Task done and reward given.
 //    6   Did not start the quest.
 // Others:
-// @peter = Peter variable.
+// .@peter = Peter variable.
 // "000-2-2.gat" - map with mobs.
-// "$@RAT_SAILOR_HELPER$" - Name of the participant.
-// "$@RAT_SAILOR_DEATHS - Number of deaths when the participant starts the fight.
-// "$@RAT_SAILOR_CONTROL" - Explanation of each index of the array.
-// "$@RAT_SAILOR_OLD_HELPER$" - Name of the participant.
-// "$@RAT_SAILOR_COUNTDOWN" - Seconds since the epoch of when the player done the quest.
+// "$.@RAT_SAILOR_HELPER$" - Name of the participant.
+// "$.@RAT_SAILOR_DEATHS - Number of deaths when the participant starts the fight.
+// "$.@RAT_SAILOR_CONTROL" - Explanation of each index of the array.
+// "$.@RAT_SAILOR_OLD_HELPER$" - Name of the participant.
+// "$.@RAT_SAILOR_COUNTDOWN" - Seconds since the epoch of when the player done the quest.
 // [1] = Shows status of ratto number 1 (1 is dead and 0 is alive).
 // [2] = Shows status of ratto number 2 (1 is dead and 0 is alive).
 // [3] = Shows status of ratto number 3 (1 is dead and 0 is alive).
@@ -44,18 +44,18 @@
 
 OnTouch:
     if (BaseLevel < 5) goto L_Stop;
-    if ($@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown;
-    if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto L_NoGoodTick;
-    if (($@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0)) && ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 60)) goto L_NoGoodTick;
-    set $@RAT_SAILOR_COUNTDOWN, "";
+    if ($.@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown;
+    if ((gettimetick(2) - $.@RAT_SAILOR_COUNTDOWN) < 10) goto L_NoGoodTick;
+    if (($.@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0)) && ((gettimetick(2) - $.@RAT_SAILOR_COUNTDOWN) < 60)) goto L_NoGoodTick;
+    set $.@RAT_SAILOR_COUNTDOWN, "";
 
 L_NoCountDown:
-    if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
-    set @peter, getq(ShipQuests_Peter);
-    if (@peter < 1 || @peter > 5) goto L_Task;
-    if (@peter == 1 || @peter == 2) goto L_Rfail;
-    if (@peter == 3 || @peter == 4) goto L_Rwin;
-    if (@peter > 5) goto L_SecondTime;
+    if ($.@RAT_SAILOR_HELPER$ != "") goto L_Occupied;
+    set .@peter, getq(ShipQuests_Peter);
+    if (.@peter < 1 || .@peter > 5) goto L_Task;
+    if (.@peter == 1 || .@peter == 2) goto L_Rfail;
+    if (.@peter == 3 || .@peter == 4) goto L_Rwin;
+    if (.@peter > 5) goto L_SecondTime;
     doevent "Peter::OnReturnWin";
     close;
 
@@ -92,19 +92,19 @@ L_NoGoodTick:
 // Gender = 1
 000-2-1,70,35,0	script	Peter	403,{
     if (BaseLevel < 5) goto OnTooWeak;
-    if ($@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown;
-    if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
-    if (($@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0)) && ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 60)) goto OnNoGoodTick;
-    set $@RAT_SAILOR_COUNTDOWN, "";
+    if ($.@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown;
+    if ((gettimetick(2) - $.@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick;
+    if (($.@RAT_SAILOR_OLD_HELPER$ == strcharinfo(0)) && ((gettimetick(2) - $.@RAT_SAILOR_COUNTDOWN) < 60)) goto OnNoGoodTick;
+    set $.@RAT_SAILOR_COUNTDOWN, "";
 
 L_NoCountDown:
-    set @peter, getq(ShipQuests_Peter);
-    if (@peter == 1 || @peter == 2) goto OnReturnFail;
-    if (@peter == 3 || @peter == 4 || @peter == 5)  goto OnReturnWin;
+    set .@peter, getq(ShipQuests_Peter);
+    if (.@peter == 1 || .@peter == 2) goto OnReturnFail;
+    if (.@peter == 3 || .@peter == 4 || .@peter == 5)  goto OnReturnWin;
 
 OnGiveTask:
     setq ShipQuests_Peter, 6;
-    set @peter, getq(ShipQuests_Peter);
+    set .@peter, getq(ShipQuests_Peter);
     mesn;
     mesq g(l("Hey, girl!"),
            l("Hey, man!"));
@@ -158,13 +158,13 @@ OnReturnWin:
     mesq l("Thanks again for helping me. Drats these rattos for infesting our fair vessal! They are a permanent problem; so you can always be sure that your help with the extermination, to keep their numbers under control, is very welcome indeed. But the situation is, that I can give you a reward only the one time.");
     next;
 
-    if (@peter == 3 || @peter == 4)
+    if (.@peter == 3 || .@peter == 4)
         menu
             l("Did you say reward? I want it!"), L_BonusTask,
             l("I am not worried about rewards. I just want to help."), L_Task,
             l("Sorry, I am not in the mood for another fight with these rattos."), -;
 
-    if (@peter == 5)
+    if (.@peter == 5)
         menu
             l("No problem, I can help you anyway."), L_Task,
             l("Sorry, I am not in the mood for another fight with these rattos."), -;
@@ -185,16 +185,16 @@ L_BonusTask:
         lg("Okay, I'm ready to work!"), -,
         l("What? This reward is too small!"), L_Quit;
 
-    if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    if (@peter == 6) setq ShipQuests_Peter, 2;
-    if (@peter == 3) setq ShipQuests_Peter, 4;
-    set @peter, getq(ShipQuests_Peter);
+    if ($.@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
+    if (.@peter == 6) setq ShipQuests_Peter, 2;
+    if (.@peter == 3) setq ShipQuests_Peter, 4;
+    set .@peter, getq(ShipQuests_Peter);
     goto L_Start;
 
 L_Task:
-    if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    if (@peter == 6) setq ShipQuests_Peter, 1;
-    set @peter, getq(ShipQuests_Peter);
+    if ($.@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
+    if (.@peter == 6) setq ShipQuests_Peter, 1;
+    set .@peter, getq(ShipQuests_Peter);
 
 L_Start:
     mes "";
@@ -202,9 +202,9 @@ L_Start:
     mesq l("Okay, you can start!");
 
 OnStartOutside:
-    if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
-    set $@RAT_SAILOR_HELPER$, strcharinfo(0);
-    set $@RAT_SAILOR_DEATHS, PC_DIE_COUNTER;
+    if ($.@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp;
+    set $.@RAT_SAILOR_HELPER$, strcharinfo(0);
+    set $.@RAT_SAILOR_DEATHS, PC_DIE_COUNTER;
     initnpctimer;
     warp "000-2-2.gat", 48, 28;
     doevent "RattosControl::OnSpawn";
@@ -212,25 +212,25 @@ OnStartOutside:
     goto L_Quit;
 
 OnTimer2000:
-    if (attachrid(getcharid(3, $@RAT_SAILOR_HELPER$)) == 0) goto L_Logoff;
-    set $@RAT_SAILOR_CONTROL[9], $@RAT_SAILOR_CONTROL[9] + 2;
-    if ($@RAT_SAILOR_CONTROL[9] > 100) goto L_Timeout;
-    if (PC_DIE_COUNTER > $@RAT_SAILOR_DEATHS) goto L_Dead;
-    if ($@RAT_SAILOR_CONTROL[1] && $@RAT_SAILOR_CONTROL[2] && $@RAT_SAILOR_CONTROL[3] && $@RAT_SAILOR_CONTROL[4]) goto L_Done;
+    if (attachrid(getcharid(3, $.@RAT_SAILOR_HELPER$)) == 0) goto L_Logoff;
+    set $.@RAT_SAILOR_CONTROL[9], $.@RAT_SAILOR_CONTROL[9] + 2;
+    if ($.@RAT_SAILOR_CONTROL[9] > 100) goto L_Timeout;
+    if (PC_DIE_COUNTER > $.@RAT_SAILOR_DEATHS) goto L_Dead;
+    if ($.@RAT_SAILOR_CONTROL[1] && $.@RAT_SAILOR_CONTROL[2] && $.@RAT_SAILOR_CONTROL[3] && $.@RAT_SAILOR_CONTROL[4]) goto L_Done;
     if (getmapusers("000-2-2.gat") == 0) goto L_CleaningEnd;
     goto L_CheckRattos;
 
     end;
 
 L_CheckRattos:
-    if ($@RAT_SAILOR_CONTROL[1]) set $@RAT_SAILOR_CONTROL[5], $@RAT_SAILOR_CONTROL[5] + 2;
-    if ($@RAT_SAILOR_CONTROL[2]) set $@RAT_SAILOR_CONTROL[6], $@RAT_SAILOR_CONTROL[6] + 2;
-    if ($@RAT_SAILOR_CONTROL[3]) set $@RAT_SAILOR_CONTROL[7], $@RAT_SAILOR_CONTROL[7] + 2;
-    if ($@RAT_SAILOR_CONTROL[4]) set $@RAT_SAILOR_CONTROL[8], $@RAT_SAILOR_CONTROL[8] + 2;
-    if ($@RAT_SAILOR_CONTROL[5] > 40) doevent "RattosControl::OnRatto1Respawn";
-    if ($@RAT_SAILOR_CONTROL[6] > 40) doevent "RattosControl::OnRatto2Respawn";
-    if ($@RAT_SAILOR_CONTROL[7] > 40) doevent "RattosControl::OnRatto3Respawn";
-    if ($@RAT_SAILOR_CONTROL[8] > 40) doevent "RattosControl::OnRatto4Respawn";
+    if ($.@RAT_SAILOR_CONTROL[1]) set $.@RAT_SAILOR_CONTROL[5], $.@RAT_SAILOR_CONTROL[5] + 2;
+    if ($.@RAT_SAILOR_CONTROL[2]) set $.@RAT_SAILOR_CONTROL[6], $.@RAT_SAILOR_CONTROL[6] + 2;
+    if ($.@RAT_SAILOR_CONTROL[3]) set $.@RAT_SAILOR_CONTROL[7], $.@RAT_SAILOR_CONTROL[7] + 2;
+    if ($.@RAT_SAILOR_CONTROL[4]) set $.@RAT_SAILOR_CONTROL[8], $.@RAT_SAILOR_CONTROL[8] + 2;
+    if ($.@RAT_SAILOR_CONTROL[5] > 40) doevent "RattosControl::OnRatto1Respawn";
+    if ($.@RAT_SAILOR_CONTROL[6] > 40) doevent "RattosControl::OnRatto2Respawn";
+    if ($.@RAT_SAILOR_CONTROL[7] > 40) doevent "RattosControl::OnRatto3Respawn";
+    if ($.@RAT_SAILOR_CONTROL[8] > 40) doevent "RattosControl::OnRatto4Respawn";
 
 L_NotYet:
     setnpctimer 0;
@@ -241,7 +241,7 @@ OnDontneedHelp:
     mesn;
     mesq l("I don't need your help right now, come back later.");
     next;
-    mesq l("@@ is helping me.", $@RAT_SAILOR_HELPER$);
+    mesq l("@@ is helping me.", $.@RAT_SAILOR_HELPER$);
 
     goto L_Quit;
 
@@ -262,19 +262,19 @@ L_Dead:
     goto L_CleaningEnd;
 
 L_Done:
-    set $@RAT_SAILOR_CONTROL[10], $@RAT_SAILOR_CONTROL[10] + 2;
-    if($@RAT_SAILOR_CONTROL[10] < 5) goto L_NotYet;
-    set @peter, getq(ShipQuests_Peter);
-    if (@peter == 2 || @peter == 4) goto L_Reward;
+    set $.@RAT_SAILOR_CONTROL[10], $.@RAT_SAILOR_CONTROL[10] + 2;
+    if($.@RAT_SAILOR_CONTROL[10] < 5) goto L_NotYet;
+    set .@peter, getq(ShipQuests_Peter);
+    if (.@peter == 2 || .@peter == 4) goto L_Reward;
     warp "000-2-1.gat", 72, 36;
 
     goto L_Thanks;
 
 L_CleaningEnd:
     stopnpctimer;
-    set $@RAT_SAILOR_HELPER$, "";
-    set $@RAT_SAILOR_DEATHS, 0;
-    cleararray $@RAT_SAILOR_CONTROL, 0, 11;
+    set $.@RAT_SAILOR_HELPER$, "";
+    set $.@RAT_SAILOR_DEATHS, 0;
+    cleararray $.@RAT_SAILOR_CONTROL, 0, 11;
     killmonster "000-2-2.gat", "RattosControl::OnRatto1Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto2Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto3Death";
@@ -284,22 +284,22 @@ L_CleaningEnd:
 
 L_CleaningClose:
     stopnpctimer;
-    set $@RAT_SAILOR_OLD_HELPER$, $@RAT_SAILOR_HELPER$;
-    set $@RAT_SAILOR_HELPER$, "";
-    set $@RAT_SAILOR_DEATHS, 0;
-    cleararray $@RAT_SAILOR_CONTROL, 0, 11;
+    set $.@RAT_SAILOR_OLD_HELPER$, $.@RAT_SAILOR_HELPER$;
+    set $.@RAT_SAILOR_HELPER$, "";
+    set $.@RAT_SAILOR_DEATHS, 0;
+    cleararray $.@RAT_SAILOR_CONTROL, 0, 11;
     killmonster "000-2-2.gat", "RattosControl::OnRatto1Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto2Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto3Death";
     killmonster "000-2-2.gat", "RattosControl::OnRatto4Death";
-    set $@RAT_SAILOR_COUNTDOWN, gettimetick(2);
+    set $.@RAT_SAILOR_COUNTDOWN, gettimetick(2);
 
     close;
 
 L_Reward:
     warp "000-2-1.gat", 72, 36;
     setq ShipQuests_Peter, 5;
-    set @peter, getq(ShipQuests_Peter);
+    set .@peter, getq(ShipQuests_Peter);
     mesn;
     mesq l("Good job!") + " " + l("Here's your reward!");
     getexp 100, 0;
@@ -311,14 +311,14 @@ L_Reward:
 L_Thanks:
     mesn;
     mesq l("Thanks for helping me!");
-    set @peter, getq(ShipQuests_Peter);
-    if (@peter == 1) setq ShipQuests_Peter, 3;
-    set @peter, getq(ShipQuests_Peter);
+    set .@peter, getq(ShipQuests_Peter);
+    if (.@peter == 1) setq ShipQuests_Peter, 3;
+    set .@peter, getq(ShipQuests_Peter);
 
     goto L_CleaningClose;
 
 L_Quit:
-    set @peter, 0;
+    set .@peter, 0;
 
     close;