bunch of updates..

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

10 files changed, 156 insertions, 117 deletions

diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index 046e7c308..a3085aa4f 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -107,8 +107,8 @@ alde_alche.gat,24,188,3	script	Gever AI Sharp	740,{
 			mes "[Gever AI Sharp]";

 			if(Zeny < @price) goto sL_NoZeny;	

 			if (checkweight(@itemid,1) == 0) goto sL_OverW;

-			getitem @itemid,1;

 			set Zeny,Zeny-@price;

+			getitem @itemid,1;			

 		L_Bye:

 			mes "Thank you for buying!";

 			mes "Come again.";

diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index a63dd2b71..e0cff38e3 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -277,73 +277,73 @@ L_Dye_Orange:
 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(980) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes orange.";

-	setlook 7,@orange;

 	delitem 980,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes orange.";

+	setlook 7,@orange;

 	close;

 L_Dye_Violet:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(981) < 1) goto  sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes Violet.";

-	setlook 7,@violet;

 	delitem 981,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes Violet.";

+	setlook 7,@violet;

 	close;

 L_Dye_Red:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(975) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes red.";

-	setlook 7,@red;

 	delitem 975,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes red.";

+	setlook 7,@red;

 	close;

 L_Dye_Black:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(983) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes black.";

-	setlook 7,@black;

 	delitem 983,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes black.";

+	setlook 7,@black;

 	close;

 L_Dye_Green:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(979) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes green.";

-	setlook 7,@green;

 	delitem 979,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes green.";

+	setlook 7,@green;

 	close;

 L_Dye_Blue:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(978) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes blue.";

-	setlook 7,@blue;

 	delitem 978,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes blue.";

+	setlook 7,@blue;

 	close;

 L_Dye_White:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(982) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes white.";

-	setlook 7,@white;

 	delitem 982,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes white.";

+	setlook 7,@white;

 	close;

 L_Dye_Yellow:

 	mes "[Dyer Ginedin Rephere]";

 	if(countitem(976) < 1) goto sL_NoDye;

 	if(Zeny < 10000) goto sL_Zeny;

-	mes "Ok. I will dye you clothes yellow.";

-	setlook 7,@yellow;

 	delitem 976,1;

 	set Zeny, Zeny - 10000;

+	mes "Ok. I will dye you clothes yellow.";

+	setlook 7,@yellow;

 	close;

 

 sL_Sorry:

diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index eb258c688..ecfdce186 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -98,13 +98,13 @@ morocc_in.gat,146,99,2	script	Dye Maker JavaDullihan	122,{
 				mes "[Dye Maker JavaDullihan]";

 				if((countitem(507) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;

 				if(Zeny < 3000) goto sl_LowZeny;

-				mes "Missing text.";

-				mes "Under development";

+				set Zeny, Zeny - 3000;

 				delitem 507,30;

 				delitem 973,1;

 				delitem 713,1;

-				set Zeny, Zeny - 3000;

 				getitem 975,1;

+				mes "Missing text.";

+				mes "Under development";

 				close;

 

 		sM_Lemon:

diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt
index bad02c3f1..666eefd84 100644
--- a/npc/merchants/grandpa_pharmacist.txt
+++ b/npc/merchants/grandpa_pharmacist.txt
@@ -131,13 +131,13 @@ sF_Make:
 		if(Zeny < (getarg(2)*@amount)) goto L_NdZeny;

 

 	L_End:

-		mes "[Grampa Pharmacist]";

-		mes "Here are your " +getarg(4)+ " potions.";

+		set Zeny, Zeny - (getarg(2)*@amount);

 		delitem getarg(0), (@amount*@herbnum);

 		if(getarg(1) != 0) delitem getarg(1), (@amount*@herbnum);

 		delitem 713, @amount;

-		set Zeny, Zeny - (getarg(2)*@amount);

 		getitem getarg(3), @amount;

+		mes "[Grampa Pharmacist]";

+		mes "Here are your " +getarg(4)+ " potions.";

 		close;

 

 	L_NdBottle:

diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 61bda6f1b..f684138a2 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -41,10 +41,11 @@ prt_in.gat,243,168,4	script	HairDyer Jovovich	91,{
 			mes "[HairDyer Jovovich]";

 			if(countitem(975) < 1) goto sL_NoDye;

 			if(Zeny < 1000) goto sL_Zeny;

+			set Zeny, Zeny - 1000;

+			delitem 975,1;

 			mes "Ok. I will dye you hair red.";

 			setlook 6,8;

-			delitem 975,1;

-			set Zeny, Zeny - 1000;

+

 			close;

 

 		sM_b:

diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index d5b85af9c..c2dada38e 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -417,7 +417,8 @@ mhair1:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,1;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -425,7 +426,7 @@ mhair1:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,1;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (1) style.";

@@ -458,7 +459,8 @@ mhair2:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,2;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -466,7 +468,7 @@ mhair2:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,2;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (2) style.";

@@ -499,7 +501,8 @@ mhair3:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,3;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -507,7 +510,7 @@ mhair3:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,3;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (3) style.";

@@ -540,7 +543,8 @@ mhair4:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,4;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -548,7 +552,7 @@ mhair4:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,4;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (4) style.";

@@ -581,7 +585,8 @@ mhair5:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,5;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -589,7 +594,7 @@ mhair5:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,5;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (5) style.";

@@ -622,7 +627,8 @@ mhair6:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,6;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -630,7 +636,7 @@ mhair6:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,6;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (6) style.";

@@ -663,7 +669,8 @@ mhair7:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,7;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -671,7 +678,7 @@ mhair7:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,7;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (7) style.";

@@ -704,7 +711,8 @@ mhair8:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,8;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -712,7 +720,7 @@ mhair8:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,8;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (8) style.";

@@ -745,7 +753,8 @@ mhair9:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,9;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -753,7 +762,7 @@ mhair9:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,9;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (9) style.";

@@ -786,7 +795,8 @@ mhair10:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,10;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -794,7 +804,7 @@ mhair10:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,10;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (10) style.";

@@ -827,7 +837,8 @@ mhair11:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,11;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -835,7 +846,7 @@ mhair11:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,11;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (11) style.";

@@ -868,7 +879,8 @@ mhair12:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,12;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -876,7 +888,7 @@ mhair12:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,12;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (12) style.";

@@ -909,7 +921,8 @@ mhair13:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,13;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -917,7 +930,7 @@ mhair13:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,13;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (13) style.";

@@ -950,7 +963,8 @@ mhair14:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,14;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -958,7 +972,7 @@ mhair14:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,14;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (14) style.";

@@ -991,7 +1005,8 @@ mhair15:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,15;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -999,7 +1014,7 @@ mhair15:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,15;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (15) style.";

@@ -1032,7 +1047,8 @@ mhair16:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,16;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1040,7 +1056,7 @@ mhair16:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,16;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (16) style.";

@@ -1073,7 +1089,8 @@ mhair17:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,17;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1081,7 +1098,7 @@ mhair17:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,17;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (17) style.";

@@ -1114,7 +1131,8 @@ mhair18:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,18;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1122,7 +1140,7 @@ mhair18:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,18;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (18) style.";

@@ -1155,7 +1173,8 @@ mhair19:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,19;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1163,7 +1182,7 @@ mhair19:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,19;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (19) style.";

@@ -1220,7 +1239,8 @@ fhair1:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,1;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1228,7 +1248,7 @@ fhair1:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,1;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (1) style.";

@@ -1261,7 +1281,8 @@ fhair2:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,2;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1269,7 +1290,7 @@ fhair2:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,2;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (2) style.";

@@ -1302,7 +1323,8 @@ fhair3:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,3;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1310,7 +1332,7 @@ fhair3:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,3;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (3) style.";

@@ -1343,7 +1365,8 @@ fhair4:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,4;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1351,7 +1374,7 @@ fhair4:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,4;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (4) style.";

@@ -1384,7 +1407,8 @@ fhair5:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,5;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1392,7 +1416,7 @@ fhair5:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,5;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (5) style.";

@@ -1425,7 +1449,8 @@ fhair6:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,6;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1433,7 +1458,7 @@ fhair6:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,6;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (6) style.";

@@ -1466,7 +1491,8 @@ fhair7:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,7;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1474,7 +1500,7 @@ fhair7:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,7;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (7) style.";

@@ -1507,7 +1533,8 @@ fhair8:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,8;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1515,7 +1542,7 @@ fhair8:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,8;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (8) style.";

@@ -1548,7 +1575,8 @@ fhair9:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,9;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1556,7 +1584,7 @@ fhair9:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,9;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (9) style.";

@@ -1589,7 +1617,8 @@ fhair10:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,10;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1597,7 +1626,7 @@ fhair10:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,10;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (10) style.";

@@ -1630,7 +1659,8 @@ fhair11:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,11;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1638,7 +1668,7 @@ fhair11:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,11;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (11) style.";

@@ -1671,7 +1701,8 @@ fhair12:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,12;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1679,7 +1710,7 @@ fhair12:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,12;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (12) style.";

@@ -1712,7 +1743,8 @@ fhair13:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,13;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1720,7 +1752,7 @@ fhair13:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,13;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (13) style.";

@@ -1753,7 +1785,8 @@ fhair14:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,14;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1761,7 +1794,7 @@ fhair14:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,14;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (14) style.";

@@ -1794,7 +1827,8 @@ fhair15:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,15;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1802,7 +1836,7 @@ fhair15:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,15;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (15) style.";

@@ -1835,7 +1869,8 @@ fhair16:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,16;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1843,7 +1878,7 @@ fhair16:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,16;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (16) style.";

@@ -1876,7 +1911,8 @@ fhair17:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,17;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1884,7 +1920,7 @@ fhair17:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,17;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (17) style.";

@@ -1917,7 +1953,8 @@ fhair18:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,18;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1925,7 +1962,7 @@ fhair18:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,18;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (18) style.";

@@ -1958,7 +1995,8 @@ fhair19:
 	mes "- Klit klit Klit klit -";

 	mes "- Snap snap Snap snap -";

 	next;

-		setlook 1,19;

+		if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;

+		set Zeny,Zeny-99800;

 		delitem 973,3;

 		delitem 974,3;

 		delitem 901,100;

@@ -1966,7 +2004,7 @@ fhair19:
 		delitem 1020,100;

 		delitem 1060,100;

 		delitem 7152,100;

-		set Zeny,Zeny-99800;

+		setlook 1,19;

 	mes "[Veronica]";

 	mes "Wow~ it came out very well~~";

 	mes "I hope you like this (19) style.";

diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index 27c94d74b..9dcaa6425 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -33,8 +33,8 @@ alberta.gat,120,45,2	script	Ice Cream Maker::IceCreamer	85,{
 		if(@input<1) goto L_inpC;

 		if(@input>5) goto L_inpM;

 		if(Zeny< @input*100) goto L_NoZ;

-		getitem 536,@input;

 		set Zeny,Zeny-100*@input;

+		getitem 536,@input;

 		mes "Here you go  " +@input+ "  Ice Cream for you.";

 		close;

 		

diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index f81c6f90f..42be03f63 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -39,9 +39,9 @@ prontera.gat,71,131,7	script	Milk Trader	86,{
 		if(zeny < (@amount*20)) goto L_NoZeny;

 

 	L_Milk:

-		getitem 519, @amount;

-		delitem 713, @amount;

 		set zeny, zeny - (@amount*20);

+		delitem 713, @amount;

+		getitem 519, @amount;

 

 	M_End:

 		mes "[Milk Trader]";

diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index d29224742..730b7327b 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -112,12 +112,12 @@ sF_Make:
 		if(Zeny < (getarg(1)*@amount)) goto L_NdZeny;

 

 	L_End:

+		set Zeny, Zeny - (getarg(1)*@amount);

+		delitem getarg(0), (@amount*@arrownum);

+		getitem getarg(2), @amount;

 		mes "[Inventor Jaax]";

 		mes "There you go~!";

 		mes "Here are your " +getarg(3)+ ".";

-		delitem getarg(0), (@amount*@arrownum);

-		set Zeny, Zeny - (getarg(1)*@amount);

-		getitem getarg(2), @amount;

 		close;

 

 	L_NdArrows:

diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 712bc1aa1..ecef1519d 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -57,25 +57,25 @@ geffen_in.gat,110,172,2	script	Christopher#1::Chris	63,{
 

 		sM_Anvil:

 			if(Zeny < 30000) goto L_NoZeny;

-			mes "[Christopher Guillenrow]";

-			mes "This is the cheapest one but it's very efficient.";

 			set Zeny, Zeny - 30000;

 			getitem 986,1;

+			mes "[Christopher Guillenrow]";

+			mes "This is the cheapest one but it's very efficient.";

 			next;

 			goto L_Thanks;

 		sM_OriAnvil:

 			if(Zeny < 120000) goto L_NoZeny;

-			mes "[Christopher Guillenrow]";

-			mes "Ah! Ye have a good eye for anvils. This here is the proper anvil for a Blacksmith.";

 			set Zeny, Zeny - 120000;

 			getitem 987,1;

+			mes "[Christopher Guillenrow]";

+			mes "Ah! Ye have a good eye for anvils. This here is the proper anvil for a Blacksmith.";

 			next;

 			goto L_Thanks;

 		sM_GolAnvil:

 			if(Zeny < 300000) goto L_NoZeny;

+			set Zeny, Zeny - 300000;

 			mes "[Christopher Guillenrow]";

 			mes "This is the best anvil in my workshop! With this ye'll be the best Blasksmith in no time.";

-			set Zeny, Zeny - 300000;

 			getitem 988,1;

 			next;

 			goto L_Thanks;

@@ -381,8 +381,8 @@ L_refinenormal:
 

 		L_Sub:

 			if ((countitem(@material) < 1) || (Zeny < @price)) goto Lcancel2;

-			delitem @material,1;

 			set Zeny,Zeny-@price;

+			delitem @material,1;

 

 Lrefine:

 	if (getequipisequiped(@part) == 0) goto LNoItem; // hacker has removed the item (not changed, why?)

@@ -458,8 +458,8 @@ Lsafe:
 	next;

 	menu "Yes",-,"No...",Lcancel;

 	if((countitem(@material) < @refinecnt) || (Zeny < @fullprice)) goto Lcancel2;

-	delitem @material,@refinecnt;

 	set Zeny,Zeny - @fullprice;

+	delitem @material,@refinecnt;

 	goto L_refinesafe;

 

 Lnosafe:

@@ -477,8 +477,8 @@ Lnosafe:
 	menu "Yes...",-,"No...",Lcancel;

 		if(@refinecheck > @safe) goto Lwarn;

 		if((countitem(@material) < @refinecnt) || (Zeny < @fullprice)) goto Lcancel2;

-		delitem @material,@refinecnt;

 		set Zeny,Zeny - @fullprice;

+		delitem @material,@refinecnt;

 		goto L_refinenumber;

 		end;

 

@@ -489,8 +489,8 @@ Lnosafe:
 			next;

 			menu "Yes",-,"No...",Lcancel1;

 				if((countitem(@material) < @refinecnt) || (Zeny < @fullprice)) goto Lcancel2;

-				delitem @material,@refinecnt;

 				set Zeny,Zeny - @fullprice;

+				delitem @material,@refinecnt;

 				goto L_refinenumber;

 

 Lcancel3:

@@ -618,8 +618,8 @@ CONTINUE:
 	if (@ammount > 999) goto L_ABOVE;

 	if (zeny < @value * @ammount) goto L_NOZENY;

 	if (checkweight(@itemid,@ammount) == 0) goto L_WEIGHT;

-	getitem @itemid,@ammount;

 	set Zeny,Zeny-@value*@ammount;

+	getitem @itemid,@ammount;

 	mes "[" + @name$ + "]";

 	mes "Here you go.";

 	close;