Merge pull request #1 from Earisu/master

updating, with earisu's

29 files changed, 179 insertions, 187 deletions

diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 70b11c167..eca847c6f 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Advanced Refiner
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules Git
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.
@@ -22,9 +22,11 @@
 //= 1.2 Optimizing refine method [Zephyrus]
 //= 1.3 Typo fixes [Yommy]
 //= 1.4 Removed unnecessary dialogs [Zephyrus]
+//= 1.4a Added 'disable_items' command. [Euphy]
 //============================================================
 
 payon,174,138,0	script	Suhnbi#cash	85,{
+	disable_items;
 	mes "[Suhnbi]";
 	mes "I am the Armsmith";
 	mes "I can refine all kinds of weapons,";
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index b99f7bf25..d48ee68bb 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Alchemist Shop
 //===== By: ================================================== 
 //= rAthena Team
 //===== Current Version: ===================================== 
 //= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Selling Alchemist Materials and Manuals
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index fadf8b03f..f4df03a0a 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Magazine Dealer Kenny
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Turns bullets into magazines/packs.
 //===== Additional Comments: =================================
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 71f189c6e..b9d515ad4 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Bullet Dealer Tony
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
 //= 1.5
-//===== Compatible With ======================================
-//= rAthena SVN
 //===== Description ==========================================
 //= Bullet trader.
 //===== Comments =============================================
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index 4e9065b8e..4532921bd 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Buying Shop Scripts
 //===== By: ==================================================
 //= Kisuka, skyiing, Scriptor
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Buying Shop licenses and catalogs.
 //===== Additional Comments: =================================
@@ -213,7 +211,7 @@ alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 				mes "Okay, you're now approved to open the Bulk Buyer Shop.";
 				set Zeny,Zeny-10000;
 				getitem 6377,5; //Buy_Stall_Permit
-				skill "ALL_BUYING_STORE",1,0;
+				skill "ALL_BUYING_STORE",1,3;
 				next;
 				mes "[Mr. Hugh]";
 				mes "Currently, only normal items ^8C2121EXCEPT^000000 equipment, certain potions, and hand-crafted items can be purchased in bulk, but this can still be very beneficial to you, depending on how you use it.";
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index 168445fa0..dfde86a4d 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Cash Hair Stylist
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Exchange cash item, New_Style_Coupon, for new hair styles.
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt
index 2de6e794e..b61120dea 100644
--- a/npc/merchants/cash_trader.txt
+++ b/npc/merchants/cash_trader.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Cash Shop NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Sell Cash shop items.
 //= Based on iRO's Cash shop. Headgears omitted.
diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt
index fa309738a..49003e18b 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Headgear Dyer (Cash)
 //===== By: ==================================================
 //= Xantara
 //= Maud_Dib
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Change headgear's color. Cost is a Mysterious Dyestuff
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 489194428..38e44d3cb 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -1,24 +1,22 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Clothes Dyer
 //===== By: ================================================== 
 //= Usnul
 //===== Current Version: ===================================== 
 //= 2.5
-//===== Compatible With: ===================================== 
-//= rAthena 1.0+
 //===== Description: ========================================= 
 //= Clothes dyer with standard palletes
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 2.1 Shortened some labels to make this script loading,
 //= Added Black+White Colors desc [Lupus]
