Fixed some bugs on jobs and merchants scripts.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16559 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 61 insertions, 41 deletions

diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 6498ca2a8..f14da8d41 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1223,6 +1223,8 @@ job_knt,89,106,4	script	Knight Windsor#knt	733,{
 }
 
 job_knt,89,106,4	script	Windsor Benedict#knt	733,{
+	end;
+
 OnInit:
 	disablenpc "Windsor Benedict#knt";
 	waitingroom "Waiting Room",20,"Windsor Benedict#knt::OnStartArena",1;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index db81f1a17..285b7fa14 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -895,6 +895,8 @@ job_duncer,95,93,4	script	Bijou#da	101,{
 // Waiting Room
 //============================================================ 
 job_duncer,32,154,1	script	Waiting Room#dance	66,{
+	end;
+
 OnInit:
 	waitingroom "Waiting Room",20,"Waiting Room#dance::OnStartArena",1;
 	enablewaitingroomevent;
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index fead53630..481392c60 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2560,6 +2560,8 @@ job_sage,50,165,4	script	Test Helper#talk	700,{
 }
 
 job_sage,50,165,4	script	Waiting Room#sg	700,{
+	end;
+
 OnInit:
 	disablenpc "Waiting Room#sg";
 	waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1;
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index 60acac1c4..d5f321518 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -13,15 +13,16 @@
 //= 1.0 First version.
 //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586)
 //= 1.2 Optimized. [Euphy]
