* A few minor bugs fixed. :3

- Fixed npc in okolnir quest using non-existant event. (Bugreport:3085)
- Translated non-translated lines in Okolnir quest.
- Fixed Asprika quest giving Brynhild requirement message.
- Added missing warps for The Sign quest. (Bugreport:3295)
- Corrected time check for Sir Jore in the Sign Quest.
* Updated warps for 13.1 maps.

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

16 files changed, 126 insertions, 93 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 34030a286..9ceea9151 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,13 @@
 Date		Added
 ======
+2009/07/07
+	* Rev. 13940 A few minor bugs fixed. :3 [L0ne_W0lf]
+	- Fixed npc in okolnir quest using non-existant event. (Bugreport:3085)
+	- Translated non-translated lines in Okolnir quest.
+	- Fixed Asprika quest giving Brynhild requirement message.
+	- Added missing warps for The Sign quest. (Bugreport:3295)
+	- Corrected time check for Sir Jore in the Sign Quest.
+	* Updated warps for 13.1 maps.
 2009/06/09
 	* Rev. 13878 Implemented rewrite of the quest "The Sign". [L0ne_W0lf]
 	- Attempts to save player progress when quest npcs are talked too. This is Untested.
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 6e3e5ad7d..4c9bb54c7 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
-//= 3.0
+//= 3.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //=     Due to the incompatabity of the old script with this
 //=     version, variables will attmept to be translated to the
 //=     new version, however it is untested.
+//= 3.1 Corrected time check for Sir Jore. [L0ne_W0lf]
 //============================================================ 
 
 //============================================================ 
@@ -2648,7 +2649,7 @@ aldeba_in,139,103,5	script	Monograph#sign	111,{
 
 aldeba_in,155,101,3	script	Sir Jore#sign	805,7,7,{
 	callfunc "F_UpdateSignVars";
