diff options
author | Haru <haru@dotalux.com> | 2014-10-26 04:26:34 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2014-11-02 01:36:51 +0100 |
commit | 46fbbaabefa29df1378ae68b7f063dbc64846042 (patch) | |
tree | 8a29abc6017e4dfbc9430e6484871ead9ab41c49 /npc/re/cities | |
parent | d853cc9c0ccdafb8e23ddf6b3f18e7859af0a710 (diff) | |
download | hercules-46fbbaabefa29df1378ae68b7f063dbc64846042.tar.gz hercules-46fbbaabefa29df1378ae68b7f063dbc64846042.tar.bz2 hercules-46fbbaabefa29df1378ae68b7f063dbc64846042.tar.xz hercules-46fbbaabefa29df1378ae68b7f063dbc64846042.zip |
Replaced 'set' with direct assignment where applicable (re folder)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re/cities')
-rw-r--r-- | npc/re/cities/brasilis.txt | 2 | ||||
-rw-r--r-- | npc/re/cities/dewata.txt | 14 | ||||
-rw-r--r-- | npc/re/cities/izlude.txt | 2 | ||||
-rw-r--r-- | npc/re/cities/malangdo.txt | 58 | ||||
-rw-r--r-- | npc/re/cities/malaya.txt | 52 |
5 files changed, 64 insertions, 64 deletions
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 405ce486c..417dc87b8 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -132,7 +132,7 @@ brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{ else break; } - set .@icecream_hap,.@input*100; + .@icecream_hap = .@input*100; if (Zeny < .@icecream_hap) { mes "[Ice Cream Maker]"; mes "Dood~! You don't have enough money."; diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 1205a4de1..022d3d715 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -278,12 +278,12 @@ dewata,146,109,5 script Restauranteur#dew 4_COOK,{ case 1: mes "[Restauranteur]"; mes "This is Nasi Goreng fried with my special sauce plus egg fry on the top. It only costs ^0000FF5000^000000 Zeny."; - set .@food,11532; + .@food = 11532; break; case 2: mes "[Restauranteur]"; mes "This is the Satay, a slice of meat skewered and grilled over Palm fruit charcoal. It costs only ^0000FF5000^000000 Zeny."; - set .@food,11533; + .@food = 11533; break; } next; @@ -474,9 +474,9 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ mes "- Cancelled. -"; close; } else if (.@input <= 50000) - set .@good_luck, rand(1,10000); + .@good_luck = rand(1,10000); else - set .@good_luck, rand(1,5000); + .@good_luck = rand(1,5000); if (.@input > Zeny) { mes "- Not enough Zeny. -"; close; @@ -498,10 +498,10 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ 1,1,2,2,2,2,4,4,8,8,8,16,16,16,16,16,32,32,32,32,32,32,64,64,64,128,128,128; if (.@good_luck == 7 || .@good_luck == 77 || .@good_luck == 777 || .@good_luck == 7777) - set .@bonus,1; - for(set .@i,0; .@i<getarraysize(.@wishes$); set .@i,.@i+1) { + .@bonus = 1; + for(.@i = 0; .@i<getarraysize(.@wishes$); ++.@i) { if (compare(.@wish$,.@wishes$[.@i])) { - set .@stat, .@stat | .@index[.@i]; + .@stat |= .@index[.@i]; break; } } diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt index 7e37f9de2..6c6734cd1 100644 --- a/npc/re/cities/izlude.txt +++ b/npc/re/cities/izlude.txt @@ -89,7 +89,7 @@ function script F_IzludeChannel { mes "I can send you to another copy of Izlude."; mes "Do you want to go to another copy?"; next; - set .@i, select(getarg(0)+":Never mind"); + .@i = select(getarg(0)+":Never mind"); if (.@i < 6) { setarray .@maps$[1],"izlude","izlude_a","izlude_b","izlude_c","izlude_d"; savepoint .@maps$[.@i],128,98; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 5a651c090..7e597a140 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -27,7 +27,7 @@ mes "We are sent to here to take you to the heaven of cats, ^A2314BMalangdo^000000."; next; mes "[Dolangmal]"; - set .@s$,"Why don't you go to ^A2314BMalangdo^000000?"; + .@s$ = "Why don't you go to ^A2314BMalangdo^000000?"; switch(atoi(strnpcinfo(2))) { case 1: mes "How is that? The crowded city of Prontera is good, but why don't you go our heaven of the cats, ^A2314BMalangdo^000000?"; break; case 2: mes "Why don't you go to ^A2314BMalangdo^000000? That place is better than Geffen, where there are only crowds of simple honest wizards."; break; @@ -165,17 +165,17 @@ mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 4_CAT_DOWN mes "Meow? Huh?"; next; if (ep13_yong1 == 0) { - set .@price,1000; - set .@s1$,"Huh! You are so annoying. Let me send you to ^A2314BMalangdo^000000 for ^0000FF1000 Zeny^000000."; - set .@s2$,"Money? Where is the money? You can't go anywhere without the money. Shame on you."; + .@price = 1000; + .@s1$ = "Huh! You are so annoying. Let me send you to ^A2314BMalangdo^000000 for ^0000FF1000 Zeny^000000."; + .@s2$ = "Money? Where is the money? You can't go anywhere without the money. Shame on you."; } else if (ep13_yong1 < 60) { - set .@price,999; - set .@s1$,"You have a little relationship with fleet of cat. I'll give you special discount price ^0000FF999 Zeny^000000 to ^A2314BMalangdo^000000, because you have relationship with fleet."; - set .@s2$,"Where is the money? You don't have a sense of honor."; + .@price = 999; + .@s1$ = "You have a little relationship with fleet of cat. I'll give you special discount price ^0000FF999 Zeny^000000 to ^A2314BMalangdo^000000, because you have relationship with fleet."; + .@s2$ = "Where is the money? You don't have a sense of honor."; } else if (ep13_yong1 > 59 && ep13_yong1 < 80) { - set .@price,500; - set .@s1$,"You gave several help to our cat's fleet so let me give you special that with 50% discount price ^0000FF500 Zeny^000000. I'll send you to ^A2314BMalangdo^000000."; - set .@s2$,"You don't have any money for paying 50% discount price? I can't believe it."; + .@price = 500; + .@s1$ = "You gave several help to our cat's fleet so let me give you special that with 50% discount price ^0000FF500 Zeny^000000. I'll send you to ^A2314BMalangdo^000000."; + .@s2$ = "You don't have any money for paying 50% discount price? I can't believe it."; } else { mes "[Odgnalam]"; mes "You are a hero of cat's fleet. Your activity is the legend between us."; @@ -218,36 +218,36 @@ malangdo,219,86,4 script Kong#malang 4_CAT_SAILOR2,{ mes "The fleet has a service to Izlude and Alberta."; next; if (ep13_yong1 == 0) { - set .@price,1000; - set .@s1$, "1000 zeny"; - set .@s2$, "Have a nice day in Malangdo."; - set .@no_money$, "It is difficult for free."; - set .@yes_money$, "Have a nice trip."; + .@price = 1000; + .@s1$ = "1000 zeny"; + .@s2$ = "Have a nice day in Malangdo."; + .@no_money$ = "It is difficult for free."; + .@yes_money$ = "Have a nice trip."; mes "[Kong]"; mes "The fee of ship is only 1000 zeny, where do you want to go?"; next; } else if (ep13_yong1 < 60) { - set .@price,999; - set .@s1$,"999 zeny"; - set .@s2$, "Have a full of fortune day in Malangdo..."; - set .@no_money$, "It is difficult even though you have a relationship with the fleet."; - set .@yes_money$, "Thanks, have a wonderful trip."; + .@price = 999; + .@s1$ = "999 zeny"; + .@s2$ = "Have a full of fortune day in Malangdo..."; + .@no_money$ = "It is difficult even though you have a relationship with the fleet."; + .@yes_money$ = "Thanks, have a wonderful trip."; mes "[Kong]"; mes "You have a connection with our fleet. Apply special price 999 zeny. Where do you want to go?"; next; } else if (ep13_yong1 > 59 && ep13_yong1 < 80) { - set .@price,500; - set .@s1$,"500 zeny"; - set .@s2$, "There are full of fortune and jackpot in Malangdo."; - set .@no_money$, "Oh my god. You don't have 500 zeny? It is difficult for free."; - set .@yes_money$, "Have a nice trip and come again."; + .@price = 500; + .@s1$ = "500 zeny"; + .@s2$ = "There are full of fortune and jackpot in Malangdo."; + .@no_money$ = "Oh my god. You don't have 500 zeny? It is difficult for free."; + .@yes_money$ = "Have a nice trip and come again."; mes "[Kong]"; mes "Wow~ You contributed to our fleet a lot. Alright!! Special discount price 500 zeny. Where do you want to go?"; next; } else { - set .@price,0; - set .@s1$,"Free for the hero of our fleet!!"; - set .@s2$, "No one objects to the hero of our fleet staying in Malangdo..."; + .@price = 0; + .@s1$ = "Free for the hero of our fleet!!"; + .@s2$ = "No one objects to the hero of our fleet staying in Malangdo..."; mes "[Kong]"; mes "Ah... You are the legendary hero of our cat's fleet."; next; @@ -255,7 +255,7 @@ malangdo,219,86,4 script Kong#malang 4_CAT_SAILOR2,{ mes "We can't charge the hero of our fleet. What is your destination?"; next; } - set .@i, select("- Izlude destination --- "+.@s1$+":- Alberta destination --- "+.@s1$+":- Stay on Malangdo"); + .@i = select("- Izlude destination --- "+.@s1$+":- Alberta destination --- "+.@s1$+":- Stay on Malangdo"); mes "[Kong]"; if (.@i == 3) { mes .@s2$; 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]"; |