From 46fbbaabefa29df1378ae68b7f063dbc64846042 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 26 Oct 2014 04:26:34 +0100 Subject: Replaced 'set' with direct assignment where applicable (re folder) Signed-off-by: Haru --- npc/re/cities/malaya.txt | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'npc/re/cities/malaya.txt') diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index 54064d8a5..f806d4908 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -142,9 +142,9 @@ OnInit: case 9: setarray .@npc$,"09","10","11"; break; default: end; } - set .@size, getarraysize(.@npc$); - set .@rand, rand(.@size); - for(set .@i,0; .@i<.@size; set .@i,.@i+1) + .@size = getarraysize(.@npc$); + .@rand = rand(.@size); + for(.@i = 0; .@i<.@size; ++.@i) donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable"); end; OnEnable: @@ -159,9 +159,9 @@ OnBingx2: case 5: setarray .@npc$,"06","07","08"; break; case 9: setarray .@npc$,"10","11"; break; } - set .@size, getarraysize(.@npc$); - set .@rand, rand(.@size); - for(set .@i,0; .@i<.@size; set .@i,.@i+1) + .@size = getarraysize(.@npc$); + .@rand = rand(.@size); + for(.@i = 0; .@i<.@size; ++.@i) donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable"); donpcevent strnpcinfo(0)+"::OnDisable"; end; @@ -174,9 +174,9 @@ OnTouch: } if (rand(1,5)%2) { switch(atoi(strnpcinfo(2))) { - case 1: set $ma_name04$,strcharinfo(0); break; - case 5: set $ma_name05$,strcharinfo(0); break; - case 9: set $ma_name06$,strcharinfo(0); break; + case 1: $ma_name04$ = strcharinfo(0); break; + case 5: $ma_name05$ = strcharinfo(0); break; + case 9: $ma_name06$ = strcharinfo(0); break; } } donpcevent strnpcinfo(0)+"::OnBingx2"; @@ -210,23 +210,23 @@ OnBingx2: case 10: setarray .@npc$,"09","11"; break; case 11: setarray .@npc$,"09","10"; break; } - set .@size, getarraysize(.@npc$); - set .@rand, rand(.@size); - for(set .@i,0; .@i<.@size; set .@i,.@i+1) + .@size = getarraysize(.@npc$); + .@rand = rand(.@size); + for(.@i = 0; .@i<.@size; ++.@i) donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable"); donpcevent strnpcinfo(0)+"::OnDisable"; end; OnTouch: - set .@i, atoi(strnpcinfo(2)); + .@i = atoi(strnpcinfo(2)); if (.@i%4 == 2) { if (getcharid(0) == getpartyleader(getcharid(1),2)) - set .@pass,1; + .@pass = 1; } else if (.@i%4 == 3) { if (questprogress(4229,PLAYTIME) && questprogress(9223,PLAYTIME) && questprogress(12278,PLAYTIME)) - set .@pass,1; + .@pass = 1; } else if (.@i%4 == 0) { if (rand(1,100)%10 == 7) - set .@pass,1; + .@pass = 1; } if (.@pass) { if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { @@ -239,16 +239,16 @@ OnTouch: case 2: case 3: case 4: - set $ma_name04$,strcharinfo(0); + $ma_name04$ = strcharinfo(0); break; case 6: case 7: case 8: - set $ma_name05$,strcharinfo(0); + $ma_name05$ = strcharinfo(0); break; case 10: case 11: - set $ma_name06$,strcharinfo(0); + $ma_name06$ = strcharinfo(0); break; } } @@ -438,7 +438,7 @@ malaya,88,252,4 script Little Girl#ma04 4_F_BARYO_GIRL,{ close; } if (rand(1,3) == 2) { - set .@name$, getd("$ma_name0"+rand(1,6)+"$"); + .@name$ = getd("$ma_name0"+rand(1,6)+"$"); mes "[Little Girl]"; mes "A little while ago "+.@name$+" came and told me a fun story."; next; @@ -513,7 +513,7 @@ malaya,363,283,4 script Local#ma06 4_M_MALAYA,{ mes "The village is chaotic these days. If you see someone with red eyes, try not to stare at their eyes."; close; } - set .@name$, getd("$ma_name0"+rand(1,6)+"$"); + .@name$ = getd("$ma_name0"+rand(1,6)+"$"); switch(rand(1,6)) { case 1: mes "[Local]"; @@ -611,8 +611,8 @@ malaya,63,185,4 script Woman#ma08 4_F_MALAYA,{ close; } if (rand(1,3) == 2) { - set .@name$, getd("$ma_name0"+rand(1,6)+"$"); - set .@rand, rand(1,10); + .@name$ = getd("$ma_name0"+rand(1,6)+"$"); + .@rand = rand(1,10); if (.@rand < 5) { mes "[Woman]"; mes "I like fun stories. Not so long ago, "+.@name$+" came and told me a funny story."; @@ -747,19 +747,19 @@ function script F_Malaya_Jeepney { viewpoint 1, 237, 240, 1, 0xF7E009; viewpoint 1, 67 , 44 , 2, 0xF7E009; viewpoint 1, 282, 129, 3, 0xF7E009; - set .@zif_in, 12; + .@zif_in = 12; break; case 2: viewpoint 1, 134, 250, 4, 0xF7E009; viewpoint 1, 341, 153, 5, 0xF7E009; viewpoint 1, 293, 290, 6, 0xF7E009; - set .@zif_in, 30; + .@zif_in = 30; break; case 3: viewpoint 1, 242, 221, 7, 0xF7E009; viewpoint 1, 62 , 245, 8, 0xF7E009; viewpoint 1, 257, 58 , 9, 0xF7E009; - set .@zif_in, 60; + .@zif_in = 60; break; } mes "[Jeepney Driver]"; -- cgit v1.2.3-70-g09d2