Updated more placeholders and fixed some spacing issues.

28 files changed, 34 insertions, 78 deletions

diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 70b11c167..01983d96d 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Advanced Refiner
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Refiner that uses Enriched ores to increase upgrade success.
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index d3506244d..d48ee68bb 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script ======================================= 
+//===== Hercules Script ======================================
 //= Alchemist Shop
 //===== By: ================================================== 
 //= rAthena Team
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 75d203123..f4df03a0a 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -1,7 +1,7 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Magazine Dealer Kenny
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.5
 //===== Description: =========================================
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index 93e7d0f0b..89654f0cc 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
 //= Buying Shop Scripts
 //===== By: ==================================================
 //= Kisuka, skyiing, Scriptor
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index 3028d302d..dfde86a4d 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script ======================================= 
+//===== Hercules Script ======================================
 //= Cash Hair Stylist
 //===== By: ================================================== 
 //= Kisuka
diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt
index 1063800f6..b61120dea 100644
--- a/npc/merchants/cash_trader.txt
+++ b/npc/merchants/cash_trader.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script ======================================= 
+//===== Hercules Script ======================================
 //= Cash Shop NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt
index e0887b30e..49003e18b 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script ======================================= 
+//===== Hercules Script ======================================
 //= Headgear Dyer (Cash)
 //===== By: ==================================================
 //= Xantara
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 489194428..514178bd6 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Clothes Dyer
 //===== By: ================================================== 
 //= Usnul
 //===== Current Version: ===================================== 
 //= 2.5
-//===== Compatible With: ===================================== 
-//= rAthena 1.0+
 //===== Description: ========================================= 
 //= Clothes dyer with standard palletes
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 8603383ad..a894485a8 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Manuk & Splendide Coin Merchants
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Coin redemption NPCs.
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 632e14f17..c4bc2f5f8 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Dye Maker
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index 3d30b1668..2d120d190 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Elemental Stone Trader
 //===== By: ================================================== 
-//= rAthena Team & MasterOfMuppets
+//=  MasterOfMuppets, rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Trade impure types of elemental stones for pure ones.
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index d5f321518..94cdd615e 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//=====Hercules Script =======================================
 //= Armor Enchanter
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 854954c0a..74962fef2 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Gemstone Trader
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Trade various colors of gemstones for other color gemstones.
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 70f26ca58..c3479cbbe 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Hair Dyer
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Hair Dyer with standard palletes
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 19f5b9dca..cf4db6333 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hair Dresser
 //===== By: ==================================================
 //= Muad_Dib, Samuray22, Kisuka
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Allows you to change your hairstyle.
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index d04dbe08e..f126b723e 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Ice Cream Maker
 //===== By: ==================================================
 //= KOOK SWU, Kisuka
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= A man makes you ice-cream
 //===== Additional Comments: =================================
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index d9cc39a8e..7c4935942 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
-//= Inn Npcs
+//===== Hercules Script ======================================
+//= Inn NPCs
 //===== By: ==================================================
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: =====================================
 //= 2.9a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Inn Npcs, Save and Heal
 //============================================================
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 97bc89f12..6f5fd953b 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Kunai Merchant Kashin
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 7e7da5c3f..15fe3c497 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Milk Trader
 //===== By: ==================================================
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Trades bottles for milk
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index 61049f805..cd8cede0e 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Novice Goods Exchanger
 //===== By: ==================================================
-//= ???, rAthena Team
+//= ???, rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis COnversion]
 //= Exchanges your Basic Monster drops for Red Potions.
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index ba00b8f4d..d01eb92e3 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Old Pharmacist
 //===== By: ==================================================
 //= DZeroX
 //===== Current Version: =====================================
 //= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN Trunk
 //===== Description: =========================================
 //= Trade in items for potions
 //===============================
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index b193bac4c..30a4788a8 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Arrow Quiver Event
 //===== By: ==================================================
 //= Muad_Dib (Prometheus Project); L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis COnversion]
 //= Turns arrows into Arrow Quivers.
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 4433bbd66..a6a799774 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Refining NPCs
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
 //= 3.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Refining NPCs and Metal Salesmen.
 //===== Additional Comments: =================================
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index bcaded6f6..02afc4059 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Renters
 //===== By: ================================================== 
 //= kobra_k88, mod by Lupus
 //===== Current Version: ===================================== 
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index a06ba1ad2..50bc9b610 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Shops
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 3.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0+
 //===== Description: ========================================= 
 //= Town shop NPCs.
 //===== Additional Comments: ================================= 
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index acd3b2fe6..4e0b7985d 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Episode 11.1 Socket Enchant NPC
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
 //= 2.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Adds slots to selected weapons and armor.
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index c302b2763..6456ca25d 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Episode 12 Socket Enchant NPC
 //===== By: ================================================== 
 //= Gepard
 //===== Current Version: ===================================== 
 //= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Adds slots to selected weapons and armor.
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
index 5bd9140e7..8be6ed276 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Spirit Liquor trader.
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Trade Broken Liquor Jars and alcohol for wanderer