From 6eeae2ee499b4aec7b9f771c75ff09264d79c8fd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 5 Dec 2014 12:47:25 +0300 Subject: Replace script function set to direct variable assignments. --- npc/000-0/sailors.txt | 2 +- npc/000-1/ale.txt | 4 +-- npc/000-1/astapolos.txt | 4 +-- npc/000-1/chest.txt | 4 +-- npc/000-1/cookiemaster.txt | 4 +-- npc/000-1/couwan.txt | 2 +- npc/000-1/darlin.txt | 2 +- npc/000-1/gugli.txt | 14 +++++------ npc/000-1/gulukan.txt | 10 ++++---- npc/000-1/jalad.txt | 4 +-- npc/000-1/lean.txt | 2 +- npc/000-1/max.txt | 4 +-- npc/000-1/muller.txt | 4 +-- npc/000-1/tarlan.txt | 2 +- npc/000-1/tibbo.txt | 4 +-- npc/000-2-0/doors.txt | 4 +-- npc/000-2-0/julia.txt | 18 +++++++------- npc/000-2-1/alige.txt | 4 +-- npc/000-2-1/arpan.txt | 18 +++++++------- npc/000-2-1/chefgado.txt | 8 +++--- npc/000-2-1/chest.txt | 6 ++--- npc/000-2-1/dan.txt | 2 +- npc/000-2-1/knife.txt | 6 ++--- npc/000-2-1/peter.txt | 54 ++++++++++++++++++++-------------------- npc/000-2-2/doors.txt | 2 +- npc/000-2-2/ratto.txt | 24 +++++++++--------- npc/000-2-3/box.txt | 2 +- npc/000-2-3/elmo.txt | 2 +- npc/000-2-3/nard.txt | 6 ++--- npc/001-1/cookiemaster.txt | 8 +++--- npc/functions/asleep.txt | 2 +- npc/functions/goodbye.txt | 2 +- npc/functions/inventoryplace.txt | 4 +-- npc/functions/sailordialogue.txt | 2 +- npc/items/croconut.txt | 2 +- 35 files changed, 121 insertions(+), 121 deletions(-) diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 94c2baf0c..42856eb63 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -62,7 +62,7 @@ OnTouch: menuimage("flags/it", "Vi sento... (Italiano)"), -, menuimage("flags/nl_BE", "Ik kan je horen... (Nederlands)"), -, menuimage("flags/ca", "Et escolto (Català)"), -; - set .@lang, @menu-1; + .@lang = @menu-1; if (.@lang < 0 || .@lang > 10) close; Lang = .@lang; diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 54044d06e..cccd0e3d2 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -7,10 +7,10 @@ // Aquada box. 000-1,55,23,0 script Ale 105,{ - set .@g, getq(ShipQuests_Gugli); + .@g = getq(ShipQuests_Gugli); if (.@g == 0) goto L_NoTask; - set .@q, getq(ShipQuests_Ale); + .@q = getq(ShipQuests_Ale); if (.@q == 1) goto L_CallFunc; mesn; diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index 57ca18ac2..2475f516b 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -8,10 +8,10 @@ // Croconut box. 000-1,22,50,0 script Astapolos 107,{ - set .@g, getq(ShipQuests_Gugli); + .@g = getq(ShipQuests_Gugli); if (.@g == 0) goto L_NoTask; - set .@q, getq(ShipQuests_Astapolos); + .@q = getq(ShipQuests_Astapolos); if (.@q == 1) goto L_CallFunc; mesn; diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index 82fa2766d..402d07544 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -13,7 +13,7 @@ 000-1,83,70,0 script #chest 416,{ - set .@q, getq(ShipQuests_TreasureChest); + .@q = getq(ShipQuests_TreasureChest); if (getnpcdir ("") == 4) goto L_Give; setnpcdir 2; @@ -28,7 +28,7 @@ L_Give: setq ShipQuests_TreasureChest, 1; - set Zeny, Zeny + 100; + Zeny = Zeny + 100; getitem "OldBook", 1; npctalk3 l("You open the treasure chest."); diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt index 0253003ae..0e7231dfe 100644 --- a/npc/000-1/cookiemaster.txt +++ b/npc/000-1/cookiemaster.txt @@ -177,8 +177,8 @@ L_Reward: next; mesq l("Anyway, here, have a cookie!"); - set .@item, 517; - set .@count, 1; + .@item = 517; + .@count = 1; inventoryplace 517, 1; setq General_Cookies, 1; diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index 97f7bb51e..880fe95cd 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -13,7 +13,7 @@ // 2 Done quest scam. 000-1,89,36,0 script Couwan 111,{ - set .@q, getq(ShipQuests_Couwan); + .@q = getq(ShipQuests_Couwan); if (.@q == 1) goto L_QuestGiven; if (.@q > 1) goto L_QuestDone; diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt index a579f4607..ebdcebcfc 100644 --- a/npc/000-1/darlin.txt +++ b/npc/000-1/darlin.txt @@ -11,7 +11,7 @@ // 1 Treasure Chest has been opened. 000-1,89,95,0 script Darlin 103,{ - set .@q, getq(ShipQuests_TreasureChest); + .@q = getq(ShipQuests_TreasureChest); mesn; setcamnpc; diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index f068455cb..02379d1a5 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -26,9 +26,9 @@ OnTalk: mesn; - set .@nard, getq(ShipQuests_Nard); - set .@gugli, getq(ShipQuests_Gugli); - set .@gado, getq(ShipQuests_ChefGado); + .@nard = getq(ShipQuests_Nard); + .@gugli = getq(ShipQuests_Gugli); + .@gado = getq(ShipQuests_ChefGado); if (.@nard > 3) goto L_AllComplete; if (.@nard > 1 || .@gugli == 2) goto L_TaskCompleted; @@ -141,7 +141,7 @@ L_Couwan: if (countitemcolor("FishBox") > 0) delitem "FishBox", 1; setq ShipQuests_Couwan, 2; - set Zeny, Zeny+10; + Zeny = Zeny + 10; getexp 40, 0; message strcharinfo(0), l("You receive @@ E!", 10); @@ -157,7 +157,7 @@ L_Location: mesq l("You can try talking with some other sailors to get some information about that."); next; - set .@r, rand(3000)/1000; + .@r = rand(3000)/1000; if (.@r == 1) goto L_Silvio; if (.@r == 2) goto L_Lean; @@ -193,7 +193,7 @@ L_TaskDone: if (countitemcolor("PlushroomBox") == 1) delitem "PlushroomBox", 1; setq ShipQuests_Gugli, 2; - set Zeny, Zeny+250; + Zeny = Zeny + 250; getexp 50, 0; mes ""; @@ -234,7 +234,7 @@ OnInit: } 000-1,83,107,0 script GugliBarrierCheck 32767,2,0,{ - set .@gugli, getq(ShipQuests_Gugli); + .@gugli = getq(ShipQuests_Gugli); if (.@gugli > 0) close; doevent "Gugli::OnTalk"; close; diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index 356d1fa81..532327f31 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -8,10 +8,10 @@ // Croconut box. 000-1,54,90,0 script Gulukan 113,{ - set .@g, getq(ShipQuests_Gugli); + .@g = getq(ShipQuests_Gugli); if (.@g == 0) goto L_NoTask; - set .@q, getq(ShipQuests_Gulukan); + .@q = getq(ShipQuests_Gulukan); if (.@q == 1) goto L_Func; mesn; @@ -52,8 +52,8 @@ L_Continue2: mesq l("Anyway I am glad I can give you some of these yoyoxs."); next; - set .@item, 715; - set .@count, 1; + .@item = 715; + .@count = 1; inventoryplace 715, 1; setq ShipQuests_Gulukan, 1; @@ -68,7 +68,7 @@ L_Continue2: L_Func: mesn; - set .@q, rand(0, 400) / 100; + .@q = rand(0, 400) / 100; if (.@q == 0) goto L_RandomA; if (.@q == 1) goto L_RandomB; if (.@q > 1) goto L_RandomC; diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index 4bd1edd32..4e1eaedb1 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -8,10 +8,10 @@ // Plushroom box. 000-1,46,35,0 script Jalad 112,{ - set .@g, getq(ShipQuests_Gugli); + .@g = getq(ShipQuests_Gugli); if (.@g == 0) goto L_NoTask; - set .@q, getq(ShipQuests_Jalad); + .@q = getq(ShipQuests_Jalad); if (.@q == 1) goto L_CallFunc; mesn; diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt index 6b500f8ef..455854cfe 100644 --- a/npc/000-1/lean.txt +++ b/npc/000-1/lean.txt @@ -7,7 +7,7 @@ // Sailor who gives some informations to the player. 000-1,79,108,0 script Lean 106,{ - set .@gugli, getq(ShipQuests_Gugli); + .@gugli = getq(ShipQuests_Gugli); mesn; mesq l("Hi! I can finally see you under the sunlight!"); diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt index ea49c2390..baac0d5fa 100644 --- a/npc/000-1/max.txt +++ b/npc/000-1/max.txt @@ -7,8 +7,8 @@ // Friend of Sapartan, he gives some information on how to find Gulukan, Astapolos and Q-Muller. 000-1,72,110,0 script Max 115,{ - set .@gugli, getq(ShipQuests_Gugli); - set .@knife, getq(ShipQuests_Knife); + .@gugli = getq(ShipQuests_Gugli); + .@knife = getq(ShipQuests_Knife); mesn; mesq lg("We are glad captain Nard has let you join us down here!"); diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index 403556e04..2418d0391 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -7,10 +7,10 @@ // Plushroom box. 000-1,35,69,0 script Q'Muller 104,{ - set .@g, getq(ShipQuests_Gugli); + .@g = getq(ShipQuests_Gugli); if (.@g == 0) goto L_NoTask; - set .@q, getq(ShipQuests_QMuller); + .@q = getq(ShipQuests_QMuller); if (.@q == 1) goto L_CallFunc; mesn; diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt index 17ffeea0f..d2a42a9a9 100644 --- a/npc/000-1/tarlan.txt +++ b/npc/000-1/tarlan.txt @@ -8,7 +8,7 @@ setnpcdir 2; mesn; - set .@a, rand(4); + .@a = rand(4); if (.@a == 0) goto L_HardToHit; if (.@a == 1) goto L_Aouch; if (.@a == 2) goto L_DoYou; diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index 585698098..32b10dd2a 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -8,10 +8,10 @@ // Aquada box. 000-1,34,111,0 script Tibbo 110,{ - set .@g, getq(ShipQuests_Gugli); + .@g = getq(ShipQuests_Gugli); if (.@g == 0) goto L_NoTask; - set .@q, getq(ShipQuests_Tibbo); + .@q = getq(ShipQuests_Tibbo); if (.@q == 1) goto L_CallFunc; mesn; diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt index 054164f46..ee792c53f 100644 --- a/npc/000-2-0/doors.txt +++ b/npc/000-2-0/doors.txt @@ -19,7 +19,7 @@ 000-2-0,20,28,0 script AreaNPC#doors1 32767,0,0,{ OnTouch: - set .@nard, getq(ShipQuests_Nard); + .@nard = getq(ShipQuests_Nard); if (.@nard > 0 && countitemcolor("JohanneKey") > 0) goto L_Key; // if (.@nard == 2) goto L_GotoNard; // if (.@nard == 3) goto L_End; @@ -57,7 +57,7 @@ L_End: 000-2-0,33,28,0 script AreaNPC#doors2 32767,0,0,{ OnTouch: - set .@julia, getq(ShipQuests_Julia); + .@julia = getq(ShipQuests_Julia); if (.@julia == 2) goto L_Warp; close; diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index 1bdf7ffb8..ad9596842 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -41,9 +41,9 @@ mesq l("What do you want today?"); next; - set .@q2, getq(ShipQuests_ChefGado); - set .@q3, getq(ShipQuests_Nard); - set .@s$, l("I don't want to change my language, sorry."); + .@q2 = getq(ShipQuests_ChefGado); + .@q3 = getq(ShipQuests_Nard); + .@s$ = l("I don't want to change my language, sorry."); L_Menu: menu @@ -74,7 +74,7 @@ L_First: next; mesq lg("Could I ask you what your native language is? A sailor told me you're russian, but another one told me you're french... I'm a bit lost. I will register you on the ship boarding list just after that."); next; - set .@s$, ""; + .@s$ = ""; goto L_ChooseLang; L_ChooseLang: @@ -91,7 +91,7 @@ L_First: menuimage("flags/nl_BE", l("I speak Dutch.") + " (Nederlands)"), -, menuimage("flags/ca", l("I speak Catalan.") + " (Català)"), -, .@s$, L_NoChanges; - set .@lang, @menu-1; + .@lang = @menu-1; if (.@lang < 0 || .@lang > 10) close; Lang = .@lang; @@ -99,7 +99,7 @@ L_First: mesn; mesq l("Ok, done."); - set .@q, getq(ShipQuests_Julia); + .@q = getq(ShipQuests_Julia); if (.@q == 2) goto L_NoRules; next; @@ -196,7 +196,7 @@ L_Rules: goto L_YNMenu; OnTouch: - set .@q, getq(ShipQuests_Julia); + .@q = getq(ShipQuests_Julia); if (.@q == 0 || .@q == 1) goto L_First; close; @@ -228,7 +228,7 @@ L_Regret: mesq l("Take this money for your wise choice. But do not try it again. The open sea has been merciful with you once... Do not further tempt the fates!"); setq ShipQuests_ChefGado, 5; - set Zeny, Zeny + 200; + Zeny = Zeny + 200; message strcharinfo(0), l("You receive @@ E!", 200); getexp 15, 0; @@ -263,7 +263,7 @@ L_Rumors: mesq l("Take this money as a reward for your nice words."); setq ShipQuests_ChefGado, 6; - set Zeny, Zeny + 100; + Zeny = Zeny + 100; message strcharinfo(0), l("You receive @@ E!", 100); getexp 8, 0; diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index a9d2903a6..8b6d82b17 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -48,7 +48,7 @@ OnTimer190: } 000-2-1,43,31,0 script Alige 401,{ - set .@q, getq(ShipQuests_Alige); + .@q = getq(ShipQuests_Alige); if (.@q > 1) goto L_AskForFood; goto OnFirstEncounter; @@ -181,7 +181,7 @@ L_GiveFood: rif(countitemcolor(516, 1), l(getitemname("PumpkinSeeds"))), 1, l("I don't have anything good for you today."), -1; - set .@id, @menuret; + .@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. diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index fa99342bb..358207044 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -17,21 +17,21 @@ // 12 Has been registered by Julia 000-2-1,49,36,0 script LeftDoorCheck 32767,0,0,{ - set .@q, getq(ShipQuests_Arpan); + .@q = getq(ShipQuests_Arpan); if (.@q == 0) doevent "Magic Arpan::OnTalk"; close; } 000-2-1,54,36,0 script RightDoorCheck 32767,0,0,{ - set .@q, getq(ShipQuests_Arpan); + .@q = getq(ShipQuests_Arpan); if (.@q == 0) doevent "Magic Arpan::OnTalk"; close; } 000-2-1,47,32,0 script LeftBarrierCheck 32767,0,2,{ - set .@q, getq(ShipQuests_Arpan); + .@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; @@ -58,7 +58,7 @@ L_EquipDone: } 000-2-1,56,32,0 script RightBarrierCheck 32767,0,2,{ - set .@q, getq(ShipQuests_Arpan); + .@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; @@ -85,8 +85,8 @@ L_EquipDone: } 000-2-1,49,33,0 script Magic Arpan 407,{ - set .@q, getq(ShipQuests_Arpan); - set .@q_julia, getq(ShipQuests_Julia); + .@q = getq(ShipQuests_Arpan); + .@q_julia = getq(ShipQuests_Julia); if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; OnTalk: @@ -141,7 +141,7 @@ 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; + .@equipped = getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200; menu lg("Could you tell me where I am?"), L_Where, @@ -197,8 +197,8 @@ L_WhereOldClothes: next; setq ShipQuests_ArpanMoney, 1; - set .@q, getq(ShipQuests_Arpan); - set Zeny, Zeny+10; + .@q = getq(ShipQuests_Arpan); + Zeny = Zeny + 10; message strcharinfo(0), l("You receive @@ E!", 10); goto L_BeforeMenu; diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 3663e30b4..e5fc8ea91 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -17,8 +17,8 @@ // 6 Quest complete. Julia wins. 000-2-1,27,28,0 script Chef Gado 418,{ - set .@q, getq(ShipQuests_ChefGado); - set .@n, getq(ShipQuests_Nard); + .@q = getq(ShipQuests_ChefGado); + .@n = getq(ShipQuests_Nard); if (.@q == 1) goto L_QuestAccepted; if (.@q == 2) goto L_PoisonAccepted; if (.@q == 3) goto L_PoisonJulia; @@ -28,7 +28,7 @@ if (.@n == 3) goto L_QuestStart; mesn; - set .@r, rand(3); + .@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."); @@ -162,7 +162,7 @@ L_PoisonJulia: mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!"); setq ShipQuests_ChefGado, 4; - set Zeny, Zeny + 200; + Zeny = Zeny + 200; message strcharinfo(0), l("You receive @@ E!", 200); inventoryplace 502, 2; getitem "Bread", 1; diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index 50ff9aa17..f8f739eeb 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -11,7 +11,7 @@ // 2 Has the clothes. 000-2-1,51,37,0 script Chest 417,{ - set .@q, getq(ShipQuests_Arpan); + .@q = getq(ShipQuests_Arpan); if (.@q == 0) goto L_Talk; if (getnpcdir ("") == 4) goto L_Give; @@ -23,8 +23,8 @@ L_Give: if (.@q > 1) goto L_Quit; - set .@item, 1300; - set .@count, 2; + .@item = 1300; + .@count = 2; inventoryplace 1300, 2; setq ShipQuests_Arpan, 2; diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt index 4aef3f6fc..f9d52fd29 100644 --- a/npc/000-2-1/dan.txt +++ b/npc/000-2-1/dan.txt @@ -8,7 +8,7 @@ 000-2-1,32,31,0 script Dan 101,{ mesn; - set .@q, rand(3); + .@q = rand(3); if (.@q == 0) goto L_QuestStory; mesq l("You see these pious around us?"); diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt index bdb85e4a6..a757560f9 100644 --- a/npc/000-2-1/knife.txt +++ b/npc/000-2-1/knife.txt @@ -11,7 +11,7 @@ // 1 Knife taken. 000-2-1,50,24,0 script #knife 100,{ - set .@q, getq(ShipQuests_Knife); + .@q = getq(ShipQuests_Knife); if (.@q) close; mesn "Narrator"; @@ -27,8 +27,8 @@ L_Give: mes ""; - set .@item, 3500; - set .@count, 1; + .@item = 3500; + .@count = 1; inventoryplace 3500, 1; setq ShipQuests_Knife, 1; diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index cd41f7fbd..11da7fdf1 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -46,11 +46,11 @@ OnTouch: 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, ""; + $@RAT_SAILOR_COUNTDOWN = ""; L_NoCountDown: if ($@RAT_SAILOR_HELPER$ != "") goto L_Occupied; - set .@peter, getq(ShipQuests_Peter); + .@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; @@ -92,16 +92,16 @@ L_NoGoodTick: 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, ""; + $@RAT_SAILOR_COUNTDOWN = ""; L_NoCountDown: - set .@peter, getq(ShipQuests_Peter); + .@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); + .@peter = getq(ShipQuests_Peter); mesn; mesq lg("Hey, girl!", "Hey, man!"); @@ -185,13 +185,13 @@ L_BonusTask: 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); + .@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); + .@peter = getq(ShipQuests_Peter); L_Start: mes ""; @@ -200,8 +200,8 @@ L_Start: OnStartOutside: if ($@RAT_SAILOR_HELPER$ != "") goto OnDontneedHelp; - set $@RAT_SAILOR_HELPER$, strcharinfo(0); - set $@RAT_SAILOR_DEATHS, PC_DIE_COUNTER; + $@RAT_SAILOR_HELPER$ = strcharinfo(0); + $@RAT_SAILOR_DEATHS = PC_DIE_COUNTER; initnpctimer; warp "000-2-2.gat", 48, 28; doevent "RattosControl::OnSpawn"; @@ -210,7 +210,7 @@ OnStartOutside: OnTimer2000: if (attachrid(getcharid(3, $@RAT_SAILOR_HELPER$)) == 0) goto L_Logoff; - set $@RAT_SAILOR_CONTROL[9], $@RAT_SAILOR_CONTROL[9] + 2; + $@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; @@ -220,10 +220,10 @@ OnTimer2000: 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[1]) $@RAT_SAILOR_CONTROL[5] = $@RAT_SAILOR_CONTROL[5] + 2; + if ($@RAT_SAILOR_CONTROL[2]) $@RAT_SAILOR_CONTROL[6] = $@RAT_SAILOR_CONTROL[6] + 2; + if ($@RAT_SAILOR_CONTROL[3]) $@RAT_SAILOR_CONTROL[7] = $@RAT_SAILOR_CONTROL[7] + 2; + if ($@RAT_SAILOR_CONTROL[4]) $@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"; @@ -259,9 +259,9 @@ L_Dead: goto L_CleaningEnd; L_Done: - set $@RAT_SAILOR_CONTROL[10], $@RAT_SAILOR_CONTROL[10] + 2; + $@RAT_SAILOR_CONTROL[10] = $@RAT_SAILOR_CONTROL[10] + 2; if($@RAT_SAILOR_CONTROL[10] < 5) goto L_NotYet; - set .@peter, getq(ShipQuests_Peter); + .@peter = getq(ShipQuests_Peter); if (.@peter == 2 || .@peter == 4) goto L_Reward; warp "000-2-1.gat", 72, 36; @@ -269,8 +269,8 @@ L_Done: L_CleaningEnd: stopnpctimer; - set $@RAT_SAILOR_HELPER$, ""; - set $@RAT_SAILOR_DEATHS, 0; + $@RAT_SAILOR_HELPER$ = ""; + $@RAT_SAILOR_DEATHS = 0; cleararray $@RAT_SAILOR_CONTROL, 0, 11; killmonster "000-2-2.gat", "RattosControl::OnRatto1Death"; killmonster "000-2-2.gat", "RattosControl::OnRatto2Death"; @@ -281,26 +281,26 @@ L_CleaningEnd: L_CleaningClose: stopnpctimer; - set $@RAT_SAILOR_OLD_HELPER$, $@RAT_SAILOR_HELPER$; - set $@RAT_SAILOR_HELPER$, ""; - set $@RAT_SAILOR_DEATHS, 0; + $@RAT_SAILOR_OLD_HELPER$ = $@RAT_SAILOR_HELPER$; + $@RAT_SAILOR_HELPER$ = ""; + $@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); + $@RAT_SAILOR_COUNTDOWN = gettimetick(2); close; L_Reward: warp "000-2-1.gat", 72, 36; setq ShipQuests_Peter, 5; - set .@peter, getq(ShipQuests_Peter); + .@peter = getq(ShipQuests_Peter); mesn; mesq l("Good job!") + " " + l("Here's your reward!"); getexp 100, 0; - set Zeny, Zeny + 1000; + Zeny = Zeny + 1000; message strcharinfo(0), l("You receive @@ E!", 1000); goto L_CleaningClose; @@ -308,14 +308,14 @@ L_Reward: L_Thanks: mesn; mesq l("Thanks for helping me!"); - set .@peter, getq(ShipQuests_Peter); + .@peter = getq(ShipQuests_Peter); if (.@peter == 1) setq ShipQuests_Peter, 3; - set .@peter, getq(ShipQuests_Peter); + .@peter = getq(ShipQuests_Peter); goto L_CleaningClose; L_Quit: - set .@peter, 0; + .@peter = 0; close; diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt index 7ce792e3c..d7ef6ed2a 100644 --- a/npc/000-2-2/doors.txt +++ b/npc/000-2-2/doors.txt @@ -14,7 +14,7 @@ OnTouch: goto L_Warp; L_Warn: - set .@q, getq(ShipQuests_Peter); + .@q = getq(ShipQuests_Peter); if (.@q == 5) goto L_Warp; mesn "Narrator"; diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt index 1c65fe404..ef4b5a400 100644 --- a/npc/000-2-2/ratto.txt +++ b/npc/000-2-2/ratto.txt @@ -28,41 +28,41 @@ OnSpawn: OnRatto1Respawn: areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; - set $@RAT_SAILOR_CONTROL[1], 0; - set $@RAT_SAILOR_CONTROL[5], 0; + $@RAT_SAILOR_CONTROL[1] = 0; + $@RAT_SAILOR_CONTROL[5] = 0; end; OnRatto2Respawn: areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; - set $@RAT_SAILOR_CONTROL[2], 0; - set $@RAT_SAILOR_CONTROL[6], 0; + $@RAT_SAILOR_CONTROL[2] = 0; + $@RAT_SAILOR_CONTROL[6] = 0; end; OnRatto3Respawn: areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; - set $@RAT_SAILOR_CONTROL[3], 0; - set $@RAT_SAILOR_CONTROL[7], 0; + $@RAT_SAILOR_CONTROL[3] = 0; + $@RAT_SAILOR_CONTROL[7] = 0; end; OnRatto4Respawn: areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; - set $@RAT_SAILOR_CONTROL[4], 0; - set $@RAT_SAILOR_CONTROL[8], 0; + $@RAT_SAILOR_CONTROL[4] = 0; + $@RAT_SAILOR_CONTROL[8] = 0; end; OnRatto1Death: - set $@RAT_SAILOR_CONTROL[1], 1; + $@RAT_SAILOR_CONTROL[1] = 1; end; OnRatto2Death: - set $@RAT_SAILOR_CONTROL[2], 1; + $@RAT_SAILOR_CONTROL[2] = 1; end; OnRatto3Death: - set $@RAT_SAILOR_CONTROL[3], 1; + $@RAT_SAILOR_CONTROL[3] = 1; end; OnRatto4Death: - set $@RAT_SAILOR_CONTROL[4], 1; + $@RAT_SAILOR_CONTROL[4] = 1; end; } diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt index 185c30a26..a07212ed6 100644 --- a/npc/000-2-3/box.txt +++ b/npc/000-2-3/box.txt @@ -19,7 +19,7 @@ // 5 Reward taken from the box. 000-2-3,25,24,0 script Box 102,{ - set .@q, getq(ShipQuests_Nard); + .@q = getq(ShipQuests_Nard); mesn "Narrator"; mes col(l("Some Bandanas and Sailor Hats are inside this box."), 9); diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt index b1a66b2e9..eaaf6010c 100644 --- a/npc/000-2-3/elmo.txt +++ b/npc/000-2-3/elmo.txt @@ -6,7 +6,7 @@ // Elmo's second dialog. 000-2-3,27,27,0 script Elmo 409,{ - set .@q, getq(ShipQuests_ArpanMoney); + .@q = getq(ShipQuests_ArpanMoney); if (.@q == 1) goto L_GotMoney; mesn; diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index 42d7d1b37..483f4ff55 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -24,9 +24,9 @@ // 12 Gave all of the boxes to Gugli. 000-2-3,25,26,0 script Nard 406,{ - set .@nard, getq(ShipQuests_Nard); - set .@gugli, getq(ShipQuests_Gugli); - set .@gado, getq(ShipQuests_ChefGado); + .@nard = getq(ShipQuests_Nard); + .@gugli = getq(ShipQuests_Gugli); + .@gado = getq(ShipQuests_ChefGado); L_Checker: if (.@gado > 3 && .@nard == 3) goto L_ChefQuestComplete; diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt index 563d1b000..5ba8c6030 100644 --- a/npc/001-1/cookiemaster.txt +++ b/npc/001-1/cookiemaster.txt @@ -175,8 +175,8 @@ L_Reward: next; mesq l("Anyway, here, have a cookie!"); - set .@item, 517; - set .@count, 1; + .@item = 517; + .@count = 1; inventoryplace 517, 1; setq General_Cookies, 1; @@ -240,8 +240,8 @@ L_LostCookie: mesq l("This is the last one. If you use it again out of clumsiness, I will take your flesh as the main ingredient for my cookie recipe."); next; - set .@item, 517; - set .@count, 1; + .@item = 517; + .@count = 1; inventoryplace 517, 1; getitem "DeliciousCookie", 1; diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt index ca28669d3..35a6f5c49 100644 --- a/npc/functions/asleep.txt +++ b/npc/functions/asleep.txt @@ -9,7 +9,7 @@ function script asleep { - set .@rand, rand(3); + .@rand = rand(3); if (.@rand == 0) npctalk3 l("Zzzzzzzzz..."); if (.@rand == 1) npctalk3 l("Rrrr... Pchhhh..."); if (.@rand == 2) npctalk3 l("Ggrmm... Grmmmm..."); diff --git a/npc/functions/goodbye.txt b/npc/functions/goodbye.txt index ea0600994..c23aeeacc 100644 --- a/npc/functions/goodbye.txt +++ b/npc/functions/goodbye.txt @@ -9,7 +9,7 @@ function script goodbye { closedialog; - set .@rand, rand(13); + .@rand = rand(13); if (.@rand == 0) npctalk3 l("See you!"); if (.@rand == 1) npctalk3 l("See you later!"); if (.@rand == 2) npctalk3 l("See you soon!"); diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt index 58b60754c..0d8fe3970 100644 --- a/npc/functions/inventoryplace.txt +++ b/npc/functions/inventoryplace.txt @@ -12,8 +12,8 @@ function script inventoryplace { getinventorylist; - set .@iteminfo, getiteminfo(getarg(0), 2); - set .@countitem, countitemcolor(getarg(0)); + .@iteminfo = getiteminfo(getarg(0), 2); + .@countitem = countitemcolor(getarg(0)); if (checkweight(getarg(0), getarg(1)) == 0) goto L_Warn; if ((.@iteminfo < 4) && (.@countitem == 0) && (.@inventorylist_count < 100)) return; diff --git a/npc/functions/sailordialogue.txt b/npc/functions/sailordialogue.txt index 6a2bc1084..51e7e2928 100644 --- a/npc/functions/sailordialogue.txt +++ b/npc/functions/sailordialogue.txt @@ -8,7 +8,7 @@ function script sailorfood { mesn; - set .@q, rand(0, 400) / 100; + .@q = rand(0, 400) / 100; if (.@q == 0) goto L_RandomA; if (.@q == 1) goto L_RandomB; if (.@q > 1) goto L_RandomC; diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt index bf4ef4a87..61e63fe9a 100644 --- a/npc/items/croconut.txt +++ b/npc/items/croconut.txt @@ -39,7 +39,7 @@ L_TooWeak: mes ""; mesn "Narrator"; - set .@q, rand(5); + .@q = rand(5); if (.@q == 0) goto L_TooWeakLost; if ( (.@q == 1) || (.@q == 2) ) goto L_TooWeakFail; if ( (.@q == 3) || (.@q == 4) || (.@q == 5) ) goto L_Weak; -- cgit v1.2.3-70-g09d2