-	if ((gettime(3) > 17) && (gettime(3) < 22)) {
+	if ((gettime(3) > 16) && (gettime(3) < 22)) {
 		if (sign_q == 15) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "Excuse me...";
diff --git a/npc/quests/okolnir/godse_aru01.txt b/npc/quests/okolnir/godse_aru01.txt
index add9434f6..f5617f6c3 100644
--- a/npc/quests/okolnir/godse_aru01.txt
+++ b/npc/quests/okolnir/godse_aru01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,10 @@
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     Fixed two NPC named that were missed when translating.
 //=     Fixed Dialog that was overlooked in some files and not others.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
+//=     Removed extra dialog that was used in the Brynhild quest.
 //============================================================ 
 
 arug_cas01,161,371,3	script	Guide#gq_aru01	899,{
@@ -262,10 +266,6 @@ que_qaru01,345,82,3	script	Wish Maiden#gq_aru01	403,{
 				mes "a Heavenly Maiden's Robe, as well as Soft feathers.";
 				next;
 				mes "[Wish Maiden]";
-				mes "You must bring those six things, 10 Gold, and 20 Elunium.";
-				mes "Many Valhala's Flowers are also required as an offering.";
-				next;
-				mes "[Wish Maiden]";
 				mes "Once all of those are prepared, the gate will open.";
 				next;
 				mes "[Wish Maiden]";
@@ -884,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1841,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qaru01","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#aru01::OnDisable";
+	disablenpc "Piamette#aru01";
 	monster "que_qaru01",131,135,"Angry Piamette",1930,1,"#piamette_aru01::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_aru02.txt b/npc/quests/okolnir/godse_aru02.txt
index 2a3cb2c53..7ae66cc87 100644
--- a/npc/quests/okolnir/godse_aru02.txt
+++ b/npc/quests/okolnir/godse_aru02.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,10 @@
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     Fixed two NPC named that were missed when translating.
 //=     Fixed Dialog that was overlooked in some files and not others.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
+//=     Removed extra dialog that was used in the Brynhild quest.
 //============================================================ 
 
 arug_cas02,349,347,3	script	Guide#gq_aru02	899,{
@@ -262,10 +266,6 @@ que_qaru02,345,82,3	script	Wish Maiden#gq_aru02	403,{
 				mes "a Heavenly Maiden's Robe, as well as Soft feathers.";
 				next;
 				mes "[Wish Maiden]";
-				mes "You must bring those six things, 10 Gold, and 20 Elunium.";
-				mes "Many Valhala's Flowers are also required as an offering.";
-				next;
-				mes "[Wish Maiden]";
 				mes "Once all of those are prepared, the gate will open.";
 				next;
 				mes "[Wish Maiden]";
@@ -884,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1841,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qaru02","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#aru02::OnDisable";
+	disablenpc "Piamette#aru02";
 	monster "que_qaru02",131,135,"Angry Piamette",1930,1,"#piamette_aru02::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_aru03.txt b/npc/quests/okolnir/godse_aru03.txt
index fac4f9682..ceea46902 100644
--- a/npc/quests/okolnir/godse_aru03.txt
+++ b/npc/quests/okolnir/godse_aru03.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,10 @@
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     Fixed two NPC named that were missed when translating.
 //=     Fixed Dialog that was overlooked in some files and not others.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
+//=     Removed extra dialog that was used in the Brynhild quest.
 //============================================================ 
 
 arug_cas03,324,161,3	script	Guide#gq_aru03	899,{
@@ -262,10 +266,6 @@ que_qaru03,345,82,3	script	Wish Maiden#gq_aru03	403,{
 				mes "a Heavenly Maiden's Robe, as well as Soft feathers.";
 				next;
 				mes "[Wish Maiden]";
-				mes "You must bring those six things, 10 Gold, and 20 Elunium.";
-				mes "Many Valhala's Flowers are also required as an offering.";
-				next;
-				mes "[Wish Maiden]";
 				mes "Once all of those are prepared, the gate will open.";
 				next;
 				mes "[Wish Maiden]";
@@ -884,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1841,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qaru03","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#aru03::OnDisable";
+	disablenpc "Piamette#aru03";
 	monster "que_qaru03",131,135,"Angry Piamette",1930,1,"#piamette_aru03::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_aru04.txt b/npc/quests/okolnir/godse_aru04.txt
index 1e0f61721..425137bfc 100644
--- a/npc/quests/okolnir/godse_aru04.txt
+++ b/npc/quests/okolnir/godse_aru04.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,10 @@
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     Fixed two NPC named that were missed when translating.
 //=     Fixed Dialog that was overlooked in some files and not others.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
+//=     Removed extra dialog that was used in the Brynhild quest.
 //============================================================ 
 
 arug_cas04,324,161,3	script	Guide#gq_aru04	899,{
@@ -262,10 +266,6 @@ que_qaru04,345,82,3	script	Wish Maiden#gq_aru04	403,{
 				mes "a Heavenly Maiden's Robe, as well as Soft feathers.";
 				next;
 				mes "[Wish Maiden]";
-				mes "You must bring those six things, 10 Gold, and 20 Elunium.";
-				mes "Many Valhala's Flowers are also required as an offering.";
-				next;
-				mes "[Wish Maiden]";
 				mes "Once all of those are prepared, the gate will open.";
 				next;
 				mes "[Wish Maiden]";
@@ -884,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1841,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qaru04","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#aru04::OnDisable";
+	disablenpc "Piamette#aru04";
 	monster "que_qaru04",131,135,"Angry Piamette",1930,1,"#piamette_aru04::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_aru05.txt b/npc/quests/okolnir/godse_aru05.txt
index f8c0531fb..116ba7015 100644
--- a/npc/quests/okolnir/godse_aru05.txt
+++ b/npc/quests/okolnir/godse_aru05.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,10 @@
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     Fixed two NPC named that were missed when translating.
 //=     Fixed Dialog that was overlooked in some files and not others.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
+//=     Removed extra dialog that was used in the Brynhild quest.
 //============================================================ 
 
 arug_cas05,324,161,3	script	Guide#gq_aru05	899,{
@@ -262,10 +266,6 @@ que_qaru05,345,82,3	script	Wish Maiden#gq_aru05	403,{
 				mes "a Heavenly Maiden's Robe, as well as Soft feathers.";
 				next;
 				mes "[Wish Maiden]";
-				mes "You must bring those six things, 10 Gold, and 20 Elunium.";
-				mes "Many Valhala's Flowers are also required as an offering.";
-				next;
-				mes "[Wish Maiden]";
 				mes "Once all of those are prepared, the gate will open.";
 				next;
 				mes "[Wish Maiden]";
@@ -884,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1841,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qaru05","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#aru05::OnDisable";
+	disablenpc "Piamette#aru05";
 	monster "que_qaru05",131,135,"Angry Piamette",1930,1,"#piamette_aru05::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_sch01.txt b/npc/quests/okolnir/godse_sch01.txt
index 8f5d09623..fb1802f93 100644
--- a/npc/quests/okolnir/godse_sch01.txt
+++ b/npc/quests/okolnir/godse_sch01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,9 @@
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     fixed two NPC named that were missed when translating.
 //=     Fixed Dialog that was overlooked in some files and not others.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
 //============================================================ 
 
 schg_cas01,376,307,3	script	Guide#gq_sch01	899,{
@@ -882,7 +885,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1839,7 +1842,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qsch01","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#sch01::OnDisable";
+	disablenpc "Piamette#sch01";
 	monster "que_qsch01",131,135,"Angry Piamette",1930,1,"#piamette_sch01::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_sch02.txt b/npc/quests/okolnir/godse_sch02.txt
index aca3c37ae..4a7040a10 100644
--- a/npc/quests/okolnir/godse_sch02.txt
+++ b/npc/quests/okolnir/godse_sch02.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,9 @@
 //=     Fixed calling an event that doesn't exist when killing Piamete.
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     fixed two NPC named that were missed when translating.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
 //============================================================ 
 
 schg_cas02,181,335,3	script	Guide#gq_sch02	899,{
@@ -881,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1838,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qsch02","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#sch02::OnDisable";
+	disablenpc "Piamette#sch02";
 	monster "que_qsch02",131,135,"Angry Piamette",1930,1,"#piamette_sch02::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_sch03.txt b/npc/quests/okolnir/godse_sch03.txt
index 0950f3f6e..41c5324da 100644
--- a/npc/quests/okolnir/godse_sch03.txt
+++ b/npc/quests/okolnir/godse_sch03.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,9 @@
 //=     Fixed calling an event that doesn't exist when killing Piamete.
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     fixed two NPC named that were missed when translating.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
 //============================================================ 
 
 schg_cas03,84,101,3	script	Guide#gq_sch03	899,{
@@ -881,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1838,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qsch03","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#sch03::OnDisable";
+	disablenpc "Piamette#sch03";
 	monster "que_qsch03",131,135,"Angry Piamette",1930,1,"#piamette_sch03::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_sch04.txt b/npc/quests/okolnir/godse_sch04.txt
index f68e65025..6bca62310 100644
--- a/npc/quests/okolnir/godse_sch04.txt
+++ b/npc/quests/okolnir/godse_sch04.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,9 @@
 //=     Fixed calling an event that doesn't exist when killing Piamete.
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     fixed two NPC named that were missed when translating.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
 //============================================================ 
 
 schg_cas04,376,307,3	script	Guide#gq_sch04	899,{
@@ -881,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1838,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qsch04","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#sch04::OnDisable";
+	disablenpc "Piamette#sch04";
 	monster "que_qsch04",131,135,"Angry Piamette",1930,1,"#piamette_sch04::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/quests/okolnir/godse_sch05.txt b/npc/quests/okolnir/godse_sch05.txt
index 08fbf184d..36645ebf7 100644
--- a/npc/quests/okolnir/godse_sch05.txt
+++ b/npc/quests/okolnir/godse_sch05.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,9 @@
 //=     Fixed calling an event that doesn't exist when killing Piamete.
 //=     Fixed the Wish Maiden not enabling when the boss is killed.
 //=     fixed two NPC named that were missed when translating.
+//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
+//=     Fixed message on the portal when the okolnir section is full.
+//=     Corrected non-angry Piamette not disabling.
 //============================================================ 
 
 schg_cas05,376,307,3	script	Guide#gq_sch05	899,{
@@ -881,7 +884,7 @@ OnTouch:
 		}
 	}
 	else {
-		mes "Á¤¿øÀ» ÃÊ°úÇÏ¿´½À´Ï´Ù. ´õÀÌ»ó ÁøÀÔÇÒ ¼ö ¾ø½À´Ï´Ù.";
+		mes "There are too many people, you can't enter.";
 		close;
 	}
 	end;
