Merge pull request #1 from Earisu/master

updating, with earisu's

26 files changed, 200 insertions, 260 deletions

diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 27d60a48a..3909d63b2 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Alberta Town
 //===== By: ================================================== 
 //= DZeroX
 //===== Current Version: ===================================== 
 //= 1.6
-//===== Compatible With: ===================================== 
-//= rAthena 1.0
 //===== Description: ========================================= 
 //= Town-specific Alberta NPCs
 //===== Additional Comments: ================================= 
@@ -69,45 +67,41 @@ alberta,131,139,2	script	Drunken Old Man	54,{
 	mes "Wh-what are you";
 	mes "staring at? Get lost!!";
 	next;
-	switch(select("Say nothing.","Leave him alone.")) {
-		case 1:
+	if(select("Say nothing.","Leave him alone.") == 1) {
+		mes "[Deagle]";
+		mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
+		next;
+		if(select("Never heard of it.","Really? No kidding!") == 1) {
 			mes "[Deagle]";
-			mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
+			mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
 			next;
-			switch(select("Never heard of it.","Really? No kidding!")) {
-				case 1:
-					mes "[Deagle]";
-					mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
-					next;
-					mes "[Deagle]";
-					mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
-					next;
-					mes "[Deagle]";
-					mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
-					close;
-				case 2:
-					mes "[Deagle]";
-					mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
-					next;
-					mes "[Deagle]";
-					mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
-					next;
-					mes "[Deagle]";
-					mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
-					next;
-					mes "[Deagle]";
-					mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
-					next;
-					mes "[Deagle]";
-					mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
-					close;
-			}
-		case 2:
 			mes "[Deagle]";
-			mes "That's right!";
-			mes "Go AWAY~";
+			mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
+			next;
+			mes "[Deagle]";
+			mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
 			close;
+		}
+		mes "[Deagle]";
+		mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
+		next;
+		mes "[Deagle]";
+		mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
+		next;
+		mes "[Deagle]";
+		mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
+		next;
+		mes "[Deagle]";
+		mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
+		next;
+		mes "[Deagle]";
+		mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
+		close;
 	}
+	mes "[Deagle]";
+	mes "That's right!";
+	mes "Go AWAY~";
+	close;
 }
 
 alberta,58,80,2	script	Shakir	99,{
@@ -234,7 +228,7 @@ alb2trea,39,50,6	script	Fisk#a2t	100,{
 	mes "[Fisk]";
 	mes "So you wanna head back to the mainland in Alberta, eh?";
 	next;
-	if(select("Yes please.","I changed my mind.")==1)
+	if(select("Yes please.","I changed my mind.") == 1)
 		warp "alberta",192,169;
 	close;
 }
@@ -257,25 +251,22 @@ alberta,195,151,2	script	Paul	86,{
 	mes "fee is only";
 	mes "200 Zeny.";
 	next;
-	switch(select("Sign me up!","Uh, no thanks.")) {
-		case 1:
-			if (Zeny < 200) {
-				mes "[Paul]";
-				mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
-				close;
-			} else {
-				set Zeny,Zeny - 200;
-				warp "alb2trea",62,69;
-				close;
-			}
-		case 2:
+	if(select("Sign me up!","Uh, no thanks.") == 1) {
+		if (Zeny < 200) {
 			mes "[Paul]";
-			mes "Alright, well...";
-			mes "I'll be around";
-			mes "if you change";
-			mes "your mind.";
+			mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
 			close;
+		}
+		set Zeny,Zeny - 200;
+		warp "alb2trea",62,69;
+		close;
 	}
+	mes "[Paul]";
+	mes "Alright, well...";
+	mes "I'll be around";
+	mes "if you change";
+	mes "your mind.";
+	close;
 }
 
 alberta,190,173,4	script	Phelix	85,{
@@ -301,111 +292,106 @@ alberta,190,173,4	script	Phelix	85,{
 		mes "If you're interested in my offer, get me the stuff I mentioned.";
 		set @event_zelopy,1;
 		close;
-	} else {
-		mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
+	}
+	mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
+	next;
+	if(select("Red Potions please.","Carrots please.") == 1) {
+		mes "[Phelix]";
+		mes "Alright...";
+		mes "Let's see";
+		mes "what'cha got...";
+		next;
+		mes "[Phelix]";
+		if (countitem(909) < 10) {
+			mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
+			close;
+		}
+		set .@max,countitem(909)/10;
+		mes "Hmm, not bad...";
+		mes "How many potions";
+		mes "do you want to get?";
 		next;
-		switch(select("Red Potions please.","Carrots please.")) {
+		switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
 		case 1:
+			delitem 909,.@max*10;	// Jellopy
+			getitem 501,.@max;	// Red_Potion
+			break;
+		case 2:
 			mes "[Phelix]";
-			mes "Alright...";
-			mes "Let's see";
-			mes "what'cha got...";
+			mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
+			mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
+			input .@amount;
 			next;
 			mes "[Phelix]";
-			if (countitem(909) < 10) {
-				mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
-				close;
-			} else {
-				set .@max,countitem(909)/10;
-				mes "Hmm, not bad...";
-				mes "How many potions";
-				mes "do you want to get?";
-				next;
-				switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
-				case 1:
-					delitem 909,.@max*10;	// Jellopy
-					getitem 501,.@max;	// Red_Potion
-					break;
-				case 2:
-					mes "[Phelix]";
-					mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
-					mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
-					input .@amount;
-					next;
-					mes "[Phelix]";
-					if (.@amount <= 0) {
-						mes "Much obliged, come again anytime.";
-						close;
-					}
-					if (.@amount > 100) {
-						mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
-						close;
-					}
-					if (countitem(909) < .@amount*10) {
-						mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
-						close;
-					}
-					delitem 909,.@amount*10;	// Jellopy
-					getitem 501,.@amount;	// Red_Potion
-					break;
-				case 3:
-					mes "[Phelix]";
-					mes "No problem,";
-					mes "see you next time.";
-					close;
-				}
-				mes "[Phelix]";
-				mes "There you go! As I promised. Don't go suckin' them all down at once.";
+			if (.@amount <= 0) {
+				mes "Much obliged, come again anytime.";
 				close;
 			}
-		case 2:
-			mes "[Phelix]";
-			mes "Alright, let's see what ya got...";
-			next;
-			mes "[Phelix]";
-			if (countitem(909) < 3) {
-				mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
+			if (.@amount > 100) {
+				mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
 				close;
-			} else {
-				set .@max,countitem(909)/3;
-				mes "Not too bad pansy...";
-				mes "How many do you want?";
-				next;
-				switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
-				case 1:
-					delitem 909,.@max*3;	// Jellopy
-					getitem 515,.@max;	// Carrot
-					break;
-				case 2:
-					mes "[Phelix]";
-					mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
-					input .@amount;
-					next;
-					mes "[Phelix]";
-					if (.@amount == 0) {
-						mes "Alright then, see you next time.";
-						close;
-					}
-					if (.@amount > 100) {
-						mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
-						close;
-					}
-					if (countitem(909) < .@amount*10) {
-						mes "Seems you don't have enough. Go get some more if you want anything else.";
-						close;
-					}
-					delitem 909,.@amount*3;	// Jellopy
-					getitem 515,.@amount;	// Carrot
-					break;
-				case 3:
-					mes "[Phelix]";
-					mes "Catch'ya later.";
-					close;
-				}
-				mes "[Phelix]";
-				mes "There you go~! As I promised. Try not to stuff yer face.";
+			}
+			if (countitem(909) < .@amount*10) {
+				mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
 				close;
 			}
+			delitem 909,.@amount*10;	// Jellopy
+			getitem 501,.@amount;	// Red_Potion
+			break;
+		case 3:
+			mes "[Phelix]";
+			mes "No problem,";
+			mes "see you next time.";
+			close;
 		}
+		mes "[Phelix]";
+		mes "There you go! As I promised. Don't go suckin' them all down at once.";
+		close;
+	}
+	mes "[Phelix]";
+	mes "Alright, let's see what ya got...";
+	next;
+	mes "[Phelix]";
+	if (countitem(909) < 3) {
+		mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
+		close;
 	}
+	set .@max,countitem(909)/3;
+	mes "Not too bad pansy...";
+	mes "How many do you want?";
+	next;
+	switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
+	case 1:
+		delitem 909,.@max*3;	// Jellopy
+		getitem 515,.@max;	// Carrot
+		break;
+	case 2:
+		mes "[Phelix]";
+		mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
+		input .@amount;
+		next;
+		mes "[Phelix]";
+		if (.@amount == 0) {
+			mes "Alright then, see you next time.";
+			close;
+		}
+		if (.@amount > 100) {
+			mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
+			close;
+		}
+		if (countitem(909) < .@amount*10) {
+			mes "Seems you don't have enough. Go get some more if you want anything else.";
+			close;
+		}
+		delitem 909,.@amount*3;	// Jellopy
+		getitem 515,.@amount;	// Carrot
+		break;
+	case 3:
+		mes "[Phelix]";
+		mes "Catch'ya later.";
+		close;
+	}
+	mes "[Phelix]";
+	mes "There you go~! As I promised. Try not to stuff yer face.";
+	close;
 }
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index 0a28caade..d49a4f8f0 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Al De Baran Town
 //===== By: ================================================== 
-//= rAthena dev team; L0ne_W0lf
+//= L0ne_W0lf, rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 2.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Al De Baran Town NPCs
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 1458815c7..de68aff7b 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Amatsu Town
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Amatsu Town Script
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index abba76866..1c22c2975 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Ayotaya Town
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
+//= 1.9
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Ayotaya Town Script
@@ -13,6 +11,7 @@
 //= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.7 Fixed character's anme bugs [Lupus]
 //= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy]
+//= 1.9 Updated Warp coordinates to Alberta
 //============================================================ 
 
 // Ayothaya Transportation NPC
@@ -93,9 +92,9 @@ ayothaya,152,68,1	script	Aibakthing#ayo2	843,{
 		mes "You will be welcome to come back whenever you please. I hope that we will see each other again sometime soon. Thank you~";
 		close2;
 		if (checkre(0))
-			warp "alberta",238,22;
-		else
 			warp "alberta",235,45;
+		else
+			warp "alberta",238,22;
 		end;
 	}
 	mes "[Aibakthing]";
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 38d7731ba..31d108710 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Comodo Town
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 2.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Comodo Town NPCs
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index 3e39655e3..a4c969910 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Einbech Town
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena Revision 3000+
 //===== Description: ========================================= 
 //=
 //===== Additional Comments: ================================= 
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 710c57740..27f561007 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Einbroch Town
 //===== By: ================================================== 
 //= Everybody mentioned in the comments
 //===== Current Version: ===================================== 
 //= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena Revision 3000+
 //===== Description: ========================================= 
 //=
 //===== Additional Comments: ================================= 
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index f5cff90d3..bc337bf3c 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Geffen Town
 //===== By: ================================================== 
 //= Everybody mentioned in the comments
 //===== Current Version: ===================================== 
 //= 1.9
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Geffen Town NPCs
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index b3e6b7dda..4d2141e00 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Kunlun Town
 //===== By: ================================================== 
 //= x[tsk], KarLaeda
 //===== Current Version: ===================================== 
 //= 1.6
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Kunlun Town Script
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index aba6f3997..845b81015 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Hugel City
 //===== By: ==================================================
 //= vicious_pucca, Poki#3, erKURITA, Munin, and everybody in the
 //= comments
 //===== Current Version: =====================================
 //= 1.7
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= NPC's for the City of Hugel.
 //===== Additional Comments: =================================
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 156e6b207..da7b650d7 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Izlude Town
 //===== By: ================================================== 
 //= kobra_k88
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.8a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Izlude town NPCs
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index e6706df4a..a54e2a487 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Jawaii (The Lovers' Paradise) Town
 //===== By: ==================================================
 //= jAthena (1.0)
@@ -6,8 +6,6 @@
 //= L0ne_w0lf
 //===== Current Version: =====================================
 //= 3.7
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Official Conversion]
 //= Jawaii Town NPCs
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 9ba02bca3..35af28b2d 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -1,44 +1,12 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Lighthalzen City
 //===== By: ================================================== 
 //=  erKURITA, Au{R}oN (Translated by Alan), $ephiroth
 //===== Current Version: ===================================== 
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Lighthalzen NPCs (Temporal names for now) [erKURITA]
 //===== Additional Comments: ==================================
