Merge pull request #201 from Michieru/master

Super-Mega Thanks to Michieru!
NPC Changelog (might be incomplete, did my best)
- npc/battleground/bg_common.txt 
-- 1.4 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius02.txt 
-- 1.5 Label standardization. [Euphy] 
-- 1.6 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra02.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/cities/ayothaya.txt 
-- 1.9 Updated Renewal warp coordinates. 
- npc/cities/izlude.txt 
-- 1.9a A part of Kylick's dialogue is Pre-Renewal only. [Euphy] 
- npc/cities/yuno.txt 
-- 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy] 
- npc/events/bossnia.txt 
-- 1.2 Moved spawns and warps (by Masao) to this file. [Euphy] 
- npc/events/easter_2010.txt 
-- 1.0 First version. [Euphy] 
- npc/events/gdevent_aru.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/gdevent_sch.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/god_se_festival.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/jobs/2-2/rogue.txt 
-- impossible get a Gladius [3]. (bugreport:481) [Samuray22] 
- npc/jobs/2-2e/SoulLinker.txt 
-- 1.6 Updated to match the latest official script. [Euphy] 
- npc/kafras/kafras.txt 
-- 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass] 
-- 1.1b Enabled saving in Izlude duplicates (RE). [Euphy] 
- npc/merchants/alchemist.txt 
-- 1.8 Moved Craft Book Merchant to Renewal path. [Euphy] 
- npc/mobs/citycleaners.txt 
-- 1.2 Split spawns into Pre-RE/RE and Town files. [Euphy] 
- npc/mobs/towns.txt 
-- 1.0 First version. 
- npc/other/Global_Functions.txt 
-- 2.17 Renamed 'F_RandMes' to 'F_Rand'. [Euphy]
-- 2.18 Removed useless 'getJobName' function. [Euphy]
- npc/other/acolyte_warp.txt 
-- 1.0 First version. [Euphy] 
- npc/other/arena/arena_aco.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates, and removed two level restrictions. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/other/arena/arena_lvl50.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl60.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates. [Euphy] 
- npc/other/arena/arena_lvl70.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl80.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_party.txt 
-- 1.4 Label standardization and bug fixes. [Euphy] 
-- 1.5 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_room.txt 
-- 1.2 Label standardization, disabled GM NPCs. [Euphy] 
-- 1.2a Added Renewal level checksk. [Euphy] 
-- 1.3 Script updates. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/hugel_bingo.txt 
-- 1.9 Some optimization/standardization. [Euphy] 
- npc/other/marriage.txt 
-- 1.3 Changed permanent global variables to temporary ones. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/pvp.txt 
-- 2.4 Fixed incorrect use of 'close' and some cleaning. [Joseph] 
-- 2.5 Renewal/Pre-Renewal split. [Euphy] 
- npc/other/turbo_track.txt 
-- 1.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.2 Added Renewal features. [Euphy] 
- npc/pre-re/cities/yuno.txt 
-- 1.0 First version. 
- npc/pre-re/kafras/kafras.txt 
-- 1.0 First version. 
- npc/pre-re/merchants/ammo_boxes.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/ammo_dealer.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/shops.txt 
-- 1.1 Moved Izlude shops to pre-re/re paths. [Streusel] 
- npc/pre-re/mobs/citycleaners.txt 
-- 1.0 First version, Pre-Renewal spawns. 
- npc/pre-re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/pre-re/other/msg_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE path. 
- npc/pre-re/other/pvp.txt 
-- 1.0 First version, Pre-Renewal. 
- npc/pre-re/other/resetskill.txt 
-- 1.0 First version. [L0ne_W0lf] 
- npc/pre-re/other/turbo_track.txt 
-- 1.0 Split Peco Peco Manager NPC. 
- npc/pre-re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/pre-re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/pre-re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
- npc/pre-re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/pre-re/quests/quests_veins.txt 
-- 1.0 First version. 
- npc/pre-re/warps/other/arena.txt 
-- 1.0 First version, Pre-Renewal warps. 
- npc/quests/dandelion_request.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/quests/eye_of_hellion.txt 
-- 2.0 Updated EXP rewards. 
-- 2.1 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/first_class/tu_archer.txt 
-- 1.1 optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_magician01.txt 
-- 1.4 Updated to match the official script. [Euphy] 
- npc/quests/first_class/tu_merchant.txt 
-- 1.1 Fixed bugs, optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_sword.txt 
-- 1.5 Added Renewal Izlude coordinates. 
-- 1.6 Added Pre-Renewal support. [Euphy] 
- npc/quests/first_class/tu_thief01.txt 
-- 1.5 Added Pre-Renewal support. [Euphy] 
- npc/quests/mage_solution.txt 
-- 1.0 Split from Pre-Renewal Mage job quest. [Zopokx] 
- npc/quests/okolnir.txt 
-- 1.1 Some bug fixes. [Toshiro90/Euphy] 
- npc/quests/partyrelay.txt 
-- 1.2 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_13_1.txt 
-- 3.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 3.2 Updated ep13_start and dialog to match official script. [Joseph] 
-- 3.3 Updated to match the latest official script. [Euphy] 
-- 3.3a Added Izlude RE coordinates. [Euphy] 
-- 3.4 Added GM management function and NPC. [Euphy] 
- npc/quests/quests_alberta.txt 
-- 2.6 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_amatsu.txt 
-- 1.5 Added questlog support. [Euphy] 
- npc/quests/quests_geffen.txt 
-- 1.5 Added Number Match Game. [Euphy] 
- npc/quests/quests_juperos.txt 
-- 1.8 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.9 Added GM management NPC. [Euphy] 
- npc/quests/quests_niflheim.txt 
-- Updated to Aegis 10.3 Standed, added Message Delivery Quest. 
-- 1.6 Added questlog support. [Euphy] 
- npc/quests/quests_veins.txt 
-- Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf] 
- npc/quests/seals/god_global.txt 
-- 1.2 Renewal script update. [Euphy] 
- npc/quests/seals/god_weapon_creation.txt 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/seal_status.txt 
-- 1.0 Translated from the official. [L0ne_W0lf] 
-- 1.1 Now checks proper char vars. [L0ne_W0lf] 
-- 1.2 Cleaning. [Euphy] 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/sleipnir_seal.txt 
-- 1.4 Renewal script update. [Euphy] 
- npc/quests/skills/novice_skills.txt 
-- 1.8 Added Baby support. [Zopokx] 
- npc/quests/skills/rogue_skills.txt 
-- 1.8 Some cleaning. [Euphy] 
- npc/quests/skills/sage_skills.txt 
-- 1.5 Optimized. [Euphy] 
- npc/re/airports/izlude.txt 
-- 1.0 Updated to match the new Izlude Map. [Masao] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/cities/dicastes.txt 
-- 1.3 Updated to match official script. [SkittleNugget] 
- npc/re/cities/izlude.txt 
-- 1.1 Updated to match the official script. [Euphy] 
-- 1.2 Added Channel Warper and Izlude duplicates. [Euphy] 
- npc/re/cities/jawaii.txt 
-- 1.1 Moved "Honeymoon Helper" NPC. 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/cities/malangdo.txt 
-- 1.2 Moved "Odgnalam" coordinates. 
-- 1.3 Fixed dialogues. 
-- 1.4 Dialogue edits, source iRO. 
-- 1.5 Added Izlude duplicates. 
- npc/re/cities/malaya.txt 
-- 0.1 Alberta sailors only. [Euphy] 
-- 0.2 Adapted from Masao's conversion. 
-- 1.0 Added remaining NPCs. 
- npc/re/cities/yuno.txt 
-- 1.0 First version. 
- npc/re/guides/guides_alberta.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_aldebaran.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_amatsu.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_ayothaya.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_brasilis.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_comodo.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_dewata.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_dicastes.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_einbroch.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_geffen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_gonryun.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_hugel.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_izlude.txt 
-- 1.2 Added Renewal Izlude viewpoint coordinates. 
-- 1.3 Navigation system update. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/guides/guides_juno.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_lighthalzen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_louyang.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_lutie.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_malaya.txt 
-- 1.0 First version. [Euphy] 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_mora.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_morroc.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_moscovia.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_niflheim.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_payon.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_prontera.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_rachel.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_umbala.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_veins.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/navigation.txt 
-- 1.0 First version. 
- npc/re/guild/invest_main.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/jobs/3-1/guillotine_cross.txt 
-- 1.4 Added missing labels. [Joseph] 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/royal_guard.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/sura.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/re/jobs/novice/novice.txt 
-- 1.0 First version, hand scripted from iRO. [Kisuka] 
-- 1.5 Replaced with the official kRO scripts. [Euphy] 
- npc/re/jobs/repair.txt 
-- 1.0 First version. 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/kafras/kafras.txt 
-- 1.2 Added Port Malaya Kafras. [Euphy] 
-- 1.3 Added Eden Group Kafra. [Euphy] 
-- 1.3a Moved Rune Knight Kafra from job file. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/3rd_trader.txt 
-- 1.3 Added Malangdo/Mora Points NPC. [Euphy] 
-- 1.4 Updated to match the official scripts. [Euphy] 
-- 1.5 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/advanced_refiner.txt 
-- 1.0 Added Malangdo Refiner "Holink". [Euphy] 
- npc/re/merchants/alchemist.txt 
-- 1.0 Split Geneticist shop from main file. [Euphy] 
- npc/re/merchants/ammo_boxes.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/ammo_dealer.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/card_separation.txt 
-- 1.1 Added "Richard" NPC. [Euphy] 
- npc/re/merchants/enchan_mora.txt 
-- 1.2 Bug fixes (bugreport:7930) [DeadlySilence] 
- npc/re/merchants/enchan_upg.txt 
-- 1.0 First version. 
-- 1.1 Standardizing, grammar and bug fixes. [Euphy] 
- npc/re/merchants/flute.txt 
-- 1.2a Fixed some conditions. [Euphy] 
- npc/re/merchants/renters.txt 
-- 2.2 Updated to match the official scripts. [Euphy] 
- npc/re/merchants/shops.txt 
-- 1.7 Added Izlude duplicates. [Euphy] 
- npc/re/mobs/citycleaners.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/mobs/dungeons/ecl_tdun.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/dungeons/mal_dun.txt 
-- 1.2 Added Pouring spawn, source iRO. [Euphy] 
- npc/re/mobs/fields/eclage.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/towns.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/re/other/item_merge.txt 
-- 1.0 First version, currently useless/disabled. 
- npc/re/other/mail.txt 
-- 1.0 First version, Renewal duplicates. 
- npc/re/other/mercenary_rent.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/pvp.txt 
-- 1.0 First version, Renewal. 
- npc/re/other/resetskill.txt 
-- 1.0 First version, Renewal script. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/stone_change.txt 
-- 1.0 First version. 
- npc/re/other/turbo_track.txt 
-- 1.0 Split Mount Manager NPC. 
- npc/re/quests/eden/71-85.txt 
-- 1.3 Updated to match the official scripts. [Euphy] 
- npc/re/quests/eden/eden_iro.txt 
-- 1.0 First version. 
-- 1.1 Edited and added more NPCs, lots of placeholders. [Euphy] 
- npc/re/quests/eden/eden_quests.txt 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/re/quests/homun_s.txt 
-- Genetic quest to mutate a level 99 evolved Homunculus 
-- 1.0 First Version, entirely custom. [Masao] 
- npc/re/quests/magic_books.txt 
-- 1.1 Optimized. [Euphy] 
-- 1.1a Updated NPC name to "Master Velofos". [Euphy] 
- npc/re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/re/quests/mrsmile.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_izlude.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_lighthalzen.txt 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_malangdo.txt 
-- 1.4a Dialogue edits, source iRO. 
-- 1.5 Added Cat Gamers. 
-- 1.6 Added GM management function. 
- npc/re/quests/quests_malaya.txt 
-- 0.4 Added "Cautious Village" and subsequent quests [DeadlySilence] 
-- 0.5 Added "Bakonawa Extermination" quest. [Euphy] 
-- 1.0 Added "Nurse in Port Malaya" and "Pintados Festival" quests. [Euphy] 
-- 1.1 Added GM management function and NPC. [Euphy] 
- npc/re/quests/quests_mora.txt 
-- 1.1 Added GM management function and NPCs. [Euphy] 
- npc/re/quests/quests_morocc.txt 
-- 1.1 Added new warpers for Satan Morroc maps. [Euphy] 
- npc/re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/re/warps/cities/eclage.txt 
-- 1.0a Disabled quest warp. [Euphy] 
- npc/re/warps/cities/izlude.txt 
-- 1.7 Updated to match the official scripts. [Euphy] 
-- 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/cities/malaya.txt 
-- 1.1 Updated to match official scripts. [Masao] 
-- 1.2 Added official Jeepney warp scripts. [Euphy] 
- npc/re/warps/fields/prontera_fild.txt 
-- 1.3a Moved Izlude warp to other file. [Euphy] 
-- 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy] 
-- 1.5 Added Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/other/arena.txt 
-- 1.0 First version, Renewal warps. 
- npc/re/warps/other/jobquests.txt 
-- 2.3 Added exit warps (job_exit) for 2nd class quests. [Euphy] 
- npc/warps/fields/glastheim.txt 
-- 1.5 Fixed random warp coordinates. [Euphy] 
- npc/warps/other/arena.txt 
-- 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy] 
-- 1.4 Added GM management function. [Euphy]

