From 46fbbaabefa29df1378ae68b7f063dbc64846042 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 26 Oct 2014 04:26:34 +0100
Subject: Replaced 'set' with direct assignment where applicable (re folder)

Signed-off-by: Haru <haru@dotalux.com>
---
 npc/re/merchants/enchan_mal.txt | 354 ++++++++++++++++++++--------------------
 1 file changed, 177 insertions(+), 177 deletions(-)

(limited to 'npc/re/merchants/enchan_mal.txt')

diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 24ed71c04..6dbb264df 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -49,21 +49,21 @@ malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 		mes "Several rules are changed. Well, you better have experience.";
 		close;
 	case 2:
-		set @mal_enchant_select,1;
+		@mal_enchant_select = 1;
 		break;
 	case 3:
-		set @mal_enchant_select,2;
+		@mal_enchant_select = 2;
 		break;
 	}
 
 	if (!getequipisequiped(EQI_HAND_R)) {
 		mes "[Mayomayo]";
 		mes "Did you take off your equipment?";
-		set @mal_enchant_select,0;
+		@mal_enchant_select = 0;
 		close;
 	}
-	set @mal_equip_id, getequipid(EQI_HAND_R);
-	set .@equip_type, getiteminfo(@mal_equip_id,11);
+	@mal_equip_id = getequipid(EQI_HAND_R);
+	.@equip_type = getiteminfo(@mal_equip_id,11);
 
 	//callsub L_Socket,<cost multiplier>,<4-x enchants possible>;
 	switch(.@equip_type) { // Check weapon type first to speed up the checks.
@@ -306,18 +306,18 @@ malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 		mes "This is not a suitable equipment for the enchant. Don't forget we only take care of high class weapons, including level 4 weapons~";
 	else
 		mes "This equipment can not be initialized. Don't forget we only handle some luxury weapons, including level 4 weapons~";
-	set @mal_equip_id,0;
-	set @mal_enchant_select,0;
+	@mal_equip_id = 0;
+	@mal_enchant_select = 0;
 	close;
 
 L_Socket:
-	set .@select, @mal_enchant_select;
-	set .@equip_id, @mal_equip_id;
-	set .@equip_name$, getitemname(.@equip_id)+((getitemslots(.@equip_id))?"["+getitemslots(.@equip_id)+"]":"");
-	set .@equip_refine, getequiprefinerycnt(EQI_HAND_R);
+	.@select = @mal_enchant_select;
+	.@equip_id = @mal_equip_id;
+	.@equip_name$ = getitemname(.@equip_id)+((getitemslots(.@equip_id))?"["+getitemslots(.@equip_id)+"]":"");
+	.@equip_refine = getequiprefinerycnt(EQI_HAND_R);
 	setarray .@equip_card[0], getequipcardid(EQI_HAND_R,0),getequipcardid(EQI_HAND_R,1),getequipcardid(EQI_HAND_R,2),getequipcardid(EQI_HAND_R,3);
-	set @mal_equip_id,0;
-	set @mal_enchant_select,0;
+	@mal_equip_id = 0;
+	@mal_enchant_select = 0;
 
 	if (.@select == 1) {
 		mes "[Mayomayo]";
@@ -327,16 +327,16 @@ L_Socket:
 		setarray .@coin[0],6422,6421,6420,6419,6418,6423; // Payment ID
 		setarray .@cost[0],  15,  10,   6,   3,   2,   1; // Payment multiplier
 
-		set .@menu$, "Stop:";
-		for(set .@i,0; .@i<getarraysize(.@coin); set .@i,.@i+1) {
-			set .@count[.@i], countitem(.@coin[.@i]);
-			set .@total[.@i], getarg(0)*.@cost[.@i];
+		.@menu$ = "Stop:";
+		for(.@i = 0; .@i<getarraysize(.@coin); ++.@i) {
+			.@count[.@i] = countitem(.@coin[.@i]);
+			.@total[.@i] = getarg(0)*.@cost[.@i];
 			if (.@count[.@i] < .@total[.@i])
-				set .@menu$, .@menu$+"^999999"+getitemname(.@coin[.@i])+" (missing "+(.@total[.@i]-.@count[.@i])+")^000000:";
+				.@menu$ += "^999999"+getitemname(.@coin[.@i])+" (missing "+(.@total[.@i]-.@count[.@i])+")^000000:";
 			else
-				set .@menu$, .@menu$+getitemname(.@coin[.@i])+" (have "+.@count[.@i]+", need "+.@total[.@i]+"):";
+				.@menu$ += getitemname(.@coin[.@i])+" (have "+.@count[.@i]+", need "+.@total[.@i]+"):";
 		}
-		set .@coin_select, select(.@menu$)-2;
+		.@coin_select = select(.@menu$)-2;
 		if (.@coin_select == -1) {
 			mes "[Mayomayo]";
 			mes "Come back again if you change your mind.";
@@ -348,16 +348,16 @@ L_Socket:
 		}
 		switch(.@coin_select) {
 		case 0: //Egrade_Coin
-			set .@enchant_type,10;
+			.@enchant_type = 10;
 			break;
 		case 1: //Dgrade_Coin
-			set .@enchant_type,9;
+			.@enchant_type = 9;
 			break;
 		case 2: //Cgrade_Coin
-			set .@enchant_type,8;
+			.@enchant_type = 8;
 			break;
 		case 3: //Bgrade_Coin
-			set .@enchant_type,7;
+			.@enchant_type = 7;
 			break;
 		case 4: //Agrade_Coin
 		case 5: //Anger_Seagod
@@ -370,23 +370,23 @@ L_Socket:
 				mes "Ok. If you change your mind, let me know.";
 				close;
 			case 2:
-				set .@enchant_type,((.@coin_select == 4)?4:1);
+				.@enchant_type = ((.@coin_select == 4)?4:1);
 				break;
 			case 3:
-				set .@enchant_type,((.@coin_select == 4)?5:2);
+				.@enchant_type = ((.@coin_select == 4)?5:2);
 				break;
 			case 4:
-				set .@enchant_type,((.@coin_select == 4)?6:3);
+				.@enchant_type = ((.@coin_select == 4)?6:3);
 				break;
 			}
 			break;
 		}
 		if (.@equip_card[3] == 0 && getarg(1) < 4) {
-			set .@socket,4;
-			set .@str$,"1st";
+			.@socket = 4;
+			.@str$ = "1st";
 		} else if (.@equip_card[2] == 0 && getarg(1) < 3) {
-			set .@socket,3;
-			set .@str$,"2nd";
+			.@socket = 3;
+			.@str$ = "2nd";
 		} else {
 			mes "[Mayomayo]";
 			mes "This equipment is at the end of enchant. Please initialize the enchant and you will be able to enchant it again, or bring another weapon.";
@@ -402,174 +402,174 @@ L_Socket:
 		}
 		switch(.@enchant_type) {
 		case 10: //Egrade_Coin
-			set .@i, rand(1,531);
-			     if (.@i < 101) set .@enchant,4787; //Mdef4
-			else if (.@i < 201) set .@enchant,4792; //Def6
-			else if (.@i < 301) set .@enchant,4801; //SP100
-			else if (.@i < 351) set .@enchant,4795; //HP100
-			else if (.@i < 401) set .@enchant,4796; //HP200
-			else if (.@i < 451) set .@enchant,4819; //Atk1
-			else if (.@i < 476) set .@enchant,4720; //Dexterity1
-			else if (.@i < 501) set .@enchant,4740; //Vitality1
-			else if (.@i < 526) set .@enchant,4750; //Luck1
-			else if (.@i < 528) set .@enchant,4700; //Strength1
-			else if (.@i < 530) set .@enchant,4730; //Agility1
-			else if (.@i < 532) set .@enchant,4710; //Inteligence1
-			else set .@enchant,9;
+			.@i = rand(1,531);
+			     if (.@i < 101) .@enchant = 4787; //Mdef4
+			else if (.@i < 201) .@enchant = 4792; //Def6
+			else if (.@i < 301) .@enchant = 4801; //SP100
+			else if (.@i < 351) .@enchant = 4795; //HP100
+			else if (.@i < 401) .@enchant = 4796; //HP200
+			else if (.@i < 451) .@enchant = 4819; //Atk1
+			else if (.@i < 476) .@enchant = 4720; //Dexterity1
+			else if (.@i < 501) .@enchant = 4740; //Vitality1
+			else if (.@i < 526) .@enchant = 4750; //Luck1
+			else if (.@i < 528) .@enchant = 4700; //Strength1
+			else if (.@i < 530) .@enchant = 4730; //Agility1
+			else if (.@i < 532) .@enchant = 4710; //Inteligence1
+			else .@enchant = 9;
 			break;
 		case 9: //Dgrade_Coin
-			set .@i, rand(1,531);
-			     if (.@i < 101) set .@enchant,4795; //HP100
-			else if (.@i < 201) set .@enchant,4796; //HP200
-			else if (.@i < 301) set .@enchant,4819; //Atk1
-			else if (.@i < 351) set .@enchant,4720; //Dexterity1
-			else if (.@i < 401) set .@enchant,4740; //Vitality1
-			else if (.@i < 451) set .@enchant,4750; //Luck1
-			else if (.@i < 476) set .@enchant,4700; //Strength1
-			else if (.@i < 501) set .@enchant,4730; //Agility1
-			else if (.@i < 526) set .@enchant,4710; //Inteligence1
-			else if (.@i < 528) set .@enchant,4701; //Strength2
-			else if (.@i < 530) set .@enchant,4731; //Agility2
-			else if (.@i < 532) set .@enchant,4711; //Inteligence2
-			else set .@enchant,9;
+			.@i = rand(1,531);
+			     if (.@i < 101) .@enchant = 4795; //HP100
+			else if (.@i < 201) .@enchant = 4796; //HP200
+			else if (.@i < 301) .@enchant = 4819; //Atk1
+			else if (.@i < 351) .@enchant = 4720; //Dexterity1
+			else if (.@i < 401) .@enchant = 4740; //Vitality1
+			else if (.@i < 451) .@enchant = 4750; //Luck1
+			else if (.@i < 476) .@enchant = 4700; //Strength1
+			else if (.@i < 501) .@enchant = 4730; //Agility1
+			else if (.@i < 526) .@enchant = 4710; //Inteligence1
+			else if (.@i < 528) .@enchant = 4701; //Strength2
+			else if (.@i < 530) .@enchant = 4731; //Agility2
+			else if (.@i < 532) .@enchant = 4711; //Inteligence2
+			else .@enchant = 9;
 			break;
 		case 8: //Cgrade_Coin
-			set .@i, rand(1,531);
-			     if (.@i < 101) set .@enchant,4720; //Dexterity1
-			else if (.@i < 201) set .@enchant,4740; //Vitality1
-			else if (.@i < 301) set .@enchant,4750; //Luck1
-			else if (.@i < 351) set .@enchant,4700; //Strength1
-			else if (.@i < 401) set .@enchant,4730; //Agility1
-			else if (.@i < 451) set .@enchant,4710; //Inteligence1
-			else if (.@i < 476) set .@enchant,4701; //Strength2
-			else if (.@i < 501) set .@enchant,4731; //Agility2
-			else if (.@i < 526) set .@enchant,4711; //Inteligence2
-			else if (.@i < 528) set .@enchant,4702; //Strength3
-			else if (.@i < 530) set .@enchant,4732; //Agility3
-			else if (.@i < 532) set .@enchant,4712; //Inteligence3
-			else set .@enchant,9;
+			.@i = rand(1,531);
+			     if (.@i < 101) .@enchant = 4720; //Dexterity1
+			else if (.@i < 201) .@enchant = 4740; //Vitality1
+			else if (.@i < 301) .@enchant = 4750; //Luck1
+			else if (.@i < 351) .@enchant = 4700; //Strength1
+			else if (.@i < 401) .@enchant = 4730; //Agility1
+			else if (.@i < 451) .@enchant = 4710; //Inteligence1
+			else if (.@i < 476) .@enchant = 4701; //Strength2
+			else if (.@i < 501) .@enchant = 4731; //Agility2
+			else if (.@i < 526) .@enchant = 4711; //Inteligence2
+			else if (.@i < 528) .@enchant = 4702; //Strength3
+			else if (.@i < 530) .@enchant = 4732; //Agility3
+			else if (.@i < 532) .@enchant = 4712; //Inteligence3
+			else .@enchant = 9;
 			break;
 		case 7: //Bgrade_Coin
-			set .@i, rand(1,531);
-			     if (.@i < 101) set .@enchant,4700; //Strength1
-			else if (.@i < 201) set .@enchant,4730; //Agility1
-			else if (.@i < 301) set .@enchant,4710; //Inteligence1
-			else if (.@i < 351) set .@enchant,4701; //Strength2
-			else if (.@i < 401) set .@enchant,4731; //Agility2
-			else if (.@i < 451) set .@enchant,4711; //Inteligence2
-			else if (.@i < 476) set .@enchant,4702; //Strength3
-			else if (.@i < 501) set .@enchant,4732; //Agility3
-			else if (.@i < 526) set .@enchant,4712; //Inteligence3
-			else if (.@i < 528) set .@enchant,4703; //Strength4
-			else if (.@i < 530) set .@enchant,4733; //Agility4
-			else if (.@i < 532) set .@enchant,4713; //Inteligence4
-			else set .@enchant,9;
+			.@i = rand(1,531);
+			     if (.@i < 101) .@enchant = 4700; //Strength1
+			else if (.@i < 201) .@enchant = 4730; //Agility1
+			else if (.@i < 301) .@enchant = 4710; //Inteligence1
+			else if (.@i < 351) .@enchant = 4701; //Strength2
+			else if (.@i < 401) .@enchant = 4731; //Agility2
+			else if (.@i < 451) .@enchant = 4711; //Inteligence2
+			else if (.@i < 476) .@enchant = 4702; //Strength3
+			else if (.@i < 501) .@enchant = 4732; //Agility3
+			else if (.@i < 526) .@enchant = 4712; //Inteligence3
+			else if (.@i < 528) .@enchant = 4703; //Strength4
+			else if (.@i < 530) .@enchant = 4733; //Agility4
+			else if (.@i < 532) .@enchant = 4713; //Inteligence4
+			else .@enchant = 9;
 			break;
 		case 6: //Agrade_Coin - Caster
-			set .@i, rand(1,555);
-			     if (.@i < 81)  set .@enchant,4711; //Inteligence2
-			else if (.@i < 161) set .@enchant,4721; //Dexterity2
-			else if (.@i < 241) set .@enchant,4814; //Spell2
-			else if (.@i < 311) set .@enchant,4712; //Inteligence3
-			else if (.@i < 371) set .@enchant,4722; //Dexterity3
-			else if (.@i < 431) set .@enchant,4813; //Spell3
-			else if (.@i < 476) set .@enchant,4713; //Inteligence4
-			else if (.@i < 516) set .@enchant,4812; //Spell4
-			else if (.@i < 526) set .@enchant,4760; //Matk1
-			else if (.@i < 546) set .@enchant,4714; //Inteligence5
-			else if (.@i < 551) set .@enchant,4826; //Spell5
-			else if (.@i < 556) set .@enchant,4761; //Matk2
-			else set .@enchant,9;
+			.@i = rand(1,555);
+			     if (.@i < 81)  .@enchant = 4711; //Inteligence2
+			else if (.@i < 161) .@enchant = 4721; //Dexterity2
+			else if (.@i < 241) .@enchant = 4814; //Spell2
+			else if (.@i < 311) .@enchant = 4712; //Inteligence3
+			else if (.@i < 371) .@enchant = 4722; //Dexterity3
+			else if (.@i < 431) .@enchant = 4813; //Spell3
+			else if (.@i < 476) .@enchant = 4713; //Inteligence4
+			else if (.@i < 516) .@enchant = 4812; //Spell4
+			else if (.@i < 526) .@enchant = 4760; //Matk1
+			else if (.@i < 546) .@enchant = 4714; //Inteligence5
+			else if (.@i < 551) .@enchant = 4826; //Spell5
+			else if (.@i < 556) .@enchant = 4761; //Matk2
+			else .@enchant = 9;
 			break;
 		case 5: //Agrade_Coin - Long Range
-			set .@i, rand(1,555);
-			     if (.@i < 81)  set .@enchant,4731; //Agility2
-			else if (.@i < 161) set .@enchant,4833; //Expert_Archer2
-			else if (.@i < 241) set .@enchant,4817; //Sharp2
-			else if (.@i < 311) set .@enchant,4732; //Agility3
-			else if (.@i < 371) set .@enchant,4834; //Expert_Archer3
-			else if (.@i < 431) set .@enchant,4816; //Sharp3
-			else if (.@i < 476) set .@enchant,4733; //Agility4
-			else if (.@i < 516) set .@enchant,4835; //Expert_Archer4
-			else if (.@i < 526) set .@enchant,4807; //Atk_Speed1
-			else if (.@i < 546) set .@enchant,4734; //Agility5
-			else if (.@i < 551) set .@enchant,4836; //Expert_Archer5
-			else if (.@i < 556) set .@enchant,4807; //Atk_Speed1
-			else set .@enchant,9;
+			.@i = rand(1,555);
+			     if (.@i < 81)  .@enchant = 4731; //Agility2
+			else if (.@i < 161) .@enchant = 4833; //Expert_Archer2
+			else if (.@i < 241) .@enchant = 4817; //Sharp2
+			else if (.@i < 311) .@enchant = 4732; //Agility3
+			else if (.@i < 371) .@enchant = 4834; //Expert_Archer3
+			else if (.@i < 431) .@enchant = 4816; //Sharp3
+			else if (.@i < 476) .@enchant = 4733; //Agility4
+			else if (.@i < 516) .@enchant = 4835; //Expert_Archer4
+			else if (.@i < 526) .@enchant = 4807; //Atk_Speed1
+			else if (.@i < 546) .@enchant = 4734; //Agility5
+			else if (.@i < 551) .@enchant = 4836; //Expert_Archer5
+			else if (.@i < 556) .@enchant = 4807; //Atk_Speed1
+			else .@enchant = 9;
 			break;
 		case 4: //Agrade_Coin - Short Range
-			set .@i, rand(1,555);
-			     if (.@i < 81)  set .@enchant,4731; //Agility2
-			else if (.@i < 161) set .@enchant,4808; //Fighting_Spirit4
-			else if (.@i < 241) set .@enchant,4817; //Sharp2
-			else if (.@i < 311) set .@enchant,4732; //Agility3
-			else if (.@i < 371) set .@enchant,4820; //Fighting_Spirit5
-			else if (.@i < 431) set .@enchant,4816; //Sharp3
-			else if (.@i < 476) set .@enchant,4733; //Agility4
-			else if (.@i < 516) set .@enchant,4821; //Fighting_Spirit6
-			else if (.@i < 526) set .@enchant,4807; //Atk_Speed1
-			else if (.@i < 546) set .@enchant,4734; //Agility5
-			else if (.@i < 551) set .@enchant,4822; //Fighting_Spirit7
-			else if (.@i < 556) set .@enchant,4807; //Atk_Speed1
-			else set .@enchant,9;
+			.@i = rand(1,555);
+			     if (.@i < 81)  .@enchant = 4731; //Agility2
+			else if (.@i < 161) .@enchant = 4808; //Fighting_Spirit4
+			else if (.@i < 241) .@enchant = 4817; //Sharp2
+			else if (.@i < 311) .@enchant = 4732; //Agility3
+			else if (.@i < 371) .@enchant = 4820; //Fighting_Spirit5
+			else if (.@i < 431) .@enchant = 4816; //Sharp3
+			else if (.@i < 476) .@enchant = 4733; //Agility4
+			else if (.@i < 516) .@enchant = 4821; //Fighting_Spirit6
+			else if (.@i < 526) .@enchant = 4807; //Atk_Speed1
+			else if (.@i < 546) .@enchant = 4734; //Agility5
+			else if (.@i < 551) .@enchant = 4822; //Fighting_Spirit7
+			else if (.@i < 556) .@enchant = 4807; //Atk_Speed1
+			else .@enchant = 9;
 			break;
 		case 3: //Anger_Seagod - Caster
-			set .@i, rand(1,555);
-			     if (.@i < 81)  set .@enchant,4712; //Inteligence3
-			else if (.@i < 161) set .@enchant,4722; //Dexterity3
-			else if (.@i < 241) set .@enchant,4813; //Spell3
-			else if (.@i < 311) set .@enchant,4713; //Inteligence4
-			else if (.@i < 371) set .@enchant,4812; //Spell4
-			else if (.@i < 431) set .@enchant,4760; //Matk1
-			else if (.@i < 476) set .@enchant,4714; //Inteligence5
-			else if (.@i < 516) set .@enchant,4826; //Spell5
-			else if (.@i < 526) set .@enchant,4761; //Matk2
-			else if (.@i < 546) set .@enchant,4715; //Inteligence6
-			else if (.@i < 551) set .@enchant,4827; //Spell6
-			else if (.@i < 556) set .@enchant,4761; //Matk2
-			else set .@enchant,9;
+			.@i = rand(1,555);
+			     if (.@i < 81)  .@enchant = 4712; //Inteligence3
+			else if (.@i < 161) .@enchant = 4722; //Dexterity3
+			else if (.@i < 241) .@enchant = 4813; //Spell3
+			else if (.@i < 311) .@enchant = 4713; //Inteligence4
+			else if (.@i < 371) .@enchant = 4812; //Spell4
+			else if (.@i < 431) .@enchant = 4760; //Matk1
+			else if (.@i < 476) .@enchant = 4714; //Inteligence5
+			else if (.@i < 516) .@enchant = 4826; //Spell5
+			else if (.@i < 526) .@enchant = 4761; //Matk2
+			else if (.@i < 546) .@enchant = 4715; //Inteligence6
+			else if (.@i < 551) .@enchant = 4827; //Spell6
+			else if (.@i < 556) .@enchant = 4761; //Matk2
+			else .@enchant = 9;
 			break;
 		case 2: //Anger_Seagod - Long Range
-			set .@i, rand(1,555);
-			     if (.@i < 81)  set .@enchant,4732; //Agility3
-			else if (.@i < 161) set .@enchant,4834; //Expert_Archer3
-			else if (.@i < 241) set .@enchant,4843; //Sharp4
-			else if (.@i < 311) set .@enchant,4733; //Agility4
-			else if (.@i < 371) set .@enchant,4835; //Expert_Archer4
-			else if (.@i < 431) set .@enchant,4844; //Sharp5
-			else if (.@i < 476) set .@enchant,4734; //Agility5
-			else if (.@i < 516) set .@enchant,4836; //Expert_Archer5
-			else if (.@i < 526) set .@enchant,4807; //Atk_Speed1
-			else if (.@i < 546) set .@enchant,4735; //Agility6
-			else if (.@i < 551) set .@enchant,4837; //Expert_Archer6
-			else if (.@i < 556) set .@enchant,4807; //Atk_Speed1
-			else set .@enchant,9;
+			.@i = rand(1,555);
+			     if (.@i < 81)  .@enchant = 4732; //Agility3
+			else if (.@i < 161) .@enchant = 4834; //Expert_Archer3
+			else if (.@i < 241) .@enchant = 4843; //Sharp4
+			else if (.@i < 311) .@enchant = 4733; //Agility4
+			else if (.@i < 371) .@enchant = 4835; //Expert_Archer4
+			else if (.@i < 431) .@enchant = 4844; //Sharp5
+			else if (.@i < 476) .@enchant = 4734; //Agility5
+			else if (.@i < 516) .@enchant = 4836; //Expert_Archer5
+			else if (.@i < 526) .@enchant = 4807; //Atk_Speed1
+			else if (.@i < 546) .@enchant = 4735; //Agility6
+			else if (.@i < 551) .@enchant = 4837; //Expert_Archer6
+			else if (.@i < 556) .@enchant = 4807; //Atk_Speed1
+			else .@enchant = 9;
 			break;
 		case 1: //Anger_Seagod - Short Range
-			set .@i, rand(1,555);
-			     if (.@i < 81)  set .@enchant,4732; //Agility3
-			else if (.@i < 161) set .@enchant,4820; //Fighting_Spirit5
-			else if (.@i < 241) set .@enchant,4843; //Sharp4
-			else if (.@i < 311) set .@enchant,4733; //Agility4
-			else if (.@i < 371) set .@enchant,4821; //Fighting_Spirit6
-			else if (.@i < 431) set .@enchant,4844; //Sharp5
-			else if (.@i < 476) set .@enchant,4734; //Agility5
-			else if (.@i < 516) set .@enchant,4822; //Fighting_Spirit7
-			else if (.@i < 526) set .@enchant,4807; //Atk_Speed1
-			else if (.@i < 546) set .@enchant,4735; //Agility6
-			else if (.@i < 551) set .@enchant,4823; //Fighting_Spirit8
-			else if (.@i < 556) set .@enchant,4807; //Atk_Speed1
-			else set .@enchant,9;
+			.@i = rand(1,555);
+			     if (.@i < 81)  .@enchant = 4732; //Agility3
+			else if (.@i < 161) .@enchant = 4820; //Fighting_Spirit5
+			else if (.@i < 241) .@enchant = 4843; //Sharp4
+			else if (.@i < 311) .@enchant = 4733; //Agility4
+			else if (.@i < 371) .@enchant = 4821; //Fighting_Spirit6
+			else if (.@i < 431) .@enchant = 4844; //Sharp5
+			else if (.@i < 476) .@enchant = 4734; //Agility5
+			else if (.@i < 516) .@enchant = 4822; //Fighting_Spirit7
+			else if (.@i < 526) .@enchant = 4807; //Atk_Speed1
+			else if (.@i < 546) .@enchant = 4735; //Agility6
+			else if (.@i < 551) .@enchant = 4823; //Fighting_Spirit8
+			else if (.@i < 556) .@enchant = 4807; //Atk_Speed1
+			else .@enchant = 9;
 			break;
 		default:
 			mes "[Mayomayo]";
 			mes "There is something wrong. Please try again.";
 			close;
 		}
-		     if (.@equip_card[3] == 0 && getarg(1) < 4) set .@equip_card[3],.@enchant;
-		else if (.@equip_card[2] == 0 && getarg(1) < 3) set .@equip_card[2],.@enchant;
-		else if (.@equip_card[1] == 0 && getarg(1) < 2) set .@equip_card[1],.@enchant;
-		else if (.@equip_card[0] == 0 && getarg(1) < 1) set .@equip_card[0],.@enchant;
+		     if (.@equip_card[3] == 0 && getarg(1) < 4) .@equip_card[3] = .@enchant;
+		else if (.@equip_card[2] == 0 && getarg(1) < 3) .@equip_card[2] = .@enchant;
+		else if (.@equip_card[1] == 0 && getarg(1) < 2) .@equip_card[1] = .@enchant;
+		else if (.@equip_card[0] == 0 && getarg(1) < 1) .@equip_card[0] = .@enchant;
 		else {
 			mes "[Mayomayo]";
 			mes "This equipment is at the end of enchant. I provide enchant for two times maximum.";
@@ -628,9 +628,9 @@ L_Socket:
 		delequip EQI_HAND_R;
 
 //		GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
-		for(set .@i,0; .@i<4; set .@i,.@i+1) {
+		for(.@i = 0; .@i<4; ++.@i) {
 			if (.@equip_card[.@i] >= 4700) // Armor Enchant System
-				set .@equip_card[.@i],0;
+				.@equip_card[.@i] = 0;
 		}
 		getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
 
-- 
cgit v1.2.3-70-g09d2