-//= 2.1a - added adv classes + baby class support [Lupus]
-//= 2.2 - Spell checked. [Nexon]
-//= 2.3 - Fixed dis $hit! [Poki#3]
-//= 2.4 - Disabled cloth dyeing since it's not implemented
-//	  on official servers and cause your client to crash
-//	  [Playtester]
-//= 2.5 - Optimized. [Euphy]
+//= 2.1a added adv classes + baby class support [Lupus]
+//= 2.2 Spell checked. [Nexon]
+//= 2.3 Fixed dis $hit! [Poki#3]
+//= 2.4 Disabled cloth dyeing since it's not implemented
+//	   on official servers and cause your client to crash
+//	   [Playtester]
+//= 2.5 Optimized. [Euphy]
 //============================================================
 
 prt_in,284,168,2	script	Dyer Ginedin Rephere	55,{
@@ -35,75 +33,100 @@ function Dyes;
 		mes "How may I assist you?";
 		next;
 		switch(select("- Talk:- Dye Clothing:- Price List:- ^777777Cancel^000000")) {
-			case 1:
-				mes .n$;
-				mes "Life may have gotten a bit better, but when I look at all of the orders I've received... Whew!";
-				mes "It seems that the young women of Rune Midgard must be very well off these days.";
-				next;
-				mes .n$;
-				mes "Not that I think that they are indulging in anything luxurious, mind you.";
-				mes "I don't think there is anything wrong with the pursuit of beauty and being fashionable.";
-				next;
-				mes .n$;
-				mes "For us humans, who have no colorful fur or decorative scales, clothes are one of the few ways we have to display our personality, style, and beauty.";
-				next;
-				mes .n$;
-				mes "Haha... When I think about it, I really feel that my job is worthwhile.  I believe that I provide a service that the people desire.";
-				next;
-				mes .n$;
-				mes "Can you feel it too? The energy that is released when rough fabric and leather are brought to life with color?.....";
-				next;
-				mes .n$;
-				mes "Although the process is very tedious and time consuming, the joy and happiness I feel when a dress is finished more than makes up for all of the hard work!!";
+		case 1:
+			mes .n$;
+			mes "Life may have gotten a bit better, but when I look at all of the orders I've received... Whew!";
+			mes "It seems that the young women of Rune Midgard must be very well off these days.";
+			next;
+			mes .n$;
+			mes "Not that I think that they are indulging in anything luxurious, mind you.";
+			mes "I don't think there is anything wrong with the pursuit of beauty and being fashionable.";
+			next;
+			mes .n$;
+			mes "For us humans, who have no colorful fur or decorative scales, clothes are one of the few ways we have to display our personality, style, and beauty.";
+			next;
+			mes .n$;
+			mes "Haha... When I think about it, I really feel that my job is worthwhile.  I believe that I provide a service that the people desire.";
+			next;
+			mes .n$;
+			mes "Can you feel it too? The energy that is released when rough fabric and leather are brought to life with color?.....";
+			next;
+			mes .n$;
+			mes "Although the process is very tedious and time consuming, the joy and happiness I feel when a dress is finished more than makes up for all of the hard work!!";
+			break;
+		case 2:
+			mes .n$;
+			if (!.@EnableDyes) {
+				mes "Sorry, I'm too busy with other jobs to dye your clothes.";
 				break;
-			case 2:
-				mes .n$;
-				if (!.@EnableDyes) {
-					mes "Sorry, I'm too busy with other jobs to dye your clothes."; break; }
-				mes "Oh... you need my work? Well... okay, sounds good.";
-				next;
-				mes .n$;
-				mes "Please choose a color";
-				mes "that suits you.";
-				next;
-				set .@eac, eaclass();
-				switch(roclass(eaclass()&EAJ_UPPERMASK)) {
+			}
+			mes "Oh... you need my work? Well... okay, sounds good.";
+			next;
+			mes .n$;
+			mes "Please choose a color";
+			mes "that suits you.";
+			next;
 
-				// Dyes(<color value>,<dye number>{,...});
-				// Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow
+			// Dyes(<color value>,<dye number>{,...});
+			// Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow
+			switch(BaseJob) {
+			case Job_Novice:
+				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4);
+			case Job_Swordman:
+				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4);
+			case Job_Mage:
+				if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4);
+			case Job_Archer:
+				if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4);
+			case Job_Acolyte:
+				if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4);
+			case Job_Merchant:
+				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4);
+			case Job_Thief:
+				if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4);
+			case Job_Knight:
+			case Job_Crusader:
+				if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4);
+			case Job_Priest:
+			case Job_Monk:
+				if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4);
+			case Job_Wizard:
+			case Job_Sage:
+				if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4);
+			case Job_Blacksmith:
+			case Job_Alchemist:
+				if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4);
+			case Job_Hunter:
+			case Job_Bard:
+			case Job_Dancer:
+				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4);
+			case Job_Assassin:
+			case Job_Rogue:
+				if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
+			case Job_SuperNovice:
+				if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
+			default: 
+				mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";
+				close;
+			}
+		case 3:
+			mes .n$;
+			mes "Each color costs 10000z and 1 dye:";
+			mes " ";
+			mes " - ^FF4422Red^000000: Scarlet Dyestuffs";
+			mes " - ^D5A500Yellow^000000: Lemon Dyestuffs";
+			mes " - ^AA00AAViolet^000000: Violet Dyestuffs";
+			mes " - ^FF8800Orange^000000: Orange Dyestuffs";
+			mes " - ^4422FFBlue^000000: CobaltBlue Dyestuffs";
+			mes " - ^009500Green^000000: DarkGreen Dyestuffs";
+			mes " - Black: Black Dyestuffs";
+			mes " - White: White Dyestuffs";
+			break;
+		case 4:
+			goto L_End;
+		}
+	}
 
