npc header consistency update

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

107 files changed, 272 insertions, 269 deletions

diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 06f5d818b..5541e2d88 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -1,5 +1,5 @@
 //===== eAthena Script ======================================= 
-//= Ayotaya Town
+//= Ayothaya Town
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: =====================================
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index dc283ce90..36c13f1c2 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1,5 +1,5 @@
-//===== eAthena script =======================================
-//= Jawaii (The Lovers Paradise) Town script
+//===== eAthena Script =======================================
+//= Jawaii (The Lovers' Paradise) Town script
 //===== By: ==================================================
 //= jAthena (1.0)
 //= DNett123 (1.1 - 1.5)
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index e0388a78b..0d8cf2488 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -1,4 +1,4 @@
-//===== eAthena script =======================================
+//===== eAthena Script =======================================
 //= Umbala Town script
 //===== By: ==================================================
 //= jAthena (1.0) Fusion Dev Team (1.1) Muad Dib (1.2) Darkchild (1.3)
diff --git a/npc/custom/Auctioneer.txt b/npc/custom/Auctioneer.txt
index efdbd204e..433fc8170 100644
--- a/npc/custom/Auctioneer.txt
+++ b/npc/custom/Auctioneer.txt
@@ -47,7 +47,7 @@ L_RNameLoop:
 	mes "I am very sorry if you have lost items";
 	close;
 
-// If the Auction has started, it will run this, during this time items can be registerd and registerd items retrieved
+// If the Auction has started, it will run this, during this time items can be registered and registered items retrieved
 
 L_Register:
 	mes "Welcome to the auction, you may register you items at this time";
@@ -166,7 +166,7 @@ L_Sorry:
 	close;
 L_Already:
 	mes "[Auctioneer]";
-	mes "It seems you already have have an item registerd here, would you like to retrieve your item?";
+	mes "It seems you already have have an item registered here, would you like to retrieve your item?";
 	next;
 	menu "Yes",-,"No",L_End;
 	getitem $AItems[@num],$AAmount[@num];
@@ -185,7 +185,7 @@ L_NotEnough:
 	mes "[Auctioneer]";
 	mes "Seems you don't have that much "+getitemname(@setitem)+"'s";
 	close;
-// If the Auction has enterd phase 2, it will run this, during this time items you can bid on registerd
+// If the Auction has enterd phase 2, it will run this, during this time items you can bid on registered
 // No items can be retrieved during this time, they are now stuck
 
 L_Bid:
diff --git a/npc/custom/adoption.txt b/npc/custom/adoption.txt
index f9f2361b3..3ab37d3e1 100644
--- a/npc/custom/adoption.txt
+++ b/npc/custom/adoption.txt
@@ -1,8 +1,8 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Simple Adoption Script
-//===== By ================================================
+//===== By ===================================================
 //= Fredzilla with help from Kamari,Acky
-//===== Version ===========================================
+//===== Version ==============================================
 //= 1.7 Moved warps to the southern exit of the main chappel. [L0ne_W0lf]
 //= 1.6a Fixed wrong label name [KarLaeda]
 //= 1.6 Removed call to function Is_Taekwon_Class in favor of baseClass == Job_Taekwon [Silentdragon]
@@ -21,13 +21,13 @@
 //= 1.1 - Minor correction, replaced missing close; and mes :D
 //= 1.0 - First Release, most likely going to have some bugs
 //=	  Is using @adopt instead of proper NPC script command 
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena Final (SVN), any version that contained the GM command @adopt
 //= This is any version released after 03/29/05, don't know the number
-//===== Description =======================================
+//===== Description ==========================================
 //= A simple adoption script that lets couples adopt a 
 //= lvl 1/1 novice without the help of a GM there
-//===== Comments ==========================================
+//===== Comments =============================================
 //= List or Variables used
 //= $@AdoptionActive = Stops other people trying to use 
 //= the adoption NPC's intill the currant one is over.
@@ -48,7 +48,7 @@
 //= 	*event_adopted = Put on baby so it can't be adopted again.
 //= 	Use "getchildid()>0" insread of event_adopt
 //= 	Use "Upper==2" insread of event_adopted
-//=========================================================
+//============================================================
 
 prt_church,83,122,0	warp	prtch03	1,2,prt_church,164,171
 prt_church,162,171,0	warp	prtch01-3	1,2,prt_church,86,122
@@ -415,7 +415,7 @@ A_FinalYesB:
 	close;
 A_SameFail:
 	mes "[Inanna]";
-	mes "Sorry, it seems you have registerd as both parents, this isn't allowed";
+	mes "Sorry, it seems you have registered as both parents, this isn't allowed";
 	callfunc "AdoptReset","both parents are the same person";
 	close;
 
diff --git a/npc/custom/eAAC_Scripts/DonationGirl/donate.txt b/npc/custom/eAAC_Scripts/DonationGirl/donate.txt
index b0fa93176..97e39519f 100644
--- a/npc/custom/eAAC_Scripts/DonationGirl/donate.txt
+++ b/npc/custom/eAAC_Scripts/DonationGirl/donate.txt
@@ -1,8 +1,8 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Donation NPC
-//===== By ==================================================
+//===== By ===================================================
 //= Josh
-//===== Version =============================================
+//===== Version ==============================================
 //= 1.0 - First release. Probably contains bugs/security
 //=	  risks
 //= 1.1 - Added a check for whether the account exists when
@@ -26,26 +26,26 @@
 //= 3.3 - Optimized query speeds by combining a few select 
 //=	  queries into one. Requires Trunk 7975 OR
 //=	  Stable 8637.
