From bf4b0a281207e46a9b21a9c9f779aeafaa739b62 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 26 Oct 2014 02:06:46 +0100 Subject: Replaced 'set' with direct assignment where applicable (common folder) Signed-off-by: Haru --- npc/merchants/advanced_refiner.txt | 12 +-- npc/merchants/alchemist.txt | 4 +- npc/merchants/cashheadgear_dye.txt | 38 +++++----- npc/merchants/clothes_dyer.txt | 14 ++-- npc/merchants/coin_exchange.txt | 14 ++-- npc/merchants/dye_maker.txt | 38 +++++----- npc/merchants/elemental_trader.txt | 14 ++-- npc/merchants/enchan_arm.txt | 54 +++++++------- npc/merchants/gemstone.txt | 2 +- npc/merchants/hair_dyer.txt | 60 +++++++-------- npc/merchants/hair_style.txt | 36 ++++----- npc/merchants/hd_refine.txt | 36 ++++----- npc/merchants/milk_trader.txt | 6 +- npc/merchants/novice_exchange.txt | 2 +- npc/merchants/old_pharmacist.txt | 10 +-- npc/merchants/quivers.txt | 8 +- npc/merchants/refine.txt | 146 ++++++++++++++++++------------------- npc/merchants/renters.txt | 18 ++--- npc/merchants/socket_enchant.txt | 2 +- npc/merchants/socket_enchant2.txt | 4 +- 20 files changed, 259 insertions(+), 259 deletions(-) (limited to 'npc/merchants') diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 853e82f5e..6d19d68e4 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -35,20 +35,20 @@ payon,157,146,6 script Suhnbi#cash 4_M_03,{ next; setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3"; - set .@menu$,""; - for(set .@i,1; .@i<=10; set .@i,.@i+1) { + .@menu$ = ""; + for(.@i = 1; .@i<=10; ++.@i) { if (getequipisequiped(.@i)) { - set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]"; - set .@equipped,1; + .@menu$ += .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]"; + .@equipped = 1; } - set .@menu$, .@menu$ + ":"; + .@menu$ += ":"; } if (.@equipped == 0) { mes "[Suhnbi]"; mes "I don't think I can refine any items you have..."; close; } - set .@part, select(.@menu$); + .@part = select(.@menu$); if (!getequipisequiped(.@part)) //custom check close; diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index dfb9a68b4..91dc048c9 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -60,8 +60,8 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{ break; } } - set .@sell,.@input * 8; - set .@item_weight,.@input * 10; + .@sell = .@input * 8; + .@item_weight = .@input * 10; if (Zeny < .@sell) { mes "[Gever Al Sharp]"; mes "You don't"; diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index f2d739aba..f9a6cd089 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -15,7 +15,7 @@ prt_in,253,168,4 script Alora 4_F_LGTGIRL,{ // Mysterious Dyestuff - set .@dyeID, 6220; + .@dyeID = 6220; // Headgear Choices setarray .@hgn$[1], "Mage Hat","Beanie","Drooping Cat","Deviruchi Hat","Wig","Ribbon","Magestic Goat"; // Mage Hats - Normal, Yellow, Blue, Brown, Gray, Red @@ -39,12 +39,12 @@ prt_in,253,168,4 script Alora 4_F_LGTGIRL,{ mes "[Alora]"; mes "Do you have a headgear that you would like to dye?"; next; - for(set .@i,1; .@i < getarraysize(.@hgn$); set .@i,.@i+1) { - if(.@i == 1) set .@menu$, .@hgn$[.@i]; - else set .@menu$, .@menu$ +":"+ .@hgn$[.@i]; + for(.@i = 1; .@i < getarraysize(.@hgn$); ++.@i) { + if(.@i == 1) .@menu$ = .@hgn$[.@i]; + else .@menu$ += ":"+ .@hgn$[.@i]; } - set .@menu$, .@menu$ +":Cancel"; - set .@t, select(.@menu$); + .@menu$ += ":Cancel"; + .@t = select(.@menu$); if(.@t == getarraysize(.@hgn$)) { mes "[Alora]"; mes "Have a good journey adventurer!"; @@ -54,24 +54,24 @@ prt_in,253,168,4 script Alora 4_F_LGTGIRL,{ mes "[Alora]"; mes "Okay, what color do you want to change it to?"; next; - for(set .@i,1; .@i < getarraysize(getd(".@hg_"+.@t+"")); set .@i,.@i+1) { + for(.@i = 1; .@i < getarraysize(getd(".@hg_"+.@t+"")); ++.@i) { if(.@i == 1 && .@t != 5) - set .@menu$, "Normal"; + .@menu$ = "Normal"; else if(.@i == 1 && .@t == 5) - set .@menu$, getitemname(getd(".@hg_"+.@t+"["+.@i+"]")); + .@menu$ = getitemname(getd(".@hg_"+.@t+"["+.@i+"]")); else { sscanf(getitemname(getd(".@hg_"+.@t+"["+.@i+"]")),"%s "+ .@hgn$[.@t],.@colour$); - set .@menu$, .@menu$ +":"+ .@colour$; + .@menu$ += ":"+ .@colour$; } } - set .@menu$, .@menu$ +":Cancel"; - set .@c, select(.@menu$); + .@menu$ += ":Cancel"; + .@c = select(.@menu$); if(.@c == getarraysize(getd(".@hg_"+.@t+""))) { mes "[Alora]"; mes "Oh, okay no problem!"; close; } - set .@dyHG, getd(".@hg_"+.@t+"["+.@c+"]"); + .@dyHG = getd(".@hg_"+.@t+"["+.@c+"]"); mes "[Alora]"; mes "Oh I'm so excited aren't you?"; mes "And just to be sure, what color is the "+ .@hgn$[.@t] +" you want me to use?"; @@ -85,18 +85,18 @@ prt_in,253,168,4 script Alora 4_F_LGTGIRL,{ mes "["+ strcharinfo(0) +"]"; mes "Ok, thanks for the warning, I think I'll give you my"; next; - set .@menu$, "Nevermind"; - for(set .@i,1; .@i < getarraysize(getd(".@hg_"+.@t+"")); set .@i,.@i+1) { - if(.@i == 1) set .@menu$, .@menu$ +":Normal "+ getitemname(getd(".@hg_"+.@t+"["+.@i+"]")); - else set .@menu$, .@menu$ +":"+ getitemname(getd(".@hg_"+.@t+"["+.@i+"]")); + .@menu$ = "Nevermind"; + for(.@i = 1; .@i < getarraysize(getd(".@hg_"+.@t+"")); ++.@i) { + if(.@i == 1) .@menu$ += ":Normal "+ getitemname(getd(".@hg_"+.@t+"["+.@i+"]")); + else .@menu$ += ":"+ getitemname(getd(".@hg_"+.@t+"["+.@i+"]")); } - set .@mine, select(.@menu$) - 1; + .@mine = select(.@menu$) - 1; if(!.@mine) { mes "[Alora]"; mes "It's best to be very sure, have a safe journey."; close; } - set .@myHG, getd(".@hg_"+.@t+"["+.@mine+"]"); + .@myHG = getd(".@hg_"+.@t+"["+.@mine+"]"); if(.@dyHG == .@myHG) { mes "[Alora]"; mes "Woah what happened?"; diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 94fab1d5c..b7e90febf 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -22,9 +22,9 @@ prt_in,284,168,2 script Dyer Ginedin Rephere 1_M_JOBTESTER,{ function Dyes; - set .@EnableDyes,1; // Disable (set to 0) if palettes cause errors [see note v2.4] + .@EnableDyes = 1; // Disable (set to 0) if palettes cause errors [see note v2.4] - set .n$,"[Dyer Ginedin Rephere]"; + .n$ = "[Dyer Ginedin Rephere]"; mes .n$; mes "11... 12... Mmm... good. I think I'll be able to finish before tonight's party. Oh! I didn't notice you were here!"; while(1) { @@ -135,11 +135,11 @@ L_End: function Dyes { setarray .@DyeName$[0],"the default color","Orange","Violet","Red","Black","Green","Blue","White","Yellow"; setarray .@DyeItems[0],0,980,981,975,983,979,978,982,976; - set .@menu$,"- Default:"; - for(set .@i,0; .@i 7) { mes "I will take 8 of them and"; @@ -91,13 +91,13 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ mes "[Laspuchin Gregory]"; mes "HeeHee, what do you want? Choose one!"; next; - set .@menu$, ""; - for(set .@j,1; .@j<5; set .@j,.@j+1) { - if (.@items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@items[.@j]); - set .@menu$, .@menu$+":"; + .@menu$ = ""; + for(.@j = 1; .@j < 5; ++.@j) { + if (.@items[.@j] != .@i) .@menu$ += getitemname(.@items[.@j]); + .@menu$ += ":"; } - set .@menu$, .@menu$+"Cancel the trade"; - set .@j, select(.@menu$); + .@menu$ += "Cancel the trade"; + .@j = select(.@menu$); mes "[Laspuchin Gregory]"; if (.@j == 5) { mes "Oh, well."; diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index ee3032440..10aecf6ae 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -36,25 +36,25 @@ prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{ switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) { case 1: setarray .@items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396; - set .@j,50; + .@j = 50; break; case 2: setarray .@items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351; - set .@j,55; - set .@k,1; + .@j = 55; + .@k = 1; break; case 3: setarray .@items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390; - set .@j,60; + .@j = 60; break; case 4: mes "[Apprentice Craftsman]"; mes "Please come back when you have any interest in enchanting your armor."; close; } - set .@menu$,""; - for(set .@i,0; .@i 10) { mes "[" + getarg(0) + "]"; mes "I can't refine this item that many times."; close; } if(.@refinecheck > .@safe) { - set .@refinecheck,.@refinecheck - .@safe; + .@refinecheck -= .@safe; mes "[" + getarg(0) + "]"; mes "This will try to refine the equipment " + .@refinecheck + " times past the safe limit. Your equipment may be destroyed... is that ok?"; next; @@ -842,7 +842,7 @@ function script refinemain { mes "You said so... So be it."; close; } - set .@fullprice,.@price * .@refinecnt; + .@fullprice = .@price * .@refinecnt; mes "[" + getarg(0) + "]"; mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?"; next; @@ -877,17 +877,17 @@ function script refinemain { emotion e_omg; mes "[" + getarg(0) + "]"; mes "WAHHHH!!! I'm so sorry... I warned you this could happen..."; - set .@refinecnt,.@refinecnt - 1; + --.@refinecnt; if(.@refinecnt == 0) close; mes "Here's the unused Zeny and materials back..."; getitem .@material,.@refinecnt; - set .@fullprice,.@refinecnt * .@price; + .@fullprice = .@refinecnt * .@price; Zeny += .@fullprice; close; } successrefitem .@part; emotion e_no1; - set .@refinecnt,.@refinecnt - 1; + --.@refinecnt; next; } mes "[" + getarg(0) + "]"; @@ -946,12 +946,12 @@ function script phramain { next; switch(select("Phracon - 200 Zeny:Emveretarcon - 1000 Zeny:Ask about other Metals")) { case 1: - set .@material,1010; - set .@price,200; + .@material = 1010; + .@price = 200; break; case 2: - set .@material,1011; - set .@price,1000; + .@material = 1011; + .@price = 1000; break; case 3: mes "[" + getarg(0) + "]"; @@ -984,7 +984,7 @@ function script phramain { break; } } - set .@sell,.@input * .@price; + .@sell = .@input * .@price; if (Zeny < .@sell) { mes "[" + getarg(0) + "]"; mes "Err..."; @@ -1183,7 +1183,7 @@ sch_gld,340,80,7 script Repairman#sch_gld 4_M_04,{ // Equipment Repair Function //============================================================ function script repairmain { - set .@repairprice,5000; + .@repairprice = 5000; mes "["+getarg(0)+"]"; mes "Hey there!"; mes "Do you want me"; @@ -1193,14 +1193,14 @@ function script repairmain { next; switch(select("Actually, I do have some items...:None at the moment.")) { case 1: - set .@checkitem,1; + .@checkitem = 1; while (1) { if (getbrokenid(.@checkitem) == 0) { break; } - set .@checkitem,.@checkitem+1; + ++.@checkitem; } - set .@checkitem,.@checkitem-1; + --.@checkitem; if (!.@checkitem) { mes "["+getarg(0)+"]"; mes "Oh wow, this is incredible!"; @@ -1217,7 +1217,7 @@ function script repairmain { mes "" + .@checkitem + " are damaged."; mes "Would you like to repair?"; next; - set .@totalcost,.@repairprice*.@checkitem; + .@totalcost = .@repairprice*.@checkitem; mes "["+getarg(0)+"]"; mes "Each repair costs " + .@repairprice + " Zeny. So to repair all your damaged items would cost " + .@totalcost + " Zeny! Would you like to repair the items?"; next; @@ -1229,19 +1229,19 @@ function script repairmain { mes "Check your wallet before you receive the repair bill! I can't repair anything because you don't have enough Zeny."; close; } - set .@checkitem2,1; + .@checkitem2 = 1; while (1) { if (getbrokenid(.@checkitem2) == 0) { break; } - set .@checkitem2,.@checkitem2+1; + ++.@checkitem2; } - set .@checkitem2,.@checkitem2-1; + --.@checkitem2; if (.@checkitem == .@checkitem2) { Zeny -= .@totalcost; while (.@checkitem) { repair(.@checkitem); - set .@checkitem,.@checkitem-1; + --.@checkitem; } mes "["+getarg(0)+"]"; mes "Okay! All done. Now, try to be a little more careful. Items have lives too you know."; diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 3b6e6c28c..00ff18dd5 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -26,9 +26,9 @@ // PecoPeco Breeder (for Knights)------------------------------------------- prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ - if(Upper==0) set .@price,2500; //Normal Peco - default price - if(Upper==1) set .@price,2500; //Armored Peco - if(Upper==2) set .@price,2500; //Baby Peco + if(Upper==0) .@price = 2500; //Normal Peco - default price + if(Upper==1) .@price = 2500; //Armored Peco + if(Upper==2) .@price = 2500; //Baby Peco mes "[Peco Peco Breeder]"; if (BaseJob == Job_Knight && Class < Job_Rune_Knight) { @@ -88,9 +88,9 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ // Grand PecoPeco Breeder (for Crusaders)------------------------------------------- prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ - if(Upper==0) set .@price,3500; //Normal Peco - default price - if(Upper==1) set .@price,3500; //Armored Peco - if(Upper==2) set .@price,3500; //Baby Peco + if(Upper==0) .@price = 3500; //Normal Peco - default price + if(Upper==1) .@price = 3500; //Armored Peco + if(Upper==2) .@price = 3500; //Baby Peco mes "[PecoPeco Breeder]"; if (BaseJob == Job_Crusader && Class < Job_Rune_Knight) { @@ -149,9 +149,9 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ // Falcon Master-------------------------------------------------------------- hu_in01,381,304,5 script Falcon Breeder#hnt 8W_SOLDIER,{ - if(Upper==0) set .@price,2500; //Normal Falcon - default price - if(Upper==1) set .@price,2500; //Scarf Falcon - if(Upper==2) set .@price,2500; //Baby Falcon + if(Upper==0) .@price = 2500; //Normal Falcon - default price + if(Upper==1) .@price = 2500; //Scarf Falcon + if(Upper==2) .@price = 2500; //Baby Falcon mes "[Falcon Breeder]"; if (BaseJob == Job_Hunter) { diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 4c806a819..178f8ca98 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -281,7 +281,7 @@ function script Func_Socket { mes "Alright then, let the work begin!"; mes "You'd better pray for a successful result."; next; - set .@a, rand(1,100); + .@a = rand(1,100); if ((.@a > getarg(2)) && (.@a < getarg(3))) { specialeffect getarg(3) == 51 ? EF_LORD : EF_SANCTUARY; // only S Class items have Lord of Vermillion effect diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index dbdcfe379..08fe62ed9 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -277,7 +277,7 @@ mes "Shall we start now?"; mes "Pray to your gods for good luck."; next; - set .@a, rand(1,100); + .@a = rand(1,100); if ((.@a > 4) && (.@a < 95)) { specialeffect EF_LORD; @@ -417,7 +417,7 @@ function script Func_Socket2 { mes "Alright then, let the work begin!"; mes "You'd better pray for a successful result."; next; - set .@a, rand(1,100); + .@a = rand(1,100); if ((.@a > getarg(2)) && (.@a < getarg(3))) { specialeffect EF_LORD; -- cgit v1.2.3-60-g2f50