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/card_separation.txt | 138 ++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 65 deletions(-) (limited to 'npc/re/merchants/card_separation.txt') diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index 9954476ca..fa64db4f0 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -23,8 +23,8 @@ close; } if (strnpcinfo(1) == "Jeremy") { - set .@Jeremy,1; - set .@n$, "[Jeremy]"; + .@Jeremy = 1; + .@n$ = "[Jeremy]"; setarray .@equip_name$[0], "Armor", "Shoes", "Garment", "Upper Hat"; setarray .@equip_slot[0], EQI_ARMOR,EQI_SHOES,EQI_GARMENT,EQI_HEAD_TOP; @@ -32,8 +32,8 @@ mes "Long time no see~"; mes "I have learned a new skill that separates cards from Armor, Shoes, Garment and Headgear. Do you want to try it?"; } else { - set .@Jeremy,0; - set .@n$, "[Richard]"; + .@Jeremy = 0; + .@n$ = "[Richard]"; setarray .@equip_name$[0], "Left hand", "Right hand"; setarray .@equip_slot[0], EQI_HAND_L, EQI_HAND_R; @@ -48,14 +48,14 @@ mes "There is a possibility of destroying them even using a special item. Also, ^ff0000the refine level might be lost^000000. Do you have any equipment to separate?"; next; - for(set .@i,0; .@i= 4700) // Armor Enchant System - set .@equip_card[.@i],0; + .@cardcount = 4; + for (.@i = 0; .@i < 4; ++.@i) { + if (.@equip_card[.@i] >= 4700 // Armor Enchant System + || .@equip_card[.@i] == 0) { + .@equip_card[.@i] = 0; + --.@cardcount; + } } - if (!getarraysize(.@equip_card)) { + if (!.@cardcount) { mes .@n$; mes "The card is not equipped. Do you want to check again?"; close; } - if ((.@equip_card[0] && compare(.@mvp_list$,"|"+.@equip_card[0]+"|")) || - (.@equip_card[1] && compare(.@mvp_list$,"|"+.@equip_card[1]+"|")) || - (.@equip_card[2] && compare(.@mvp_list$,"|"+.@equip_card[2]+"|")) || - (.@equip_card[3] && compare(.@mvp_list$,"|"+.@equip_card[3]+"|"))) - set .@boss_chk,1; + for (.@i = 0; .@i < 4; ++.@i) { + if (.@equip_card[.@i] == 0) + continue; + for (.@j = 0; .@j < getarraysize(.@mvp_list); ++.@j) { + if (.@equip_card[.@i] == .@mvp_list[.@j]) + .@boss_chk = true; + } + } } else { // Official "Richard" script uses a hardcoded list including every possible item. //if (!getequipisequiped(.@equip_num)) { @@ -141,21 +148,21 @@ mes "[Richard]"; mes "Which number socket do you want to separate the card? From the left socket, they are sorted 1,2,3,4."; next; - set .@menu$,""; - for(set .@i,0; .@i<4; set .@i,.@i+1) { + .@menu$ = ""; + for(.@i = 0; .@i<4; ++.@i) { if (.@equip_card[.@i] && .@equip_card[.@i] < 4700) // Armor Enchant System - set .@menu$, .@menu$+"Socket "+(.@i+1)+" - "+getitemname(.@equip_card[.@i])+":"; + .@menu$ += "Socket "+(.@i+1)+" - "+getitemname(.@equip_card[.@i])+":"; else - set .@menu$, .@menu$+"^777777Socket "+(.@i+1)+" - No card^000000:"; + .@menu$ += "^777777Socket "+(.@i+1)+" - No card^000000:"; } - set .@i, select("Stop the work:"+.@menu$); + .@i = select("Stop the work:"+.@menu$); switch(.@i) { case 1: mes .@n$; mes "Whenever you need to work, please come to me."; close; default: - set .@slot, .@i-2; + .@slot = .@i-2; if (.@equip_card[.@slot] == 0 || .@equip_card[.@slot] >= 4700) { mes .@n$; mes "This socket is not equipped with any card. Why don't you check again?"; @@ -163,18 +170,19 @@ } break; } - if (compare(.@mvp_list$,"|"+.@equip_card[.@slot]+"|")) - set .@boss_chk,1; + for (.@i = 0; .@i < getarraysize(.@mvp_list); ++.@i) { + if (.@equip_card[.@slot] == .@mvp_list[.@i]) + .@boss_chk = true; + } } - if (.@boss_chk == 0) { + if (!.@boss_chk) { mes .@n$; if (.@Jeremy) mes "Except cards, ^ff0000all enchanted effects will disappear.^000000 If you agree to this, please choose the work type:"; else mes "Please choose the working fee."; next; - set .@menu$, - "Next time...:"+ + .@menu$ = "Next time...:"+ ((Zeny >= 1000000)?"Use 1,000,000z (Do not use special item):":"^999999Use 1,000,000z (Insufficient)^000000:")+ ((countitem(6441))?"Use Premium Lubricant:":"^999999Premium Lubricant (Insufficient)^000000:")+ ((countitem(6440))?"Use Ordinary Lubricant":"^999999Ordinary Lubricant (Insufficient)^000000"); @@ -197,9 +205,9 @@ mes "Whenever you need the work, visit me here."; close; } - set .@sf_c_num,150; - set .@sf_r_num,150; - set .@sf_w_num,150; + .@sf_c_num = 150; + .@sf_r_num = 150; + .@sf_w_num = 150; Zeny -= 1000000; break; case 3: @@ -216,9 +224,9 @@ mes "Whenever you need the work, visit me here."; close; } - set .@sf_c_num,75; - set .@sf_r_num,75; - set .@sf_w_num,75; + .@sf_c_num = 75; + .@sf_r_num = 75; + .@sf_w_num = 75; delitem 6441,1; //High_RankLubricant break; case 4: @@ -235,13 +243,13 @@ mes "Whenever you need the work, visit me here."; close; } - set .@sf_c_num,75; - set .@sf_r_num,150; - set .@sf_w_num,150; + .@sf_c_num = 75; + .@sf_r_num = 150; + .@sf_w_num = 150; delitem 6440,1; //General_Lubricant break; } - } else if (.@boss_chk == 1) { + } else { mes .@n$; mes "This equipment contains a precious MVP card. This card can't be separated with lubricant. If you bring the super surfactant ^0000ffSillit Pong^000000, I will be able to work."; next; @@ -261,10 +269,10 @@ mes .@n$; if (.@Jeremy) { mes "Except cards, ^ff0000all enchanted effects will disappear.^000000 If you agree to this, please choose the work type:"; - set .@menu$,"Alright, let's do it!"; + .@menu$ = "Alright, let's do it!"; } else { mes "May I continue?"; - set .@menu$,"I got it. Just do it quickly!"; + .@menu$ = "I got it. Just do it quickly!"; } next; switch(select("Next time...:"+.@menu$)) { @@ -273,45 +281,45 @@ mes "Whenever you need the work, visit me here."; close; case 2: - set .@sf_c_num,60; - set .@sf_r_num,60; - set .@sf_w_num,60; + .@sf_c_num = 60; + .@sf_r_num = 60; + .@sf_w_num = 60; delitem 6443,1; //Sillit_Pong_Bottle break; } } - set .@equip_id, getequipid(.@equip_num); - set .@equip_refine, getequiprefinerycnt(.@equip_num); + .@equip_id = getequipid(.@equip_num); + .@equip_refine = getequiprefinerycnt(.@equip_num); delequip .@equip_num; // Chance of retaining refine level. if (rand(1,.@sf_r_num) >= 61) - set .@equip_refine,0; + .@equip_refine = 0; if (.@Jeremy) { // Chance of retaining equipment. if (rand(1,.@sf_w_num) < 61) { - set .@equip_safe,1; + .@equip_safe = 1; getitem2 .@equip_id,1,1,.@equip_refine,0,0,0,0,0; } // Chance of retaining cards. - for(set .@i,0; .@i<4; set .@i,.@i+1) { + for(.@i = 0; .@i<4; ++.@i) { if (.@equip_card[.@i]) { if (rand(1,.@sf_c_num) < 61) getitem .@equip_card[.@i],1; else - set .@card_break,1; + .@card_break = 1; } } } else { - set .@card, .@equip_card[.@slot]; - set .@equip_card[.@slot],0; + .@card = .@equip_card[.@slot]; + .@equip_card[.@slot] = 0; // Chance of retaining equipment. if (rand(1,.@sf_w_num) < 61) { - set .@equip_safe,1; + .@equip_safe = 1; getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3]; } @@ -319,7 +327,7 @@ if (rand(1,.@sf_c_num) < 61) getitem .@card,1; else - set .@card_break,1; + .@card_break = 1; } // Display corresponding effect. -- cgit v1.2.3-60-g2f50