@@ -1838,7 +1841,7 @@ OnTimer1000:
 
 OnTimer5000:
 	mapannounce "que_qsch05","Piamette : I'm pissed off now!",bc_map,"0xdb7093";
-	donpcevent "Piamette#sch05::OnDisable";
+	disablenpc "Piamette#sch05";
 	monster "que_qsch05",131,135,"Angry Piamette",1930,1,"#piamette_sch05::OnMyMobDead";
 	stopnpctimer;
 	end;
diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt
index 643152e4f..b4582e4a6 100644
--- a/npc/warps/cities/aldebaran.txt
+++ b/npc/warps/cities/aldebaran.txt
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= 1.2 Added Turbo Room Warps [Justin84]
 //= 1.3 Removed Turbo Track entrance. Scripted warp. [L0ne_W0lf]
+//= 1.4 Added missing warps. [L0ne_W0lf]
 //============================================================
 
 //===== Al De Baran Warps =====================================
@@ -47,5 +48,9 @@ aldeba_in,83,224,0	warp	ald16-1	2,2,aldeba_in,83,188
 aldeba_in,94,38,0	warp	ald02-1	3,2,aldebaran,197,68
 aldeba_in,97,102,0	warp	ald10-1	2,2,aldeba_in,103,58
 
+aldebaran,225,54	warp	aldeb_sign1-1	1,1,aldeba_in,149,120
+aldeba_in,149,123	warp	aldeb_sign1-2	3,2,aldebaran,223,56
+
+
 //Turbo Track Room
 turbo_room,100,62,0	warp	exit_turbo	1,1,alde_gld,183,198
diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt
index acdc9e04e..65d346936 100644
--- a/npc/warps/cities/mid_camp.txt
+++ b/npc/warps/cities/mid_camp.txt
@@ -3,42 +3,45 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points for Another World
+//= Warp points to and from fild22b and mid_camp are temporary.
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Fixed a small bug by brianlew, bugreport:1824 [Brainstorm]
 //= 1.2 Corrected the observatory warp portal, thanks to Ziu. [brianluau]
+//= 1.3 Added warps, and also Updated warp positions. [L0ne_W0lf]
 //============================================================
 
-moc_fild22b,233,197,0	warp	moc_fild22b1-1	1,1,mid_camp,210,290
 mid_camp,210,293,0	warp	moc_fild22b1-2	1,1,moc_fild22b,241,195
-mid_camp,205,211,0	warp	mid_weapon1-1	1,1,mid_campin,230,124
-mid_campin,233,124,0	warp	mid_weapon1-2	1,1,mid_camp,207,211
-mid_campin,222,108,0	warp	mid_weapon1-3	1,1,mid_camp,198,205
-mid_camp,196,204,0	warp	mid_weapon1-4	1,1,mid_campin,221,111
-mid_camp,214,249,0	warp	mid_meeting1-1	1,1,mid_campin,90,101
-mid_campin,90,98,0	warp	mid_meeting1-2	1,1,mid_camp,215,246
-mid_campin,113,113,0	warp	mid_meeting2-1	1,1,mid_campin,164,82
-mid_campin,162,82,0	warp	mid_meeting2-2	1,1,mid_campin,110,113
-mid_campin,113,119,0	warp	mid_meeting3-1	1,1,mid_campin,164,126
-mid_campin,162,126,0	warp	mid_meeting3-2	1,1,mid_campin,110,119
-mid_campin,111,127,0	warp	mid_meeting4-1	1,1,mid_campin,164,170
-mid_campin,162,170,0	warp	mid_meeting4-2	1,1,mid_campin,109,127
-mid_campin,93,141,0	warp	mid_meeting5-1	1,1,mid_campin,65,180
-mid_campin,65,178,0	warp	mid_meeting5-2	1,1,mid_campin,93,138
-mid_campin,85,141,0	warp	mid_meeting6-1	1,1,mid_campin,117,180
-mid_campin,117,178,0	warp	mid_meeting6-2	1,1,mid_campin,85,138
-mid_campin,68,127,0	warp	mid_meeting7-1	1,1,mid_campin,23,168
-mid_campin,25,168,0	warp	mid_meeting7-2	1,1,mid_campin,70,127
-mid_campin,66,119,0	warp	mid_meeting8-1	1,1,mid_campin,23,124
-mid_campin,25,124,0	warp	mid_meeting8-2	1,1,mid_campin,69,119
-mid_campin,66,113,0	warp	mid_meeting9-1	1,1,mid_campin,23,80
-mid_campin,25,80,0	warp	mid_meeting9-2	1,1,mid_campin,69,113
+mid_camp,205,211,0	warp	mid_weapon1-1	1,1,mid_campin,229,123
+mid_campin,232,123,0	warp	mid_weapon1-2	1,1,mid_camp,208,211
+mid_camp,196,204,0	warp	mid_weapon2-1	1,1,mid_campin,220,109
+mid_campin,223,109,0	warp	mid_weapon2-2	1,1,mid_camp,198,205
+mid_camp,214,249,0	warp	mid_meeting1-1	1,1,mid_campin,89,102
+mid_campin,89,99,0	warp	mid_meeting1-2	1,1,mid_camp,215,247
+mid_campin,66,114,0	warp	mid_meeting2-1	1,1,mid_campin,22,80
+mid_campin,25,80,0	warp	mid_meeting2-2	1,1,mid_campin,70,114
+mid_campin,66,120,0	warp	mid_meeting3-1	1,1,mid_campin,22,124
+mid_campin,25,124,0	warp	mid_meeting3-2	1,1,mid_campin,70,120
+mid_campin,68,128,0	warp	mid_meeting4-1	1,1,mid_campin,22,168
+mid_campin,25,168,0	warp	mid_meeting4-2	1,1,mid_campin,71,128
+mid_campin,86,141,0	warp	mid_meeting5-1	1,1,mid_campin,66,181
+mid_campin,65,178,0	warp	mid_meeting5-2	1,1,mid_campin,86,138
+mid_campin,94,141,0	warp	mid_meeting6-1	1,1,mid_campin,117,181
+mid_campin,117,178,0	warp	mid_meeting6-2	1,1,mid_campin,94,138
+mid_campin,111,128,0	warp	mid_meeting7-1	1,1,mid_campin,165,170
+mid_campin,162,170,0	warp	mid_meeting7-2	1,1,mid_campin,108,128
+mid_campin,113,120,0	warp	mid_meeting8-1	1,1,mid_campin,165,126
+mid_campin,162,126,0	warp	mid_meeting8-2	1,1,mid_campin,110,120
+mid_campin,113,114,0	warp	mid_meeting9-1	1,1,mid_campin,165,82
+mid_campin,162,82,0	warp	mid_meeting9-2	1,1,mid_campin,110,114
 mid_camp,266,260,0	warp	mid_house1-1	1,1,mid_campin,284,124
 mid_campin,282,124,0	warp	mid_house1-2	1,1,mid_camp,263,260
