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/merchants/enchan_upg.txt | 168 ++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 84 deletions(-) (limited to 'npc/re/merchants/enchan_upg.txt') diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt index abbc0896a..939f7d812 100644 --- a/npc/re/merchants/enchan_upg.txt +++ b/npc/re/merchants/enchan_upg.txt @@ -49,7 +49,7 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ mes "Are you listening to me? I will only do for you if you bring the Enchant Book!"; close; } - set .@select,1; + .@select = 1; break; case 3: mes "[Devil Enchant Master]"; @@ -64,10 +64,10 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ mes "Come back after you have confirmed!"; close; } - set .@select,2; + .@select = 2; break; } - set .@part, EQI_HAND_R; + .@part = EQI_HAND_R; mes "[Devil Enchant Master]"; if (!getequipisequiped(.@part)) { @@ -79,13 +79,13 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ mes "It is dangerous to remove equipment during enchant process!"; close; } - set .@equip_id, getequipid(.@part); - set .@item$, "|1292|1394|1491|1585|2015|13071|13115|16019|18112|21000|"; + .@equip_id = getequipid(.@part); + .@item$ = "|1292|1394|1491|1585|2015|13071|13115|16019|18112|21000|"; if (!compare(.@item$,"|"+.@equip_id+"|")) { mes "I don't want to touch your equipment now!"; close; } - set .@equip_refine, getequiprefinerycnt(.@part); + .@equip_refine = getequiprefinerycnt(.@part); if (.@select == 1) { if (!countitem(6484)) { @@ -100,10 +100,10 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ mes "Come back again after you change your mind!"; close; case 2: - set .@enc_type,1; + .@enc_type = 1; break; case 3: - set .@enc_type,2; + .@enc_type = 2; break; } mes "[Devil Enchant Master]"; @@ -125,81 +125,81 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ } if (.@enc_type == 1) { // Physical Series - set .@i, rand(1,1300); - if (.@i < 51) set .@enchant,4734; //Agility5 - else if (.@i < 76) set .@enchant,4735; //Agility6 - else if (.@i < 88) set .@enchant,4736; //Agility7 - else if (.@i < 93) set .@enchant,4737; //Agility8 - else if (.@i < 95) set .@enchant,4738; //Agility9 - else if (.@i < 96) set .@enchant,4739; //Agility10 - else if (.@i < 146) set .@enchant,4724; //Dexterity5 - else if (.@i < 171) set .@enchant,4725; //Dexterity6 - else if (.@i < 183) set .@enchant,4726; //Dexterity7 - else if (.@i < 188) set .@enchant,4727; //Dexterity8 - else if (.@i < 190) set .@enchant,4728; //Dexterity9 - else if (.@i < 191) set .@enchant,4729; //Dexterity10 - else if (.@i < 291) set .@enchant,4704; //Strength5 - else if (.@i < 341) set .@enchant,4705; //Strength6 - else if (.@i < 366) set .@enchant,4706; //Strength7 - else if (.@i < 378) set .@enchant,4707; //Strength8 - else if (.@i < 383) set .@enchant,4708; //Strength9 - else if (.@i < 384) set .@enchant,4709; //Strength10 - else if (.@i < 434) set .@enchant,4754; //Luck5 - else if (.@i < 459) set .@enchant,4755; //Luck6 - else if (.@i < 471) set .@enchant,4756; //Luck7 - else if (.@i < 476) set .@enchant,4757; //Luck8 - else if (.@i < 478) set .@enchant,4758; //Luck9 - else if (.@i < 479) set .@enchant,4759; //Luck10 - else if (.@i < 679) set .@enchant,4744; //Vitality5 - else if (.@i < 779) set .@enchant,4745; //Vitality6 - else if (.@i < 829) set .@enchant,4746; //Vitality7 - else if (.@i < 854) set .@enchant,4747; //Vitality8 - else if (.@i < 866) set .@enchant,4748; //Vitality9 - else if (.@i < 867) set .@enchant,4749; //Vitality10 - else if (.@i < 967) set .@enchant,4808; //Fighting_Spirit4 - else if (.@i < 992) set .@enchant,4820; //Fighting_Spirit5 - else if (.@i < 1092) set .@enchant,4835; //Expert_Archer4 - else if (.@i < 1117) set .@enchant,4836; //Expert_Archer5 - else if (.@i < 1217) set .@enchant,4835; //Expert_Archer4 - else if (.@i < 1242) set .@enchant,4836; //Expert_Archer5 - else set .@enchant,0; + .@i = rand(1,1300); + if (.@i < 51) .@enchant = 4734; //Agility5 + else if (.@i < 76) .@enchant = 4735; //Agility6 + else if (.@i < 88) .@enchant = 4736; //Agility7 + else if (.@i < 93) .@enchant = 4737; //Agility8 + else if (.@i < 95) .@enchant = 4738; //Agility9 + else if (.@i < 96) .@enchant = 4739; //Agility10 + else if (.@i < 146) .@enchant = 4724; //Dexterity5 + else if (.@i < 171) .@enchant = 4725; //Dexterity6 + else if (.@i < 183) .@enchant = 4726; //Dexterity7 + else if (.@i < 188) .@enchant = 4727; //Dexterity8 + else if (.@i < 190) .@enchant = 4728; //Dexterity9 + else if (.@i < 191) .@enchant = 4729; //Dexterity10 + else if (.@i < 291) .@enchant = 4704; //Strength5 + else if (.@i < 341) .@enchant = 4705; //Strength6 + else if (.@i < 366) .@enchant = 4706; //Strength7 + else if (.@i < 378) .@enchant = 4707; //Strength8 + else if (.@i < 383) .@enchant = 4708; //Strength9 + else if (.@i < 384) .@enchant = 4709; //Strength10 + else if (.@i < 434) .@enchant = 4754; //Luck5 + else if (.@i < 459) .@enchant = 4755; //Luck6 + else if (.@i < 471) .@enchant = 4756; //Luck7 + else if (.@i < 476) .@enchant = 4757; //Luck8 + else if (.@i < 478) .@enchant = 4758; //Luck9 + else if (.@i < 479) .@enchant = 4759; //Luck10 + else if (.@i < 679) .@enchant = 4744; //Vitality5 + else if (.@i < 779) .@enchant = 4745; //Vitality6 + else if (.@i < 829) .@enchant = 4746; //Vitality7 + else if (.@i < 854) .@enchant = 4747; //Vitality8 + else if (.@i < 866) .@enchant = 4748; //Vitality9 + else if (.@i < 867) .@enchant = 4749; //Vitality10 + else if (.@i < 967) .@enchant = 4808; //Fighting_Spirit4 + else if (.@i < 992) .@enchant = 4820; //Fighting_Spirit5 + else if (.@i < 1092) .@enchant = 4835; //Expert_Archer4 + else if (.@i < 1117) .@enchant = 4836; //Expert_Archer5 + else if (.@i < 1217) .@enchant = 4835; //Expert_Archer4 + else if (.@i < 1242) .@enchant = 4836; //Expert_Archer5 + else .@enchant = 0; } else if (.@enc_type == 2) { // Magical Series - set .@i, rand(1,1200); - if (.@i < 51) set .@enchant,4714; //Inteligence5 - else if (.@i < 76) set .@enchant,4715; //Inteligence6 - else if (.@i < 88) set .@enchant,4716; //Inteligence7 - else if (.@i < 93) set .@enchant,4717; //Inteligence8 - else if (.@i < 95) set .@enchant,4718; //Inteligence9 - else if (.@i < 96) set .@enchant,4719; //Inteligence10 - else if (.@i < 146) set .@enchant,4724; //Dexterity5 - else if (.@i < 171) set .@enchant,4725; //Dexterity6 - else if (.@i < 183) set .@enchant,4726; //Dexterity7 - else if (.@i < 188) set .@enchant,4727; //Dexterity8 - else if (.@i < 190) set .@enchant,4728; //Dexterity9 - else if (.@i < 191) set .@enchant,4729; //Dexterity10 - else if (.@i < 291) set .@enchant,4734; //Agility5 - else if (.@i < 341) set .@enchant,4735; //Agility6 - else if (.@i < 366) set .@enchant,4736; //Agility7 - else if (.@i < 378) set .@enchant,4737; //Agility8 - else if (.@i < 383) set .@enchant,4738; //Agility9 - else if (.@i < 384) set .@enchant,4739; //Agility10 - else if (.@i < 484) set .@enchant,4754; //Luck5 - else if (.@i < 534) set .@enchant,4755; //Luck6 - else if (.@i < 559) set .@enchant,4756; //Luck7 - else if (.@i < 571) set .@enchant,4757; //Luck8 - else if (.@i < 576) set .@enchant,4758; //Luck9 - else if (.@i < 577) set .@enchant,4759; //Luck10 - else if (.@i < 777) set .@enchant,4744; //Vitality5 - else if (.@i < 877) set .@enchant,4745; //Vitality6 - else if (.@i < 927) set .@enchant,4746; //Vitality7 - else if (.@i < 952) set .@enchant,4747; //Vitality8 - else if (.@i < 964) set .@enchant,4748; //Vitality9 - else if (.@i < 969) set .@enchant,4749; //Vitality10 - else if (.@i < 1069) set .@enchant,4812; //Spell4 - else if (.@i < 1094) set .@enchant,4826; //Spell5 - else if (.@i < 1119) set .@enchant,4761; //Matk2 - else if (.@i < 1124) set .@enchant,4806; //Matk3 - else set .@enchant,0; + .@i = rand(1,1200); + if (.@i < 51) .@enchant = 4714; //Inteligence5 + else if (.@i < 76) .@enchant = 4715; //Inteligence6 + else if (.@i < 88) .@enchant = 4716; //Inteligence7 + else if (.@i < 93) .@enchant = 4717; //Inteligence8 + else if (.@i < 95) .@enchant = 4718; //Inteligence9 + else if (.@i < 96) .@enchant = 4719; //Inteligence10 + else if (.@i < 146) .@enchant = 4724; //Dexterity5 + else if (.@i < 171) .@enchant = 4725; //Dexterity6 + else if (.@i < 183) .@enchant = 4726; //Dexterity7 + else if (.@i < 188) .@enchant = 4727; //Dexterity8 + else if (.@i < 190) .@enchant = 4728; //Dexterity9 + else if (.@i < 191) .@enchant = 4729; //Dexterity10 + else if (.@i < 291) .@enchant = 4734; //Agility5 + else if (.@i < 341) .@enchant = 4735; //Agility6 + else if (.@i < 366) .@enchant = 4736; //Agility7 + else if (.@i < 378) .@enchant = 4737; //Agility8 + else if (.@i < 383) .@enchant = 4738; //Agility9 + else if (.@i < 384) .@enchant = 4739; //Agility10 + else if (.@i < 484) .@enchant = 4754; //Luck5 + else if (.@i < 534) .@enchant = 4755; //Luck6 + else if (.@i < 559) .@enchant = 4756; //Luck7 + else if (.@i < 571) .@enchant = 4757; //Luck8 + else if (.@i < 576) .@enchant = 4758; //Luck9 + else if (.@i < 577) .@enchant = 4759; //Luck10 + else if (.@i < 777) .@enchant = 4744; //Vitality5 + else if (.@i < 877) .@enchant = 4745; //Vitality6 + else if (.@i < 927) .@enchant = 4746; //Vitality7 + else if (.@i < 952) .@enchant = 4747; //Vitality8 + else if (.@i < 964) .@enchant = 4748; //Vitality9 + else if (.@i < 969) .@enchant = 4749; //Vitality10 + else if (.@i < 1069) .@enchant = 4812; //Spell4 + else if (.@i < 1094) .@enchant = 4826; //Spell5 + else if (.@i < 1119) .@enchant = 4761; //Matk2 + else if (.@i < 1124) .@enchant = 4806; //Matk3 + else .@enchant = 0; } else { mes "[Devil Enchant Master]"; mes "Hmm! This item is having a problem, please check it again!"; @@ -217,8 +217,8 @@ prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{ if (.@enchant == 0) { specialeffect EF_SHIELDCHARGE; mes "Oh! Unbelievable!! It failed!! Please come again!"; - set .@lost_refine, rand(0,.@equip_refine); - set .@equip_refine, .@equip_refine - .@lost_refine; + .@lost_refine = rand(0,.@equip_refine); + .@equip_refine -= .@lost_refine; } else { specialeffect EF_REPAIRWEAPON; mes "The slot ^9900004^000000 has been enchanted!"; -- cgit v1.2.3-70-g09d2