-					case Job_Novice: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4);
-					case Job_Swordman: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4);
-					case Job_Mage: if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4);
-					case Job_Archer: if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4);
-					case Job_Acolyte: if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4);
-					case Job_Merchant: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4);
-					case Job_Thief: if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4);
-					case Job_Knight: case Job_Crusader: if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4);
-					case Job_Priest: case Job_Monk: if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4);
-					case Job_Wizard: case Job_Sage: if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4);
-					case Job_Blacksmith: case Job_Alchemist: if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4);
-					case Job_Hunter: case Job_Bard: case Job_Dancer: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4);
-					case Job_Assassin: case Job_Rogue: if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
-					case Job_SuperNovice: if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
-					default: 
-						mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";
-						close; }
-			case 3:
-				mes .n$;
-				mes "Each color costs 10000z and 1 dye:";
-				mes " ";
-				mes " - ^FF4422Red^000000: Scarlet Dyestuffs";
-				mes " - ^D5A500Yellow^000000: Lemon Dyestuffs";
-				mes " - ^AA00AAViolet^000000: Violet Dyestuffs";
-				mes " - ^FF8800Orange^000000: Orange Dyestuffs";
-				mes " - ^4422FFBlue^000000: CobaltBlue Dyestuffs";
-				mes " - ^009500Green^000000: DarkGreen Dyestuffs";
-				mes " - Black: Black Dyestuffs";
-				mes " - White: White Dyestuffs";
-				break;
-			case 4:
-				goto L_End; } }
 L_End:
 	mes .n$;
 	mes "Make yourself at home. Even though I don't have time for you.";
@@ -113,32 +136,39 @@ function Dyes {
 	setarray .@DyeName$[0],"the default color","Orange","Violet","Red","Black","Green","Blue","White","Yellow";
 	setarray .@DyeItems[0],0,980,981,975,983,979,978,982,976;
 	set .@menu$,"- Default:";
-	for(set .@i,0; 1; set .@i,.@i+2) {
-		if (!getarg(.@i,0)) break;
-		set .@menu$, .@menu$+"- "+.@DyeName$[getarg(.@i)]+":"; }
+	for(set .@i,0; .@i<getargcount(); set .@i,.@i+2)
+		set .@menu$, .@menu$+"- "+.@DyeName$[getarg(.@i)]+":";
 	set .@menu$, .@menu$+"- ^777777Cancel^000000";
 	set .@s, select(.@menu$)-1;
-	if (.@s==.@i-2) goto L_End;
+	if (.@s == (getargcount()/2)+1) goto L_End;
 	mes .n$;
-	if (!.@s) {
+	if (.@s == 0) {
 		mes "I can change your dye to";
 		mes "the default for free.";
 		mes "Are you sure?";
 		next;
-		if(select("Yes:No")==2) goto L_End;
-		mes .n$;
-		setlook 7,0;
-		mes "Your clothes have been dyed "+.@DyeName$[0]+".";
-		close; }
+		switch(select("Yes:No")) {
+		case 1:
+			mes .n$;
+			setlook 7,0;
+			mes "Your clothes have been dyed "+.@DyeName$[0]+".";
+			close;
+		case 2:
+			goto L_End;
+		}
+	}
 	if (!countitem(.@DyeItems[getarg((.@s-1)*2)])) {
 		mes "For me to dye your clothes, I'll need the appropriate Dyestuffs. Please check my price list for the information.";
-		close; }
+		close;
+	}
 	if (Zeny < 10000) {
 		mes "I'm sorry, but you don't have enough money.";
-		close; }
+		close;
+	}
 	delitem .@DyeItems[getarg((.@s-1)*2)],1;
 	set Zeny, Zeny-10000;
 	setlook 7, ((.@s)?(getarg((.@s-1)*2+1)):0);
 	mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+".";
