diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-12-05 12:47:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-12-05 12:47:25 +0300 |
commit | 6eeae2ee499b4aec7b9f771c75ff09264d79c8fd (patch) | |
tree | d024b7517c78adc0cfda5f4d4d17ac03ced5cb3a /npc/000-2-1 | |
parent | 58cf99bc280bb54f3c6ad6538ae3bc14fd54ec7f (diff) | |
download | serverdata-6eeae2ee499b4aec7b9f771c75ff09264d79c8fd.tar.gz serverdata-6eeae2ee499b4aec7b9f771c75ff09264d79c8fd.tar.bz2 serverdata-6eeae2ee499b4aec7b9f771c75ff09264d79c8fd.tar.xz serverdata-6eeae2ee499b4aec7b9f771c75ff09264d79c8fd.zip |
Replace script function set to direct variable assignments.
Diffstat (limited to 'npc/000-2-1')
-rw-r--r-- | npc/000-2-1/alige.txt | 4 | ||||
-rw-r--r-- | npc/000-2-1/arpan.txt | 18 | ||||
-rw-r--r-- | npc/000-2-1/chefgado.txt | 8 | ||||
-rw-r--r-- | npc/000-2-1/chest.txt | 6 | ||||
-rw-r--r-- | npc/000-2-1/dan.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/knife.txt | 6 | ||||
-rw-r--r-- | npc/000-2-1/peter.txt | 54 |
7 files changed, 49 insertions, 49 deletions
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index a9d2903a..8b6d82b1 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 fa99342b..35820704 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 3663e30b..e5fc8ea9 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 50ff9aa1..f8f739ee 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 4aef3f6f..f9d52fd2 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 bdb85e4a..a757560f 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 cd41f7fb..11da7fdf 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; |