-//= 0.1 Placed temporal names, why there weren't on the SVN before? [erKURITA]
-//= 0.2 Implemented some crap NPCs [MasterOfMuppets]
-//= 0.3 Another load of NPCs. Scripted by Kargha [MasterOfMuppets]
-//= 0.4 More Town NPCs. [Musashiden]
-//= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden]
-//= 0.6 Fixed some typos+Coordinates. [Musashiden]
-//= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets]
-//= 0.8 Removed Duplicates [Silent]
-//= 0.9 Removed Duplicates [Toms]
-//= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets]
-//= 1.0a added constants to emotions, minor optimization [Lupus]
-//= 1.0b npcid fix [KarLaeda]
-//= 1.1 Added new NPC by $ephiroth and merged other NPCs
-//=	from npc\other\lighthalzen_???.txt [Lupus]
-//= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth]
-//= 1.3	Moved some other NPCs for quests purposes. [SinSloth]
-//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
-//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
-//= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf]
-//=	added missing dialogs, fixed indentation, corrected some NPC
-//=	facing positions, NPC names are more unique now. Removed 
-//=	whitespace (empty lines after header and before end curly)
-//=	reduced usage of the command "goto", grammatical corrections.
-//=	Added additional missing NPCs.
-//= 1.7 Removed Auciton Staff as the offical auction file has been added. [L0ne_W0lf]
-//=	Corrected Lucius so he checks the donation variable. (bugreport:1103) [L0ne_W0lf]
-//= 1.7a Another fix to Lucius. (bugreport:1118) [L0ne_W0lf]
-//= 1.7b Another fix to Lucius (trivial). (bugreport:1125)
-//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
-//= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf]
 //= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard]
 //= 2.1 Commented out Duplicate NPCs. (bugreport:4555)
 //= 2.2 Added missing NPC found in AEGIS files. [L0ne_W0lf]