-	close; }
+	close;
+}
 }
\ No newline at end of file
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 8603383ad..c52db9787 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Manuk & Splendide Coin Merchants
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Coin redemption NPCs.
@@ -15,6 +13,8 @@
 //= 1.2 Optimized and merged into one file. [Euphy]
 //============================================================
 
+// Manuk & Splendide
+//============================================================
 -	script	::merchant_13_2	-1,{
 	set .@n$, "["+strnpcinfo(1)+"]";
 	mes .@n$;
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 632e14f17..c4bc2f5f8 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Dye Maker
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index 3d30b1668..2d120d190 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Elemental Stone Trader
 //===== By: ================================================== 
-//= rAthena Team & MasterOfMuppets
+//=  MasterOfMuppets, rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Trade impure types of elemental stones for pure ones.
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index d5f321518..a9ad383b8 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script ======================================= 
+//=====Hercules Script =======================================
 //= Armor Enchanter
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.3a
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Hercules Git
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
@@ -14,9 +14,11 @@
 //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586)
 //= 1.2 Optimized. [Euphy]
 //= 1.3 Fixed some typos and optimized a little more. [Daegaladh]
+//= 1.3a Added 'disable_items' command. [Euphy]
 //============================================================ 
 
 prontera,165,60,2	script	Apprentice Craftsman	73,{
+	disable_items;
 	mes "[Apprentice Craftsman]";
 	if (Zeny > 399999) {
 		mes "I've been studying ways to enhance an armor to maximize its capability.";
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 854954c0a..74962fef2 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Gemstone Trader
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Trade various colors of gemstones for other color gemstones.
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 70f26ca58..c3479cbbe 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hair Dyer
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Hair Dyer with standard palletes
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 19f5b9dca..cf4db6333 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hair Dresser
 //===== By: ==================================================
 //= Muad_Dib, Samuray22, Kisuka
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Allows you to change your hairstyle.
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index d04dbe08e..f126b723e 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ice Cream Maker
 //===== By: ==================================================
 //= KOOK SWU, Kisuka
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= A man makes you ice-cream
 //===== Additional Comments: =================================
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index d9cc39a8e..7c4935942 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
-//= Inn Npcs
+//===== Hercules Script ======================================
+//= Inn NPCs
 //===== By: ==================================================
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: =====================================
 //= 2.9a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Inn Npcs, Save and Heal
 //============================================================
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 97bc89f12..6f5fd953b 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kunai Merchant Kashin
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 7e7da5c3f..15fe3c497 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Milk Trader
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Trades bottles for milk
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index 61049f805..cd8cede0e 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Novice Goods Exchanger
 //===== By: ==================================================
-//= ???, rAthena Team
+//= ???, rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis COnversion]
 //= Exchanges your Basic Monster drops for Red Potions.
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index ba00b8f4d..f913b0eec 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Old Pharmacist
 //===== By: ==================================================
 //= DZeroX
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN Trunk
 //===== Description: =========================================
 //= Trade in items for potions
 //===============================
@@ -223,25 +221,22 @@ L_making:
 			mes "[Old Pharmacist]";
 			mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions.";
 			input .@amount;
+			next;
 			if (.@amount == 0) {
-				next;
 				mes "[Old Pharmacist]";
 				mes "Make up your mind, will you?!";
 				close;
 			}
 			if (.@amount > 100) {
-				next;
 				mes "[Old Pharmacist]";
 				mes "Are you deaf? I said less than 100!";
 				close;
 			}
 			if ((countitem(getarg(0)) < .@amount*2) || (countitem(713) < .@amount) || (Zeny < .@amount*getarg(1))) {
-				next;
 				mes "[Old Pharmacist]";
 				mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
 				close;
 			}
-			next;
 			set Zeny,Zeny-(.@amount*getarg(1));
 			delitem getarg(0),.@amount*2;
 			delitem 713,.@amount;	// Empty_Bottle
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index b193bac4c..30a4788a8 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Arrow Quiver Event
 //===== By: ==================================================
 //= Muad_Dib (Prometheus Project); L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis COnversion]
 //= Turns arrows into Arrow Quivers.
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 4433bbd66..da51dee3d 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Refining NPCs
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 3.2
+//= 3.2a
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Hercules Git
 //===== Description: =========================================
 //= Refining NPCs and Metal Salesmen.
 //===== Additional Comments: =================================
@@ -59,6 +59,7 @@
 //		Added WoE map Refiners.
 //= 3.1 Added the new refinement & Ore creation NPC's for +11 and above Refinement. [Masao]
 //= 3.2 Moved some scripts to Renewal file, other minor changes. [Euphy]
+//= 3.2a Added 'disable_items' command. [Euphy]
 //============================================================
 
 // Christopher: Geffen Blacksmith
@@ -603,6 +604,7 @@ lhz_in02,282,20,7	script	Fulerr	869,{
 //= .@safe to the max safe refine in refine_db.txt as well.
 //============================================================
 function	script	refinemain	{
+	disable_items;
 	set .@features,getarg(1);
 	mes "[" + getarg(0) + "]";
 	mes "I'm the Armsmith.";
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index bcaded6f6..02afc4059 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Renters
 //===== By: ================================================== 
 //= kobra_k88, mod by Lupus
 //===== Current Version: ===================================== 
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index a06ba1ad2..b9c47b659 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Shops
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0+
+//= 3.4
 //===== Description: ========================================= 
 //= Town shop NPCs.
 //===== Additional Comments: ================================= 
@@ -37,6 +35,7 @@
 //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
 //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre]
 //= 3.3 Moved more shops to Renewal file. [Euphy]
+//= 3.4 Removed some Izlude shops [Streusel]
 //============================================================ 
 
 //=======================================================
@@ -143,8 +142,6 @@ hu_in01,94,313,3	shop	Armor Dealer#hu	86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1
 //=======================================================
 izlude_in,60,127,4	shop	Weapon Dealer#iz	72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
 izlude_in,70,127,4	shop	Armor Dealer#iz	62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
-izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
 
 //=======================================================
 // Jawaii
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index acd3b2fe6..7ace07bee 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Episode 11.1 Socket Enchant NPC
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 2.0
+//= 2.0a
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules Git
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Adds slots to selected weapons and armor.
@@ -27,6 +27,7 @@
 //= 1.9 Moved Episode 12 items to separate NPC.
 //=     Some cleanup & optimization. [Gepard]
 //= 2.0 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
+//= 2.0a Added 'disable_items' command. [Euphy]
 //============================================================
 
 -	script	Seiyablem#dummy::SocketEnchant	-1,{
@@ -247,6 +248,7 @@
 
 function	script	Func_Socket	{
 
+	disable_items;
 	mes "[Seiyablem]";
 	mes "You want to add a Slot to a " + getitemname(getarg(0)) + "?";
 	mes "Alright, please bring me ^FF0000" + getarg(6) + " " + getitemname(getarg(5)) + (getarg(6) > 1 && getarg(5) != 999 ? "s":"") + "^000000, " + (getarg(7,0) != 0 && getarg(8,0) != 0 ? ("^FF0000" + getarg(8,0) + " " + getitemname(getarg(7,0)) + (getarg(8,0) > 1 && getarg(7,0) != 999 ? "s":"") + "^000000 ") : "") + "and my ^FF0000" + (getarg(4) >= 1000 ? (getarg(4)/1000 + ",000") : getarg(4)) + ",000 zeny^000000 service fee.";
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index c302b2763..6c21bdcf7 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -1,17 +1,18 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Episode 12 Socket Enchant NPC
 //===== By: ================================================== 
 //= Gepard
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.1a
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Hercules Git
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
 //= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
+//= 1.1a Added 'disable_items' command. [Euphy]
 //============================================================ 
 
 -	script	Leablem#dummy::SocketEnchant2	-1,{
@@ -385,6 +386,7 @@ moc_ruins,154,86,3	duplicate(SocketEnchant2)	Leablem#moc	86
 
 function	script	Func_Socket2	{
 
+	disable_items;
 	mes "[Leablem]";
 	if(getarg(7,0) != 0 && getarg(8,0) != 0)
 	{
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
index 5bd9140e7..8be6ed276 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Spirit Liquor trader.
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Trade Broken Liquor Jars and alcohol for wanderer