+//= 1.3 Fixed some typos and optimized a little more. [Daegaladh]
 //============================================================ 
 
 prontera,165,60,2	script	Apprentice Craftsman	73,{
 	mes "[Apprentice Craftsman]";
 	if (Zeny > 399999) {
-		mes "I've been studying ways to enhance an armor to maximize it's capability.";
+		mes "I've been studying ways to enhance an armor to maximize its capability.";
 		next;
 		mes "[Apprentice Craftsman]";
-		mes "Enchanting is an awesome skill that infuses a mysterious status power into the armor's hidden socket.";
+		mes "Enchanting is an awesome skill that infuses a mysterious status powers into the armor's hidden socket.";
 		next;
 		mes "[Apprentice Craftsman]";
 		mes "However, you have to keep in mind that if there are two armors of the same kind in your possession, the Enchantment will be applied in the order they are placed in your inventory.";
@@ -32,7 +33,7 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 		mes "[Apprentice Craftsman]";
 		mes "I'm not responsible for what would happen if you have more than one of the same kind in your inventory.";
 		next;
-		switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) {
+		switch(select("Armor with no Slots:Armor with Slots: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;
@@ -70,7 +71,7 @@ S_EnchantArmor:
 	set .@failrate,getarg(1);
 	mes "[Apprentice Craftsman]";
 	if ((countitem(.@itemid) > 0) && (countitem(.@itemid) < 2)) {
-		mes "Socket enchant wil cost you 400,000 zeny. And there will be a random option enchanted. Of course, there is a chance of breaking your armor.";
+		mes "Socket enchant will cost you 400,000 zeny. And there will be a random option enchanted. Of course, there is a chance of breaking your armor.";
 		next;
 		mes "[Apprentice Craftsman]";
 		mes "First and most importantly.";
@@ -78,7 +79,7 @@ S_EnchantArmor:
 		mes "and Cards will be GONE.^000000";
 		mes "Do you still want to try an Enchant?";
 		next;
-		if(select("Hmm... Let me think it over.:Go ahead.")==1) {
+		if(select("Hmm... Let me think it over.:I've made up my mind already. Give it a shot.")==1) {
 			mes "[Apprentice Craftsman]";
 			mes "Well, I can't blame you. Safety first, eh?";
 			mes "Now you have a nice day.";
@@ -94,33 +95,51 @@ S_EnchantArmor:
 			close;
 		}
 		progressbar "ffff00",7;
-		set .@enc_ran,rand(1,.@failrate);
 		set zeny,zeny-400000;
 		delitem .@itemid,1;
-		if (.@enc_ran == 1) set .@addpart,4702;
-		else if (.@enc_ran == 2) set .@addpart,4712;
-		else if (.@enc_ran == 3) set .@addpart,4722;
-		else if (.@enc_ran == 4) set .@addpart,4732;
-		else if (.@enc_ran == 5) set .@addpart,4742;
-		else if (.@enc_ran == 6) set .@addpart,4752;
-		else if ((.@enc_ran > 6) && (.@enc_ran < 9)) set .@addpart,4701;
-		else if ((.@enc_ran > 8) && (.@enc_ran < 11)) set .@addpart,4711;
-		else if ((.@enc_ran > 10) && (.@enc_ran < 13)) set .@addpart,4721;
-		else if ((.@enc_ran > 12) && (.@enc_ran < 15)) set .@addpart,4731;
-		else if ((.@enc_ran > 14) && (.@enc_ran < 17)) set .@addpart,4741;
-		else if ((.@enc_ran > 16) && (.@enc_ran < 19)) set .@addpart,4751;
-		else if ((.@enc_ran > 18) && (.@enc_ran < 22)) set .@addpart,4700;
-		else if ((.@enc_ran > 21) && (.@enc_ran < 25)) set .@addpart,4710;
-		else if ((.@enc_ran > 24) && (.@enc_ran < 28)) set .@addpart,4720;
-		else if ((.@enc_ran > 27) && (.@enc_ran < 31)) set .@addpart,4730;
-		else if ((.@enc_ran > 30) && (.@enc_ran < 34)) set .@addpart,4740;
-		else if ((.@enc_ran > 33) && (.@enc_ran < 37)) set .@addpart,4750;
-		else {
-			specialeffect2 EF_PHARMACY_FAIL;
-			mes "[Apprentice Craftsman]";
-			mes "Well that's too bad.";
-			mes "The requested equipment has failed to enchant.";
-			close;
+		switch (rand(1,.@failrate)) {
+			case 1: set .@addpart,4702;break;
+			case 2: set .@addpart,4712;break;
+			case 3: set .@addpart,4722;break;
+			case 4: set .@addpart,4732;break;
+			case 5: set .@addpart,4742;break;
+			case 6: set .@addpart,4752;break;
+			case 7:
+			case 8: set .@addpart,4701;break;
+			case 9:
+			case 10: set .@addpart,4711;break;
+			case 11:
+			case 12: set .@addpart,4721;break;
+			case 13:
+			case 14: set .@addpart,4731;break;
+			case 15:
+			case 16: set .@addpart,4741;break;
+			case 17:
+			case 18: set .@addpart,4751;break;
+			case 19:
+			case 20:
+			case 21: set .@addpart,4700;break;
+			case 22:
+			case 23:
+			case 24: set .@addpart,4710;break;
+			case 25:
+			case 26:
+			case 27: set .@addpart,4720;break;
+			case 28:
+			case 29:
+			case 30: set .@addpart,4730;break;
+			case 31:
+			case 32:
+			case 33: set .@addpart,4740;break;
+			case 34:
+			case 35:
+			case 36: set .@addpart,4750;break;
+			default:
+				specialeffect2 EF_PHARMACY_FAIL;
+				mes "[Apprentice Craftsman]";
+				mes "Well that's too bad.";
+				mes "The requested equipment has failed to enchant.";
+				close;
 		}
 		getitem2 .@itemid, 1, 1, 0, 0, 0, 0, 0, .@addpart;
 	}
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index ed69197ed..70f26ca58 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -88,8 +88,8 @@ prt_in,243,168,4	script	Jovovich	91,{
 						switch(.@headpalette) {
 						case 1: callsub S_NoDye,976,"yellow"; break;
 						case 2: callsub S_NoDye,978,"violet"; break;
-						case 3: callsub S_NoDye,979,"orange"; break;
-						case 4: callsub S_NoDye,980,"green"; break;
+						case 3: callsub S_NoDye,980,"orange"; break;
+						case 4: callsub S_NoDye,979,"green"; break;
 						case 5: callsub S_NoDye,981,"blue"; break;
 						case 6: callsub S_NoDye,982,"white"; break;
 						case 7: callsub S_NoDye,983,"black"; break;
@@ -104,8 +104,8 @@ prt_in,243,168,4	script	Jovovich	91,{
 						switch(.@headpalette) {
 						case 1: delitem 976,1; break; //Lemon_Dyestuffs
 						case 2: delitem 978,1; break; //Violet_Dyestuffs
-						case 3: delitem 979,1; break; //Orange_Dyestuffs
-						case 4: delitem 980,1; break; //Darkgreen_Dyestuffs
+						case 3: delitem 980,1; break; //Orange_Dyestuffs
+						case 4: delitem 979,1; break; //Darkgreen_Dyestuffs
 						case 5: delitem 981,1; break; //Cobaltblue_Dyestuffs
 						case 6: delitem 982,1; break; //White_Dyestuffs
 						case 7: delitem 983,1; break; //Black_Dyestuffs
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index a66ab30d8..c302b2763 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -380,7 +380,7 @@
 
 payon,236,199,3	duplicate(SocketEnchant2)	Leablem#pay	86
 lighthalzen,96,137,3	duplicate(SocketEnchant2)	Leablem#lhz	86
-prontera,244,169,5	duplicate(SocketEnchant2)	Leablem#prt	86
+prt_in,22,60,6	duplicate(SocketEnchant2)	Leablem#prt	86
 moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	86
 
 function	script	Func_Socket2	{
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 2dcc66de4..df6d15662 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -641,8 +641,3 @@ job_sword1,231,101,0,0	monster	Fabre	1184,2,60000,30000,0
 job_sword1,234,117,0,0	monster	Fabre	1184,2,60000,30000,0
 job_sword1,198,91,0,0	monster	Fabre	1184,2,60000,30000,0
 job_sword1,200,63,0,0	monster	Fabre	1184,2,60000,30000,0
-
-
-//============================================================ 
-// mapflag
-//============================================================