@@ -3213,3 +3181,37 @@ lhz_in01,221,131,7	script	Scientist#li_01	865,{
 // Lighthalzen Mushroom.
 // Don't really understand why it's there, but it's funny regardless.
 lhz_in01,157,54,0,0	monster	Red Mushroom	1085,1,120000,100000,0
+
+//=========================
+// Older Comments
+//=========================
+//= 0.1 Placed temporal names, why there weren't on the SVN before? [erKURITA]
+//= 0.2 Implemented some crap NPCs [MasterOfMuppets]
+//= 0.3 Another load of NPCs. Scripted by Kargha [MasterOfMuppets]
+//= 0.4 More Town NPCs. [Musashiden]
+//= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden]
+//= 0.6 Fixed some typos+Coordinates. [Musashiden]
+//= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets]
+//= 0.8 Removed Duplicates [Silent]
+//= 0.9 Removed Duplicates [Toms]
+//= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets]
+//= 1.0a added constants to emotions, minor optimization [Lupus]
+//= 1.0b npcid fix [KarLaeda]
+//= 1.1 Added new NPC by $ephiroth and merged other NPCs
+//=	from npc\other\lighthalzen_???.txt [Lupus]
+//= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth]
+//= 1.3	Moved some other NPCs for quests purposes. [SinSloth]
+//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
+//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
+//= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf]
+//=	added missing dialogs, fixed indentation, corrected some NPC
+//=	facing positions, NPC names are more unique now. Removed 
+//=	whitespace (empty lines after header and before end curly)
+//=	reduced usage of the command "goto", grammatical corrections.
+//=	Added additional missing NPCs.
+//= 1.7 Removed Auciton Staff as the offical auction file has been added. [L0ne_W0lf]
+//=	Corrected Lucius so he checks the donation variable. (bugreport:1103) [L0ne_W0lf]
+//= 1.7a Another fix to Lucius. (bugreport:1118) [L0ne_W0lf]
+//= 1.7b Another fix to Lucius (trivial). (bugreport:1125)
+//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf]
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 0fc53b045..9f4b41f80 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ====================================== 
 //= Louyang City NPC's 
 //===== By: ================================================== 
 //= Vidar (1.0)