29 files changed, 559 insertions, 677 deletions

diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 7b7825492..0ab0e29e8 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4b
-//===== Compatible With: =====================================
-//= Hercules Git
+//= 1.5
 //===== Description: =========================================
 //= [Official Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.
@@ -24,6 +22,7 @@
 //= 1.4 Removed unnecessary dialogs [Zephyrus]
 //= 1.4a Added 'disable_items' command. [Euphy]
 //= 1.4b Fixed coordinates. [Euphy]
+//= 1.5 Some official script updates. [Euphy]
 //============================================================
 
 payon,157,146,6	script	Suhnbi#cash	85,{
@@ -34,37 +33,39 @@ payon,157,146,6	script	Suhnbi#cash	85,{
 	mes "armor and equipment, so let me";
 	mes "know what you want to refine.";
 	next;
+
 	setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	set .@menu$,"";
-	for( set .@i,1; .@i <= 10; set .@i,.@i+1 )
-	{
-		if( getequipisequiped(.@i) )
+	for(set .@i,1; .@i<=10; set .@i,.@i+1) {
+		if (getequipisequiped(.@i)) {
 			set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
-
+			set .@equipped,1;
+		}
 		set .@menu$, .@menu$ + ":";
 	}
-	set .@part,select(.@menu$);
-
-	if( !getequipisequiped(.@part) )
+	if (.@equipped == 0) {
+		mes "[Suhnbi]";
+		mes "I don't think I can refine any items you have...";
 		close;
+	}
+	set .@part, select(.@menu$);
 
-	if( !getequipisenableref(.@part) )
-	{
+	if (!getequipisequiped(.@part)) //custom check
+		close;
+	if (!getequipisenableref(.@part)) {
 		mes "[Suhnbi]";
-		mes "I don't think I can refine this item at all.";
+		mes "Go find another Blacksmith. You can't refine this thing.";
 		close;
 	}
-	if( getequiprefinerycnt(.@part) >= 10 )
-	{
+	if (getequiprefinerycnt(.@part) >= 10) {
 		mes "[Suhnbi]";
-		mes "This item cannot be refined because it has already reached its maximum level...";
+		mes "Hmm... someone perfected this already. I don't think I can work on it further.";
 		close;
 	}
 
 	// Make sure you have the neccessary items and Zeny to refine your items
 	// Determines chance of failure and verifies that you want to continue.
-	switch( getequipweaponlv(.@part) )
-	{
+	switch(getequipweaponlv(.@part)) {
 		case 1: callsub S_RefineValidate,1,7620,50,.@part; break;
 		case 2: callsub S_RefineValidate,2,7620,200,.@part; break;
 		case 3: callsub S_RefineValidate,3,7620,5000,.@part; break;
@@ -72,85 +73,89 @@ payon,157,146,6	script	Suhnbi#cash	85,{
 		default: callsub S_RefineValidate,0,7619,2000,.@part; break;
 	}
 
-	if( getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100) )
-	{
-		mes "[Suhnbi]";
-		mes "Clink! Clank! Clunk!";
-		SuccessRefItem .@part;
+	mes "[Suhnbi]";
+	mes "Clang! Clang! Clang!";
+	if (getequippercentrefinery(.@part) > rand(100) || getequippercentrefinery(.@part) > rand(100)) {
+		successrefitem .@part;
 		next;
-		Emotion e_no1;
+		emotion e_no1;
 		mes "[Suhnbi]";
-		mes "Here you are! It's done.";
-		mes "It's been a while since I've made such a fine weapon. You must be happy because it has become stronger!";
+		mes "There you go! It's done.";
+		mes "It's been a while since I've made such a fine "+((getequipweaponlv(.@part))?"weapon":"armor")+". You must be happy because it has become stronger!";
 		close;
 	}
-	mes "[Suhnbi]";
-	mes "Clink! Clank! Clunk!";
-	FailedRefItem .@part;
+	failedrefitem .@part;
 	next;
-	if (rand(5) == 1){
-		Emotion e_cash;
-	} else {
-		Emotion e_omg;
-	}
+	emotion (!rand(5))?e_cash:e_omg;
 	mes "[Suhnbi]";
-	mes "Cough!!!!";
+	mes "Uuuuuuuuuummmmmph!!!";
 	next;
 	mes "[Suhnbi]";
-	mes "Cough...Cough..";
-	mes "What a shame...";
-	mes "Your equipment broke during the refining process. I had told you earlier this might happen!";
+	mes "...";
+	mes ".....";
+	mes ".......Huhuhuhuhu~";
+	mes "........It was your choice and my ability, no regret.";
 	close;
 
 S_RefineValidate:
 	mes "[Suhnbi]";
 	if (getarg(0))
-		mes "A level " + getarg(0) + " weapon...";
-	mes "To refine this I need one ^ff9999" + getitemname(getarg(1)) + "^000000 and a service fee of " + getarg(2) + " Zeny.";
-	mes "Do you wish to continue?";
+		mes "You want to refine a level " + getarg(0) + " weapon?";
+	mes "To refine that, you'll need to have one ^ff9999" + getitemname(getarg(1)) + "^000000 and " + getarg(2) + " zeny.";
+	mes "Would you like to continue?";
 	next;
-	if( select("Yes:No") == 1 )
-	{
-		if( getequippercentrefinery(getarg(3)) < 100 )
-		{
-			mes "[Suhnbi]";
-			mes "Wow!!";
-			mes "This weapon, probably";
-			mes "looks like it's been refined...";
-			mes "many times...";
-			mes "It may break if";
-			mes "you refine it again.";
-			next;
-			mes "And if it breaks,";
-			mes "you can't use it anymore!";
-			mes "All the cards in it and the";
-			mes "properties";
-			mes "^ff0000will be lost^000000!!";
-			mes "^ff0000 besides, the equipment will break!^000000";
-			mes " ";
-			mes "Are you sure you still want to continue?";
-			next;
-			if( select("Yes:No") == 2 )
-			{
+	if(select("Yes:No") == 1) {
+		if (getequippercentrefinery(getarg(3)) < 100) {
+			if (getarg(0)) {
+				mes "[Suhnbi]";
+				mes "Wow!!";
+				mes "This weapon probably";
+				mes "looks like it's been refined...";
+				mes "many times...";
+				mes "It may break if";
+				mes "you refine it again.";
+				next;
+				mes "And if it breaks,";
+				mes "you can't use it anymore!";
+				mes "All the cards in it and the properties ^ff0000will be lost^000000!";
+				mes "^ff0000Besides, the equipment will break!^000000";
+				mes "Are you sure you still want to continue?";
+				next;
+				if(select("Yes:No") == 2) {
+					mes "[Suhnbi]";
+					mes "Good.";
+					mes "Because if the weapon breaks from unreasonable refining, then I get a bad mood, too.";
+					close;
+				}
+			} else {
 				mes "[Suhnbi]";
-				mes "I completely agree...";
-				mes "I might be a great refiner, but sometimes even I make mistakes.";
-				close;
+				mes "Giggle. Giggle. Oh, you have guts, daring to refine this.";
+				mes "You know it's pretty risky, don't you?";
+				next;
+				mes "If your defensive equipment is broken, you'll never be able to use it again.";
+				mes "Even your cards and your modifications will ^ff0000completely disappear^000000.";
+				//mes "Everything will disappear. As in... GONE!";
+				mes "Do you really wish to continue?";
+				next;
+				if(select("Yes:No") == 2) {
+					mes "[Suhnbi]";
+					mes "What nonsense. You waste my precious time.";
+					mes "Get lost, punk.";
+					close;
+				}
 			}
 		}
-		if( countitem(getarg(1)) > 0 && Zeny > getarg(2) )
-		{
-			delitem getarg(1), 1;
+		if (countitem(getarg(1)) > 0 && Zeny > getarg(2)) {
+			delitem getarg(1),1;
 			set Zeny, Zeny - getarg(2);
 			return;
 		}
 		mes "[Suhnbi]";
-		mes "You don't seem to have enough Zeny or " + getitemname(getarg(1)) + "...";
-		mes "Go get some more. I'll be here all day if you need me.";
+		mes "Are these all you have?";
+		mes "I'm very sorry, but I can't do anything without all the materials. Besides, I deserve some payments for my work, don't I?";
 		close;
 	}
 	mes "[Suhnbi]";
-	mes "Yeah... There's no need to rush.";
-	mes "Take your time.";
+	mes "I can't help it even if you're not happy about it...";
 	close;
 }
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index d48ee68bb..e3da99291 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -1,131 +1,22 @@
 //===== Hercules Script ======================================
 //= Alchemist Shop
-//===== By: ================================================== 
-//= rAthena Team
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Description: ========================================= 
-//= Selling Alchemist Materials and Manuals
-//===== Additional Comments: ================================= 
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
+//= Merchants for Alchemist Materials and Manuals.
+//===== Additional Comments: =================================
 //= 1.1 fixed Medicine Bowl issue, thanx 2 MasterOfMuppets
 //= 1.2 Reddozen's fixes of typos. added optional Elemental
-//= Potion Guide. [Lupus]
+//=     Potion Guide. [Lupus]
 //= 1.3 Deleted Elemental Potions Guide due to original quest [Lupus]
 //= 1.4 Alchemists can now purchase 2000 Medicine Bowls at once. [SinSloth]
 //= 1.5 Updated to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 1.6 Corrected canceling purchase. [L0ne_W0lf]
 //= 1.7 Updated to match AEGIS script. [Masao]
-//============================================================ 
-
-alde_alche,31,186,3	script	Craft Book Salesman#alde	883,{
-
-	mes "[Craft Book Salesman]";
-	mes "Welcome.";
-	mes "I'm here to sell";
-	mes "^0000FFspecial craft books^000000 for Geneticists.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "Geneticists have some skills";
-	mes "that require craft books to activate.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "The more craft books you have,";
-	mes "the more skills you can use.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "Please understand that";
-	mes "I specialize in the sale of these special books and";
-	mes "I ^FF0000don't sell other items^000000.";
-	next;
-	mes "[Craft Book Salesman]";
-	mes "Okay then, here's the list of available craft books.";
-	next;
-	switch(select("[Apple Bomb Craft Book] 100,000 zeny:[Pineapple Bomb Craft Book] 100,000 zeny:[Coconut Bomb Craft Book] 100,000 zeny:[Melon Bomb Craft Book] 100,000 zeny:[Banana Bomb Craft Book] 100,000 zeny:[Plant Gene Cultivation Method] 100,000 zeny:[Superior Potion Craft Manual] 100,000 zeny:[Mix Cooking Book] 100,000 zeny:[Health Improvement Research Book] 100,000 zeny:[Vigor Drink Recipe] 100,000 zeny:Close")){
-	case 1:
-		callsub S_SellManual,6279,100000;
-		break;
-	case 2:
-		callsub S_SellManual,6280,100000;
-		break;
-	case 3:
-		callsub S_SellManual,6281,100000;
-		break;
-	case 4:
-		callsub S_SellManual,6282,100000;
-		break;
-	case 5:
-		callsub S_SellManual,6283,100000;
-		break;
-	case 6:
-		callsub S_SellManual,6284,100000;
-		break;
-	case 7:
-		callsub S_SellManual,6285,100000;
-		break;
-	case 8:
-		callsub S_SellManual,11022,100000;
-		break;
-	case 9:
-		callsub S_SellManual,11023,100000;
-		break;
-	case 10:
-		callsub S_SellManual,11024,100000;
-		break;
-	case 11:
-		mes "[Craft Book Salesman]";
-		mes "Thank you for your patronage.";
-		mes "Please come again.";
-		close;
-	}
-
-S_SellManual:
-	mes "[Craft Book Salesman]";
-	mes ""+getitemname(getarg(0))+"?";
-	mes "That'll be "+getarg(1)+" zeny ea.";
-	mes "How many of these books would you like to purchase?";
-	next;
-	input .@amount;
-	if (.@amount == 0) {
-		mes "[Craft Book Salesman]";
-		mes "Would you like to see some different books?";
-		close;
-	}
-	if (.@amount < 1 || .@amount > 99 ){
-		mes "[Craft Book Salesman]";
-		mes "You cannot purchase more than 100 at a time.";
-		close;
-	}
-	mes "[Craft Book Salesman]";
-	mes "You've entered "+.@amount+"x "+getitemname(getarg(0))+".";
-	mes "That'll be "+getarg(1) * .@amount+" Zeny.";
-	mes "Would you like to continue?";
-	next;
-	if (select("Yes:No") == 1) {
-		if (Zeny < getarg(1) * .@amount) {
-			mes "[Craft Book Salesman]";
-			mes "You don't";
-			mes "have enough zeny.";
-			mes "Check how much zeny";
-			mes "you have first.";
-			close;
-		}
-		if (checkweight(getarg(0),.@amount) == 0){
-			mes "[Craft Book Salesman]";
-			mes "It doesn't seem like you can carry everything.";
-			mes "Please check the space in your inventory.";
-			close;
-		}
-		mes "[Craft Book Salesman]";
-		mes "Thank you for your patronage.";
-		set Zeny,Zeny - getarg(1) * .@amount;
-		getitem getarg(0),.@amount;
-		close;
-	}
-	mes "[Craft Book Salesman]";
-	mes "Please take your time";
-	mes "before you make your decision.";
-	close;
-}
+//= 1.8 Moved Craft Book Merchant to Renewal path. [Euphy]
+//============================================================
 
 alde_alche,24,188,3	script	Guild Dealer	740,{
 	if (checkweight(1201,1) == 0) {
@@ -187,7 +78,7 @@ alde_alche,24,188,3	script	Guild Dealer	740,{
 				mes "in your inventory.";
 				close;
 			}
-			set zeny,zeny-.@sell;
+			set Zeny, Zeny-.@sell;
 			getitem 7134,.@input; //Medicine_Bowl
 			mes "[Gever Al Sharp]";
 			mes "Thank you.";
@@ -260,7 +151,7 @@ S_SellManual:
 	mes "That'll be "+getarg(1)+" zeny.";
 	next;
 	if (select("Purchase.:Quit.") == 1) {
-		set zeny,zeny-getarg(1);
+		set Zeny, Zeny-getarg(1);
 		getitem getarg(0),1;
 		mes "[Gever Al Sharp]";
 		mes "Thank you for";
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index f4df03a0a..5cb63a57b 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -1,5 +1,5 @@
 //===== Hercules Script ======================================
-//= Magazine Dealer Kenny
+//= Magazine Dealers
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
@@ -16,10 +16,9 @@
 //= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //============================================================
 
-alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
-	set .n$, compare(strnpcinfo(1),"Tonny")?"[Tonny]":"[Kenny]";
-	if(BaseJob == Job_Gunslinger) {
-		mes .n$;
+alberta,118,157,3	script	Magazine Dealer Kenny::mdk	83,{
+	if (BaseJob == Job_Gunslinger) {
+		mes "[Kenny]";
 		mes "Welcome to my Magazine Shop.";
 		mes "As you may know, large numbers";
 		mes "of bullets can be carried more";
@@ -36,7 +35,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 		case 7: callfunc "Func_Casing",13202,12150; break;
 		case 8: callfunc "Func_Casing",13201,12151; break;
 		case 9:
-			mes .n$;
+			mes "[Kenny]";
 			mes "Well, if you ever find";
 			mes "that you have too many";
 			mes "bullets, come and see me.";
@@ -45,7 +44,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 			close;
 		}
 	}
-	mes .n$;
+	mes "[Kenny]";
 	mes "Welcome to my shop.";
 	mes "Here, I provide Magazines";
 	mes "and Cartridges for Gunslingers.";
@@ -53,7 +52,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 	mes "my services would be of any";
 	mes "use to you, adventurer.";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "Eh, but if you happen to";
 	mes "know any Gunslingers, send";
 	mes "them my way. You can never";
@@ -62,18 +61,18 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 }
 
 function	script	Func_Casing	{
-	mes .n$;
+	mes "[Kenny]";
 	mes "Now, you can trade";
 	mes "500 "+getitemname(getarg(0))+"s";
 	mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure";
 	mes "you have sufficient bullets";
 	mes "and zeny for this exchange.";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny";
 	mes "with 1 "+getitemname(getarg(1))+".";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "Remember that I can't give";
 	mes "you more than 50 Magazines";
 	mes "at a time. Now please enter";
@@ -81,8 +80,8 @@ function	script	Func_Casing	{
 	mes "want to receive. If you want to cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	if(.@amount > 50 || .@amount == 0) {
-		mes .n$;
+	if (.@amount > 50 || .@amount == 0) {
+		mes "[Kenny]";
 		mes "Hey, I can't give you";
 		mes "that many Magazines.";
 		mes "Please try again, and";
@@ -93,7 +92,7 @@ function	script	Func_Casing	{
 	if (countitem(getarg(0)) >= (500*.@amount)) {
 		if (Zeny >= (500*.@amount)) {
 			if (checkweight(getarg(1),.@amount) == 0) {
-				mes .n$;
+				mes "[Kenny]";
 				mes "Hey, you've got a lot";
 				mes "of junk crammed in your";
 				mes "Inventory. Free up some";
@@ -102,7 +101,7 @@ function	script	Func_Casing	{
 				mes "some Magazines later, okay?";
 				close;
 			}else{
-				mes .n$;
+				mes "[Kenny]";
 				mes "Alright, here are";
 				mes "your Magazines. Thanks";
 				mes "for visiting my shop, and";
@@ -113,8 +112,8 @@ function	script	Func_Casing	{
 				getitem getarg(1),.@amount;
 				close;
 			}
-		}else{
-			mes .n$;
+		} else {
+			mes "[Kenny]";
 			mes "Sorry, but you don't";
 			mes "have enough zeny for";
 			mes "this Magazine exchange.";
@@ -123,8 +122,8 @@ function	script	Func_Casing	{
 			mes "some more money.";
 			close;
 		}
-	}else{
-		mes .n$;
+	} else {
+		mes "[Kenny]";
 		mes "Sorry, but you don't";
 		mes "have enough bullets for";
 		mes "this Magazine exchange.";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index b9d515ad4..7a13a5fc5 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -1,5 +1,5 @@
-//===== Hercules Script =======================================
-//= Bullet Dealer Tony
+//===== Hercules Script ======================================
+//= Bullet Dealers
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
@@ -97,7 +97,7 @@ function	script	Bullet_Trade	{
 			mes "available. Try putting some of";
 			mes "your things into Kafra Storage.";
 			close;
-		}else{
+		} else {
 			mes "[Tony]";
 			mes "Great, everything seems";
 			mes "to be in order. Let me take";
@@ -110,7 +110,7 @@ function	script	Bullet_Trade	{
 			getitem getarg(2),.@amount * 30;
 			close;
 		}
-	}else{
+	} else {
 		mes "[Tony]";
 		mes "Huh. It looks like you";
 		mes "don't have enough materials";
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index c8c001902..a18311c08 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -10,10 +10,10 @@
 //= 1.0 First version. [Kisuka]
 //= 1.1 Added Catalog Magician. [Euphy]
 //= 1.1a Moved Catalog Magician to Renewal path. [Euphy]
-//============================================================ 
+//============================================================
 
 // Black Marketeer (Buy Licenses - Non-Merchant Classes)
-//============================================================ 
+//============================================================
 que_job01,68,84,1	script	Black Marketeer#Buying	881,{
 	if (getskilllv("ALL_BUYING_STORE") == 1) {
 		mes "[Mr. Jass]";
@@ -91,7 +91,7 @@ que_job01,68,84,1	script	Black Marketeer#Buying	881,{
 }
 
 // Purchasing Team (Learn Skill - Merchant Classes)
-//============================================================ 
+//============================================================
 alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 	mes "[Mr. Hugh]";
 	if (BaseClass == Job_Merchant && getskilllv("MC_VENDING") >= 1) {
@@ -212,7 +212,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,3;
+				skill "ALL_BUYING_STORE",1,4;
 				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.";
@@ -236,4 +236,4 @@ alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 	mes "[Mr. Hugh]";
 	mes "My time is solely dedicated to our customers in the Merchant industry.";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index dfde86a4d..65c181f60 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Cash Hair Stylist
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Kisuka
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Exchange cash item, New_Style_Coupon, for new hair styles.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Kisuka]
 //============================================================
 
diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt
index b61120dea..479ccd7cf 100644
--- a/npc/merchants/cash_trader.txt
+++ b/npc/merchants/cash_trader.txt
@@ -1,13 +1,13 @@
 //===== Hercules Script ======================================
 //= Cash Shop NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Sell Cash shop items.
 //= Based on iRO's Cash shop. Headgears omitted.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. Sample shop per-say.
 //= 1.1 FIxed typo. (bugreport:1078) [L0ne_W0lf]
 //============================================================
diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt
index 3d9fd89d8..c2c91c1a6 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -6,10 +6,10 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Change headgear's color. Cost is a Mysterious Dyestuff
 //===== Additional Comments: =================================
-//= v1.0 First / Optimized Version
+//= 1.0 First / Optimized Version
 //============================================================
 
 prt_in,253,168,4	script	Alora	862,{
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 253e849a7..1395538ae 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Clothes Dyer
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Usnul
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.5
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Clothes dyer with standard palletes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 2.1 Shortened some labels to make this script loading,
 //= Added Black+White Colors desc [Lupus]
@@ -171,4 +171,4 @@ function Dyes {
 	mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+".";
 	close;
 }
-}
+}
\ No newline at end of file
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 04c4f793c..1aa28e519 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -1,5 +1,5 @@
 //===== Hercules Script ======================================
-//= Manuk & Splendide Coin Merchants
+//= Coin Merchants
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
@@ -43,7 +43,7 @@
 		if (.@i == 1) {
 			mes "Here are the item descriptions.";
 			close2;
-			ReadBook .@Book,1;
+			readbook .@Book,1;
 			end;
 		}
 		else if (.@i < 5) {
@@ -84,4 +84,4 @@
 	}
 }
 man_in01,286,16,1	duplicate(merchant_13_2)	Merchant of Manuk	454
-spl_in01,110,326,5	duplicate(merchant_13_2)	Merchant of Splendide	439
+spl_in01,110,326,5	duplicate(merchant_13_2)	Merchant of Splendide	439
\ No newline at end of file
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index c4bc2f5f8..336c0798f 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -1,12 +1,13 @@
 //===== Hercules Script ======================================
 //= Dye Maker
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.4
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//===== Additional Comments: ================================= 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Quests to create the eight colored Dyestuffs.
+//===== Additional Comments: =================================
 //= 1.0 Fully working [kobra_k88]
 //= 1.1 Spell Checked [Nexon] 
 //= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
@@ -14,7 +15,7 @@
 //= 1.3 Made the checks more dynamic [ultramage]
 //= 1.3b Fixed incorrect checking loop structure [ultramage]
 //= 1.4 Added a checkweight. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 morocc_in,146,99,3	script	Java Dullihan	58,{
 	if ((MaxWeight-Weight) < 200 || checkweight(1201,1) == 0) {
@@ -181,7 +182,7 @@ S_MakeDye:
 		// delete items
 		for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
 			delitem .@item[.@i], .@count[.@i];
-		set zeny,zeny-.@cost;
+		set Zeny, Zeny-.@cost;
 		// get dyestuff
 		getitem .@dyestuff,1;
 		
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index 10dcec3e4..dde742514 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -1,16 +1,16 @@
 //===== Hercules Script ======================================
 //= Elemental Stone Trader
-//===== By: ================================================== 
-//=  MasterOfMuppets, rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== By: ==================================================
+//= rAthena Team & MasterOfMuppets
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade impure types of elemental stones for pure ones.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
+//============================================================
 
 ama_in02,61,27,7	script	Alchemist#ama	749,{
 	mes "[Laspuchin Gregory]";
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index 5bb9a7d7d..0375aa15d 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -1,26 +1,24 @@
 //=====Hercules Script =======================================
 //= Armor Enchanter
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 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]
 //= 1.3a Added 'disable_items' command. [Euphy]
-//============================================================ 
+//============================================================
 
 prontera,165,60,2	script	Apprentice Craftsman	73,{
 	disable_items;
 	mes "[Apprentice Craftsman]";
-	if (Zeny > 399999) {
+	if (Zeny >= 400000) {
 		mes "I've been studying ways to enhance an armor to maximize its capability.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -35,24 +33,24 @@ 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("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;
-				break;
-			case 2:
-				setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
-				set .@j,55;
-				set .@k,1;
-				break;
-			case 3:
-				setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
-				set .@j,60;
-				break;
-			case 4:
-				mes "[Apprentice Craftsman]";
-				mes "Please come back when you have any interest in enchanting your armor.";
-				close;
+		switch(select("Non Slotted Armor.:Slotted Armor.: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;
+			break;
+		case 2:
+			setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
+			set .@j,55;
+			set .@k,1;
+			break;
+		case 3:
+			setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
+			set .@j,60;
+			break;
+		case 4:
+			mes "[Apprentice Craftsman]";
+			mes "Please come back when you have any interest in enchanting your armor.";
+			close;
 		}
 		set .@menu$,"";
 		for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1)
@@ -60,19 +58,17 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 		callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j;
 		end;
 	}
-	else {
-		mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
-		next;
-		mes "[Apprentice Craftsman]";
-		mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go.";
-		close;
-	}
+	mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
+	next;
+	mes "[Apprentice Craftsman]";
+	mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go.";
+	close;
 
 S_EnchantArmor:
 	set .@itemid,getarg(0);
 	set .@failrate,getarg(1);
 	mes "[Apprentice Craftsman]";
-	if ((countitem(.@itemid) > 0) && (countitem(.@itemid) < 2)) {
+	if (countitem(.@itemid) == 1) {
 		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]";
@@ -81,7 +77,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.:I've made up my mind already. Give it a shot.")==1) {
+		if(select("Hmm... Let me think it over.:Go ahead.") == 1) {
 			mes "[Apprentice Craftsman]";
 			mes "Well, I can't blame you. Safety first, eh?";
 			mes "Now you have a nice day.";
@@ -97,7 +93,7 @@ S_EnchantArmor:
 			close;
 		}
 		progressbar "ffff00",7;
-		set zeny,zeny-400000;
+		set Zeny, Zeny-400000;
 		delitem .@itemid,1;
 		switch (rand(1,.@failrate)) {
 			case 1: set .@addpart,4702;break;
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 74962fef2..40c86a5ff 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -1,21 +1,21 @@
 //===== Hercules Script ======================================
 //= Gemstone Trader
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Trade various colors of gemstones for other color gemstones.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Any notes pertaining to the prior trader may be found
-//=	in the cities/payon.txt
+//=     Any notes pertaining to the prior trader may be found
+//=     in the cities/payon.txt
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.2 Updated input with min/max values. [L0ne_W0lf]
-//=	Added a checkweight. 
+//=     Added a checkweight. 
 //= 1.3 Fixed checks. [Euphy]
-//============================================================ 
+//============================================================
 
 payon,173,238,5	script	Jade#pay	754,{
 	if (checkweight(1201,1) == 0) {
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index c3479cbbe..8b09afa6c 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -1,19 +1,19 @@
 //===== Hercules Script ======================================
 //= Hair Dyer
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.5
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Hair Dyer with standard palletes
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= 1.1 Bugfix: fixed missing menu label LEnd->M_End [Lupus]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.3 Fixed problem what "freezes" the NPC. (bugreport:509) [Samuray22]
 //= 1.4 Fixed getlook checking the wrong color. (bugreport:2392) [L0ne_W0lf]
 //= 1.5 Added Lighthalzen Hair Dying NPC. [L0ne_W0lf]
-//============================================================ 
+//============================================================
 
 prt_in,243,168,4	script	Jovovich	91,{
 	mes "[Hairdresser Jovovich]";
@@ -21,7 +21,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 	mes "How may I help you?";
 	next;
 	mes "[Hairdresser Jovovich]";
-	if (sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
+	if (Sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
 	else {
 		if (rand(20) > 11) {
 			mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
@@ -91,9 +91,9 @@ prt_in,243,168,4	script	Jovovich	91,{
 						case 5: callsub S_NoDye,981,"blue"; break;
 						case 6: callsub S_NoDye,982,"white"; break;
 						case 7: callsub S_NoDye,983,"black"; break;
-						Case 8: callsub S_NoDye,975,"red"; break;
+						case 8: callsub S_NoDye,975,"red"; break;
 						}
-						if (zeny < 1000) {
+						if (Zeny < 1000) {
 							mes "[Hairdresser Jovovich]";
 							mes "The fee is 1000 zeny. Do you not have enough...?";
 							close;
@@ -109,7 +109,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 						case 7: delitem 983,1; break; //Black_Dyestuffs
 						case 8: delitem 975,1; break; //Scarlet_Dyestuffs
 						}
-						set Zeny,Zeny-1000;
+						set Zeny, Zeny-1000;
 						setlook VAR_HEADPALETTE,.@headpalette;
 						set .@choose_success,1;
 						break;
@@ -367,7 +367,7 @@ lhz_in02,100,134,3	script	Hair Dyer#lich	850,{
 						else if (.@headpalette == 5) delitem 978,1; //Cobaltblue_Dyestuffs
 						else if (.@headpalette == 6) delitem 982,1; //White_Dyestuffs
 						else if (.@headpalette == 7) delitem 983,1; //Black_Dyestuffs
-						set zeny,zeny-1000;
+						set Zeny, Zeny-1000;
 						setlook VAR_HEADPALETTE,.@headpalette;
 						set .@choose_success,1;
 						break;
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index cf4db6333..040802811 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Allows you to change your hairstyle.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to the Aegis 10.3 Standards. [Samuray22]
@@ -470,7 +470,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 				mes "- *snip snip snip snip* -";
 				mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -";
 				next;
-				set Zeny,Zeny-99800;
+				set Zeny, Zeny-99800;
 				delitem 973,3;	// Counteragent
 				delitem 974,3;	// Mixture
 				delitem 901,100;	// Danggie
@@ -656,7 +656,7 @@ alberta,33,141,7	script	Roving Hair Dresser	87,{
 			mes "Once more I've outdone myself.";
 			mes "It's such a unique and talented";
 			mes "style! Yes, I am the best! Wooohahahahahaha!";
-			set Zeny,Zeny-199800;
+			set Zeny, Zeny-199800;
 			setlook 1,rand(1,19);
 			setlook 6,rand(1,8);
 			close;
@@ -1042,7 +1042,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 				mes "*Clip clip clip clip*";
 				mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000";
 				next;
-				set zeny,zeny-99800;
+				set Zeny, Zeny-99800;
 				delitem 973,3; //Counteragent
 				delitem 974,3; //Mixture
 				delitem 901,100; //Danggie
@@ -1249,7 +1249,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 				mes "[Assistant Beautician]";
 				mes "^333333*Pant Pant Pant*^000000";
 				next;
-				set zeny,zeny-250000;
+				set Zeny, Zeny-250000;
 				setlook VAR_HEAD,.@style_r;
 				setlook VAR_HEADPALETTE,.@color_r;
 				mes "[Assistant Beautician]";
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index dd7b0a813..5371a86a8 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -1,11 +1,9 @@
-//===== Hercules Script ====================================== 
+//===== Hercules Script ======================================
 //= HD Refiners
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= [Official Conversion]
 //= Refiners that use HD ores to refine equipment. Upon
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 7c4935942..3c5c1874b 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -1,5 +1,5 @@
 //===== Hercules Script ======================================
-//= Inn NPCs
+//= Inn Npcs
 //===== By: ==================================================
 //= Darkchild (1.1)
 //= Playtester (1.2)
@@ -21,7 +21,7 @@
 //= to arguments.[kobra_k88]
 //= 1.2 Rewrote inn script [Playtester]
 //= 1.3 Added (finally) Rachel Inn Maid. Official warp
-//=	  and save points[erKURITA]
+//=     and save points[erKURITA]
 //= 1.4 Added Hugel inn [erKurita]
 //= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
 //=	- Small corrections to the prontera Inns.
@@ -46,7 +46,7 @@
 //============================================================
 
 
-//======================== Prontera ===================================
+//========================Prontera ===================================
 // West Side Inn -------------------
 prt_in,244,135,2	script	Inn Employee#Sammy	53,{
 
@@ -60,28 +60,28 @@ prt_in,61,141,2	script	Inn Employee#Ahlma	53,{
 	warp "prt_in",60,166; end;
 }
 
-//======================== Alberta ====================================
+//========================Alberta ====================================
 alberta_in,32,142,3	script	Inn Employee#Jennie	53,{
 
 	callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142;
 	warp "alberta_in",18,188; end;
 }
 
-//====================== Geffen ======================================
+//======================Geffen ======================================
 geffen_in,70,64,5	script	Inn Employee#Cena	53,{
 
 	callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59;
 	warp "geffen_in",31,31; end;
 }
 
-//======================= Payon ======================================
+//=======================Payon ======================================
 payon_in01,132,62,5	script	Inn Employee#Ahee	53,{
 
 	callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61;
 	warp "payon_in01",132,11; end;
 }
 
-//======================== Morocc ====================================
+//========================Morocc ====================================
 // North East --------------------------
 /*
 morocc_in,147,141,3	script	Inn Employee#Hasna	53,{
@@ -97,21 +97,21 @@ morocc_in,80,100,5	script	Inn Employee#Manar	53,{
 }
 */
 
-//====================== Aldebaran ===================================
+//======================Aldebaran ===================================
 aldeba_in,92,58,5	script	Inn Maid#Rilim	53,{
 
 	callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
 	warp "aldeba_in",92,112; end;
 }
 
-//======================== Rachel ====================================
+//========================Rachel ====================================
 ra_in01,376,69,4	script	Inn Keeper#Annie	931,{
 
 	callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
 	warp "ra_in01",384,128; end;
 }
 
-//====================== Lighthalzen =================================
+//======================Lighthalzen =================================
 lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 	mes "[Hotel Employee]";
 	mes "Welcome to";
@@ -156,14 +156,14 @@ lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 	}
 }
 
-//======================== Hugel ====================================
+//========================Hugel ====================================
 hu_in01,246,107,3	script	Inn Maid#Receptionist	53,{
 
 	callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
 	warp "hu_in01",267,5; end;
 }
 
-//======================== Veins ====================================
+//========================Veins ====================================
 ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	mes "[Inn Master]";
 	mes "Good day~";
@@ -201,7 +201,7 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	}
 }
 
-//======================= Inn Function ==============================
+//=======================Inn Function ==============================
 function	script	F_InnMaid	{
 	mes getarg(0);
 	mes "Welcome to";
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 6f5fd953b..690353040 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -8,8 +8,8 @@
 //= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
 //= 1.0 Added the npc. It uses a function that sends the item 
-//=	  id of the 2 required items plus the amount. Can trade
-//= 	  up to 500 units (5,000 kunais) at once. [erKURITA]
+//=     id of the 2 required items plus the amount. Can trade
+//=     up to 500 units (5,000 kunais) at once. [erKURITA]
 //= 1.1 Officialized script [Playtester]
 //= 1.2a Optimized/cleaned up a bit [ultramage]
 //= 1.3 Updated to match AEGIS script. [Kisuka]
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 15fe3c497..1d65418a0 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.5
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trades bottles for milk
 //===== Additional Comments: =================================
 //= Fully working
@@ -49,7 +49,7 @@ prontera,73,140,0	script	Milk Vendor	86,{
 		set .@bottles,countitem(713);
 		set .@total_weight,.@bottles * 50;
 		set .@total_cost,.@bottles * 15;
-		if (zeny < .@Total_cost) {
+		if (Zeny < .@Total_cost) {
 			mes "[Milk Vendor]";
 			mes "Oh, whoa~!";
 			mes "You don't have enough";
@@ -59,7 +59,7 @@ prontera,73,140,0	script	Milk Vendor	86,{
 			mes "at least " + .@total_cost + " zeny.";
 			close;
 		}
-		if ((maxweight-weight) < .@total_weight) {
+		if (MaxWeight - Weight < .@total_weight) {
 			mes "[Milk Vendor]";
 			mes "Hmm...";
 			mes "Would you make";
@@ -69,7 +69,7 @@ prontera,73,140,0	script	Milk Vendor	86,{
 			mes "all of this milk?";
 			close;
 		}
-		set zeny,zeny-.@total_cost;
+		set Zeny, Zeny-.@total_cost;
 		delitem 713,.@bottles; //Empty Bottles
 		getitem 519,.@bottles; //Milk
 		close;
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index cd8cede0e..d7f519d1f 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -1,23 +1,22 @@
 //===== Hercules Script ======================================
 //= Novice Goods Exchanger
 //===== By: ==================================================
-//= ???, rAthena Dev Team
+//= ???, rAthena Team
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Exchanges your Basic Monster drops for Red Potions.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[
-//=	Made it easier to add new items to exhange list
-//=	meaning only the exchange is done in a function now.
+//=     Made it easier to add new items to exhange list
+//=     meaning only the exchange is done in a function now.
 //= 1.3 Fixed dialog mix-up in function. [L0ne_W0lf]
 //= 1.4 Added checkweight, and input min/max values. [L0ne_W0lf]
 //============================================================
 
 prontera,123,102,5	script	Merchant#pron	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -73,8 +72,7 @@ prontera,123,102,5	script	Merchant#pron	85,{
 }
 
 morocc,180,259,3	script	Merchant#morroc	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -131,8 +129,7 @@ morocc,180,259,3	script	Merchant#morroc	85,{
 }
 
 payon,200,134,5	script	Merchant#pay	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -186,8 +183,7 @@ payon,200,134,5	script	Merchant#pay	85,{
 }
 
 aldebaran,152,63,5	script	Merchant#alde	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -244,8 +240,7 @@ aldebaran,152,63,5	script	Merchant#alde	85,{
 }
 
 geffen,173,88,5	script	Merchant#geff	85,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 6301 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
 		mes "[Merchant]";
 		mes "Haha!";
 		mes "What are you, superhuman?";
@@ -384,9 +379,9 @@ function	script	F_PotExchange	{
 	}
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.1 Made it as a function. U can add your own Merchs [Lupus]
 //= 1.1a Fixed item select [KarLaeda]
-//============================================================ 
+//============================================================
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index f913b0eec..c62e36479 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -5,17 +5,16 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= Trade in items for potions
-//===============================
-//= Breakdown of arguments used
+//= Trade in items for potions.
+//= Breakdown of arguments used:
 //= arg(0): Herb required.
 //= arg(1): Zeny cost.
 //= arg(2): Potion given.
 //===== Additional Comments: =================================
-//= 1.0 - Fully working. [DZeroX]
-//= 1.0a - Minor fixes [Lupus]
-//= 1.1 - Added changed the dialogs and name to fit the
-//=       the official information. [DZeroX]
+//= 1.0 Fully working. [DZeroX]
+//= 1.0a Minor fixes [Lupus]
+//= 1.1 Added changed the dialogs and name to fit the
+//=     the official information. [DZeroX]
 //= 1.1a Removed .GATs [Lupus]
 //= 1.1b Fixed a bug in Orange Potion creating. Copy&Pasting = bad. [L0ne_W0lf]
 //= 1.2 Added checkweight, and input min/max values. [L0ne_W0lf]
@@ -35,156 +34,155 @@ alberta_in,16,28,4	script	Pharmacist	61,{
 	mes "[Old Pharmacist]";
 	mes "Ummmm...";
 	mes "What brings you here...?";
-	switch(select("Make Potion","Talk.","Mixing Information","Cancel")) {
-		case 1:
+	switch(select("Make Potion:Talk.:Mixing Information:Cancel")) {
+	case 1:
+		next;
+		if (MaxWeight - Weight < 5000) {
+			mes "[Old Pharmacist]";
+			mes "Why are you carrying these so many!";
+			mes "Don't be greedy, carry only as much you need!";
 			next;
-			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 5000) {
-				mes "[Old Pharmacist]";
-				mes "Why are you carrying these so many!";
-				mes "Don't be greedy, carry only as much you need!";
+			mes "[Old Pharmacist]";
+			mes "You are too heavy to receive potions from me...";
+			mes "Go store some items in your storage first!";
+			close;
+		} else {
+			mes "[Old Pharmacist]";
+			mes "You have all the stuff ready, right? Which one would you like?";
+			switch(select("Red Potion.:Orange Potion.:Yellow Potion.:White Potion.:Blue Potion.:Green Potion.:Actually, I don't want anything.")) {
+			case 1:
+				callsub L_Making,507,3,501;
+			case 2:
 				next;
 				mes "[Old Pharmacist]";
-				mes "You are too heavy to receive potions from me...";
-				mes "Go store some items in your storage first!";
-				close;
-			} else {
-				mes "[Old Pharmacist]";
-				mes "You have all the stuff ready, right? Which one would you like?";
-				switch(select("Red Potion.","Orange Potion.","Yellow Potion.","White Potion.","Blue Potion.","Green Potion.","Actually, I don't want anything.")) {
-					case 1:
-						callsub L_making,507,3,501;
-					case 2:
+				if (countitem(507) < countitem(713)) {
+					set .@max,countitem(507);
+				}
+				else if (countitem(508) < countitem(713)) {
+					set .@max,countitem(508);
+				}
+				else {
+					set .@max,countitem(713);
+				}
+				if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) {
+					mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
+					mes "Get lost!";
+					close;
+				}
+				if (Zeny < 3) {
+					mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
+					mes "Get lost!";
+					close;
+				}
+				mes "How many?";
+				switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
+				case 1:
+					next;
+					if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
+						mes "[Old Pharmacist]";
+						mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
+						close;
+					}
+					set Zeny,Zeny-(.@max*5);
+					delitem 507,.@max; //Red_Herb
+					delitem 508,.@max; //Yellow_Herb
+					delitem 713,.@max; //Empty_Bottle
+					getitem 502,.@max; //Orange_Potion
+					break;
+				case 2:
+					next;
+					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,0,101;
+					if (.@amount == 0) {
 						next;
 						mes "[Old Pharmacist]";
-						if (countitem(507) < countitem(713)) {
-							set .@max,countitem(507);
-						}
-						else if (countitem(508) < countitem(713)) {
-							set .@max,countitem(508);
-						}
-						else {
-							set .@max,countitem(713);
-						}
-						if ((countitem(507) < 1) || (countitem(508) < 1) || (countitem(713) == 0)) {
-							mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
-							mes "Get lost!";
-							close;
-						}
-						if (Zeny < 3) {
-							mes "You rascal! What did you expect?! Coming here with nothing. Tsk!";
-							mes "Get lost!";
-							close;
-						}
-						mes "How many?";
-						switch(select("Make as many as I can.","I want to choose an amount.","Actually, I don't want anything.")) {
-							case 1:
-								next;
-								if ((countitem(507) < .@max) || (countitem(508) < .@max) || (countitem(713) < .@max) || (Zeny < .@max*3)) {
-									mes "[Old Pharmacist]";
-									mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-									close;
-								}
-								set Zeny,Zeny-(.@max*5);
-								delitem 507,.@max;	// Red_Herb
-								delitem 508,.@max;	// Yellow_Herb
-								delitem 713,.@max;	// Empty_Bottle
-								getitem 502,.@max;	// Orange_Potion
-								break;
-							case 2:
-								next;
-								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,0,101;
-								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(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
-									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*5);
-								delitem 507,.@amount;	// Red_Herb
-								delitem 508,.@amount;	// Yellow_Herb
-								delitem 713,.@amount;	// Empty_Bottle
-								getitem 502,.@amount; 	// Orange_Potion
-								break;
-							case 3:
-								next;
-								mes "[Old Pharmacist]";
-								mes "What?!";
-								mes "Grrr...";
-								mes "Bleh!";
-								mes "Get lost!";
-								close;
-						}
-							mes "[Old Pharmacist]";
-							mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-							close;
-					case 3:
-						callsub L_making,508,10,503;
-					case 4:
-						callsub L_making,509,20,504;
-					case 5:
-						callsub L_making,510,30,505;
-					case 6:
-						callsub L_making,511,3,506;
-					case 7:
+						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(507) < .@amount) || (countitem(508) < .@amount) || (countitem(713) < .@amount) || (Zeny < .@amount*3)) {
+						next;
 						mes "[Old Pharmacist]";
-						mes "What?!";
-						mes "Grrr...";
-						mes "Bleh!";
-						mes "Get lost!";
+						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*5);
+					delitem 507,.@amount; //Red_Herb
+					delitem 508,.@amount; //Yellow_Herb
+					delitem 713,.@amount; //Empty_Bottle
+					getitem 502,.@amount; //Orange_Potion
+					break;
+				case 3:
+					next;
+					mes "[Old Pharmacist]";
+					mes "What?!";
+					mes "Grrr...";
+					mes "Bleh!";
+					mes "Get lost!";
+					close;
 				}
+				mes "[Old Pharmacist]";
+				mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+				close;
+			case 3:
+				callsub L_Making,508,10,503;
+			case 4:
+				callsub L_Making,509,20,504;
+			case 5:
+				callsub L_Making,510,30,505;
+			case 6:
+				callsub L_Making,511,3,506;
+			case 7:
+				mes "[Old Pharmacist]";
+				mes "What?!";
+				mes "Grrr...";
+				mes "Bleh!";
+				mes "Get lost!";
+				close;
 			}
-		case 2:
-			mes "[Old Pharmacist]";
-			mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "Anyways, a potion is merely a potion. Nothing more and nothing less.";
-			close;
-		case 3:
-			mes "[Old Pharmacist]";
-			mes "Hrrrmm...";
-			mes "You young ones can be quite annoying. But, since you asked, I'll explain.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "Herbs work well by themselves, but if you use my special techniques and skills to make potions out of them, the effect is much much greater.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "If you ask eagerly and politely, I will make them for you. But, not for free... Don't worry though, I only charge a small fee, so it's not that expensive.";
-			next;
-			mes "[Old Pharmacist]";
-			mes "Red Potion - ^0098E52 Red Herbs, 1 Empty Bottle, 2 zeny fee.^000000";
-			mes "Orange Potion - ^0098E51 Red Herb, 1 Yellow Herb, 1 Empty Bottle, 5 zeny fee.^000000";
-			mes "Yellow Potion - ^0098E52 Yellow Herbs, 1 Empty Bottle, 10 zeny.^000000";
-			next;
-			mes "[Old Pharmacist]";
-			mes "White Potion - ^0098E52 White Herbs, 1 Empty Bottle, 20 zeny fee.^000000";
-			mes "Blue Potion - ^0098E52 Blue Herbs, 1 Empty Bottle, 30 zeny fee.^000000";
-			mes "Green Potion - ^0098E52 Green Herbs, 1 Empty Bottle, 3 zeny fee.^000000";
-			close;
-		case 4:
-			mes "[Old Pharmacist]";
-			mes "What a boring person. If you have something to say, why don't you say it?!";
-			close;
+		}
+	case 2:
+		mes "[Old Pharmacist]";
+		mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "Anyways, a potion is merely a potion. Nothing more and nothing less.";
+		close;
+	case 3:
+		mes "[Old Pharmacist]";
+		mes "Hrrrmm...";
+		mes "You young ones can be quite annoying. But, since you asked, I'll explain.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "Herbs work well by themselves, but if you use my special techniques and skills to make potions out of them, the effect is much much greater.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "If you ask eagerly and politely, I will make them for you. But, not for free... Don't worry though, I only charge a small fee, so it's not that expensive.";
+		next;
+		mes "[Old Pharmacist]";
+		mes "Red Potion - ^0098E52 Red Herbs, 1 Empty Bottle, 2 zeny fee.^000000";
+		mes "Orange Potion - ^0098E51 Red Herb, 1 Yellow Herb, 1 Empty Bottle, 5 zeny fee.^000000";
+		mes "Yellow Potion - ^0098E52 Yellow Herbs, 1 Empty Bottle, 10 zeny.^000000";
+		next;
+		mes "[Old Pharmacist]";
+		mes "White Potion - ^0098E52 White Herbs, 1 Empty Bottle, 20 zeny fee.^000000";
+		mes "Blue Potion - ^0098E52 Blue Herbs, 1 Empty Bottle, 30 zeny fee.^000000";
+		mes "Green Potion - ^0098E52 Green Herbs, 1 Empty Bottle, 3 zeny fee.^000000";
+		close;
+	case 4:
+		mes "[Old Pharmacist]";
+		mes "What a boring person. If you have something to say, why don't you say it?!";
+		close;
 	}
 	
-L_making:
+L_Making:
 	next;
 	mes "[Old Pharmacist]";
 	if ((countitem(getarg(0))/2) < countitem(713)) {
@@ -203,55 +201,55 @@ L_making:
 		close;
 	}
 	mes "How many?";
-	switch(select("Make as many as I can.","I want to choose an amount.","Actually, I don't want anything.")) {
-		case 1:
-			next;
-			if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) {
-				mes "[Old Pharmacist]";
-				mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-				close;
-			}
-			set Zeny,Zeny-(.@max*getarg(1));
-			delitem getarg(0),.@max*2;
-			delitem 713,.@max;	// Empty_Bottle
-			getitem getarg(2),.@max; 
-			break;
-		case 2:
-			next;
+	switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) {
+	case 1:
+		next;
+		if ((countitem(getarg(0)) < .@max*2) || (countitem(713) < .@max) || (Zeny < .@max*getarg(1))) {
 			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) {
-				mes "[Old Pharmacist]";
-				mes "Make up your mind, will you?!";
-				close;
-			}
-			if (.@amount > 100) {
-				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))) {
-				mes "[Old Pharmacist]";
-				mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
-				close;
-			}
-			set Zeny,Zeny-(.@amount*getarg(1));
-			delitem getarg(0),.@amount*2;
-			delitem 713,.@amount;	// Empty_Bottle
-			getitem getarg(2),.@amount; 
-			break;
-		case 3:
-			next;
+			mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
+			close;
+		}
+		set Zeny,Zeny-(.@max*getarg(1));
+		delitem getarg(0),.@max*2;
+		delitem 713,.@max; //Empty_Bottle
+		getitem getarg(2),.@max; 
+		break;
+	case 2:
+		next;
+		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) {
 			mes "[Old Pharmacist]";
-			mes "What?!";
-			mes "Grrr...";
-			mes "Bleh!";
-			mes "Get lost!";
+			mes "Make up your mind, will you?!";
 			close;
-	}
+		}
+		if (.@amount > 100) {
+			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))) {
+			mes "[Old Pharmacist]";
+			mes "You rascal! You don't even have all the materials and you want me to make you potions?!";
+			close;
+		}
+		set Zeny,Zeny-(.@amount*getarg(1));
+		delitem getarg(0),.@amount*2;
+		delitem 713,.@amount; //Empty_Bottle
+		getitem getarg(2),.@amount; 
+		break;
+	case 3:
+		next;
 		mes "[Old Pharmacist]";
-		mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+		mes "What?!";
+		mes "Grrr...";
+		mes "Bleh!";
+		mes "Get lost!";
 		close;
+	}
+	mes "[Old Pharmacist]";
+	mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+	close;
 }
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index 30a4788a8..53ae6d114 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -5,13 +5,13 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Turns arrows into Arrow Quivers.
-// Breakdown of Subroutine "S_BuyQuiver"
-// arg(0): Type of Arrow to be packaged (item ID)
-// arg(1): How many of each 'getarg(0)' arrow per quiver
-// arg(2): The cost of making a 'getarg(0)' quiver.
-// arg(3): The quiver given by the NPC. (item ID)
+//= Breakdown of Subroutine "S_BuyQuiver"
+//= arg(0): Type of Arrow to be packaged (item ID).
+//= arg(1): How many of each 'getarg(0)' arrow per quiver.
+//= arg(2): The cost of making a 'getarg(0)' quiver.
+//= arg(3): The quiver given by the NPC (item ID).
 //===== Additional Comments: =================================
 //= 07/06/05 : Added 1st Version. [Muad_Dib]
 //= Converted to rAthena format by Dr.Evil
@@ -19,18 +19,11 @@
 //= Fixed a few spelling errors. [Nexon]
 //= 1.1 Added Holy Arrow Quivers [Playtester]
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Removed "Holy Arrows" from the list.
+//=     Removed "Holy Arrows" from the list.
 //============================================================
 
 payon_in01,5,134,5	script	Inventor Jaax	89,{
-	if (checkweight(1201,1) == 0) {
-		mes "[Inventor Jaax]";
-		mes "Hey, you're carrying";
-		mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?";
-		close;
-	}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "[Inventor Jaax]";
 		mes "Hey, you're carrying";
 		mes "way too much stuff. Why don't you stash it away in Kafra Storage? We can talk after you do that, right?";
@@ -47,7 +40,7 @@ payon_in01,5,134,5	script	Inventor Jaax	89,{
 	mes "created something";
 	mes "truly extraordinary. I call them... ^663300Magic Quivers^000000 !! This will be remembered in history as an";
 	mes "arrow revolution!";
-	Emotion e_no1;
+	emotion e_no1;
 	next;
 	mes "[Inventor Jaax]";
 	mes "I've studied magic and quivers for years, working night and day until I finally figured how to condense arrows with magic! With magic quivers, you'll be carrying more arrows, but with less weight!";
@@ -76,7 +69,7 @@ payon_in01,5,134,5	script	Inventor Jaax	89,{
 	//close;
 
 S_BuyQuiver:
-	if (countitem(getarg(0)) > 499) {
+	if (countitem(getarg(0)) >= getarg(1)) {
 		mes "[Inventor Jaax]";
 		mes "Excellent!";
 		mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+getarg(1)+" of your "+getitemname(getarg(0))+"s for only ^FF3131"+getarg(2)+" Zeny^000000.";
@@ -105,7 +98,7 @@ S_BuyQuiver:
 					mes "[Inventor Jaax]";
 					mes "There you go!";
 					mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000.";
-					set zeny,zeny-.@arrow_zeny01;
+					set Zeny, Zeny-.@arrow_zeny01;
 					delitem getarg(0),.@arrows_used; //Arrow
 					getitem getarg(3),.@quiver; //Quiver
 					next;
@@ -131,11 +124,11 @@ S_BuyQuiver:
 			mes "a quiver is so close?";
 			close;
 		case 2:
-			if (zeny > getarg(2)) {
+			if (Zeny > getarg(2)) {
 				mes "[Inventor Jaax]";
 				mes "There you go!";
 				mes "Just remember, ^FF0000you won't be able to use the Quiver when your carried weight is 90% of your maximum weight limit^000000.";
-				set zeny,zeny-getarg(2);
+				set Zeny, Zeny-getarg(2);
 				delitem getarg(0),getarg(1); //Arrow
 				getitem getarg(3),1; //Quiver
 				next;
@@ -166,11 +159,11 @@ S_BuyQuiver:
 	}
 	else {
 		mes "[Inventor Jaax]";
-		mes "You can carry a maximum of 500 Arrows within this quiver. It was made using my secret method,";
+		mes "You can carry a maximum of "+getarg(1)+" Arrows within this quiver. It was made using my secret method,";
 		mes "so the total weight of the Arrows and Quiver is less than carrying the Arrows alone.";
 		next;
 		mes "[Inventor Jaax]";
-		mes "It's a miracle of science! One that you can experience for yourself if you bring me at least 500 Arrows and 500 Zeny for each Quiver.";
+		mes "It's a miracle of science! One that you can experience for yourself if you bring me at least "+getarg(1)+" Arrows and "+getarg(2)+" Zeny for each Quiver.";
 		close;
 	}
 }
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index db4910d7e..3efbe592a 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -3,45 +3,43 @@
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 3.2a
-//===== Compatible With: =====================================
-//= Hercules Git
+//= 3.3
 //===== Description: =========================================
 //= Refining NPCs and Metal Salesmen.
 //===== Additional Comments: =================================
-//= 1.0 - by A bunch of people!
-//=       Syrus22 - Completely redid the script using functions... also
-//=       added the option for auto safe refining and multiple refining.
-//= 1.1 - Negative input bug fixed [Lupus]
-//= 1.2 - Added additional reparimen in morroc and payon. Added
-//=       Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88]
-//= 1.3 - New Payon Locations [Darkchild]
-//=       Corrected zeny subtraction thx to jpnmania77.[kobra_k88]
-//= 1.3a - Temporary corrected an exploit. Need to check sources
-//=        to fully fix bug [Shinigami]
-//=        Fixed repairman prices [shadowlady]
-//=        Fixed bug that skips requirements thanks to sir_loon [massdriller]
-//=        Fixed itemid error thanks to -Vitamin- [massdriller]
-//= 1.4 - check again item in refining procedure to avoid
-//=        hacker that can change item [dafide18]
-//= 1.5 - Fixed crashing due to badly used callfunc's [Skotlex]
-//        Lupus, don't rollback this important fix again! >.<
-//= 1.5a - Corrected an unneeded callfunc, fixed the anti-bot 
-//=       exploit ruining the safe refine loop. [Skotlex]
-//= 1.5b - Fixed Spelling mistakes. [Nexon] 
-//= 1.6	- Replaced all breaks for ends as per the new script engine [Skotlex]
-//= 1.7 - Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
-//= 1.8 - Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
-//= 1.8a - Fixed wrong indication thanks to NeoSaro [Lupus]
-//= 1.9 - Rewrote repairman, removed the Steel from repair cost [DracoRPG]
-//= 2.0 - Fixed missed equppment presence check. Thx2 Coltaro [Lupus]
-//= 2.0a - Added weight checks thanks to Neouni [Playtester]
-//= 2.0b - Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha]
-//= 2.1 - Removed Duplicates [Silent]
-//= 2.2 - Changed name from "Emvertacon" to "Emveretarcon". [Samuray22]
-//	- Thanks to Barron-Monster.
-//= 2.2b - Changed name from "Pharacon" to "Phracon". [Samuray22]
-//	- Thanks to Barron-Monster.
+//= 1.0 by A bunch of people!
+//=     Syrus22 - Completely redid the script using functions... also
+//=     added the option for auto safe refining and multiple refining.
+//= 1.1 Negative input bug fixed [Lupus]
+//= 1.2 Added additional reparimen in morroc and payon. Added
+//=     Christopher the blacksmith in Geffen. Edited some dialogue [kobra_k88]
+//= 1.3 New Payon Locations [Darkchild]
+//=     Corrected zeny subtraction thx to jpnmania77.[kobra_k88]
+//= 1.3a Temporary corrected an exploit. Need to check sources
+//=     to fully fix bug [Shinigami]
+//=     Fixed repairman prices [shadowlady]
+//=     Fixed bug that skips requirements thanks to sir_loon [massdriller]
+//=     Fixed itemid error thanks to -Vitamin- [massdriller]
+//= 1.4 check again item in refining procedure to avoid
+//=     hacker that can change item [dafide18]
+//= 1.5 Fixed crashing due to badly used callfunc's [Skotlex]
+//=     Lupus, don't rollback this important fix again! >.<
+//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot 
+//=     exploit ruining the safe refine loop. [Skotlex]
+//= 1.5b Fixed Spelling mistakes. [Nexon] 
+//= 1.6 Replaced all breaks for ends as per the new script engine [Skotlex]
+//= 1.7 Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
+//= 1.8 Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
+//= 1.8a Fixed wrong indication thanks to NeoSaro [Lupus]
+//= 1.9 Rewrote repairman, removed the Steel from repair cost [DracoRPG]
+//= 2.0 Fixed missed equppment presence check. Thx2 Coltaro [Lupus]
+//= 2.0a Added weight checks thanks to Neouni [Playtester]
+//= 2.0b Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha]
+//= 2.1 Removed Duplicates [Silent]
+//= 2.2 Changed name from "Emvertacon" to "Emveretarcon". [Samuray22]
+//=     Thanks to Barron-Monster.
+//= 2.2b Changed name from "Pharacon" to "Phracon". [Samuray22]
+//=     Thanks to Barron-Monster.
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.4 Updated Refiner function. cleaner, and less dated. [L0ne_w0lf]
 //= 2.5 Rather large update to the refiner and merchants. :D [L0ne_W0lf]
@@ -56,10 +54,11 @@
 //= 2.8a Small bugfix. (bugreport:2418) [Paradox924X]
 //= 2.9 Moved Morroc repairman to Morroc Ruins. [L0ne_W0lf]
 //= 3.0 Updated several NPC names and locations. [Xantara]
-//		Added WoE map Refiners.
+//=     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]
+//= 3.3 Some official script updates. [Euphy]
 //============================================================
 
 // Christopher: Geffen Blacksmith
@@ -82,7 +81,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 986,1; // Anvil
-			set Zeny,Zeny-30000;
+			set Zeny, Zeny-30000;
 			mes "[Christopher Guillenrow]";
 			mes "This is the cheapest one, but efficient enough to forge most items. Thank ye fer shopping at me workshop.  Feel free to come anytime, whenever ye need.";
 			close;
@@ -93,7 +92,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 987,1; // Oridecon_Anvil
-			set Zeny,Zeny-120000;
+			set Zeny, Zeny-120000;
 			mes "[Christopher Guillenrow]";
 			mes "Aye, friend ye have an eye for the anvil. This must be the proper anvil for a Blacksmith, eh? Thank ye fer shopping at me workshop.  Feel free to come anytime, whenever ye need.";
 			close;
@@ -104,7 +103,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 988,1; // Golden_Anvil
-			set Zeny,Zeny-300000;
+			set Zeny, Zeny-300000;
 			mes "[Christopher Guillenrow]";
 			mes "This one is the best among all me stuffs in me workshop! With this, ye can rule the Blacksmith world! Thank ye fer shopping at me workshop.  Feel free to come anytime, whenever ye need.";
 			close;
@@ -157,7 +156,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 612,.@input; // Portable_Furnace
-			set Zeny,Zeny-.@sell;
+			set Zeny, Zeny-.@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -168,7 +167,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 613,1; // Iron_Hammer
-			set Zeny,Zeny-1000;
+			set Zeny, Zeny-1000;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -179,7 +178,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 614,1; // Golden_Hammer
-			set Zeny,Zeny-3000;
+			set Zeny, Zeny-3000;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -190,7 +189,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 615,1; // Oridecon_Hammer
-			set Zeny,Zeny-5000;
+			set Zeny, Zeny-5000;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -238,7 +237,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 1010,.@input; // Phracon
-			set Zeny,Zeny-.@sell;
+			set Zeny, Zeny-.@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -276,7 +275,7 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 				close;
 			}
 			getitem 1011,.@input; // Emveretarcon
-			set Zeny,Zeny-.@sell;
+			set Zeny, Zeny-.@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need, whenever ye want.";
 			close;
@@ -336,7 +335,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Paul Spanner]";
@@ -352,37 +351,37 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 		next;
 		switch(select("Anvil - 30,000z.:Oridecon Anvil - 120,000z.:Golden Anvil - 300,000z.:I need a better anvil.:Cancel.")) {
 		case 1:
-			if (zeny < 30000) {
+			if (Zeny < 30000) {
 				mes "[Paul Spanner]";
 				mes "With that much of money, you cannot even buy a toy anvil!";
 				close;
 			}
 			getitem 986,1; //Anvil
-			set zeny,zeny-30000;
+			set Zeny, Zeny-30000;
 			mes "[Paul Spanner]";
 			mes "It is the cheapest anvil which has the most basic ability.";
 			mes "Thank you for using my shop. If you need anything, just let me know.";
 			close;
 		case 2:
-			if (zeny < 120000) {
+			if (Zeny < 120000) {
 				mes "[Paul Spanner]";
 				mes "With that much of money, you cannot even buy a toy anvil!";
 				close;
 			}
 			getitem 987,1; //Oridecon_Anvil
-			set zeny,zeny-120000;
+			set Zeny, Zeny-120000;
 			mes "[Paul Spanner]";
 			mes "Ah, you have an eye for anvil. A Blacksmith needs an anvil at least as good as this.";
 			mes "Thank you for using my shop. If you need anything, just let me know.";
 			close;
 		case 3:
-			if (zeny < 300000) {
+			if (Zeny < 300000) {
 				mes "[Paul Spanner]";
 				mes "With that much of money, you cannot even buy a toy anvil!";
 				close;
 			}
 			getitem 988,1; //Golden_Anvil
-			set zeny,zeny-300000;
+			set Zeny, Zeny-300000;
 			mes "[Paul Spanner]";
 			mes "I can tell your ambition to become a good Blacksmith just by looking at you to choose this Golden Anvil!";
 			mes "This anvil will surely aid you in creating the best weapons.";
@@ -451,7 +450,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			}
 		}
 		set .@sell,.@input * .@item_cost;
-		if (zeny < .@sell) {
+		if (Zeny < .@sell) {
 			mes "[Paul Spanner]";
 			mes "You don't have enough money. Sorry, I cannot sell them at a loss.";
 			close;
@@ -461,7 +460,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			mes "Hey, you look pale. Why don't you go lighten your weight first.";
 			close;
 		}
-		set zeny,zeny-.@sell;
+		set Zeny, Zeny-.@sell;
 		getitem .@item,.@input;
 		mes "[Paul Spanner]";
 		mes "Thank you for using my shop. If you need anything, just let me know.";
@@ -505,7 +504,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			}
 		}
 		set .@sell,.@input * .@item_price;
-		if (zeny < .@sell) {
+		if (Zeny < .@sell) {
 			mes "[Paul Spanner]";
 			mes "You don't have enough money. Sorry, I cannot sell them at a loss.";
 			close;
@@ -516,7 +515,7 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 			close;
 		}
 		getitem .@item,.@input;
-		set zeny,zeny-.@sell;
+		set Zeny, Zeny-.@sell;
 		mes "[Paul Spanner]";
 		mes "Thank you for using my shop. If you need anything, just let me know.";
 		close;
@@ -615,12 +614,20 @@ function	script	refinemain	{
 	setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	set .@menu$,"";
 	for(set .@i,1; .@i<=10; set .@i,.@i+1) {
-		if(getequipisequiped(.@i))
+		if(getequipisequiped(.@i)) {
 			set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
+			set .@equipped,1;
+		}
 		set .@menu$, .@menu$ + ":";
 	}
-	set .@part,select(.@menu$);
-	if(!getequipisequiped(.@part)) {
+	if (.@equipped == 0) {
+		mes "[" + getarg(0) + "]";
+		mes "I don't think I can refine any items you have...";
+		close;
+	}
+	set .@part, select(.@menu$);
+
+	if(!getequipisequiped(.@part)) { //custom check
 		mes "[" + getarg(0) + "]";
 		mes "You're not wearing";
 		mes "anything there that";
@@ -728,8 +735,10 @@ function	script	refinemain	{
 			mes "here all day if you need me.";
 			close;
 		}
-		set Zeny,Zeny-.@price;
+		set Zeny, Zeny-.@price;
 		delitem .@material,1;
+
+		//custom checks
 		if(getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?)
 			mes "[" + getarg(0) + "]";
 			mes "Look here... you don't have any Items on...";
@@ -743,6 +752,7 @@ function	script	refinemain	{
 			mes "You switched the item while I wasn't looking! Get out of here!";
 			close;
 		}
+
 		if(getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
 			mes "[" + getarg(0) + "]";
@@ -846,7 +856,7 @@ function	script	refinemain	{
 		mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes.";
 		close;
 	}
-	set Zeny,Zeny - .@fullprice;
+	set Zeny, Zeny - .@fullprice;
 	delitem .@material,.@refinecnt;
 	while(.@refinecnt){
 		if (getequipisequiped(.@part) == 0) {
@@ -872,7 +882,7 @@ function	script	refinemain	{
 			mes "Here's the unused Zeny and materials back...";
 			getitem .@material,.@refinecnt;
 			set .@fullprice,.@refinecnt * .@price;
-			set Zeny,Zeny + .@fullprice;
+			set Zeny, Zeny + .@fullprice;
 			close;
 		}
 		successrefitem .@part;
@@ -924,7 +934,7 @@ function	script	phramain	{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[" + getarg(0) + "]";
@@ -990,7 +1000,7 @@ function	script	phramain	{
 		close;
 	}
 	getitem .@material,.@input;
-	set Zeny,Zeny-.@sell;
+	set Zeny, Zeny-.@sell;
 	mes "[" + getarg(0) + "]";
 	mes "Here you are!";
 	mes "Thank you for";
@@ -1037,7 +1047,7 @@ function	script	orimain	{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[" + getarg(0) + "]";
@@ -1228,7 +1238,7 @@ function	script	repairmain	{
 			}
 			set .@checkitem2,.@checkitem2-1;
 			if (.@checkitem == .@checkitem2) {
-				set zeny,zeny-.@totalcost;
+				set Zeny, Zeny-.@totalcost;
 				while (.@checkitem) {
 					repair(.@checkitem);
 					set .@checkitem,.@checkitem-1;
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index 8f9410eda..ee9f70952 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -1,12 +1,12 @@
 //===== Hercules Script ======================================
 //= Renters
-//===== By: ================================================== 
+//===== By: ==================================================
 //= kobra_k88, mod by Lupus
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.2
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= Fully working
 //= Added another Falcon Master into the Hunters Guild [Lupus]
 //= 1.2: replaced checkoption(x) with checkriding,checkfalcon [Lupus]
@@ -22,7 +22,7 @@
 //= 2.0 Fixed problems with third classes and new mounts. [Euphy]
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
 //= 2.2 Added warg checks. [Euphy]
-//============================================================ 
+//============================================================
 
 // PecoPeco Breeder (for Knights)-------------------------------------------
 prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
@@ -40,7 +40,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 		next;
 		switch(select("Rent Peco Peco:Cancel")) {
 		case 1:
-			if (zeny < .@price) {
+			if (Zeny < .@price) {
 				mes "[Peco Peco Breeder]";
 				mes "You do not";
 				mes "have enough zeny.";
@@ -68,7 +68,7 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
+			set Zeny, Zeny-.@price;
 			setriding;
 			close;
 		case 2:
@@ -104,7 +104,7 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 		next;
 		switch(select("Rent a PecoPeco:Quit")) {
 		case 1:
-			if (zeny < .@price) {
+			if (Zeny < .@price) {
 				mes "[Peco Peco Breeder]";
 				mes "You do not";
 				mes "have enough zeny.";
@@ -131,7 +131,7 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 				mes "Please remove your cash mount.";
 				close;
 			}
-			set zeny,zeny-.@price;
+			set Zeny, Zeny-.@price;
 			setriding;
 			close;
 		case 2:
@@ -177,7 +177,7 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 				mes "until you dismiss your warg first!";
 				close;
 			}
-			if (zeny < .@price) {
+			if (Zeny < .@price) {
 				mes "[Falcon Breeder]";
 				mes "What is this?";
 				mes "You don't have";
@@ -205,7 +205,7 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 				mes "there, can't you see it?";
 				close;
 			}
-			set zeny,zeny-.@price;
+			set Zeny, Zeny-.@price;
 			setfalcon;
 			close;
 		case 2:
@@ -224,4 +224,4 @@ hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 		mes "...Heh heh, jealous?";
 		close;
 	}
-}
+}
\ No newline at end of file
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index b9c47b659..2e339a59a 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -1,18 +1,18 @@
 //===== Hercules Script ======================================
 //= Shops
-//===== By: ================================================== 
+//===== By: ==================================================
 //= rAthena Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 3.4
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Town shop NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= For earlier update notes see the bottom.
 //= 2.0 updated several shop npcs. [L0ne_W0lf]
-//=	Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
-//=	Moved all Cooking related NPCs to their own section.
-//=	Re-alphabetized sections. Some of them were out of place.
-//=	Removed commented out shops.
+//=     Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
+//=     Moved all Cooking related NPCs to their own section.
+//=     Re-alphabetized sections. Some of them were out of place.
+//=     Removed commented out shops.
 //= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf]
 //= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf]
 //= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf]
@@ -35,8 +35,8 @@
 //= 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]
-//============================================================ 
+//= 3.4 Moved Izlude shops to pre-re/re paths. [Streusel]
+//============================================================
 
 //=======================================================
 // Alberta
@@ -322,12 +322,12 @@ ayothaya,203,178,3	shop	Chef Assistant#ayo	83,7455:-1,577:-1
 xmas,152,137,5	shop	Chef Assistant#xmas	83,7457:-1,577:-1
 niflheim,209,180,5	shop	Chef Assistant#nif	83,581:-1
 
-//===== Additional Comments(old): ================================= 
+//===== Additional Comments(old): =================================
 //= swapped shop titles in GONRYUN, thanks to Kashy
 //= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88]
 //= 1.4 Added Niflheim Shops
 //= 1.5 New Payon Locations [Darkchild]
-//= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88]
+//=     Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88]
 //= 1.6 Removed GRAPE ID 514 from shops (caused exploits)
 //= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit)
 //= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest]
@@ -350,13 +350,13 @@ niflheim,209,180,5	shop	Chef Assistant#nif	83,581:-1
 //=   -  Guys, I suggest we crop these comments and put them at the bottom soon
 //= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus]
 //= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA]
-//=	Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
+//=     Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
 //= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]
 //= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]
 //= 1.4b Commented out temp Gunslinger shops. [Lupus]
 //= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]
-//=	  Added Official Ninja shops in their correct location and commented a few
-//=	  shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
+//=     Added Official Ninja shops in their correct location and commented a few
+//=     shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
 //= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
 //= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
 //= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 7ace07bee..546c7c17b 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -4,18 +4,16 @@
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 2.0a
-//===== Compatible With: =====================================
-//= Hercules Git
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Adds slots to selected weapons and armor.
 //===== Additional Comments: =================================
 //= 0.1a added missing L_No: to 2 funcs [Lupus]
 //= 0.1b Removed duplicates [Toms]
-//= 0.2	Added missing next;'s [Evera]
+//= 0.2 Added missing next;'s [Evera]
 //= 0.3 Fixed Zweihander[+] id [Lupus]
 //= 1.0 Fixed ingredients check [Lupus]
-//= 1.1	Updated to official. [SinSloth]
+//= 1.1 Updated to official. [SinSloth]
 //= 1.1b Optimized/cleaned [ultramage]
 //= 1.2 Fixed some typos and a nasty bug. [SinSloth]
 //= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth]
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 6c21bdcf7..3ee1b036b 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -1,19 +1,17 @@
 //===== Hercules Script ======================================
 //= Episode 12 Socket Enchant NPC
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Gepard
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Adds slots to selected weapons and armor.
-//===== Additional Comments: ================================= 
+//===== 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,{
 	if (checkweight(1201,1) == 0)
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
index 8be6ed276..c985cc4a3 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Trade Broken Liquor Jars and alcohol for wanderer
 //= pet food, 'Spirit Liquor'
 //===== Additional Comments: =================================