-mid_camp,163,231,0	warp	mid_house2-1	1,1,mid_campin,376,134
-mid_campin,376,137,0	warp	mid_house2-2	1,1,mid_camp,163,233
+mid_camp,163,231,0	warp	mid_house2-1	1,1,mid_campin,376,133
+mid_campin,376,136,0	warp	mid_house2-2	1,1,mid_camp,163,234
+
diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt
index 7ea8f2802..5905addb2 100644
--- a/npc/warps/fields/man_fild.txt
+++ b/npc/warps/fields/man_fild.txt
@@ -3,16 +3,17 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points for Manuk Field
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.1 Updated warps positions. [L0ne_W0lf]
 //============================================================
 
-mid_camp,320,139,0	warp	man_fild01-1	1,1,man_fild01,36,238
-man_fild01,44,234,0	warp	man_fild01-2	1,1,mid_camp,320,143
-man_fild01,105,56,0	warp	man_fild01-3	1,1,man_fild03,79,363
-man_fild03,79,369,0	warp	man_fild03-1	1,1,man_fild01,105,59
+man_fild01,35,232,0	warp	man_fild01-2	1,1,mid_camp,341,176
+man_fild01,103,55,0	warp	man_fild01-3	1,1,man_fild03,84,366
+man_fild03,84,369,0	warp	man_fild03-1	1,1,man_fild01,103,58
diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt
index a11ed0016..66c7e7e4a 100644
--- a/npc/warps/fields/spl_fild.txt
+++ b/npc/warps/fields/spl_fild.txt
@@ -3,21 +3,21 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Splendid
+//= [Aegis Conversion]
+//= Warp Points for Splendide
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Fixed misplaced warp. [L0ne_W0lf]
+//= 1.2 Updated warps positions. [L0ne_W0lf]
 //============================================================
 
-mid_camp,12,142,0	warp	spl_fild02-1	1,1,spl_fild02,378,144
-spl_fild02,382,144,0	warp	spl_fild02-2	1,1,mid_camp,16,142
-mid_camp,9,216,0	warp	spl_fild02-3	1,1,spl_fild02,378,215
-spl_fild02,382,215,0	warp	spl_fild02-4	1,1,mid_camp,16,216
-spl_fild02,295,5,0	warp	spl_fild02-5	1,1,spl_fild03,305,375
-spl_fild02,97,24,0	warp	spl_fild02-6	1,1,spl_fild03,105,369
-spl_fild03,305,379,0	warp	spl_fild03-1	1,1,spl_fild02,298,9
-spl_fild03,105,373,0	warp	spl_fild03-2	1,1,spl_fild02,97,29
+spl_fild02,382,143,0	warp	spl_fild02-2	1,1,mid_camp,16,143
+spl_fild02,383,216,0	warp	spl_fild02-4	1,1,mid_camp,12,215
+spl_fild02,310,10,0	warp	spl_fild02-5	1,1,spl_fild03,306,376
+spl_fild03,99,373,0	warp	spl_fild02-6	1,1,spl_fild02,102,32
+spl_fild03,306,379,0	warp	spl_fild03-1	1,1,spl_fild02,311,12
+spl_fild02,103,30,0	warp	spl_fild03-2	1,1,spl_fild03,99,370