@@ -9,8 +9,6 @@
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 3.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Louyang Town Script
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index 2596e0a4f..95fce1beb 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Lutie Town
 //===== By: ================================================== 
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: ===================================== 
 //= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Lutie - City NPCs
 //===== Additional Comments: ================================= 
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index 07bf61ccf..cd4181552 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Manuk Town
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Town-specific NPCs for Manuk.
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index a533b0fd6..83065d2c6 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Morroc Town
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Morroc Town NPCs
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index e05a4a755..50e5d0e69 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Moscovia Town
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
 //= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Moscovia Town Script
 //===== Additional Comments: ================================= 
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 581dffaf4..d9a6cb19a 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -1,13 +1,10 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Niflheim Script 
 //===== By: ================================================== 
 //= Fyrien, Dizzy, PKGINGO
 //= Official NPCs translated and re-edited by Celest
 //===== Current Version: ===================================== 
 //= 1.5
-//===== Compatible With: ===================================== 
-//= [Aegis Conversion]
-//= rAthena SVN; Niflheim Required
 //===== Description: ========================================= 
 //= Official NPC's for Niflheim
 //= 1.01 Splitted file(guides, shops). Fixed rand() bugs,
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 4d85c3a9c..feea5ed88 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Payon City
 //===== By: ================================================== 
 //= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2)
 //= Darkchild (1.3) DracoRPG (1.5) L0ne_W0lf (2.1)
 //===== Current Version: ===================================== 
 //= 2.1b
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= Payon City Npcs
 //===== Additional Comments: ================================= 
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 8dac3d078..5c81cadce 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Prontera Town
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
 //= 2.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= NPCs in Prontera
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index cf6c0ed64..db3c6816e 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Rachel City NPCs
 //===== By: ==================================================
 //= First Version: Tsuyuki and Harp
 //= iRO Version: L0ne_W0lf
 //===== Current Version: =====================================
 //= 0.9
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Partial Aegis Conversion]
 //= Arunafeltz NPCs
diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt
index 87bf41a81..2a961040d 100644
--- a/npc/cities/splendide.txt
+++ b/npc/cities/splendide.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Splendide Town
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Town-specific NPCs for Splendide.
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 74fc5b6ea..cb8a1e0c0 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Town script
 //===== By: ==================================================
 //= jAthena (1.0) Fusion Dev Team (1.1) Muad Dib (1.2) Darkchild (1.3)
 //===== Current Version: =====================================
 //= 2.1
-//===== Compatible With: =====================================
-//= rAthena SVN; RO Episode XX
 //===== Description: =========================================
 //- [Aegis Conversion]
 //= Umbala Town Npcs
diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt
index 2f066f10d..f07955587 100644
--- a/npc/cities/veins.txt
+++ b/npc/cities/veins.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Veins Town script
 //===== By: ==================================================
 //= Muad_Dib
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Veins Town Npcs
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index 31c57bdc2..f681aa4e4 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Juno City
 //===== By: ================================================== 
 //= KitsuneStarwind, kobra_k88, L0ne_W0lf
 //===== Current Version: ===================================== 
 //= 1.4a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= NPCs for the City of Juno