-//===== Compatible With =====================================
+//===== Compatible With ======================================
 //= eAthena - any version that contains the new query_sql
 //=	      command (Stable 8637 OR Trunk 7975).
-//===== Description =========================================
+//===== Description ==========================================
 //= A script that lets a player claim an item for donating.
 //= Allows a GM to input each donation.
-//===== Comments ============================================
+//===== Comments =============================================
 //= This script uses SQL tables to store variables for the
 //= amount donated by users and the items claimable.
-//===== Installation ========================================
+//===== Installation =========================================
 //= You must execute donate.sql and donate_item_db.sql before
 //= using this script.
-//===========================================================
+//============================================================
 //= Thanks to Vich for helping me with the SQL syntax.
 //= Thanks to Lance for helping me with the the arrays and 
 //= for implementing query_sql.
 //= Thanks to Skotlex for implementing escape_sql.
 //= Thanks to Toms for implementing the new multi-column 
 //= query_sql command.
-//===========================================================
+//============================================================
 
 prontera,145,179,5	script	Donation Girl	714,{
 
diff --git a/npc/custom/gefenia.txt b/npc/custom/gefenia.txt
index 5bb5a6018..86b4cd8a2 100644
--- a/npc/custom/gefenia.txt
+++ b/npc/custom/gefenia.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Gefenia Warper Script
 //===== By: ==================================================
 //= Darkchild (1.0)
diff --git a/npc/custom/market.txt b/npc/custom/market.txt
index 0f17b9354..35a4db3b5 100644
--- a/npc/custom/market.txt
+++ b/npc/custom/market.txt
@@ -1,17 +1,17 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Market Place
-//===== By ================================================
+//===== By ===================================================
 //= Lupus
-//===== Version ===========================================
+//===== Version ==============================================
 //= 1.0
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 5760+
-//===== Description =======================================
+//===== Description ==========================================
 //= This script should move vending crowds from Prontera
 //= streets to a suitable market place. Save your traffic 8)
-//===== Comments ==========================================
+//===== Comments =============================================
 // No comments yet
-//=========================================================
+//============================================================
 
 
 prontera,144,174,3	script	Market Place	722,{
diff --git a/npc/custom/penal_servitude.txt b/npc/custom/penal_servitude.txt
index ddcc82e6b..673130979 100644
--- a/npc/custom/penal_servitude.txt
+++ b/npc/custom/penal_servitude.txt
@@ -1,20 +1,20 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Penal Servitude Script
-//===== By ================================================
+//===== By ===================================================
 //= Lupus
-//===== Version ===========================================
+//===== Version ==============================================
 //= 1.2
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena Final (SVN)
-//===== Description =======================================
+//===== Description ==========================================
 //= A simple Penal Servitude Script.
 //= It could cheer up your prisoners a bit.
-//===== Comments ==========================================
+//===== Comments =============================================
 // This script uses CHEQUES of the 2nd KAFRA_BANK.TXT
 // var PRISON - it counts number of your imprisonments.
 // 1.1 English translation
 // 1.2 Stricted the conditions a bit
-//=========================================================
+//============================================================
 
 sec_pri,36,58,1	script	Chief Warder	105,{ 
 	mes "[Saddeus]";
diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt
index 3feeabfb0..18d5bc48c 100644
--- a/npc/custom/quests/thq/THQS_ChatingNPC.txt
+++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt
@@ -1,24 +1,24 @@
-//===== Athena Script =====================================
+//===== eAthena Script =======================================
 //= Treasure Hunter Script
-//===== Converted By ======================================
+//===== Converted By =========================================
 //= Fredzilla
 //= Original
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//                                                    Treasure Hunter Quests                                          //
-//                                                         By: Ezekial                                                //
-//                                                for the use on nRO run by Newbe5                                    //
-//                                                      revised By Warlock                                            //
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//===== Version ===========================================
+//////////////////////////////////////////////////////////////
+//                  Treasure Hunter Quests                  //
+//                       By: Ezekial                        //
+//             for the use on nRO run by Newbe5             //
+//                    revised By Warlock                    //
+//////////////////////////////////////////////////////////////
+//===== Version ==============================================
 //= 1.0 - Straight conversion of Aegis NPC file
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 1.0
-//===== Description =======================================
+//===== Description ==========================================
 //= Start for Treasure hunter quests
-//===== Comments ==========================================
-//= Event_THQS - Used to check if you have already registerd
+//===== Comments =============================================
+//= Event_THQS - Used to check if you have already registered
 //= #Treasure_Token - used to keep track of tokens
-//////////////////////////////////////////////////////////
+//============================================================
 
 
 //Entrance Flags
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 5041f5916..ca851a997 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -1,24 +1,24 @@
-//===== Athena Script =====================================
+//===== eAthena Script =======================================
 //= Treasure Hunter Script
-//===== Converted By ======================================
+//===== Converted By =========================================
 //= Fredzilla
 //= Original
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//                                                    Treasure Hunter Quests                                          //
-//                                                         By: Ezekial                                                //
-//                                                for the use on nRO run by Newbe5                                    //
-//                                                      revised By Warlock                                            //
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//===== Version ===========================================
+//////////////////////////////////////////////////////////////
+//                  Treasure Hunter Quests                  //
+//                       By: Ezekial                        //
+//             for the use on nRO run by Newbe5             //
+//                    revised By Warlock                    //
+//////////////////////////////////////////////////////////////
+//===== Version ==============================================
 //= 1.0 - Straight conversion of Aegis NPC file
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 1.0
-//===== Description =======================================
+//===== Description ==========================================
 //= Start for Treasure hunter quests
-//===== Comments ==========================================
-//= Event_THQS - Used to check if you have already registerd
+//===== Comments =============================================
+//= Event_THQS - Used to check if you have already registered
 //= #Treasure_Token - used to keep track of tokens
-//////////////////////////////////////////////////////////
+//============================================================
 
 
 yuno_in01,124,164,6	script	Guild Leader	108,{
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 708b7e957..db02c88fe 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -1,27 +1,27 @@
-//===== Athena Script =====================================
+//===== eAthena Script =======================================
 //= Treasure Hunter Script
-//===== Converted By ======================================
+//===== Converted By =========================================
 //= Fredzilla
 //= Original
-///////////////////////////////////////////////////////////
-//           Treasure Hunter Quests                      //
-//             By: Ezekial                               //
-//      for the use on nRO run by Newbe5                 //
-//         revised By Warlock                            //
-///////////////////////////////////////////////////////////
-//===== Version ===========================================
+//////////////////////////////////////////////////////////////
+//                  Treasure Hunter Quests                  //
+//                       By: Ezekial                        //
+//             for the use on nRO run by Newbe5             //
+//                    revised By Warlock                    //
+//////////////////////////////////////////////////////////////
+//===== Version ==============================================
 //= 1.2
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 1.0
-//===== Description =======================================
+//===== Description ==========================================
 //= Start for Treasure hunter quests
-//===== Comments ==========================================
-//= Event_THQS - Used to check if you have already registerd
+//===== Comments =============================================
+//= Event_THQS - Used to check if you have already registered
 //= #Treasure_Token - used to keep track of tokens
 //= 1.0 - Straight conversionof Aegis NPC file
 //= 1.1 Added time penalty to prevent get quests to often [Lupus]
 //= 1.2 Fixed not working penalty, added anti-cheat [Lupus]
-//////////////////////////////////////////////////////////
+//============================================================
 
 
 yuno_in01,112,151,6	script	Quest Manager	62,{
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 7dfd3ce6b..950f5486c 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -1,27 +1,27 @@
-//===== Athena Script =====================================
+//===== eAthena Script =======================================
 //= Treasure Hunter Script
-//===== Converted By ======================================
+//===== Converted By =========================================
 //= Fredzilla
 //= Original
-///////////////////////////////////////////////////////////
-//                 Treasure Hunter Quests                //
-//                      By: Ezekial                      //
-//                 for the use on nRO run by Newbe5      //
-//                   revised By Warlock                  //
-///////////////////////////////////////////////////////////
-//===== Version ===========================================
+//////////////////////////////////////////////////////////////
+//                  Treasure Hunter Quests                  //
+//                       By: Ezekial                        //
+//             for the use on nRO run by Newbe5             //
+//                    revised By Warlock                    //
+//////////////////////////////////////////////////////////////
+//===== Version ==============================================
 //= 1.3
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 1.0
-//===== Description =======================================
+//===== Description ==========================================
 //= Start for Treasure hunter quests
-//===== Comments ==========================================
-//= Event_THQS - Used to check if you have already registerd
+//===== Comments =============================================
+//= Event_THQS - Used to check if you have already registered
 //= #Treasure_Token - used to keep track of tokens
 //= 1.0 - Straight conversionof Aegis NPC file
 //= 1.2 some bugfixes, typos [Lupus]
 //= 1.3 Removed Duplicates [Silent]
-//////////////////////////////////////////////////////////
+//============================================================
 
 
 ///////Job list 1///////
diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt
index 239b544d7..9dbc07657 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -1,27 +1,27 @@
-//===== Athena Script =====================================
+//===== eAthena Script =======================================
 //= Treasure Hunter Script
-//===== Converted By ======================================
+//===== Converted By =========================================
 //= Fredzilla
 //= Original
-///////////////////////////////////////////////////////////
-//         Treasure Hunter Quests                        //
-//         By: Ezekial                                   //
-//         for the use on nRO run by Newbe5              //
-//         revised By Warlock                            //
-///////////////////////////////////////////////////////////
-//===== Version ===========================================
+//////////////////////////////////////////////////////////////
+//                  Treasure Hunter Quests                  //
+//                       By: Ezekial                        //
+//             for the use on nRO run by Newbe5             //
+//                    revised By Warlock                    //
+//////////////////////////////////////////////////////////////
+//===== Version ==============================================
 //= 1.1
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 1.0
-//===== Description =======================================
+//===== Description ==========================================
 //= Start for Treasure hunter quests
-//===== Comments ==========================================
-//= Event_THQS - Used to check if you have already registerd
+//===== Comments =============================================
+//= Event_THQS - Used to check if you have already registered
 //= #Treasure_Token - used to keep track of tokens
 //= v1.0 - Straight conversion of Aegis NPC file
 //= v1.1 - balanced some prices, fixed 1 missing label
 //= 	removed Executioner&Mysteltain swords [Lupus]
-//////////////////////////////////////////////////////////
+//============================================================
 
 prt_in,159,172,0	warp	thqwrp	3,3,yuno_in01,123,155
 
diff --git a/npc/events/custom/valentinesdayexp.txt b/npc/events/custom/valentinesdayexp.txt
index 2b65cc6ce..6d2b3355e 100644
--- a/npc/events/custom/valentinesdayexp.txt
+++ b/npc/events/custom/valentinesdayexp.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Valentine Event Script + EXP bonus
 //===== By: ==================================================
 //= Lupus (based on Muad_Dib's work)
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index e32cec779..898d20368 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -1,17 +1,17 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Imitation of Dumpling Festival
-//===== By ================================================
+//===== By ===================================================
 //= Massdriller
-//===== Version ===========================================
+//===== Version ==============================================
 //= 1.01
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 0.52+
-//===== Description =======================================
+//===== Description ==========================================
 //= A complete redering of the Dumpling Festival.
-//===== Comments ==========================================
+//===== Comments =============================================
 //= Ver 1.0- Duplicate of MRO's Dumpling Event
 //= 1.01 fixed bugs [Lupus]
-//=========================================================
+//============================================================
   
 payon,93,81,4	script	Exorcist Master Fahae	834,{
 
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt
index fb2d53cea..e7a33ef8d 100644
--- a/npc/events/valentinesday.txt
+++ b/npc/events/valentinesday.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Valentine Event Script
 //===== By: ==================================================
 //= Muad_Dib(Prometheus Project)
diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt
index 9eedd40f6..bdd4b3c75 100644
--- a/npc/events/whiteday.txt
+++ b/npc/events/whiteday.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= White Day Event Script
 //===== By: ==================================================
 //= 1.0a Muad_Dib (Prometheus Project)
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 7d9cd0359..83582f5b6 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1,4 +1,4 @@
-////===== eAthena Script ======================================= 
+//===== eAthena Script ======================================= 
 //= Crusader Quest
 //===== By: ================================================== 
 //= Made by: Black Dragon
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 14acae92d..1ec1d74ba 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Bullet Dealer Tony
 //===== By ===================================================
 //= Playtester, Paradox924X
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 80774654e..158015ab4 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Hair Dresser
 //===== By: ==================================================
 //= [Muad_Dib] 1.0 (The Prometheus Project)
diff --git a/npc/mobs/dungeons/abbey.txt b/npc/mobs/dungeons/abbey.txt
index 2d7dd859c..ac5c6752b 100644
--- a/npc/mobs/dungeons/abbey.txt
+++ b/npc/mobs/dungeons/abbey.txt
@@ -1,35 +1,35 @@
-//===== Athena Script ========================================

-//= Abbey Dungeon Monster Spawn Script

-//===== By: ==================================================

-//= $ephiroth

-//===== Current Version: =====================================

-//= 1.0

-//===== Compatible With: =====================================

-//= Any Athena Version

-//===== Additional Comments: =================================

-//= 1.0 Initial version [$ephiroth]

-//============================================================

-

-// Nameless Island

-nameless_n.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

-nameless_n.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

-nameless_n.gat,0,0,0,0	monster	Hell Poodle	1866,20,0,0,0

-

-// Cursed Abbey Dungeon [01]

-abbey01.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

-abbey01.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

-abbey01.gat,0,0,0,0	monster	Flame Skull	1869,20,0,0,0

-

-// Cursed Abbey Dungeon [02]

-abbey02.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

-abbey02.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

-abbey02.gat,0,0,0,0	monster	Banshee	1867,20,0,0,0

-abbey01.gat,0,0,0,0	monster	Flame Skull	1869,20,0,0,0

-abbey02.gat,0,0,0,0	monster	Falling Bishop	1871,1,7200000,3600000,1

-

-// Cursed Abbey Dungeon [03]

-abbey03.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0

-abbey03.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0

-abbey03.gat,0,0,0,0	monster	Banshee	1867,20,0,0,0

-abbey03.gat,0,0,0,0	monster	Necromancer	1870,20,0,0,0

+//===== eAthena Script ========================================
+//= Abbey Dungeon Monster Spawn Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+// Nameless Island
+nameless_n.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0
+nameless_n.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0
+nameless_n.gat,0,0,0,0	monster	Hell Poodle	1866,20,0,0,0
+
+// Cursed Abbey Dungeon [01]
+abbey01.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0
+abbey01.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0
+abbey01.gat,0,0,0,0	monster	Flame Skull	1869,20,0,0,0
+
+// Cursed Abbey Dungeon [02]
+abbey02.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0
+abbey02.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0
+abbey02.gat,0,0,0,0	monster	Banshee	1867,20,0,0,0
+abbey01.gat,0,0,0,0	monster	Flame Skull	1869,20,0,0,0
+abbey02.gat,0,0,0,0	monster	Falling Bishop	1871,1,7200000,3600000,1
+
+// Cursed Abbey Dungeon [03]
+abbey03.gat,0,0,0,0	monster	Zombie Slaughter	1864,20,0,0,0
+abbey03.gat,0,0,0,0	monster	Ragged Zombie	1865,20,0,0,0
+abbey03.gat,0,0,0,0	monster	Banshee	1867,20,0,0,0
+abbey03.gat,0,0,0,0	monster	Necromancer	1870,20,0,0,0
 abbey03.gat,0,0,0,0	monster	Beelzebub	1873,1,39600000,19800000,1
\ No newline at end of file
diff --git a/npc/mobs/dungeons/thor.txt b/npc/mobs/dungeons/thor.txt
index a78e14cb7..162d88f94 100644
--- a/npc/mobs/dungeons/thor.txt
+++ b/npc/mobs/dungeons/thor.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script ========================================
 //= Thor Volcano Monster Spawn Script
 //===== By: ==================================================
 //= Playtester
diff --git a/npc/other/resetskill.txt b/npc/other/resetskill.txt
index 0d95b78cf..753a43467 100644
--- a/npc/other/resetskill.txt
+++ b/npc/other/resetskill.txt
@@ -1,4 +1,4 @@
-//===== Freya Script =========================================
+//===== eAthena Script =======================================
 //= Hypnotist
 //===== By: ==================================================
 //= L0ne_W0lf
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index c3c73ce38..ca5e1b0a4 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -1,3 +1,5 @@
+//===== eAthena Script =======================================
+//= Gunslinger quests
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index 20ab43474..fd435fbd4 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -1,3 +1,5 @@
+//===== eAthena Script =======================================
+//= Ninja quests
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 6e84d1aff..2931d06f8 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -1,16 +1,16 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Old Blue Box Quest
-//===== By ================================================
+//===== By ===================================================
 //= Celesta, Lupus
-//===== Version ===========================================
+//===== Version ==============================================
 //= 1.6a
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= SVN3000+
-//===== Description =======================================
+//===== Description ==========================================
 //= Official OBB Quest. You can pass it any times you want.
 //= 1.6 Updated, fixed, optimized and translated into English [Lupus]
 //= 1.6a Halved the required items to make an obb, thanks to marquis007 [MasterOfMuppets]
-//===== Description =======================================
+//===== Description ==========================================
 
 alberta,115,204,5	script	Tourist	97,{
 	mes "[Tourist]";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 18c67a177..8ec262c57 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -1,15 +1,15 @@
-//===== Athena Script =======================================
+//===== eAthena Script =======================================
 //= Quest NPCs related to Ayothaya
-//===== By ================================================
+//===== By ===================================================
 //= Fredzilla
-//===== Version ===========================================
+//===== Version ==============================================
 //= 1.6
-//===== Compatible With ===================================
+//===== Compatible With ======================================
 //= eAthena 1.0
-//===== Description =======================================
+//===== Description ==========================================
 //= Ayothaya Clue Quest, Ayothaya Shrimp Quest, Ayothaya
 //= Dungeon Quest, Tom Yum Goong Quest,
-//===== Comments ==========================================
+//===== Comments =============================================
 //= List or Variables used
 //= @fishing - 	Checks for if you have caught a fish or not, 
 //=	       	1/10 chance you will get the wedding ring if 
@@ -28,7 +28,7 @@
 //= 1.5 Removed Duplicates [Silent]
 //= 1.6 Moved quests from cities/ to here:
 //= Shrimp, Dungeon, Tom Yum Goong [Evera]
-//=========================================================
+//============================================================
 
 //============================================================
 //============================================== Ayothaya Clue
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 3b7c96b19..e1ffe0a2f 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -1,18 +1,18 @@
-//===== Athena Script =====================================

+//===== eAthena Script =======================================

 //= Juperos Dungeon Quests

-//===== By ================================================

+//===== By ===================================================

 //= MasterOfMuppets

-//===== Version ===========================================

+//===== Version ==============================================

 //= 1.1

-//===== Compatible With ===================================

+//===== Compatible With ======================================

 //= eAthena 1.0

-//===== Description =======================================

+//===== Description ==========================================

 //= Juperos Ruins related Quests

-//===== Comments ==========================================

+//===== Comments =============================================

 //= 1.0 First version, partly implemented [MasterOfMuppets]

 //= 1.1 Added official Juperos Ruins History Quest. Thanks

 //= to Keplerk for his first version. [SinSloth]

-//=========================================================

+//============================================================

 

 yuno_in04,190,125,4	script	Scholar	700,{

 

diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt
index 271288235..f410ec860 100644
--- a/npc/warps/cities/alberta.txt
+++ b/npc/warps/cities/alberta.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Alberta Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt
index 370fab0fb..6a8fca2ff 100644
--- a/npc/warps/cities/aldebaran.txt
+++ b/npc/warps/cities/aldebaran.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Al de Baran Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index a855c3409..0a8858978 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Amatsu Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt
index 279281023..400ef2c06 100644
--- a/npc/warps/cities/ayothaya.txt
+++ b/npc/warps/cities/ayothaya.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Ayothaya Town Warps Script
 //===== By: ==================================================
 //= Muad_Dib, L0ne_W0lf (1.0)
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index 6ea63eff0..f63c8ee42 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Comodo Warp Script
 //===== By: ==================================================
 //= eAthena dev team
diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt
index 600143b01..83ddec989 100644
--- a/npc/warps/cities/einbroch.txt
+++ b/npc/warps/cities/einbroch.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Einbroch Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.3), SSUNNY@YOUNG(1.7), erKURITA (1.8)
diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt
index 697b041d5..08ed3490c 100644
--- a/npc/warps/cities/geffen.txt
+++ b/npc/warps/cities/geffen.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index 8eb6ca9f6..afbba5ac9 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Gonryun Town Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt
index 276a47dc7..444acdd99 100644
--- a/npc/warps/cities/hugel.txt
+++ b/npc/warps/cities/hugel.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Garden City Hugel Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.1)
@@ -19,7 +19,7 @@
 //= 1.6 Some official warps [Playtester]
 //============================================================
 
-//= Hugel City ================================================
+//= Hugel City ===============================================
 
 //Entrance
 hu_fild06,200,372,0	warp	hugel01	1,1,hugel,95,37
diff --git a/npc/warps/cities/izlude.txt b/npc/warps/cities/izlude.txt
index 8ab2841f4..a6454aa6d 100644
--- a/npc/warps/cities/izlude.txt
+++ b/npc/warps/cities/izlude.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Izlude Warp Script
 //===== By: ==================================================
 //= Athena (1.0), Nana (1.1)
diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt
index 17035392a..9ca5914d9 100644
--- a/npc/warps/cities/lighthalzen.txt
+++ b/npc/warps/cities/lighthalzen.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lighthalzen Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt
index 4ca33c483..7e0cc2f97 100644
--- a/npc/warps/cities/louyang.txt
+++ b/npc/warps/cities/louyang.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lou Yang Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
@@ -15,7 +15,7 @@
 //= 1.3 Fixed a few warp-back [erKURITA]
 //============================================================
 
-//= Louyang Town ============================================
+//= Louyang Town =============================================
 louyang,217,22,0	warp	louwarp001	3,3,lou_fild01,232,353
 louyang,37,270,0	warp	louwarp002	3,3,lou_dun01,218,196
 louyang,218,253,0	warp	louwarp005	3,3,lou_in01,101,122
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index 1d39a9e28..2679db67e 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lutie Warp Script
 //===== By: ==================================================
 //= Athena (1.0) Nana (1.1)
diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt
index 8aa210c1d..32249fb5f 100644
--- a/npc/warps/cities/morroc.txt
+++ b/npc/warps/cities/morroc.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Morroc Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt
index db7529f1b..2c03eef40 100644
--- a/npc/warps/cities/moscovia.txt
+++ b/npc/warps/cities/moscovia.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Moscovia City Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt
index e20f7b347..8ab516b3e 100644
--- a/npc/warps/cities/nameless.txt
+++ b/npc/warps/cities/nameless.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Nameless Island Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt
index 91437bc22..58824938f 100644
--- a/npc/warps/cities/niflheim.txt
+++ b/npc/warps/cities/niflheim.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Niflheim Warp Script
 //===== By: ==================================================
 //= PKGINGO (1.0)
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index ef3564f19..eb1c1ff29 100644
--- a/npc/warps/cities/prontera.txt
+++ b/npc/warps/cities/prontera.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Prontera Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index 49d3aeb1a..39b3cc3a5 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Rachel Warp Script
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index 47aca7de9..e166387e2 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Umbala Warp Script
 //===== By: ==================================================
 //= Darkchild (1.0v A) 
diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt
index f4e6fc21e..80f505531 100644
--- a/npc/warps/cities/veins.txt
+++ b/npc/warps/cities/veins.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Veins City Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt
index 456f83ad9..84a51400f 100644
--- a/npc/warps/cities/yggdrasil.txt
+++ b/npc/warps/cities/yggdrasil.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Yggdrasil Tree Warp Script
 //===== By: ==================================================
 //= PKGINGO (1.0)
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 230b79d74..54d559f57 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Yuno Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt
index 1b2d129fb..f980083d1 100644
--- a/npc/warps/disabled_warps.txt
+++ b/npc/warps/disabled_warps.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Disabled Warps
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/abbey_dun.txt b/npc/warps/dungeons/abbey_dun.txt
index 5e7fa2a77..5ebef4d3a 100644
--- a/npc/warps/dungeons/abbey_dun.txt
+++ b/npc/warps/dungeons/abbey_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Abbey Dungeon Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt
index 6bf41f0b3..71abfabcf 100644
--- a/npc/warps/dungeons/abyss.txt
+++ b/npc/warps/dungeons/abyss.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Abyss Lake Dungeon Warp Script
 //===== By: ==================================================
 //= Muad-Dib (1.0)
diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt
index ed772a59b..93d881914 100644
--- a/npc/warps/dungeons/alberta_duns.txt
+++ b/npc/warps/dungeons/alberta_duns.txt
@@ -1,4 +1,4 @@
-//==== Athena Script ========================================
+//==== eAthena Script ========================================
 //= Alberta Field's Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
index 25ba86713..a8dcef359 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Al de Baran Clock Tower Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/amatsu_dun.txt
index 3e7baa20f..68defa5e9 100644
--- a/npc/warps/dungeons/amatsu_dun.txt
+++ b/npc/warps/dungeons/amatsu_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Amatsu Dungeon Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt
index e0150200f..dfc4e2a5c 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Ant Hell Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt
index 89d26ccd7..75bb8659a 100644
--- a/npc/warps/dungeons/ayo_dun.txt
+++ b/npc/warps/dungeons/ayo_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Ayothaya Dungeon Warp Script
 //===== By: ==================================================
 //= eAthena Team (1.0)
diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/coal_mine.txt
index 8050477d9..38d4f163d 100644
--- a/npc/warps/dungeons/coal_mine.txt
+++ b/npc/warps/dungeons/coal_mine.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Coal Mine Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/com_dun.txt
index 65ab8585b..ba6e36989 100644
--- a/npc/warps/dungeons/com_dun.txt
+++ b/npc/warps/dungeons/com_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Comodo Dungeon Warp
 //===== By: ==================================================
 //= Nana (1.0)
@@ -12,7 +12,7 @@
 //= No comment!
 //============================================================
 
-//Beach Dungeon ==================================================
+//Beach Dungeon ==============================================
 beach_dun,276,67,0	warp	cmd004	1,1,comodo,31,215
 beach_dun2,154,13,0	warp	cmd005	2,1,comodo,176,353
 beach_dun3,17,265,0	warp	cmd007	1,1,comodo,328,175
diff --git a/npc/warps/dungeons/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt
index 40898f7fe..cefca39d0 100644
--- a/npc/warps/dungeons/ein_dun.txt
+++ b/npc/warps/dungeons/ein_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Einbroch Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.3), SSUNNY@YOUNG(1.4)
diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt
index 1b1b03036..573032d0d 100644
--- a/npc/warps/dungeons/geffen_dun.txt
+++ b/npc/warps/dungeons/geffen_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
index 6f60ba611..847f4bde8 100644
--- a/npc/warps/dungeons/gon_dun.txt
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Gonryun Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt
index fc4920c13..e26f7cd3a 100644
--- a/npc/warps/dungeons/ice_dun.txt
+++ b/npc/warps/dungeons/ice_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Ice Dungeon Warp Script
 //===== By: ==================================================
 //= Playtester
@@ -11,7 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 Initial version [Playtester]
 //= 1.1 Official warps [Playtester]
-//= 1.2 Added quest warp. FLoor 4 to floor 3. [L0ne_W0lf[
+//= 1.2 Added quest warp. FLoor 4 to floor 3. [L0ne_W0lf]
 //============================================================
 
 ice_dun01,157,10,0	warp	ice001	1,1,ra_fild01,233,327
diff --git a/npc/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/izlude_dun.txt
index f010492ea..199e35116 100644
--- a/npc/warps/dungeons/izlude_dun.txt
+++ b/npc/warps/dungeons/izlude_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Izlude Dungeon Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt
index e2481512a..3208e4c3d 100644
--- a/npc/warps/dungeons/juperos.txt
+++ b/npc/warps/dungeons/juperos.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Juperos Dungeon Warp Script
 //===== By: ==================================================
 //= Muad-Dib (1.0)
diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt
index 096e5fd03..ee2337871 100644
--- a/npc/warps/dungeons/kiel_dun.txt
+++ b/npc/warps/dungeons/kiel_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Kiel Dungeon Warp Script
 //===== By: ==================================================
 //= Lost Kakashi
diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt
index c5aafeb6c..c91b04565 100644
--- a/npc/warps/dungeons/lhalzen_dun.txt
+++ b/npc/warps/dungeons/lhalzen_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lighthalzen Dungeon Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt
index d1c19ee76..ff14558bb 100644
--- a/npc/warps/dungeons/lutie_dun.txt
+++ b/npc/warps/dungeons/lutie_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lutie Dungeon (Toy Factory) Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt
index 261144cf6..c570d4a42 100644
--- a/npc/warps/dungeons/morroc_duns.txt
+++ b/npc/warps/dungeons/morroc_duns.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Morroc Dungeons Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt
index 6cbbfde42..55d31b40d 100644
--- a/npc/warps/dungeons/mosk_dun.txt
+++ b/npc/warps/dungeons/mosk_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Moscovia Dungeon Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt
index 0ffee0a92..6f1df0022 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Odin Temple Warp Script
 //===== By: ==================================================
 //= birkiczd  (1.0)
diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orc_dun.txt
index 78255ef87..debd6217c 100644
--- a/npc/warps/dungeons/orc_dun.txt
+++ b/npc/warps/dungeons/orc_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Orc Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt
index 5f7eee910..fc038d31a 100644
--- a/npc/warps/dungeons/prt_dun.txt
+++ b/npc/warps/dungeons/prt_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Prontera Dungeons Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt
index aa724c6c9..052f46529 100644
--- a/npc/warps/dungeons/rachel_dun.txt
+++ b/npc/warps/dungeons/rachel_dun.txt
@@ -1,20 +1,20 @@
-//==== Athena Script =====================================
+//===== eAthena Script =======================================
 //= Rachel Sanctuary Dungeon Warp Script
-//==== By ================================================
+//===== By ===================================================
 //= Playtester
-//==== Current Version :==================================
+//===== Current Version :=====================================
 //= 1.4
-//==== Compatible With :==================================
+//===== Compatible With :=====================================
 //= Any Athena Version
-//==== Description :======================================
+//===== Description :=========================================
 //= Warp Points For Rachel Sanctuary Dungeon
-//==== Additional Comment:================================
+//===== Additional Comment:===================================
 //= 1.1 Added $ephiroth's warps [Playtester]
 //= 1.2 Replaced old versions with jAthena's [Playtester]
 //= 1.3 Official warps [Playtester]
 //= 1.4 Added quest map warp to random warp. [L0ne_W0lf]
 //=	Added Dungeon exit back into temple.
-//========================================================
+//============================================================
 
 ra_san01,139,13,0	script	sanctuary01	45,1,1,{
 	if (ra_tem_q == 21) { warp "que_san04",119,110; end; }
diff --git a/npc/warps/dungeons/thor_dun.txt b/npc/warps/dungeons/thor_dun.txt
index d9798bc2a..97a7be547 100644
--- a/npc/warps/dungeons/thor_dun.txt
+++ b/npc/warps/dungeons/thor_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Thor's Volcano Dungeon Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt
index 5c986b3b6..9f3ce3000 100644
--- a/npc/warps/dungeons/umbala_dun.txt
+++ b/npc/warps/dungeons/umbala_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Umbala Dungeon (Yggdrasil Cave) Warp Script
 //===== By: ==================================================
 //= Darkchild (1.0vA); Athena (1.0vB)
diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/yuno_dun.txt
index 9dcb7d009..2459241e2 100644
--- a/npc/warps/dungeons/yuno_dun.txt
+++ b/npc/warps/dungeons/yuno_dun.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Yuno Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index 77573d261..f927f8b22 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Abyss Cave Warper
 //===== By: ==================================================
 //= erKURITA
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index ddfc57f69..cc61996e8 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Amatsu Field Warp's
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
index 7ab7ebe35..5e60150b3 100644
--- a/npc/warps/fields/com_fild.txt
+++ b/npc/warps/fields/com_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Comodo Warp Script
 //===== By: ==================================================
 //= Nana
diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt
index 2d9d9cb92..ef9cba74a 100644
--- a/npc/warps/fields/ein_fild.txt
+++ b/npc/warps/fields/ein_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Einbroch Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0), SSUNNY@YOUNG(1.2)
diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt
index ac15da3ca..b7707192f 100644
--- a/npc/warps/fields/gefenia.txt
+++ b/npc/warps/fields/gefenia.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Gefenia Warp Script
 //===== By: ==================================================
 //= Muad Dib (1.0)
diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt
index 932861f61..778b1b063 100644
--- a/npc/warps/fields/geffen_fild.txt
+++ b/npc/warps/fields/geffen_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Geffen Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index cec683191..adfcd9179 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Glastheim Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt
index dc7ed999c..2b7053cca 100644
--- a/npc/warps/fields/hugel_fild.txt
+++ b/npc/warps/fields/hugel_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Hugel Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
@@ -13,7 +13,7 @@
 //= 1.1 Official warps [Playtester]
 //============================================================
 
-//= Hugel Field ================================================
+//= Hugel Field ==============================================
 ein_fild04,343,293,0	warp	hugel001	1,1,ein_fild05,80,294
 ein_fild05,76,294,0	warp	hugel001a	1,1,ein_fild04,336,292
 ein_fild05,376,183,0	warp	hugel002	1,1,ein_fild06,47,166
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
index fe50d24d3..78cae5473 100644
--- a/npc/warps/fields/jawaii.txt
+++ b/npc/warps/fields/jawaii.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Jawaii Warp Script
 //===== By: ==================================================
 //= Muad Dib (1.0)
diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt
index aa7b22240..bf57ed914 100644
--- a/npc/warps/fields/lhalzen_fild.txt
+++ b/npc/warps/fields/lhalzen_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lighthalzen Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index f84196a14..a7d0f3921 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Lutie Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt
index d94f3d20f..4d9fd13bc 100644
--- a/npc/warps/fields/morroc_fild.txt
+++ b/npc/warps/fields/morroc_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Morroc Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
index e01034c25..7523297cc 100644
--- a/npc/warps/fields/mtmjolnir.txt
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Mt. Mjolnir Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/prontera_fild.txt b/npc/warps/fields/prontera_fild.txt
index 9571a87fa..fc5d82a7d 100644
--- a/npc/warps/fields/prontera_fild.txt
+++ b/npc/warps/fields/prontera_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Prontera Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index 6bc84f181..b61bff8eb 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Rachel Field Warp Script
 //===== By: ==================================================
 //= Playtester
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
index 683974fdd..95e9f2669 100644
--- a/npc/warps/fields/umbala_fild.txt
+++ b/npc/warps/fields/umbala_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Umbala Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
index cd49a48b3..e98cfef35 100644
--- a/npc/warps/fields/veins_fild.txt
+++ b/npc/warps/fields/veins_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Veins Field Warp Script
 //===== By: ==================================================
 //= $ephiroth
diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt
index 3b93a8aa2..cd5afe441 100644
--- a/npc/warps/fields/yuno_fild.txt
+++ b/npc/warps/fields/yuno_fild.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Yuno Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0), Sara
diff --git a/npc/warps/guild/guildcastles.txt b/npc/warps/guild/guildcastles.txt
index d80699290..92c2b8b26 100644
--- a/npc/warps/guild/guildcastles.txt
+++ b/npc/warps/guild/guildcastles.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Guild Castles Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
index ed4f1b256..69e97c520 100644
--- a/npc/warps/other/airplane.txt
+++ b/npc/warps/other/airplane.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Airports & Airplanes Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0), SSUNNY@YOUNG(1.6)
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index 610a8e377..1ff42c441 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -1,5 +1,4 @@
-//============================================================
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Arena Warps
 //===== By: ==================================================
 //= SinSloth
diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt
index d09be4de5..08168c836 100644
--- a/npc/warps/other/god.txt
+++ b/npc/warps/other/god.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= God Seal Quest Warps
 //===== By: ==================================================
 //= MasterOfMuppets && SinSloth
@@ -12,7 +12,7 @@
 //= 1.0 Added some warps of the Sleipnir part [SinSloth]
 //============================================================
 
-yuno,218,180,0	warp	yuno_god01	1,1,que_god01,99,84				
+yuno,218,180,0	warp	yuno_god01	1,1,que_god01,99,84
 que_god01,99,81,0	warp	god01_yuno	1,1,yuno,218,177
 que_god01,63,88,0	warp	god_sl_w0-1	1,1,que_god01,87,92	
 que_god01,62,116,0	warp	god_sl_w1-1	1,1,que_god01,46,94	
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index a6086f46d..23f36c076 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Job Quest Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 7ca01c475..8bfa968a4 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Kiel Warp Script (Kiel Buildings)
 //===== By: ==================================================
 //= Playtester; L0ne_W0lf
diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt
index 1e3a1290a..9e6bd30e2 100644
--- a/npc/warps/other/other.txt
+++ b/npc/warps/other/other.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Other Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
diff --git a/npc/warps/other/sign.txt b/npc/warps/other/sign.txt
index 74a636d70..9b53b0967 100644
--- a/npc/warps/other/sign.txt
+++ b/npc/warps/other/sign.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Sign Quest Warps
 //===== By: ==================================================
 //= MasterOfMuppets
diff --git a/npc/warps/pvp/pvp.txt b/npc/warps/pvp/pvp.txt
index 5cee4f3b2..3e9d055e8 100644
--- a/npc/warps/pvp/pvp.txt
+++ b/npc/warps/pvp/pvp.txt
@@ -1,4 +1,4 @@
-//===== Athena Script ========================================
+//===== eAthena Script =======================================
 //= Prontera Arena & PvP Warp Script
 //===== By: ==================================================
 //= Athena (any)