* Rather large update to the WoE scripts.

- Eliminated unofficial map-broadcasts (opening treasures/guardian death.)
- Fixed several errors in guardian spawning (script-wise.)
- Treasure spawning itself is done weird... What exactly is the last paramater for anyway? Near as I can see it's ALWAYS 1. Why is it used? what does it do? Why is it undocumented? Mysteries and more!
- Updated dialog and restructured several NPCs.
* Created a unique function for novice WoE as the new manager does not support it.


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

22 files changed, 962 insertions, 1005 deletions

diff --git a/npc/guild/aldeg/aldeg_ev_agit.txt b/npc/guild/aldeg/aldeg_ev_agit.txt
index 41db26690..518ae1fe8 100644
--- a/npc/guild/aldeg/aldeg_ev_agit.txt
+++ b/npc/guild/aldeg/aldeg_ev_agit.txt
@@ -4,7 +4,7 @@
 //= jAthena (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88]
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
+//= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf]
 //============================================================
 
 
@@ -35,7 +36,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "aldeg_cas01",GetCastleData("aldeg_cas01",1),6;
-	Monster "aldeg_cas01",216,24,"EMPERIUM",1288,1,"Agit_A01::OnAgitBreak";
+	Monster "aldeg_cas01",216,24,"Emperium",1288,1,"Agit_A01::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","aldeg_cas01","A01";
@@ -62,7 +63,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "aldeg_cas02",GetCastleData("aldeg_cas02",1),6;
-	Monster "aldeg_cas02",214,24,"EMPERIUM",1288,1,"Agit_A02::OnAgitBreak";
+	Monster "aldeg_cas02",214,24,"Emperium",1288,1,"Agit_A02::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","aldeg_cas02","A02";
@@ -89,7 +90,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "aldeg_cas03",GetCastleData("aldeg_cas03",1),6;
-	Monster "aldeg_cas03",206,32,"EMPERIUM",1288,1,"Agit_A03::OnAgitBreak";
+	Monster "aldeg_cas03",206,32,"Emperium",1288,1,"Agit_A03::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","aldeg_cas03","A03";
@@ -116,7 +117,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "aldeg_cas04",GetCastleData("aldeg_cas04",1),6;
-	Monster "aldeg_cas04",36,218,"EMPERIUM",1288,1,"Agit_A04::OnAgitBreak";
+	Monster "aldeg_cas04",36,218,"Emperium",1288,1,"Agit_A04::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","aldeg_cas04","A04";
@@ -143,7 +144,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "aldeg_cas05",GetCastleData("aldeg_cas05",1),6;
-	Monster "aldeg_cas05",28,102,"EMPERIUM",1288,1,"Agit_A05::OnAgitBreak";
+	Monster "aldeg_cas05",28,102,"Emperium",1288,1,"Agit_A05::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","aldeg_cas05","A05";
diff --git a/npc/guild/aldeg/aldeg_guardians.txt b/npc/guild/aldeg/aldeg_guardians.txt
index 81b030c38..88271c597 100644
--- a/npc/guild/aldeg/aldeg_guardians.txt
+++ b/npc/guild/aldeg/aldeg_guardians.txt
@@ -14,98 +14,102 @@
 //= 1.2 by Akaru and Valaris
 //= 1.2a Guardians for all aldeg castles are now in this file.
 //= Minor optimizations.[kobra_k88]
+//= 1.3 Corrected what guardians will spawn, and where. [L0ne_W0lf]
+//=	All guardians will now die when OnAgiInit is run.
+//=	Removed announcment for when a guardian dies.
 //============================================================
 
 
 aldeg_cas01,216,24,0	script	Guardian_A01	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas01",10) == 1) guardian "aldeg_cas01",18,219,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas01",11) == 1) guardian "aldeg_cas01",117,42,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas01",12) == 1) guardian "aldeg_cas01",207,153,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas01",13) == 1) guardian "aldeg_cas01",68,70,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas01",14) == 1) guardian "aldeg_cas01",187,140,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas01",15) == 1) guardian "aldeg_cas01",62,204,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas01",16) == 1) guardian "aldeg_cas01",113,100,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas01",17) == 1) guardian "aldeg_cas01",211,174,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",7;
+	killmonster "aldeg_cas01","Guardian_A01::OnGuardianDied";
+	if (GetCastleData("aldeg_cas01",10) == 1) guardian "aldeg_cas01",17,218,"Guardian Soldier",1287,"Guardian_A01::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas01",11) == 1) guardian "aldeg_cas01",39,208,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas01",12) == 1) guardian "aldeg_cas01",38,196,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas01",13) == 1) guardian "aldeg_cas01",45,228,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas01",14) == 1) guardian "aldeg_cas01",21,194,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas01",15) == 1) guardian "aldeg_cas01",218,24,"Guardian Knight",1286,"Guardian_A01::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas01",16) == 1) guardian "aldeg_cas01",213,24,"Guardian Knight",1286,"Guardian_A01::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas01",17) == 1) guardian "aldeg_cas01",73,70,"Guardian Knight",1286,"Guardian_A01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "aldeg_cas01","A Guardian Has Fallen",17;
 	end;
-
-//NoSpawn:
-//	break;
 }
+
 //------------------------------------------------------------------------------
 aldeg_cas02,214,24,0	script	Guardian_A02	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas02",10) == 1) guardian "aldeg_cas02",22,186,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas02",11) == 1) guardian "aldeg_cas02",88,31,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas02",12) == 1) guardian "aldeg_cas02",207,176,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas02",13) == 1) guardian "aldeg_cas02",50,201,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas02",14) == 1) guardian "aldeg_cas02",197,146,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas02",15) == 1) guardian "aldeg_cas02",71,193,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas02",16) == 1) guardian "aldeg_cas02",88,31,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas02",17) == 1) guardian "aldeg_cas02",219,148,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",7;
+	killmonster "aldeg_cas02","Guardian_A02::OnGuardianDied";
+	if (GetCastleData("aldeg_cas02",10) == 1) guardian "aldeg_cas02",27,184,"Guardian Knight",1286,"Guardian_A02::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas02",11) == 1) guardian "aldeg_cas02",88,43,"Guardian Knight",1286,"Guardian_A02::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas02",12) == 1) guardian "aldeg_cas02",117,46,"Guardian Knight",1286,"Guardian_A02::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas02",13) == 1) guardian "aldeg_cas02",60,202,"Guardian Soldier",1287,"Guardian_A02::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas02",14) == 1) guardian "aldeg_cas02",51,183,"Guardian Soldier",1287,"Guardian_A02::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas02",15) == 1) guardian "aldeg_cas02",21,177,"Guardian Archer",1285,"Guardian_A02::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas02",16) == 1) guardian "aldeg_cas02",36,183,"Guardian Archer",1285,"Guardian_A02::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas02",17) == 1) guardian "aldeg_cas02",210,7,"Guardian Archer",1285,"Guardian_A02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "aldeg_cas02","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 aldeg_cas03,206,32,0	script	Guardian_A03	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas03",10) == 1) guardian "aldeg_cas03",57,216,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas03",11) == 1) guardian "aldeg_cas03",80,108,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas03",12) == 1) guardian "aldeg_cas03",199,183,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas03",13) == 1) guardian "aldeg_cas03",98,267,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas03",14) == 1) guardian "aldeg_cas03",91,88,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas03",15) == 1) guardian "aldeg_cas03",78,121,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas03",16) == 1) guardian "aldeg_cas03",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas03",17) == 1) guardian "aldeg_cas03",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",7;
+	killmonster "aldeg_cas03","Guardian_A03::OnGuardianDied";
+	if (GetCastleData("aldeg_cas03",10) == 1) guardian "aldeg_cas03",90,112,"Guardian Knight",1286,"Guardian_A03::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas03",11) == 1) guardian "aldeg_cas03",116,112,"Guardian Knight",1286,"Guardian_A03::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas03",12) == 1) guardian "aldeg_cas03",86,120,"Guardian Soldier",1287,"Guardian_A03::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas03",13) == 1) guardian "aldeg_cas03",116,76,"Guardian Soldier",1287,"Guardian_A03::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas03",14) == 1) guardian "aldeg_cas03",64,103,"Guardian Soldier",1287,"Guardian_A03::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas03",15) == 1) guardian "aldeg_cas03",212,160,"Guardian Archer",1285,"Guardian_A03::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas03",16) == 1) guardian "aldeg_cas03",195,151,"Guardian Archer",1285,"Guardian_A03::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas03",17) == 1) guardian "aldeg_cas03",110,217,"Guardian Archer",1285,"Guardian_A03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "aldeg_cas03","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 aldeg_cas04,36,218,0	script	Guardian_A04	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas04",10) == 1) guardian "aldeg_cas04",181,33,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas04",11) == 1) guardian "aldeg_cas04",50,68,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas04",12) == 1) guardian "aldeg_cas04",50,119,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas04",13) == 1) guardian "aldeg_cas04",169,49,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas04",14) == 1) guardian "aldeg_cas04",133,196,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas04",15) == 1) guardian "aldeg_cas04",177,87,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas04",16) == 1) guardian "aldeg_cas04",50,119,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas04",17) == 1) guardian "aldeg_cas04",133,196,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",7;
+	killmonster "aldeg_cas04","Guardian_A04::OnGuardianDied";
+	if (GetCastleData("aldeg_cas04",10) == 1) guardian "aldeg_cas04",187,100,"Guardian Archer",1285,"Guardian_A04::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas04",11) == 1) guardian "aldeg_cas04",192,42,"Guardian Archer",1285,"Guardian_A04::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas04",12) == 1) guardian "aldeg_cas04",148,88,"Guardian Archer",1285,"Guardian_A04::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas04",13) == 1) guardian "aldeg_cas04",145,209,"Guardian Soldier",1287,"Guardian_A04::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas04",14) == 1) guardian "aldeg_cas04",169,53,"Guardian Soldier",1287,"Guardian_A04::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas04",15) == 1) guardian "aldeg_cas04",198,77,"Guardian Soldier",1287,"Guardian_A04::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas04",16) == 1) guardian "aldeg_cas04",48,72,"Guardian Knight",1286,"Guardian_A04::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas04",17) == 1) guardian "aldeg_cas04",55,88,"Guardian Knight",1286,"Guardian_A04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "aldeg_cas04","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 aldeg_cas05,28,102,0	script	Guardian_A05	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas05",10) == 1) guardian "aldeg_cas05",157,192,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas05",11) == 1) guardian "aldeg_cas05",194,46,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas05",12) == 1) guardian "aldeg_cas05",146,214,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas05",13) == 1) guardian "aldeg_cas05",223,95,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas05",14) == 1) guardian "aldeg_cas05",131,223,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas05",15) == 1) guardian "aldeg_cas05",191,68,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas05",16) == 1) guardian "aldeg_cas05",160,194,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas05",17) == 1) guardian "aldeg_cas05",49,225,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",7;
+	killmonster "aldeg_cas05","Guardian_A05::OnGuardianDied";
+	if (GetCastleData("aldeg_cas05",10) == 1) guardian "aldeg_cas05",51,202,"Guardian Archer",1285,"Guardian_A05::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas05",11) == 1) guardian "aldeg_cas05",188,79,"Guardian Archer",1285,"Guardian_A05::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas05",12) == 1) guardian "aldeg_cas05",157,192,"Guardian Soldier",1287,"Guardian_A05::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas05",13) == 1) guardian "aldeg_cas05",157,74,"Guardian Soldier",1287,"Guardian_A05::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas05",14) == 1) guardian "aldeg_cas05",27,221,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas05",15) == 1) guardian "aldeg_cas05",145,78,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas05",16) == 1) guardian "aldeg_cas05",156,73,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas05",17) == 1) guardian "aldeg_cas05",41,112,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "aldeg_cas05","A Guardian Has Fallen",17;
 	end;
 }
diff --git a/npc/guild/aldeg/aldeg_managers.txt b/npc/guild/aldeg/aldeg_managers.txt
index 1b0ab19aa..bd3b3d09a 100644
--- a/npc/guild/aldeg/aldeg_managers.txt
+++ b/npc/guild/aldeg/aldeg_managers.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -12,100 +12,90 @@
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
 //= 1.3 Removed Duplicates [Silent]
+//= 1.4 Updated Guardian positions and types. [L0ne_W0lf]
+//=	Updated manager names, and some additional info
 //============================================================
 
-
 // Castle 1 ==================================================================================
-aldeg_cas01,218,175,0	script	Arl Fredo	55,{
+aldeg_cas01,218,175,0	script	Alfredo#alde1	55,{
 
-	if(callfunc("F_GldManager","Arl Fredo","aldeg_cas01",119,223,"A01") == 0) close;
+	if(callfunc("F_GldManager","Steward Alfredo","aldeg_cas01",113,223,"A01") == 0) close;
 	
-	if(@GDnum==10) guardian "aldeg_cas01",18,219,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",0;
-	if(@GDnum==11) guardian "aldeg_cas01",117,42,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas01",207,153,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas01",68,70,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",3;
-	if(@GDnum==14) guardian "aldeg_cas01",187,140,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",4;
-	if(@GDnum==15) guardian "aldeg_cas01",62,204,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",5;
-	if(@GDnum==16) guardian "aldeg_cas01",113,100,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",6;
-	if(@GDnum==17) guardian "aldeg_cas01",211,174,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",7;
-	mes "[Arl Fredo]";
-	mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "aldeg_cas01",17,218,"Guardian Soldier",1287,"Guardian_A01::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "aldeg_cas01",39,208,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "aldeg_cas01",38,196,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "aldeg_cas01",45,228,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "aldeg_cas01",21,194,"Guardian Archer",1285,"Guardian_A01::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "aldeg_cas01",218,24,"Guardian Knight",1286,"Guardian_A01::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "aldeg_cas01",213,24,"Guardian Knight",1286,"Guardian_A01::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "aldeg_cas01",73,70,"Guardian Knight",1286,"Guardian_A01::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 2 ==================================================================================
-aldeg_cas02,78,74,0	script	Chen Lee#01	55,{
-
-	if(callfunc("F_GldManager","Chen Lee","aldeg_cas02",135,231,"A02") == 0) close;
-
-	if(@GDnum==10) guardian "aldeg_cas02",22,186,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas02",88,31,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas02",207,176,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas02",50,201,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas02",197,146,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas02",71,193,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas02",88,31,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas02",219,148,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",7;
-	mes "[ Chen Lee ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+aldeg_cas02,78,74,0	script	Chenchenlie#alde2	55,{
+
+	if(callfunc("F_GldManager","Steward Chenchenlie","aldeg_cas02",133,255,"A02") == 0) close;
+
+	if (@GDnum == 10) guardian "aldeg_cas02",27,184,"Guardian Knight",1286,"Guardian_A02::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "aldeg_cas02",88,43,"Guardian Knight",1286,"Guardian_A02::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "aldeg_cas02",117,46,"Guardian Knight",1286,"Guardian_A02::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "aldeg_cas02",60,202,"Guardian Soldier",1287,"Guardian_A02::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "aldeg_cas02",51,183,"Guardian Soldier",1287,"Guardian_A02::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "aldeg_cas02",21,177,"Guardian Archer",1285,"Guardian_A02::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "aldeg_cas02",36,183,"Guardian Archer",1285,"Guardian_A02::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "aldeg_cas02",210,7,"Guardian Archer",1285,"Guardian_A02::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 3 ==================================================================================
-aldeg_cas03,110,118,0	script	Chen Lee#02	55,{
-
-	if(callfunc("F_GldManager","Chen Lee","aldeg_cas03",225,269,"A03") == 0) close;
-
-	if(@GDnum==10) guardian "aldeg_cas03",57,216,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas03",80,108,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas03",199,183,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas03",98,267,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas03",91,88,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas03",78,121,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas03",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas03",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",7;
-	mes "[ Chen Lee ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+aldeg_cas03,110,118,0	script	Nahzarf#alde3	55,{
+
+	if(callfunc("F_GldManager","Chen Lee","aldeg_cas03",229,267,"A03") == 0) close;
+
+	if (@GDnum == 10) guardian "aldeg_cas03",90,112,"Guardian Knight",1286,"Guardian_A03::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "aldeg_cas03",116,112,"Guardian Knight",1286,"Guardian_A03::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "aldeg_cas03",86,120,"Guardian Soldier",1287,"Guardian_A03::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "aldeg_cas03",116,76,"Guardian Soldier",1287,"Guardian_A03::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "aldeg_cas03",64,103,"Guardian Soldier",1287,"Guardian_A03::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "aldeg_cas03",212,160,"Guardian Archer",1285,"Guardian_A03::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "aldeg_cas03",195,151,"Guardian Archer",1285,"Guardian_A03::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "aldeg_cas03",110,217,"Guardian Archer",1285,"Guardian_A03::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 4 ==================================================================================
-aldeg_cas04,53,89,0	script	Brimhemsen#01	55,{
-//aldeg_cas04,67,116,0	script	Brimhemsen	55,{
-
-	if(callfunc("F_GldManager","Brimhemsen","aldeg_cas04",85,12,"A04") == 0) close;
-
-	if(@GDnum==10) guardian "aldeg_cas04",181,33,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas04",50,68,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas04",50,119,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas04",169,49,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas04",133,196,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas04",177,87,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas04",50,119,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas04",133,196,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",7;
-	mes "[ Brimhemsen ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+aldeg_cas04,67,116,0	script	Brymhensen#alde4	55,{
+
+	if(callfunc("F_GldManager","Steward Brymhensen","aldeg_cas04",83,17,"A04") == 0) close;
+
+	if (@GDnum == 10) guardian "aldeg_cas04",187,100,"Guardian Archer",1285,"Guardian_A04::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "aldeg_cas04",192,42,"Guardian Archer",1285,"Guardian_A04::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "aldeg_cas04",148,88,"Guardian Archer",1285,"Guardian_A04::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "aldeg_cas04",145,209,"Guardian Soldier",1287,"Guardian_A04::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "aldeg_cas04",169,53,"Guardian Soldier",1287,"Guardian_A04::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "aldeg_cas04",198,77,"Guardian Soldier",1287,"Guardian_A04::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "aldeg_cas04",48,72,"Guardian Knight",1286,"Guardian_A04::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "aldeg_cas04",55,88,"Guardian Knight",1286,"Guardian_A04::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 5 ==================================================================================
-aldeg_cas05,52,179,0	script	Brimhemsen#02	55,{
-
-	if(callfunc("F_GldManager","Brimhemsen","aldeg_cas05",66,11,"A05") == 0) close;
-
-	if(@GDnum==10) guardian "aldeg_cas05",157,192,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas05",194,46,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas05",146,214,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas05",223,95,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas05",131,223,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas05",191,68,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas05",160,194,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas05",49,225,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",7;
-	mes "[ Brimhemsen ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+aldeg_cas05,52,179,0	script	Blemhemsen#alde5	55,{
+
+	if(callfunc("F_GldManager","Steward Blemhemsen","aldeg_cas05",64,8,"A05") == 0) close;
+
+	if (@GDnum == 10) guardian "aldeg_cas05",51,202,"Guardian Archer",1285,"Guardian_A05::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "aldeg_cas05",188,79,"Guardian Archer",1285,"Guardian_A05::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "aldeg_cas05",157,192,"Guardian Soldier",1287,"Guardian_A05::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "aldeg_cas05",157,74,"Guardian Soldier",1287,"Guardian_A05::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "aldeg_cas05",27,221,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "aldeg_cas05",145,78,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "aldeg_cas05",156,73,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "aldeg_cas05",41,112,"Guardian Knight",1286,"Guardian_A05::OnGuardianDied",7;
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/guild/aldeg/aldeg_treas.txt b/npc/guild/aldeg/aldeg_treas.txt
index 06e5e70ff..aa13900c4 100644
--- a/npc/guild/aldeg/aldeg_treas.txt
+++ b/npc/guild/aldeg/aldeg_treas.txt
@@ -11,6 +11,7 @@
 //=
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Removed announces when you open chests. [L0ne_W0lf]
 //============================================================
 
 
@@ -28,9 +29,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "aldeg_cas01","Treasure Chest Broken Open",17;
 	set $boxNumA01, $boxNumA01 -1;
-	if($boxNumA01 == 0) mapannounce "aldeg_cas01", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -61,9 +60,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "aldeg_cas02","Treasure Chest Broken Open",17;
 	set $boxNumA02, $boxNumA02 -1;
-	if($boxNumA02 == 0) mapannounce "aldeg_cas02", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -95,9 +92,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "aldeg_cas03","Treasure Chest Broken Open",17;
 	set $boxNumA03, $boxNumA03 -1;
-	if($boxNumA03 == 0) mapannounce "aldeg_cas03", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -128,9 +123,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "aldeg_cas04","Treasure Chest Broken Open",17;
 	set $boxNumA04, $boxNumA04 -1;
-	if($boxNumA04 == 0) mapannounce "aldeg_cas04", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 
 }
@@ -161,9 +154,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "aldeg_cas05","Treasure Chest Broken Open",17;
 	set $boxNumA05, $boxNumA05 -1;
-	if($boxNumA05 == 0) mapannounce "aldeg_cas05", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
diff --git a/npc/guild/ev_agit_event.txt b/npc/guild/ev_agit_event.txt
index de49b519c..cb5034072 100644
--- a/npc/guild/ev_agit_event.txt
+++ b/npc/guild/ev_agit_event.txt
@@ -24,6 +24,7 @@
 //= 1.5 Fixed WOE end messages on non-WOE days, by Avaj
 //= 1.5a missing tabs [KarLaeda]
 //= 1.6 Corrected multiple "WoE has begun" announces [ultramage]
+//= 1.7 Commented out the WoE start and end announces. [L0ne_W0lf]
 //============================================================
 //| To know how to set up WoE times, go to doc\woe_time_explanation.txt
 // WoE Start/Stop times
@@ -50,14 +51,14 @@ OnAgitInit:
 
 L_End:
 	if (agitcheck()) {
-		Announce "The War Of Emperium is over!",8;
+		//Announce "The War Of Emperium is over!",8;
 		AgitEnd;
 	}
 	end;
 
 L_Start:
 	if (!agitcheck()) {
-		Announce "The War Of Emperium has begun!",8;
+		//Announce "The War Of Emperium has begun!",8;
 		AgitStart;
 	}
 	end;
@@ -68,6 +69,11 @@ L_Start:
 -	script	TreasSpawn	-1,{
 	end;
 
+// Please explain the relevence of this to me?
+// Why are we spawning chests per zone on 1 minute intervals?
+// They should al spawn at the same time in the same castle.
+// Is there a reason for this? Am I reading something wrong?
+
 OnClock0001:
 	callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,0;
 	callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,0;
diff --git a/npc/guild/gefg/gefg_ev_agit.txt b/npc/guild/gefg/gefg_ev_agit.txt
index 2a33f298b..abeffa0ae 100644
--- a/npc/guild/gefg/gefg_ev_agit.txt
+++ b/npc/guild/gefg/gefg_ev_agit.txt
@@ -4,7 +4,7 @@
 //= jAthena (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88]
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
+//= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf]
 //============================================================
 
 
@@ -35,7 +36,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "gefg_cas01",GetCastleData("gefg_cas01",1),6;
-	Monster "gefg_cas01",198,182,"EMPERIUM",1288,1,"Agit_G01::OnAgitBreak";
+	Monster "gefg_cas01",198,182,"Emperium",1288,1,"Agit_G01::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","gefg_cas01","G01";
@@ -62,7 +63,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "gefg_cas02",GetCastleData("gefg_cas02",1),6;
-	Monster "gefg_cas02",176,178,"EMPERIUM",1288,1,"Agit_G02::OnAgitBreak";
+	Monster "gefg_cas02",176,178,"Emperium",1288,1,"Agit_G02::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","gefg_cas02","G02";
@@ -89,7 +90,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "gefg_cas03",GetCastleData("gefg_cas03",1),6;
-	Monster "gefg_cas03",245,167,"EMPERIUM",1288,1,"Agit_G03::OnAgitBreak";
+	Monster "gefg_cas03",245,167,"Emperium",1288,1,"Agit_G03::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","gefg_cas03","G03";
@@ -116,7 +117,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "gefg_cas04",GetCastleData("gefg_cas04",1),6;
-	Monster "gefg_cas04",174,178,"EMPERIUM",1288,1,"Agit_G04::OnAgitBreak";
+	Monster "gefg_cas04",174,178,"Emperium",1288,1,"Agit_G04::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","gefg_cas04","G04";
@@ -143,7 +144,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "gefg_cas05",GetCastleData("gefg_cas05",1),6;
-	Monster "gefg_cas05",194,184,"EMPERIUM",1288,1,"Agit_G05::OnAgitBreak";
+	Monster "gefg_cas05",194,184,"Emperium",1288,1,"Agit_G05::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","gefg_cas05","G05";
diff --git a/npc/guild/gefg/gefg_guardians.txt b/npc/guild/gefg/gefg_guardians.txt
index 7946e0027..a3221a8ca 100644
--- a/npc/guild/gefg/gefg_guardians.txt
+++ b/npc/guild/gefg/gefg_guardians.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= holyAngelX (1.0)
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -14,95 +14,101 @@
 //= 1.2 by Akaru and Valaris
 //= 1.2a Guardians for all gefg castles are now in this file.
 //= Minor optimizations.[kobra_k88]
+//= 1.3 Corrected what guardians will spawn, and where. [L0ne_W0lf]
+//=	All guardians will now die when OnAgiInit is run.
+//=	Removed announcment for when a guardian dies.
 //============================================================
 
-
 gefg_cas01,198,182,0	script	Guardian_G01	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas01",10) == 1) guardian "gefg_cas01",30,178,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas01",11) == 1) guardian "gefg_cas01",64,180,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas01",12) == 1) guardian "gefg_cas01",61,25,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas01",13) == 1) guardian "gefg_cas01",61,44,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas01",14) == 1) guardian "gefg_cas01",189,43,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas01",15) == 1) guardian "gefg_cas01",51,192,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas01",16) == 1) guardian "gefg_cas01",49,67,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas01",17) == 1) guardian "gefg_cas01",181,14,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",7;
+	killmonster "gefg_cas01","Guardian_G01::OnGuardianDied";
+	if (GetCastleData("gefg_cas01",10) == 1) guardian "gefg_cas01",67,179,"Guardian Soldier",1287,"Guardian_G01::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas01",11) == 1) guardian "gefg_cas01",184,20,"Guardian Soldier",1287,"Guardian_G01::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas01",12) == 1) guardian "gefg_cas01",62,41,"Guardian Soldier",1287,"Guardian_G01::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas01",13) == 1) guardian "gefg_cas01",36,186,"Guardian Archer",1285,"Guardian_G01::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas01",14) == 1) guardian "gefg_cas01",50,186,"Guardian Archer",1285,"Guardian_G01::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas01",15) == 1) guardian "gefg_cas01",50,67,"Guardian Knight",1286,"Guardian_G01::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas01",16) == 1) guardian "gefg_cas01",189,41,"Guardian Knight",1286,"Guardian_G01::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas01",17) == 1) guardian "gefg_cas01",200,167,"Guardian Knight",1286,"Guardian_G01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "gefg_cas01","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 gefg_cas02,176,178,0	script	Guardian_G02	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas02",10) == 1) guardian "gefg_cas02",22,135,"Soldier Guardian",1287,"Guardian_G02::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas02",11) == 1) guardian "gefg_cas02",33,40,"Soldier Guardian",1287,"Guardian_G02::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas02",12) == 1) guardian "gefg_cas02",158,11,"Soldier Guardian",1287,"Guardian_G02::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas02",13) == 1) guardian "gefg_cas02",64,140,"Archer Guardian",1285,"Guardian_G02::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas02",14) == 1) guardian "gefg_cas02",36,140,"Archer Guardian",1285,"Guardian_G02::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas02",15) == 1) guardian "gefg_cas02",166,45,"Knight Guardian",1286,"Guardian_G02::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas02",16) == 1) guardian "gefg_cas02",10,39,"Knight Guardian",1286,"Guardian_G02::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas02",17) == 1) guardian "gefg_cas02",166,35,"Knight Guardian",1286,"Guardian_G02::OnGuardianDied",7;
+	killmonster "gefg_cas02","Guardian_G02::OnGuardianDied";
+	if (GetCastleData("gefg_cas02",10) == 1) guardian "gefg_cas02",64,168,"Guardian Soldier",1287,"Guardian_G02::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas02",11) == 1) guardian "gefg_cas02",56,41,"Guardian Soldier",1287,"Guardian_G02::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas02",12) == 1) guardian "gefg_cas02",166,25,"Guardian Soldier",1287,"Guardian_G02::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas02",13) == 1) guardian "gefg_cas02",35,148,"Guardian Archer",1285,"Guardian_G02::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas02",14) == 1) guardian "gefg_cas02",20,150,"Guardian Archer",1285,"Guardian_G02::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas02",15) == 1) guardian "gefg_cas02",19,41,"Guardian Knight",1286,"Guardian_G02::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas02",16) == 1) guardian "gefg_cas02",166,42,"Guardian Knight",1286,"Guardian_G02::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas02",17) == 1) guardian "gefg_cas02",159,188,"Guardian Knight",1286,"Guardian_G02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "gefg_cas02","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 gefg_cas03,245,167,0	script	Guardian_G03	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas03",10) == 1) guardian "gefg_cas03",101,53,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas03",11) == 1) guardian "gefg_cas03",158,40,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas03",12) == 1) guardian "gefg_cas03",158,67,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas03",13) == 1) guardian "gefg_cas03",229,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas03",14) == 1) guardian "gefg_cas03",248,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas03",15) == 1) guardian "gefg_cas03",122,53,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas03",16) == 1) guardian "gefg_cas03",243,35,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas03",17) == 1) guardian "gefg_cas03",234,33,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",7;
+	killmonster "gefg_cas03","Guardian_G03::OnGuardianDied";
+	if (GetCastleData("gefg_cas03",10) == 1) guardian "gefg_cas03",48,176,"Guardian Archer",1285,"Guardian_G03::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas03",11) == 1) guardian "gefg_cas03",113,214,"Guardian Archer",1285,"Guardian_G03::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas03",12) == 1) guardian "gefg_cas03",48,207,"Guardian Soldier",1287,"Guardian_G03::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas03",13) == 1) guardian "gefg_cas03",157,62,"Guardian Soldier",1287,"Guardian_G03::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas03",14) == 1) guardian "gefg_cas03",243,41,"Guardian Soldier",1287,"Guardian_G03::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas03",15) == 1) guardian "gefg_cas03",157,45,"Guardian Knight",1286,"Guardian_G03::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas03",16) == 1) guardian "gefg_cas03",234,25,"Guardian Knight",1286,"Guardian_G03::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas03",17) == 1) guardian "gefg_cas03",238,160,"Guardian Knight",1286,"Guardian_G03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "gefg_cas03","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 gefg_cas04,174,178,0	script	Guardian_G04	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas04",10) == 1) guardian "gefg_cas04",49,203,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas04",11) == 1) guardian "gefg_cas04",148,50,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas04",12) == 1) guardian "gefg_cas04",57,20,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas04",13) == 1) guardian "gefg_cas04",34,218,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas04",14) == 1) guardian "gefg_cas04",167,42,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas04",15) == 1) guardian "gefg_cas04",18,52,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas04",16) == 1) guardian "gefg_cas04",50,48,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas04",17) == 1) guardian "gefg_cas04",160,66,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",7;
+	killmonster "gefg_cas04","Guardian_G04::OnGuardianDied";
+	if (GetCastleData("gefg_cas04",10) == 1) guardian "gefg_cas04",53,191,"Guardian Archer",1285,"Guardian_G04::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas04",11) == 1) guardian "gefg_cas04",31,178,"Guardian Archer",1285,"Guardian_G04::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas04",12) == 1) guardian "gefg_cas04",49,220,"Guardian Soldier",1287,"Guardian_G04::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas04",13) == 1) guardian "gefg_cas04",29,46,"Guardian Soldier",1287,"Guardian_G04::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas04",14) == 1) guardian "gefg_cas04",147,65,"Guardian Soldier",1287,"Guardian_G04::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas04",15) == 1) guardian "gefg_cas04",57,46,"Guardian Knight",1286,"Guardian_G04::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas04",16) == 1) guardian "gefg_cas04",160,50,"Guardian Knight",1286,"Guardian_G04::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas04",17) == 1) guardian "gefg_cas04",148,189,"Guardian Knight",1286,"Guardian_G04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "gefg_cas04","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 gefg_cas05,194,184,0	script	Guardian_G05	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas05",10) == 1) guardian "gefg_cas05",54,149,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas05",11) == 1) guardian "gefg_cas05",80,31,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas05",12) == 1) guardian "gefg_cas05",52,32,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas05",13) == 1) guardian "gefg_cas05",77,149,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas05",14) == 1) guardian "gefg_cas05",65,18,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas05",15) == 1) guardian "gefg_cas05",66,54,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas05",16) == 1) guardian "gefg_cas05",187,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas05",17) == 1) guardian "gefg_cas05",167,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",7;
+	killmonster "gefg_cas05","Guardian_G05::OnGuardianDied";
+	if (GetCastleData("gefg_cas05",10) == 1) guardian "gefg_cas05",45,149,"Guardian Archer",1285,"Guardian_G05::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas05",11) == 1) guardian "gefg_cas05",71,163,"Guardian Archer",1285,"Guardian_G05::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas05",12) == 1) guardian "gefg_cas05",72,142,"Guardian Soldier",1287,"Guardian_G05::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas05",13) == 1) guardian "gefg_cas05",66,47,"Guardian Soldier",1287,"Guardian_G05::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas05",14) == 1) guardian "gefg_cas05",177,50,"Guardian Soldier",1287,"Guardian_G05::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas05",15) == 1) guardian "gefg_cas05",66,17,"Guardian Knight",1286,"Guardian_G05::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas05",16) == 1) guardian "gefg_cas05",177,35,"Guardian Knight",1286,"Guardian_G05::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas05",17) == 1) guardian "gefg_cas05",193,166,"Guardian Knight",1286,"Guardian_G05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "gefg_cas05","A Guardian Has Fallen",17;
 	end;
 }
diff --git a/npc/guild/gefg/gefg_managers.txt b/npc/guild/gefg/gefg_managers.txt
index eba3b231a..7b231cd21 100644
--- a/npc/guild/gefg/gefg_managers.txt
+++ b/npc/guild/gefg/gefg_managers.txt
@@ -4,101 +4,93 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
 //= 
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Updated Guardian positions and types. [L0ne_W0lf]
+//=	Updated manager names, and some additional info
 //============================================================
 
 
 // Castle 1 ==================================================================================
-gefg_cas01,40,48,5	script	Gnaucher	55,{
-	if(callfunc("F_GldManager","Gnaucher","gefg_cas01",155,112,"G01") == 0) close;
+gefg_cas01,40,48,5	script	Gnahcher#gef1	55,{
+	if(callfunc("F_GldManager","Steward Gnahcher","gefg_cas01",152,117,"G01") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas01",30,178,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas01",64,180,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas01",61,25,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas01",61,44,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas01",189,43,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas01",51,192,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas01",49,67,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas01",181,14,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",7;
-	mes "[ Gnaucher ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "gefg_cas01",67,179,"Guardian Soldier",1287,"Guardian_G01::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "gefg_cas01",184,20,"Guardian Soldier",1287,"Guardian_G01::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "gefg_cas01",62,41,"Guardian Soldier",1287,"Guardian_G01::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "gefg_cas01",36,186,"Guardian Archer",1285,"Guardian_G01::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "gefg_cas01",50,186,"Guardian Archer",1285,"Guardian_G01::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "gefg_cas01",50,67,"Guardian Knight",1286,"Guardian_G01::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "gefg_cas01",189,41,"Guardian Knight",1286,"Guardian_G01::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "gefg_cas01",200,167,"Guardian Knight",1286,"Guardian_G01::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 2 ==================================================================================
-gefg_cas02,12,66,5	script	Esmark	55,{
-	if(callfunc("F_GldManager","Esmark","gefg_cas02",141,115,"G02") == 0) close;
+gefg_cas02,12,66,5	script	Esmarehk#gef2	55,{
+	if(callfunc("F_GldManager","Steward Esmarehk","gefg_cas02",145,115,"G02") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas02",22,135,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas02",33,40,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas02",158,11,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas02",64,140,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas02",36,140,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas02",166,45,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas02",10,39,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas02",166,35,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",7;
-	mes "[ Esmark ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "gefg_cas02",64,168,"Guardian Soldier",1287,"Guardian_G02::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "gefg_cas02",56,41,"Guardian Soldier",1287,"Guardian_G02::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "gefg_cas02",166,25,"Guardian Soldier",1287,"Guardian_G02::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "gefg_cas02",35,148,"Guardian Archer",1285,"Guardian_G02::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "gefg_cas02",20,150,"Guardian Archer",1285,"Guardian_G02::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "gefg_cas02",19,41,"Guardian Knight",1286,"Guardian_G02::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "gefg_cas02",166,42,"Guardian Knight",1286,"Guardian_G02::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "gefg_cas02",159,188,"Guardian Knight",1286,"Guardian_G02::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 3 ==================================================================================
-gefg_cas03,106,23,5	script	Jyang	55,{
-	if(callfunc("F_GldManager","Jyang","gefg_cas03",270,290,"G03") == 0) close;
+gefg_cas03,106,23,5	script	Jean#gef3	55,{
+	if(callfunc("F_GldManager","Steward Jean","gefg_cas03",275,289,"G03") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas03",101,53,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",0;
-	if(@GDnum==11) guardian "gefg_cas03",158,40,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas03",158,67,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas03",229,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas03",248,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas03",122,53,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas03",243,35,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas03",234,33,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",7;
-	mes "[ Jyang ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "gefg_cas03",48,176,"Guardian Archer",1285,"Guardian_G03::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "gefg_cas03",113,214,"Guardian Archer",1285,"Guardian_G03::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "gefg_cas03",48,207,"Guardian Soldier",1287,"Guardian_G03::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "gefg_cas03",157,62,"Guardian Soldier",1287,"Guardian_G03::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "gefg_cas03",243,41,"Guardian Soldier",1287,"Guardian_G03::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "gefg_cas03",157,45,"Guardian Knight",1286,"Guardian_G03::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "gefg_cas03",234,25,"Guardian Knight",1286,"Guardian_G03::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "gefg_cas03",238,160,"Guardian Knight",1286,"Guardian_G03::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 4 ==================================================================================
-gefg_cas04,73,46,5	script	Kelbany	55,{
-	if(callfunc("F_GldManager","Kelbany","gefg_cas04",116,118,"G04") == 0) close;
+gefg_cas04,73,46,3	script	Kellvahni#gef4	55,{
+	if(callfunc("F_GldManager","Steward Kellvahni","gefg_cas04",116,123,"G04") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas04",49,203,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas04",148,50,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas04",57,20,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas04",34,218,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas04",167,42,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas04",18,52,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas04",50,48,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas04",160,66,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",7;
-	mes "[ Kelbany ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "gefg_cas04",53,191,"Guardian Archer",1285,"Guardian_G04::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "gefg_cas04",31,178,"Guardian Archer",1285,"Guardian_G04::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "gefg_cas04",49,220,"Guardian Soldier",1287,"Guardian_G04::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "gefg_cas04",29,46,"Guardian Soldier",1287,"Guardian_G04::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "gefg_cas04",147,65,"Guardian Soldier",1287,"Guardian_G04::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "gefg_cas04",57,46,"Guardian Knight",1286,"Guardian_G04::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "gefg_cas04",160,50,"Guardian Knight",1286,"Guardian_G04::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "gefg_cas04",148,189,"Guardian Knight",1286,"Guardian_G04::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 5 ==================================================================================
-gefg_cas05,70,52,5	script	Beeor	55,{
-	if(callfunc("F_GldManager","Beeor","gefg_cas05",144,110,"G05") == 0) close;
+gefg_cas05,70,52,3	script	Byohre#gef5	55,{
+	if(callfunc("F_GldManager","Steward Byohre","gefg_cas05",149,106,"G05") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas05",54,149,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas05",80,31,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas05",52,32,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas05",77,149,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas05",65,18,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas05",66,54,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas05",187,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas05",167,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",7;
-	mes "[ Beeor ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "gefg_cas05",45,149,"Guardian Archer",1285,"Guardian_G05::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "gefg_cas05",71,163,"Guardian Archer",1285,"Guardian_G05::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "gefg_cas05",72,142,"Guardian Soldier",1287,"Guardian_G05::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "gefg_cas05",66,47,"Guardian Soldier",1287,"Guardian_G05::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "gefg_cas05",177,50,"Guardian Soldier",1287,"Guardian_G05::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "gefg_cas05",66,17,"Guardian Knight",1286,"Guardian_G05::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "gefg_cas05",177,35,"Guardian Knight",1286,"Guardian_G05::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "gefg_cas05",193,166,"Guardian Knight",1286,"Guardian_G05::OnGuardianDied",7;
 	close;
 }
diff --git a/npc/guild/gefg/gefg_treas.txt b/npc/guild/gefg/gefg_treas.txt
index 0e07a2669..833c7406c 100644
--- a/npc/guild/gefg/gefg_treas.txt
+++ b/npc/guild/gefg/gefg_treas.txt
@@ -11,6 +11,7 @@
 //=
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Removed announces when you open chests. [L0ne_W0lf]
 //============================================================
 
 
@@ -28,9 +29,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "gefg_cas01","Treasure Chest Broken Open",17;
 	set $boxNumG01, $boxNumG01 -1;
-	if($boxNumG01 == 0) mapannounce "gefg_cas01", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -61,9 +60,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "gefg_cas02","Treasure Chest Broken Open",17;
 	set $boxNumG02, $boxNumG02 -1;
-	if($boxNumG02 == 0) mapannounce "gefg_cas02", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -93,9 +90,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "gefg_cas03","Treasure Chest Broken Open",17;
 	set $boxNumG03, $boxNumG03 -1;
-	if($boxNumG03 == 0) mapannounce "gefg_cas03", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -126,9 +121,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "gefg_cas04","Treasure Chest Broken Open",17;
 	set $boxNumG04, $boxNumG04 -1;
-	if($boxNumG04 == 0) mapannounce "gefg_cas04", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -159,9 +152,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "gefg_cas05","Treasure Chest Broken Open",17;
 	set $boxNumG05, $boxNumG05 -1;
-	if($boxNumG05 == 0) mapannounce "gefg_cas05", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
diff --git a/npc/guild/gldfunc_dunsw.txt b/npc/guild/gldfunc_dunsw.txt
index c1fdc8e74..89c55ec45 100644
--- a/npc/guild/gldfunc_dunsw.txt
+++ b/npc/guild/gldfunc_dunsw.txt
@@ -4,9 +4,9 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
-//= eAthena 0.1+; RO Episode 4+
+//= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
 //= Switch that warps guild members to guild dungeon.
 //==========================================
@@ -22,26 +22,33 @@
 //	Some not competent people try to change gld_dun -> gld_dun0
 //	IT is wrong, because we already supple "02","03",etc as suffix.
 //	[Lupus]
+//= 1.4 Updated script dialog and structure. [L0ne_W0lf]
 //============================================================
 
 //==================================================
 function	script	F_GldDunSw	{
+	set .@GID, GetCastleData(getarg(0),1);
+	if (.@GID == 0) {
+		mes "[ Echoing Voice ]";
+		mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' ";
+		close;
+	}
+	else {
+		mes "[ Echoing Voice ]";
+		mes " ' Only the one who can show true bravery can take this test. '";
+		next;
+		mes " ";
+		mes "There's a small lever. Will you pull it?";
+		next;
 
-	mes "[ Mysterious Voice ]";
-	mes " ' Only brave warriors may lead the guild base.. '";
-	next;
-	mes "(There is little switch over here....... Would you like to pull the switch?)";
-	next;
-	menu "Yes",-,"No",M_No;
-
-		set @GID, GetCastleData(getarg(0),1);
-		if (@GID == 0 || getcharid(2) != @GID) goto L_NotGLead;
-		warp "gld_dun"+getarg(1),getarg(2),getarg(3);
-		end;
-
-		L_NotGLead:
-			mes "[ Mysterious Voice ]";
-			mes " ' ..... it seems that you are not brave enough...... ' ";
-	M_No:
+		if (select("Pull.:Do not.") == 1) {
+			if (getcharid(2) == .@GID) {
+				warp "gld_dun"+getarg(1),getarg(2),getarg(3);
+				end;
+			}
+			mes " ";
+			mes " Nothing happened.";
+		}
 		return;
+	}
 }
diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt
index 0bd85b66f..51d863574 100644
--- a/npc/guild/gldfunc_ev_agit.txt
+++ b/npc/guild/gldfunc_ev_agit.txt
@@ -4,9 +4,9 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
-//= eAthena 0.1+; RO Episode 4+
+//= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
 //= F_AgitStart is in charge of spawning Emperium and mobs in castles
 //=   when WoE is started.
@@ -29,6 +29,8 @@
 //= 1.4 updated a couple mapannounces in OnAgitBreak. [L0ne_W0lf]
 //= 1.5 Changed the names of the Kafra from "Service" to "Staff" [L0ne_W0lf]
 //= 1.6 Fixed the OnAgitBreak message being map-only and not global. (Lil DomX) [L0ne_W0lf]
+//= 1.7 Updated functions, got rid of the various gotos. [L0ne_W0lf]
+//=	Castles can be conquered as long as they un-owned.
 //============================================================
 
 
@@ -40,83 +42,82 @@ function	script	F_AgitStart	{
 	set .@empy, getarg(3);
 
 	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),2;
-	monster .@map$,.@empx,.@empy,"EMPERIUM",1288,1,"Agit_"+.@castle$+"::OnAgitBreak";
+	monster .@map$,.@empx,.@empy,"Emperium",1288,1,"Agit_"+.@castle$+"::OnAgitBreak";
 	GvgOn .@map$;
 	if (GetCastleData(.@map$,1) != 0) return;
-	if(.@map$ == "aldeg_cas01" || .@map$ == "aldeg_cas02" || .@map$ == "aldeg_cas03" || .@map$ == "aldeg_cas04" || .@map$ == "aldeg_cas05" || .@map$ == "nguild_alde") goto L_AldegCas;
-	if(.@map$ == "gefg_cas01"  || .@map$ == "gefg_cas02"  || .@map$ == "gefg_cas03"  || .@map$ == "gefg_cas04"  || .@map$ == "gefg_cas05"  || .@map$ == "nguild_gef" ) goto L_GefgCas;
-	if(.@map$ == "payg_cas01"  || .@map$ == "payg_cas02"  || .@map$ == "payg_cas03"  || .@map$ == "payg_cas04"  || .@map$ == "payg_cas05"  || .@map$ == "nguild_pay" ) goto L_PaygCas;
-	if(.@map$ == "prtg_cas01"  || .@map$ == "prtg_cas02"  || .@map$ == "prtg_cas03"  || .@map$ == "prtg_cas04"  || .@map$ == "prtg_cas05"  || .@map$ == "nguild_prt" ) goto L_PrtgCas;
-
-L_AldegCas:
-	areamonster .@map$,0,0,300,300,"--ja--",1117,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1132,4;
-	areamonster .@map$,0,0,300,300,"--ja--",1219,2;
-	areamonster .@map$,0,0,300,300,"--ja--",1205,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1216,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1193,17;
-	areamonster .@map$,0,0,300,300,"--ja--",1269,9;
-	areamonster .@map$,0,0,300,300,"--ja--",1276,7;
-	areamonster .@map$,0,0,300,300,"--ja--",1208,3;
-	areamonster .@map$,0,0,300,300,"--ja--",1275,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1268,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1272,1;
-	monster .@map$,.@empx+1,.@empy,"--ja--",1272,1;
-	monster .@map$,.@empx-1,.@empy,"--ja--",1270,4;
-	monster .@map$,.@empx,.@empy+1,"--ja--",1268,1;
-	monster .@map$,.@empx,.@empy-1,"--ja--",1219,1;
-	monster .@map$,.@empx,.@empy,"--ja--",1276,5;
-	return;
-L_GefgCas:
-	areamonster .@map$,0,0,300,300,"--ja--",1117,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1263,11;
-	areamonster .@map$,0,0,300,300,"--ja--",1102,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1130,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1140,20;
-	areamonster .@map$,0,0,300,300,"--ja--",1163,9;
-	areamonster .@map$,0,0,300,300,"--ja--",1275,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1219,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1150,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1159,1;
-	monster .@map$,.@empx+1,.@empy,"--ja--",1203,1;
-	monster .@map$,.@empx-1,.@empy,"--ja--",1087,1;
-	monster .@map$,.@empx,.@empy+1,"--ja--",1213,7;
-	monster .@map$,.@empx,.@empy-1,"--ja--",1189,7;
-	return;
-L_PaygCas:
-	areamonster .@map$,0,0,300,300,"--ja--",1277,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1208,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1262,5;
-	areamonster .@map$,0,0,300,300,"--ja--",1102,5;
-	areamonster .@map$,0,0,300,300,"--ja--",1150,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1115,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1129,11;
-	areamonster .@map$,0,0,300,300,"--ja--",1276,5;
-	areamonster .@map$,0,0,300,300,"--ja--",1282,4;
-	areamonster .@map$,0,0,300,300,"--ja--",1253,5;
-	monster .@map$,.@empx,.@empy,"--ja--",1150,1;
-	monster .@map$,.@empx,.@empy,"--ja--",1115,1;
-	monster .@map$,.@empx,.@empy+1,"--ja--",1208,6;
-	monster .@map$,.@empx,.@empy-1,"--ja--",1276,5;
-	return;
-L_PrtgCas:
-	areamonster .@map$,0,0,300,300,"--ja--",1163,15;
-	areamonster .@map$,0,0,300,300,"--ja--",1132,10;
-	areamonster .@map$,0,0,300,300,"--ja--",1219,5;
-	areamonster .@map$,0,0,300,300,"--ja--",1268,5;
-	areamonster .@map$,0,0,300,300,"--ja--",1251,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1252,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1276,5;
-	areamonster .@map$,0,0,300,300,"--ja--",1259,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1283,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1275,1;
-	areamonster .@map$,0,0,300,300,"--ja--",1200,1;
-	monster .@map$,.@empx+1,.@empy,"--ja--",1268,1;
-	monster .@map$,.@empx-1,.@empy,"--ja--",1251,1;
-	monster .@map$,.@empx,.@empy+1,"--ja--",1252,1;
-	monster .@map$,.@empx,.@empy-1,"--ja--",1219,2;
-	monster .@map$,.@empx,.@empy,"--ja--",1276,5;
-	return;
+	if (compare(.@map$,"aldeg_cas")) {
+		areamonster .@map$,0,0,300,300,"--ja--",1117,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1132,4;
+		areamonster .@map$,0,0,300,300,"--ja--",1219,2;
+		areamonster .@map$,0,0,300,300,"--ja--",1205,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1216,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1193,17;
+		areamonster .@map$,0,0,300,300,"--ja--",1269,9;
+		areamonster .@map$,0,0,300,300,"--ja--",1276,7;
+		areamonster .@map$,0,0,300,300,"--ja--",1208,3;
+		areamonster .@map$,0,0,300,300,"--ja--",1275,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1268,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1272,1;
+		monster .@map$,.@empx+1,.@empy,"--ja--",1272,1;
+		monster .@map$,.@empx-1,.@empy,"--ja--",1270,4;
+		monster .@map$,.@empx,.@empy+1,"--ja--",1268,1;
+		monster .@map$,.@empx,.@empy-1,"--ja--",1219,1;
+		monster .@map$,.@empx,.@empy,"--ja--",1276,5;
+		return;
+	}
+	else if (compare(.@map$,"gefg_cas")) {
+		areamonster .@map$,0,0,300,300,"--ja--",1117,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1263,11;
+		areamonster .@map$,0,0,300,300,"--ja--",1102,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1130,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1140,20;
+		areamonster .@map$,0,0,300,300,"--ja--",1163,9;
+		areamonster .@map$,0,0,300,300,"--ja--",1275,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1219,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1150,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1159,1;
+		monster .@map$,.@empx+1,.@empy,"--ja--",1203,1;
+		monster .@map$,.@empx-1,.@empy,"--ja--",1087,1;
+		monster .@map$,.@empx,.@empy+1,"--ja--",1213,7;
+		monster .@map$,.@empx,.@empy-1,"--ja--",1189,7;
+		return;
+	}
+	else if (compare(.@map$,"payg_cas")) {
+		areamonster .@map$,0,0,300,300,"--ja--",1277,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1208,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1262,5;
+		areamonster .@map$,0,0,300,300,"--ja--",1102,5;
+		areamonster .@map$,0,0,300,300,"--ja--",1150,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1115,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1129,11;
+		areamonster .@map$,0,0,300,300,"--ja--",1276,5;
+		areamonster .@map$,0,0,300,300,"--ja--",1282,4;
+		areamonster .@map$,0,0,300,300,"--ja--",1253,5;
+		monster .@map$,.@empx,.@empy,"--ja--",1150,1;
+		monster .@map$,.@empx,.@empy,"--ja--",1115,1;
+		monster .@map$,.@empx,.@empy+1,"--ja--",1208,6;
+		monster .@map$,.@empx,.@empy-1,"--ja--",1276,5;
+		return;
+	}
+	else if (compare(.@map$,"prtg_cas")) {
+		areamonster .@map$,0,0,300,300,"--ja--",1163,15;
+		areamonster .@map$,0,0,300,300,"--ja--",1132,10;
+		areamonster .@map$,0,0,300,300,"--ja--",1219,5;
+		areamonster .@map$,0,0,300,300,"--ja--",1268,5;
+		areamonster .@map$,0,0,300,300,"--ja--",1251,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1252,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1276,5;
+		areamonster .@map$,0,0,300,300,"--ja--",1259,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1283,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1275,1;
+		areamonster .@map$,0,0,300,300,"--ja--",1200,1;
+		monster .@map$,.@empx+1,.@empy,"--ja--",1268,1;
+		monster .@map$,.@empx-1,.@empy,"--ja--",1251,1;
+		monster .@map$,.@empx,.@empy+1,"--ja--",1252,1;
+		monster .@map$,.@empx,.@empy-1,"--ja--",1219,2;
+		monster .@map$,.@empx,.@empy,"--ja--",1276,5;
+		return;
+	}
 }
 
 // Function for OnGuildBreak ======================================
@@ -170,7 +171,9 @@ function	script	F_AgitEnd	{
 	set .@castle$, getarg(1);
 
 	GvgOff .@map$;
-//	if (GetCastleData(.@map$,1) == 0) return;	//enable this line to allow take over of non captured castles after woe ends
+	// Disable the following if statment to keep empty
+	// castles from being aquired after after WoE ends.
+	if (GetCastleData(.@map$,1) == 0) return;
 	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),4;
 	KillMonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak";
 	end;
diff --git a/npc/guild/gldfunc_flag.txt b/npc/guild/gldfunc_flag.txt
index 654ad0d3b..1f2c81ea2 100644
--- a/npc/guild/gldfunc_flag.txt
+++ b/npc/guild/gldfunc_flag.txt
@@ -4,9 +4,9 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
-//= eAthena 0.1+; RO Episode 4+
+//= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
 //= Flags display messages stating whether or not a guild castle has been captured.
 //= Allows the guild members to return to a captured castle.
@@ -24,49 +24,48 @@
 //= v1.3a: Implemented k3dt's exploit fix [Vicious]
 //= v1.4: By default town flags are set to no longer show text. [L0ne_W0lf]
 //= v1.5: Updated remaining dialog to iRO standards. [L0ne_W0lf]
+//= v1.6 Restructred script, and removed use of gotos. [L0ne_W0lf]
 //============================================================
 
 function	script	F_Flags	{
-
+	set .@GID, GetCastleData(getarg(1),1);
 	if (getarg(5) == 0) return;
-
-	set @GID, GetCastleData(getarg(1),1);
-	if (@GID != 0) goto L_Startg;
-
-	mes " [ Edict of the Divine Rune Midgard Kingdom ]";
-	mes " ";
-	mes "1. Follow the ordinance of The Divine Rune Midgard Kingdom, ";
-	mes "We declare that";
-	mes "there is no formal master of this castle.";
-	mes " ";
-	mes "2. To the one who can ";
-	mes "overcome all trials";
-	mes "and destroy the Emperium,";
-	mes "the king will endow the one with";
-	mes "ownership of this castle.";
-	return;
-L_Startg:
-	if ((getcharid(2) == @GID) && (getarg(4) == 1)) goto L_Startg2;
-	mes "[ Edict of the Divine Rune Midgard Kingdom ]";
-	mes " ";
-	mes "1. Following the ordinance of the";
-	mes "Divine Rune Midgard Kingdom,";
-	mes "we approve that this place is in";
-	mes "the private possession of ^ff0000" + GetGuildName(@GID) + "^000000 Guild.";
-	mes " ";
-	mes "2. The guild Master of ^ff0000"+ GetGuildName(@GID) + "^000000 Guild is";
-	mes "^FF0000" + GetGuildMaster(@GID) + "^000000";
-	mes "If there is anyone who objects to this,";
-	mes " prove your strength and honor with a steel blade in your hand.";
-	return;
-L_Startg2:
-	mes "Brave ones...";
-	mes "Do you wish to return to your honorable place?";
-	next;
-	menu "Return to the guild castle.",M_Enter,"Quit.",-;
-	return;
-
-	M_Enter:
-		if (getcharid(2) == GetCastleData(getarg(1),1)) warp getarg(1),getarg(2),getarg(3);
+	if (.@GID == 0) {
+		mes " [ Edict of the Divine Rune Midgard Kingdom ]";
+		mes " ";
+		mes "1. Follow the ordinance of The Divine Rune Midgard Kingdom, ";
+		mes "We declare that";
+		mes "there is no formal master of this castle.";
+		mes " ";
+		mes "2. To the one who can ";
+		mes "overcome all trials";
+		mes "and destroy the Emperium,";
+		mes "the king will endow the one with";
+		mes "ownership of this castle.";
+		return;
+	}
+	else {
+		if (getcharid(2) == .@GID && getarg(4) == 1) {
+			mes "Brave ones...";
+			mes "Do you wish to return to your honorable place?";
+			next;
+			if (select("Return to the guild castle.:Quit.") == 1) {
+				if (getcharid(2) == GetCastleData(getarg(1),1))
+					warp getarg(1),getarg(2),getarg(3);
+			}
+			return;
+		}
+		mes "[ Edict of the Divine Rune Midgard Kingdom ]";
+		mes " ";
+		mes "1. Following the ordinance of the";
+		mes "Divine Rune Midgard Kingdom,";
+		mes "we approve that this place is in";
+		mes "the private possession of ^ff0000" + GetGuildName(@GID) + "^000000 Guild.";
+		mes " ";
+		mes "2. The guild Master of ^ff0000"+ GetGuildName(@GID) + "^000000 Guild is";
+		mes "^FF0000" + GetGuildMaster(@GID) + "^000000";
+		mes "If there is anyone who objects to this,";
+		mes " prove your strength and honor with a steel blade in your hand.";
 		return;
+	}
 }
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index 3246bba04..832036197 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -3,10 +3,11 @@
 //===== By: ==================================================
 //= jAthena - kalen (1.0) & eAthena Team
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
-//= eAthena 0.1+; RO Episode 4+
+//= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
+//= [ Aegis Conversion]
 //= The Guild Manager allows the Guildmaster to invest in comerce
 //= and defense, hire guardians and kafras, go to the treasure room,
 //= and surrender the guild castle.
@@ -31,391 +32,372 @@
 //= 1.6a Fix for guild manager recognizing [KarLaeda]
 //= 1.6b Fixed the chance for double invest, now 50% instead of 49% [Lupus]
 //= 1.7 Changed the names of the Kafra from "Service" to "Staff" [L0ne_W0lf]
+//= 1.8 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//=	This update changes quite a bit of the internal workings of the guild manager.
+//=	No longer uses defined numerical values for guardian HP calculation
+//=	Guardian summon display list is now DYNAMIC. Updated with guardian corrections.
+//=	Added dialog for castle Abandoning. Commented out be default.
 //============================================================
 
-
-
-//==============================================
 function	script	F_GldManager	{
-
-	set @GID, GetCastleData(getarg(1),1);
-	mes "[ "+getarg(0)+" ]";
-	if (@GID == 0){
-		mes "I am waiting for my master.  Brave adventurer, follow your destiny!";
-		return 0;
-	}
-	if (getcharid(2) != @GID){
-		mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!";
-		mes "Where are the guardians? Destroy these intruders!";
+	set .@GID, GetCastleData(getarg(1),1);
+
+	// Define the types of guardians on a per castle basis
+	// 1 - Soldier Guardian; 2 - Archer Guardian; 3 - Knight Guardian
+	// Aldebaran (Luina)
+	if (getarg(1) == "aldeg_cas01") setarray .@guardiantype[0],1,2,2,2,2,3,3,3;
+	if (getarg(1) == "aldeg_cas02") setarray .@guardiantype[0],3,3,3,1,1,2,2,2;
+	if (getarg(1) == "aldeg_cas03") setarray .@guardiantype[0],3,3,1,1,1,2,2,2;
+	if (getarg(1) == "aldeg_cas04") setarray .@guardiantype[0],2,2,2,1,1,1,3,3;
+	if (getarg(1) == "aldeg_cas05") setarray .@guardiantype[0],2,2,1,1,3,3,3,3;
+	// Geffen (Britoniah)
+	if (getarg(1) == "gefg_cas01") setarray .@guardiantype[0],1,1,1,2,2,3,3,3;
+	if (getarg(1) == "gefg_cas02") setarray .@guardiantype[0],1,1,1,2,2,3,3,3;
+	if (getarg(1) == "gefg_cas03") setarray .@guardiantype[0],2,2,1,1,1,3,3,3;
+	if (getarg(1) == "gefg_cas04") setarray .@guardiantype[0],2,2,1,1,1,3,3,3;
+	if (getarg(1) == "gefg_cas05") setarray .@guardiantype[0],2,2,1,1,1,3,3,3;
+	// Payon (Baulder)
+	if (getarg(1) == "payg_cas01") setarray .@guardiantype[0],2,2,2,2,2,2,2,3;
+	if (getarg(1) == "payg_cas02") setarray .@guardiantype[0],2,2,2,2,2,2,2,3;
+	if (getarg(1) == "payg_cas03") setarray .@guardiantype[0],2,2,2,2,2,2,2,3;
+	if (getarg(1) == "payg_cas04") setarray .@guardiantype[0],2,2,2,2,2,2,2,3;
+	if (getarg(1) == "payg_cas05") setarray .@guardiantype[0],2,2,2,2,2,2,2,3;
+	// Prontera (Valkyrie Realms)
+	if (getarg(1) == "prtg_cas01") setarray .@guardiantype[0],1,1,1,2,2,3,3,3;
+	if (getarg(1) == "prtg_cas02") setarray .@guardiantype[0],3,3,3,1,1,2,2,2;
+	if (getarg(1) == "prtg_cas03") setarray .@guardiantype[0],3,3,3,1,1,2,2,2;
+	if (getarg(1) == "prtg_cas04") setarray .@guardiantype[0],3,3,3,1,1,1,2,2;
+	if (getarg(1) == "prtg_cas05") setarray .@guardiantype[0],3,3,3,1,1,1,2,2;
+
+	if (.@GID == 0){
+		mes "[ "+getarg(0)+" ]";
+		mes "I have been waiting for a master to fulfill my destiny.";
+		mes "Brave soul... fate will guide you towards your future...";
 		return 0;
 	}
-	if (strcharinfo(0) != getguildmaster(@GID)){
-		mes "You're not ^5533FF" + getguildmaster(@GID) + "^000000! I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command only";
+	if (getcharid(2) != .@GID){
+		mes "[ "+getarg(0)+" ]";
+		mes "No matter how much you pester me, I'll still follow my master ^ff0000" + getguildmaster(.@GID) + "^000000. Where are Guardians?! Send these ruffians away right now!";
 		return 0;
 	}
-
-	mes "Welcome Master ^5533FF" + getguildmaster(@GID) + "^000000 ! I will assist you in any way I can!";
+	mes "[ "+getarg(0)+" ]";
+	mes "Welcome. My honorable master, ^ff0000" + getguildmaster(.@GID) + "^000000...";
+	mes "Your humble servent, "+getarg(0)+", is here to serve you.";
 	next;
 
-	//Novice Castles. (we don't need ELSE here. Menu has direct labels)
-	if(getarg(1) == "nguild_prt" || getarg(1) == "nguild_alde" || getarg(1) == "nguild_gef" || getarg(1) == "nguild_pay" )
-		menu "Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
-
-	//Common WoE Castles	
-	menu 	"Guild Base Briefing",M_Base, "Commerce Investment",M_Comrc, "Defence Investment",M_Def, "Guardian Installation",M_Guard, 
-		"Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
-
-	//========================
-	M_Base:
-	//=========
+	// To allow abandoning of castles, uncomment the following switch,
+	// comment out the switch below it, and uncomment case 7.
+	//switch(select("Castle briefing:Invest in commercial growth:Invest in Castle Defenses:Summon Guardian:Employ / discharge a storehouse staff member:Go into Master's room:Abandon Castle")) {
+	switch(select("Castle briefing:Invest in commercial growth:Invest in Castle Defenses:Summon Guardian:Employ / discharge a storehouse staff member:Go into Master's room")) {
+	case 1:
 		mes "[ "+getarg(0)+" ]";
-		mes "Guild Base Investment Information.";
+		mes "I will report the Castle briefing, Master.";
 		mes " ";
-		mes "Current Commerce Investment is : ^FF3322" + GetCastleData(getarg(1),2) + "^000000 points.";
-		mes "^0000ff - You have invested " + GetCastleData(getarg(1),4) + " times today.^000000";
-		next;
-		mes "[ "+getarg(0)+" ]";
-		mes "Current Defence Investment is : ^FF3322" + GetCastleData(getarg(1),3)  + "^000000 points.";
-		mes "^0000ff- You have invested " +  GetCastleData(getarg(1),5)  + " times today.^000000";
+		mes " ^0000ffNow, commercial growth level is " + GetCastleData(getarg(1),2) + ".";
+		if (GetCastleData(getarg(1),4) > 0)
+			mes "You invested " + GetCastleData(getarg(1),4) + "times in last 1 day.";
+		mes "Now, the Castle Defense level is " + GetCastleData(getarg(1),3) + ".^000000";
+		if (GetCastleData(getarg(1),5) > 0)
+			mes " ^0000ff- You invested " + GetCastleData(getarg(1),5) + "times in last 1 day.^000000";
 		mes " ";
-		mes "That is about it.";
+		mes "That's all to report, Master.";
 		return 0;
 
-	//========================
-	M_Comrc:
-	//=========
-		set @TriggerE,GetCastleData(getarg(1),4);
-		set @Economy,GetCastleData(getarg(1),2);
-		if(@Economy < 8) set @eco_invest,10000;
-		if(@Economy >= 8) set @eco_invest,20000;
-		if(@Economy >= 16) set @eco_invest,40000;
-		if(@Economy >= 25) set @eco_invest,80000;
-		if(@Economy >= 34) set @eco_invest,160000;
-		if(@Economy >= 44) set @eco_invest,320000;
-		if(@Economy >= 54) set @eco_invest,640000;
-		if(@Economy >= 65) set @eco_invest,1280000;
-		if(@Economy >= 76) set @eco_invest,2560000;
-		if(@Economy >= 88) set @eco_invest,5120000;
-
+	case 2:
+		set .@Economy,GetCastleData(getarg(1),2);
+		if(.@Economy < 8) set .@eco_invest,10000;
+		if(.@Economy >= 8) set .@eco_invest,20000;
+		if(.@Economy >= 16) set .@eco_invest,40000;
+		if(.@Economy >= 25) set .@eco_invest,80000;
+		if(.@Economy >= 34) set .@eco_invest,160000;
+		if(.@Economy >= 44) set .@eco_invest,320000;
+		if(.@Economy >= 54) set .@eco_invest,640000;
+		if(.@Economy >= 65) set .@eco_invest,1280000;
+		if(.@Economy >= 76) set .@eco_invest,2560000;
+		if(.@Economy >= 88) set .@eco_invest,5120000;
 		mes "[ "+getarg(0)+" ]";
-		if(@TriggerE == 2){
-			mes "^ff0000You have already invested twice today, and that's the limit.^000000 I'm expecting to see our riches grow at a high level.";
- 			return 0;
+		mes "If you invest in commercial growth, the quantity of goods made by the guild will increase. Therfore, if you consider our future, investments will be a necessity.";
+		mes " ";
+		mes "Initially, you are able to invest just once but if you pay more money, you will be able to invest twice.";
+		if (.@Economy == 100) {
+			mes " ";
+			mes "^ff0000The commercial growth level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great economist like you, Master.^000000";
+			return 0;
 		}
-		if(@Economy >= 100){
-			mes "^ff0000This Castle's commerce investment is already maxed at 100 points. You don't have to invest any further.^000000";
-	 		return 0;
+		mes " ";
+		if (GetCastleData(getarg(1),4) == 2) {
+			mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect riches of the guild to grow at a high rate.";
+			return 0;
 		}
-		mes "If you improve your Commerce Investment, the guild's productive power increases to produce more goods.";
-		mes "So an investment will be required if you're considering future growth.";
+		else if (GetCastleData(getarg(1),4) == 0)
+			mes "The current investment amount required is ^ff0000" + .@eco_invest + "^000000 zeny. Will you invest?";
+		else
+			mes "You have already invested once. Do you wish to invest one more time? ^ff0000" + .@eco_invest + "^000000 more zeny will be needed.";
 		next;
-		mes "[ "+getarg(0)+" ]";
-		if(@TriggerE == 0) {
-			mes "You can invest up to two times a day, but the second time costs more";
-			mes "The needed investment amount is ^5533FF" + @eco_invest + "^000000 zeny.";
-		} else {
-			set @eco_invest,@eco_invest*4;
-			mes "You've already invested once today, but you can invest again at ^5533FF" + @eco_invest + "^000000 Zeny.";
+		if (select("Invest in commercial growth:Cancel") == 1) {
+			mes "[ "+getarg(0)+" ]";
+			if (Zeny < .@eco_invest) {
+				mes "I'm sorry but there is not enough zeny to invest in the reserves of guild. You have failed to invest, Master.";
+				return 0;
+			}
+			set zeny,zeny-.@eco_invest;;
+			SetCastleData getarg(1),4,GetCastleData(getarg(1),4)+1;
+			SetCastleData getarg(1),2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
+			mes "We have finished investing safely. I expect in our coming days, the growth level will increase.";
+			return 0;
 		}
-		next;
 		mes "[ "+getarg(0)+" ]";
-		mes "Would you like to invest?";
+		mes "I'll do as you have instructed my master... There is no hurry. There is nothing we can not accomplish.";
+		return 0;
+
+	case 3:
+		set .@Defence,GetCastleData(getarg(1),3);
+		if(.@Defence < 8) set .@def_invest,20000;
+		if(.@Defence >= 8) set .@def_invest,40000;
+		if(.@Defence >= 16) set .@def_invest,80000;
+		if(.@Defence >= 25) set .@def_invest,160000;
+		if(.@Defence >= 34) set .@def_invest,320000;
+		if(.@Defence >= 44) set .@def_invest,640000;
+		if(.@Defence >= 54) set .@def_invest,1280000;
+		if(.@Defence >= 65) set .@def_invest,2560000;
+		if(.@Defence >= 76) set .@def_invest,5120000;
+		if(.@Defence >= 88) set .@def_invest,10240000;
+		mes "[ "+getarg(0)+" ]";
+		mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required.";
+		mes " ";
+		mes "Originally you can invest just once but if you pay more money, you can invest twice.";
+		if (.@Defence == 100) {
+			mes " ";
+			mes "^ff0000But the Castle Defense level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great strategist like you, Master.^000000";
+			return 0;
+		}
+		mes " ";
+		if (GetCastleData(getarg(1),5) == 2) {
+			mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect the Defenses of the guild to grow at a high rate.";
+			return 0;
+		}
+		else if (GetCastleData(getarg(1),5) == 1)
+			mes "The current investment amount required is ^ff0000" + .@def_invest + "^000000 zeny. Will you invest?";
+		else
+			mes "You have already invested once. Do you wish to invest one more time? ^ff0000" + .@def_invest + "^000000 more zeny will be needed.";
 		next;
-		menu "Invest Commerce.",-,"Cancel.",M_End;
 
+		if (select("Invest in Castle Defenses.:Cancel") == 1) {
 			mes "[ "+getarg(0)+" ]";
-			if(Zeny < @eco_invest){
-				mes "Master, you do not have enough money to invest.  Investment has been cancelled.";
+			if (Zeny < .@def_invest) {
+				mes "I'm sorry but there is not enough zeny to invest in the reserves of guild. You have failed to invest, Master.";
 				return 0;
 			}
-			set Zeny,Zeny-@eco_invest;
-			SetCastleData getarg(1),4,@TriggerE+1;
-			// if we learnt Emsolute Develop there's 50% chance to get +1 investment again
-			SetCastleData getarg(1),2,@Economy + 1 + (@Economy<99 && rand(2) && getgdskilllv(@GID,10014));
-
-			mes "You have invested successfully.";
+			set Zeny,Zeny-@def_invest;
+			SetCastleData getarg(1),5,GetCastleData(getarg(1),5)+1;
+			SetCastleData getarg(1),3,.@Defence+1;
+			set .@Defence, .@Defence + 1;
+			set .@AGuardian, strmobinfo(4,1285) + (.@Defence*2000);
+			set .@KGuardian, strmobinfo(4,1286) + (.@Defence*2000);
+			set .@SGuardian, strmobinfo(4,1287) + (.@Defence*2000);
+
+			for (set .@i, 0; .@i <= 7 ; set .@i, .@i+1) {
+				if (.@guardiantype[.@i] == 1) set .@GHP,.@SGuardian;
+				else if (.@guardiantype[.@i] == 2) set .@GHP,.@AGuardian;
+				else set .@GHP,.@KGuardian;
+				if (GetCastleData(getarg(1),(.@i + 10)) == 1) SetCastleData getarg(1),(.@i + 18),.@GHP;
+			}
+			mes "We have finished investing safely. I expect in our coming days, the growth level will increase.";
 			return 0;
+		}
+		mes "[ "+getarg(0)+" ]";
+		mes "I'll do as you have instructed my master... There is no hurry. There is nothing we can not accomplish.";
+		return 0;
 
-	//=========================
-	M_Def:
-	//========
-		set @TriggerD,GetCastleData(getarg(1),5);
-		set @Defence,GetCastleData(getarg(1),3);
-		if(@Defence < 8) set @def_invest,20000;
-		if(@Defence >= 8) set @def_invest,40000;
-		if(@Defence >= 16) set @def_invest,80000;
-		if(@Defence >= 25) set @def_invest,160000;
-		if(@Defence >= 34) set @def_invest,320000;
-		if(@Defence >= 44) set @def_invest,640000;
-		if(@Defence >= 54) set @def_invest,1280000;
-		if(@Defence >= 65) set @def_invest,2560000;
-		if(@Defence >= 76) set @def_invest,5120000;
-		if(@Defence >= 88) set @def_invest,10240000;
+	case 4:
+		set .@Defence,GetCastleData(getarg(1),3);
+		set .@AGuardian, strmobinfo(4,1285) + (.@Defence*2000);
+		set .@KGuardian, strmobinfo(4,1286) + (.@Defence*2000);
+		set .@SGuardian, strmobinfo(4,1287) + (.@Defence*2000);
 
 		mes "[ "+getarg(0)+" ]";
-		if(@TriggerD == 2){
-			mes "^ff0000You have already invested twice today, and that's the limit.^000000 I'm expecting to see our riches grow at a high level.";
- 			return 0;
-		}
-		if(@Defence >= 100){
-			mes "^ff0000This Castle's Defence Investment is already maxed at 100 points. You don't have to invest any further.^000000";
-	 		return 0;
-		}
-		mes "If you improve investment of defence, the durability of our Guardians and the Emperium will increase.";
-		mes "So if you consider our future battles, an investment will be required.";
+		mes "Do you still want to summon a Guardian? It'll be a protector to defend us to the end.";
+		mes "Choose a Guardian to summon.";
 		next;
-		mes "[ "+getarg(0)+" ]";
-		if(@TriggerD == 0) {
-			mes "You can invest up to two times a day, but the second time costs more";
-			mes "The needed investment amount is ^5533FF" + @def_invest + "^000000 zeny.";
-		} else {
-			set @def_invest,@def_invest*4;
-			mes "You've already invested once today, but you can invest again at ^5533FF" + @def_invest + "^000000 Zeny.";
+
+		for (set .@i, 0; .@i <= 7 ; set .@i, .@i+1) {
+			if (.@guardiantype[.@i] == 1) {
+				set .@type$,"Soldier";
+				setarray .@GuardianHP[.@i],.@SGuardian;
+			}
+			else if (.@guardiantype[.@i] == 2) {
+				set .@type$,"Archer";
+				setarray .@GuardianHP[.@i],.@AGuardian;
+			}
+			else {
+				set .@type$,"Knight";
+				setarray .@GuardianHP[.@i],.@KGuardian;
+			}
+
+			if (GetCastleData(getarg(1),(.@i+10)))
+				setarray .@name$[.@i],"Guardian "+.@type$+" - Implemented (" + guardianinfo(.@i) + "/" + .@GuardianHP[.@i] + ")";
+			else
+				setarray .@name$[.@i],"Guardian "+.@type$+" - Not Implemented";
 		}
-		next;
+	
+		set .@menu$,.@name$[0]+":"+.@name$[1]+":"+.@name$[2]+":"+.@name$[3]+":"+.@name$[4]+":"+.@name$[5]+":"+.@name$[6]+":"+.@name$[7];
+		switch(select(.@menu$)) {
+		case 1: set @GDnum,10; break;
+		case 2: set @GDnum,11; break;
+		case 3: set @GDnum,12; break;
+		case 4: set @GDnum,13; break;
+		case 5: set @GDnum,14; break;
+		case 6: set @GDnum,15; break;
+		case 7: set @GDnum,16; break;
+		case 8: set @GDnum,17; break;
+		}
+
 		mes "[ "+getarg(0)+" ]";
-		mes "Would you like to invest?";
+		mes "Do you wish to summon the chosen guardian? 10,000 zeny is required to summon it.";
 		next;
-		menu "Invest Defence.",-, "Cancel",M_End;
 
+		if (select("Summon:Cancel") == 1) {
 			mes "[ "+getarg(0)+" ]";
-			if(Zeny < @def_invest){
-				mes "Master, you do not have enough money to invest in Defence.  Defence investment has been cancelled.";
+			if (getgdskilllv(.@GID,10002) == 0) {
+				mes "Master, we do not have any research materials to summon the Guardian. If you want to accumulate knowledge for Guardians, you have to learn the Guild skill first, We have failed to summon the Guardian.";
 				return 0;
 			}
-			set Zeny,Zeny-@def_invest;
-			SetCastleData getarg(1),5,@TriggerD+1;
-			SetCastleData getarg(1),3,@Defence+1;
-			// set new hp values for guardians
-			set @Defence, @Defence + 1;
-			set @AGuardian, 28634 + (@Defence*2000);
-			set @KGuardian, 30214 + (@Defence*2000);
-			set @SGuardian, 15670 + (@Defence*2000);
-			//set @AGuardian,strmobinfo(4,1285) + (@Defence*2000);
-			//set @KGuardian,strmobinfo(4,1286) + (@Defence*2000);
-			//set @SGuardian,strmobinfo(4,1287) + (@Defence*2000);
-			if (GetCastleData(getarg(1),10) == 1) SetCastleData getarg(1),18,@SGuardian;
-			if (GetCastleData(getarg(1),11) == 1) SetCastleData getarg(1),19,@SGuardian;
-			if (GetCastleData(getarg(1),12) == 1) SetCastleData getarg(1),20,@SGuardian;
-			if (GetCastleData(getarg(1),13) == 1) SetCastleData getarg(1),21,@AGuardian;
-			if (GetCastleData(getarg(1),14) == 1) SetCastleData getarg(1),22,@AGuardian;
-			if (GetCastleData(getarg(1),15) == 1) SetCastleData getarg(1),23,@KGuardian;
-			if (GetCastleData(getarg(1),16) == 1) SetCastleData getarg(1),24,@KGuardian;
-			if (GetCastleData(getarg(1),17) == 1) SetCastleData getarg(1),25,@KGuardian;
-
-			mes "You have invested successfully.";
-			return 0;
+			if (GetCastleData(getarg(1),@GDnum) == 1) {
+				mes "Master, you have already have that Guardian. You cannot summon any more.";
+				return 0;
+			}
+			if (Zeny < 1000) {
+				mes "Well... I'm sorry but we don't have enough funds to summon the Guardian. We have failed to summon the Guardian.";
+				return 0;
+			}
+			set zeny,zeny-10000;
+			set .@HP,@GDnum + 8;
+			SetCastleData getarg(1),@GDnum,1;
+			SetCastleData getarg(1),.@HP,.@GuardianHP[(@GDnum - 10)];
+			mes "We have successfully summoned the Guardian. We now have our strong force to defend us!";
+			return 1;
 
-	//=========================
-	M_Guard:
-	//=========
-		mes "[ "+getarg(0)+" ]";
-		if (getgdskilllv(@GID,10002) == 0){
-			mes "I'm sorry Master but you cannot install any guardians right now.  Your guild must learn the Guild skill ^5533FFGuardian Research^000000 first.";
-			mes "Guardian Installation has been cancelled.";
-			return 0;
 		}
+		mes "[ "+getarg(0)+" ]";
+		mes "I have done as you have commanded, but please remember if you have money to spare, it will be better if we use a Guardian.";
+		return 0;
 
-		set @Defence,GetCastleData(getarg(1),3);
-		set @Guardian0,guardianinfo(0);
-		set @Guardian1,guardianinfo(1);
-		set @Guardian2,guardianinfo(2);
-		set @Guardian3,guardianinfo(3);
-		set @Guardian4,guardianinfo(4);
-		set @Guardian5,guardianinfo(5);
-		set @Guardian6,guardianinfo(6);
-		set @Guardian7,guardianinfo(7);
-		set @AGuardian, 28634 + (@Defence*2000);
-		set @KGuardian, 30214 + (@Defence*2000);
-		set @SGuardian, 15670 + (@Defence*2000);
-		//set @AGuardian,strmobinfo(4,1285) + (@Defence*2000);
-		//set @KGuardian,strmobinfo(4,1286) + (@Defence*2000);
-		//set @SGuardian,strmobinfo(4,1287) + (@Defence*2000);
-
-		//uncomment the following line to disable guardians Installation during WoE
-		//if(agitcheck()) goto L_CantGuard;
-		mes "Would you like to install a guardian? Guardians will protect the guild base from enemies.";
-		mes "Please choose a guardian.";
-		next;
-	
-		menu "Soldier Guardian (" + @Guardian0 + "/" + @SGuardian + ")",L4_1,
-			"Soldier Guardian (" + @Guardian1 + "/" + @SGuardian + ")",L4_2,
-			"Soldier Guardian (" + @Guardian2 + "/" + @SGuardian + ")",L4_3,
-			"Archer Guardian (" + @Guardian3 + "/" + @AGuardian + ")",L4_4,
-			"Archer Guardian (" + @Guardian4 + "/" + @AGuardian + ")",L4_5,
-			"Knight Guardian (" + @Guardian5 + "/" + @KGuardian + ")",L4_6,
-			"Knight Guardian (" + @Guardian6 + "/" + @KGuardian + ")",L4_7,
-			"Knight Guardian (" + @Guardian7 + "/" + @KGuardian + ")",L4_8;
-	
-		L4_1:
-			if (GetCastleData(getarg(1),10) == 1) goto L_GotGuard;
-			set @GDnum,10;
-			set @GDnum2,18;
-			set @GuardianHP,@SGuardian;
-			goto L4_9;
-		L4_2:
-			if (GetCastleData(getarg(1),11) == 1) goto L_GotGuard;
-			set @GDnum,11;
-			set @GDnum2,19;
-			set @GuardianHP,@SGuardian;
-			goto L4_9;
-		L4_3:
-			if (GetCastleData(getarg(1),12) == 1) goto L_GotGuard;
-			set @GDnum,12;
-			set @GDnum2,20;
-			set @GuardianHP,@SGuardian;
-			goto L4_9;
-		L4_4:
-			if (GetCastleData(getarg(1),13) == 1) goto L_GotGuard;
-			set @GDnum,13;
-			set @GDnum2,21;
-			set @GuardianHP,@AGuardian;
-			goto L4_9;
-		L4_5:
-			if (GetCastleData(getarg(1),14) == 1) goto L_GotGuard;
-			set @GDnum,14;
-			set @GDnum2,22;
-			set @GuardianHP,@AGuardian;
-			goto L4_9;
-		L4_6:
-			if (GetCastleData(getarg(1),15) == 1) goto L_GotGuard;
-			set @GDnum,15;
-			set @GDnum2,23;
-			set @GuardianHP,@KGuardian;
-			goto L4_9;
-		L4_7:
-			if (GetCastleData(getarg(1),16) == 1) goto L_GotGuard;
-			set @GDnum,16;
-			set @GDnum2,24;
-			set @GuardianHP,@KGuardian;
-			goto L4_9;
-		L4_8:
-			if (GetCastleData(getarg(1),17) == 1) goto L_GotGuard;
-			set @GDnum,17;
-			set @GDnum2,25;
-			set @GuardianHP,@KGuardian;
-		L4_9:
+	case 5:
+		if (GetCastleData(getarg(1),9) == 1) {
 			mes "[ "+getarg(0)+" ]";
-			mes "Would you really like to install a guardian? You need ^5533FF10,000 zeny^000000 to install one....";
+			mes "We are now hiring Kafra employee... Will you fire any current Kafra employee?";
 			next;
-			menu "Install",-, "Cancel",M_End;
-
-				if (Zeny < 10000){
-					mes "[ "+getarg(0)+" ]";
-					mes "I'm sorry Master, but you do not have enough zeny for a Guardian.";
+			switch(select("Discharge:Cancel")) {
+				cutin "kafra_01",2;
+				mes "[ Hired Kafra Employee ]";
+				mes "I worked so hard... How can you do that, Master?... Please... Please reconsider... Check it again, Master... Please...";
+				next;
+				switch(select("Discharge:Cancel")) {
+				case 1:
+					mes "[ Hired Kafra Employee ]";
+					mes "Oh, my goodness! This is nonsense!";
+					next;
+					cutin "kafra_01",255;
+					break;
+				case 2:
+					mes "[ Hired Kafra Employee ]";
+					mes "I'll work hard for you... Thank you!";
 					return 0;
 				}
-				set Zeny,Zeny-10000;
-				SetCastleData getarg(1),@GDnum,1;
-				SetCastleData getarg(1),@GDnum2,@GuardianHP;
-				return 1;
-
-		L_GotGuard:
+				break;
+			case 2:
+				mes "[ "+getarg(0)+" ]";
+				mes "She worked hard in my opinion. It was a good decision to keep her.";
+				return 0;
+			}	
+			disablenpc "Kafra Staff#"+getarg(4);
+			SetCastleData getarg(1),9,0;
 			mes "[ "+getarg(0)+" ]";
-			mes "Excuse me Master, but that guardian has already been installed.....";
-			emotion 4;
-			return 0;
-		L_CantGuard:
-			mes "Master.... don't you know that we can't install guardians during the War Of Emperium?!!";
-			emotion 4;
-			return 0;
-
-	//===========================
-	M_Kaf:
-	//======
-		mes "[ "+getarg(0)+" ]";
-		if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss;
-		if (getgdskilllv(@GID,10001) == 0){
-			mes "Master, you don't have a contract with the Kafra Staff Company.";
-			mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000.";
+			mes "....";
+			mes "I have discharged the Kafra employee... But... are you dissatisfied with the decision?";
 			return 0;
 		}
-
-		L_Hire:
-			mes "Would you like to employ the services of a Kafra? You will need ^5533FF10,000 Zeny^000000 to do so... ";
+		else {
+			mes "[ "+getarg(0)+" ]";
+			mes "Will you contact Kafra head office to hire Kafra staff in our Castle?";
+			mes "^ff0000 10,000 zeny is required for their services. ";
 			next;
-			menu "Employ Kafra.",-,"Cancel",sM_KafEnd;
-
+			if (select("Hire.:Cancel") == 1) {
 				mes "[ "+getarg(0)+" ]";
-				if (Zeny < 10000){
-					mes "Master, you do not have enough money to employ a Kafra. Employment has been cancelled.";
+				if (getgdskilllv(.@GID,10001) == 0) {
+					mes "Master, we cannot hire Kafra staff because we have not established a contract with Kafra head office. If you want to establish a contract with Kafra head office, you have to learn Guild skill first.";
+					return 0;
+				}
+				if (Zeny < 10000) {
+					mes "[ "+getarg(0)+" ]";
+					mes "Well... I'm sorry but we don't have enough funds to hire Kafra staff.";
 					return 0;
 				}
 				set Zeny,Zeny-10000;
 				enablenpc "Kafra Staff#"+getarg(4);
 				SetCastleData getarg(1),9,1;
-				mes "You have created a contract with the Kafra Staff Company.";
+				mes "We have completed our task in establishing a contract with Kafra head office and hired Kafra staff.";
 				next;
 				cutin "kafra_01",2;
-				mes "[ Kafra Staff ]";
-				mes "How do you do? I'm here to provide you with helpful service! I'll do the best I can to serve you.";
+				mes "[ Hired Kafra Employee ]";
+				mes "How do you do? I was dispatched from head office.";
+				mes "I'll do my best to not tarnish reputation of the Guild.";
 				next;
 				cutin "kafra_01",255;
 				mes "[ "+getarg(0)+" ]";
-				//mes "Your employment contract lasts ^5533FF1 month^000000.  After this term is over you will have to create a new contract.";
-				mes "I think the Kafra Staff will benefit our guild members.";
-				return 0;
-
-			sM_KafEnd:
-				mes "[ "+getarg(0)+" ]";
-				mes "As you wish Master.  But I suggest we get a Kafra as soon as possible!";
-				return 0;
-
-		L_Dismiss:
-			mes "Would you like to dismiss the current Kafra?";
-			next;
-			menu "Dismissal",-,"Cancel",sM_KafEnd2;
-
-				cutin "kafra_01",2;
-				mes "[ Kafra Staff ]";
-				mes "Have I done anything wrong? If I did, will you please forgive me?";
-				next;
-				menu "Dismiss",-,"Cancel",ssM_KafEnd2;
-
-					mes "[ Kafra Staff ]";
-					mes "It's unfortunate that I won't be able to serve your guild anymore....";
-					next;
-					disablenpc "Kafra Staff#"+getarg(4);
-					SetCastleData getarg(1),9,0;
-					cutin "kafra_01",255;
-					mes "[ "+getarg(0)+" ]";
-					mes "The Kafra has been dismissed.  But... we should really get a Kafra as soon as possible!";
-					return 0;
-				ssM_KafEnd2:
-					mes "[ Kafra Staff ]";
-					mes "Thank you master, I'll do my best! ^^.";
-					cutin "kafra_01",255;
-					return 0;
-			sM_KafEnd2:
-				mes "[ "+getarg(0)+" ]";
-				mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us";
+				mes "The Contract terms of the hired Kafra staff is for 1 month and after this term, you will need to to pay an additional charge.";
+				mes "This will be good for our workers.";
 				return 0;
+			}
+			mes "[ "+getarg(0)+" ]";
+			mes "I've done as you have commanded, but for the sake of our workers, it would be better to hire Kafra staff immediately.";
+			return 0;
+		}
 
-	//=========================
-	M_Treas:
-	//========
+	case 6:
 		mes "[ "+getarg(0)+" ]";
-		mes "Would you to go to our Treasure Room? Only you, the Guild Master, are allowed to enter this room.";
+		mes "Do you wish to go to the Master's Room.";
+		mes "That place is for only for you... no one else can enter the room.";
 		next;
-		menu "Enter Treasure room.",-,"Cancel",sM_TresEnd;
-
+		if (select("Go into Master's room.:Cancel") == 1) {
 			mes "[ "+getarg(0)+" ]";
-			mes "Please follow me through the secret passage way.";
-			mes "You must pull down on the secret switch in order to get out.";
-			next;
+			mes "I'll show you the secret path. Follow me...please.";
+			mes "When you want to return here, please press the secret switch.";
 			warp getarg(1),getarg(2),getarg(3);
-			return 0;
-		sM_TresEnd:
-			mes "[ "+getarg(0)+" ]";
-			mes "The goods are produced everyday.";
-			mes "You should get them whenever you can because they might dissapear if you take them at the wrong time.";
-			return 0;
-
-
-	//==========================
-	M_End:
-	//=======
+			end;
+		}
 		mes "[ "+getarg(0)+" ]";
-		mes "As you wish, master.";
+		mes "Goods are produced once a day... if you don't remove them in time, they will not be produced anymore.";
+		mes "Therefore, it will be better if you check up on them from time to time.";
 		return 0;
+
+	//case 7:
+	//	mes "[ "+getarg(0)+" ]";
+	//	mes "Master!!";
+	//	mes "Will you give up this Castle after all that we have all gone through?!";
+	//	mes "If.. If this is your final decision, what does all the blood that has been shed mean to you!?";
+	//	mes "Please reconsider! Master!!";
+	//	next;
+	//	if (select("Leave Agit.:Cancel") == 1) {
+	//		mes "[ "+getarg(0)+" ]";
+	//		mes "Master!! Please think it over, Master!!";
+	//		mes "The blood we shed so far...don't you care for all the sacrifices that were made?!";
+	//		next;
+	//		if (select("Cancel:Leave Castle.") == 1) {
+	//			mes "[ "+getarg(0)+" ]";
+	//			mes "I knew you were kidding, Master!!";
+	//			mes "Please, Master.. Although you were kidding, don't do that again. You really scared me for a moment.";
+	//			return 0;
+	//		}
+	//		mes "[ "+getarg(0)+" ]";
+	//		mes "Master!!.....";
+	//		mes "...... Ma..s...ter.....";
+	//		callfunc "F_GuildBreak",getarg(0),getarg(4);
+	//		return 0;
+	//	}
+	//	mes "[ "+getarg(0)+" ]";
+	//	mes "I knew you were kidding, Master!!";
+	//	mes "Please, Master.. Although you were kidding, don't do that again. You really scared me for a moment.";
+	//	return 0;
+	}
 }
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 1d728b376..2b6b1ab8a 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= holyAngelX (1.0) Akaru and ho|yAnge|X (1.1)
 //===== Current Version: =====================================
-//= 1.9
+//= 2.0
 //===== Compatible With: =====================================
 //= eAthena 1+; RO Episode 4+
 //===== Description: =========================================
@@ -46,6 +46,7 @@
 //= 1.7 Box Count fix by Zoc. Now it spawns 1st/2nd Treasure Chest 50%/50% [Lupus]
 //= 1.8 Official Treasure Spawn in Novice Castles. Had to add +1 in odd/even formula to leave correct ID of NG Treasure Box 8) [Lupus]
 //= 1.9 Added F_TreasProtect to remove players who are not guild master from treasure room. [L0ne_W0lf]
+//= 2.0 Updated F_GldTreas, no longer uses gotos, swapped out for a 'for' loop. [L0ne_W0lf]
 //============================================================
 
 
@@ -53,26 +54,32 @@
 // Treasure Spawning Function
 //================================================
 function	script	F_GldTreas	{
-	if(getarg(10) == 1) goto L_SPAWN;
-	setcastledata getarg(0),4,0;
-	setcastledata getarg(0),5,0;
-	killmonster getarg(0),"Treasure_"+getarg(1)+"::OnDied";
-	if(GetCastleData(getarg(0),2) > 100 || GetCastleData(getarg(0),1) == 0) return;
-	//sets the counter variable = to the box number amount
-	if(getarg(0) == "nguild_prt" || getarg(0) == "nguild_alde" || getarg(0) == "nguild_gef" || getarg(0) == "nguild_pay" ) {
-		//Novice Castles can't have more than 1 Treasure Chest
-		set getarg(2),1;
-	}else{
-		set getarg(2),GetCastleData(getarg(0),2)/5+4;
-	}
-	if (getarg(2) <= 0) return;
-	set getarg(3), getarg(2);	//sets the counter variable = to the box number amount
+	if(getarg(10) !=  1) {
+		setcastledata getarg(0),4,0;
+		setcastledata getarg(0),5,0;
+
+		// Why on earth are we killing old treasure chest spawns?
+		//killmonster getarg(0),"Treasure_"+getarg(1)+"::OnDied";
+
+		// Don't spawn treasures if Castle is empty, or Eco is greater than 100
+		if(GetCastleData(getarg(0),2) > 100 || GetCastleData(getarg(0),1) == 0) return;
 
-L_SPAWN:
-	set getarg(4), getarg(5)+((getarg(3)+1) & 1);	//sets the box id variable = to the box id
-	areamonster getarg(0),getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
-	set getarg(3), getarg(3) - 1;
-	if(getarg(3) > 0) goto L_SPAWN;
+		// Only spawn one treasure chest for notice castles.
+		if (compare(getarg(0),"nguild"))
+			set getarg(2),1;
+		else
+			set getarg(2),GetCastleData(getarg(0),2)/5+4;
+
+		if (getarg(2) <= 0) return;
+
+		//sets the counter variable = to the box number amount
+		set getarg(3), getarg(2);
+	}
+	for (set .@i,1; .@i <= getarg(3) ; set .@i,.@i+1) {
+		// set treasure box ID
+		set getarg(4), getarg(5)+((getarg(3)+1) & 1);
+		areamonster getarg(0),getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+	}
 	return;
 }
 
@@ -81,15 +88,14 @@ L_SPAWN:
 //===============================================================
 function	script	F_GldTreasSw	{
 	mes " ";
-	mes "There is little switch over here";
-	mes "Would you like to pull the switch down?";
+	mes "There's a small lever. Will you pull it? ";
 	next;
-	menu "Yes",M_1,"No",-;
-	close;
-	
-	M_1:
+
+	if (select("Pull.:Do not.") == 1) {
 		warp getarg(0),getarg(1),getarg(2);
 		return;
+	}
+	close;
 }
 
 //==============================================================
diff --git a/npc/guild/payg/payg_ev_agit.txt b/npc/guild/payg/payg_ev_agit.txt
index 9caf96b3f..61387af64 100644
--- a/npc/guild/payg/payg_ev_agit.txt
+++ b/npc/guild/payg/payg_ev_agit.txt
@@ -4,7 +4,7 @@
 //= jAthena (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88]
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
+//= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf]
 //============================================================
 
 
@@ -35,7 +36,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "payg_cas01",GetCastleData("payg_cas01",1),6;
-	Monster "payg_cas01",139,139,"EMPERIUM",1288,1,"Agit_Py01::OnAgitBreak";
+	Monster "payg_cas01",139,139,"Emperium",1288,1,"Agit_Py01::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","payg_cas01","Py01";
@@ -62,7 +63,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "payg_cas02",GetCastleData("payg_cas02",1),6;
-	Monster "payg_cas02",39,25,"EMPERIUM",1288,1,"Agit_Py02::OnAgitBreak";
+	Monster "payg_cas02",39,25,"Emperium",1288,1,"Agit_Py02::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","payg_cas02","Py02";
@@ -89,7 +90,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "payg_cas03",GetCastleData("payg_cas03",1),6;
-	Monster "payg_cas03",269,265,"EMPERIUM",1288,1,"Agit_Py03::OnAgitBreak";
+	Monster "payg_cas03",269,265,"Emperium",1288,1,"Agit_Py03::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","payg_cas03","Py03";
@@ -116,7 +117,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "payg_cas04",GetCastleData("payg_cas04",1),6;
-	Monster "payg_cas04",271,29,"EMPERIUM",1288,1,"Agit_Py04::OnAgitBreak";
+	Monster "payg_cas04",271,29,"Emperium",1288,1,"Agit_Py04::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","payg_cas04","Py04";
@@ -143,7 +144,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "payg_cas05",GetCastleData("payg_cas05",1),6;
-	Monster "payg_cas05",30,30,"EMPERIUM",1288,1,"Agit_Py05::OnAgitBreak";
+	Monster "payg_cas05",30,30,"Emperium",1288,1,"Agit_Py05::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","payg_cas05","Py05";
diff --git a/npc/guild/payg/payg_guardians.txt b/npc/guild/payg/payg_guardians.txt
index c2b925cf0..e88dd9e5e 100644
--- a/npc/guild/payg/payg_guardians.txt
+++ b/npc/guild/payg/payg_guardians.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= holyAngelX (1.0)
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -14,95 +14,102 @@
 //= 1.2 by Akaru and Valaris
 //= 1.2a Guardians for all payg castles are now in this file.
 //= Minor optimizations.[kobra_k88]
+//= 1.3 Corrected what guardians will spawn, and where. [L0ne_W0lf]
+//=	All guardians will now die when OnAgiInit is run.
+//=	Removed announcment for when a guardian dies.
 //============================================================
 
 
 payg_cas01,139,139,0	script	Guardian_Py01	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas01",10) == 1) guardian "payg_cas01",210,120,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",0;
-	if (GetCastleData("payg_cas01",11) == 1) guardian "payg_cas01",69,26,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",1; 
-	if (GetCastleData("payg_cas01",12) == 1) guardian "payg_cas01",23,141,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",2;
-	if (GetCastleData("payg_cas01",13) == 1) guardian "payg_cas01",224,87,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",3;
-	if (GetCastleData("payg_cas01",14) == 1) guardian "payg_cas01",81,45,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",4;
-	if (GetCastleData("payg_cas01",15) == 1) guardian "payg_cas01",214,53,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",5;
-	if (GetCastleData("payg_cas01",16) == 1) guardian "payg_cas01",69,26,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",6;
-	if (GetCastleData("payg_cas01",17) == 1) guardian "payg_cas01",23,141,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",7;
+	killmonster "payg_cas01","Guardian_Py01::OnGuardianDied";
+	if (GetCastleData("payg_cas01",10) == 1) guardian "payg_cas01",229,92,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",0;
+	if (GetCastleData("payg_cas01",11) == 1) guardian "payg_cas01",225,80,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",1; 
+	if (GetCastleData("payg_cas01",12) == 1) guardian "payg_cas01",222,111,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",2;
+	if (GetCastleData("payg_cas01",13) == 1) guardian "payg_cas01",99,45,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",3;
+	if (GetCastleData("payg_cas01",14) == 1) guardian "payg_cas01",65,31,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",4;
+	if (GetCastleData("payg_cas01",15) == 1) guardian "payg_cas01",36,127,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",5;
+	if (GetCastleData("payg_cas01",16) == 1) guardian "payg_cas01",51,144,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",6;
+	if (GetCastleData("payg_cas01",17) == 1) guardian "payg_cas01",138,133,"Guardian Knight",1286,"Guardian_Py01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "payg_cas01","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 payg_cas02,39,25,0	script	Guardian_Py02	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas02",10) == 1) guardian "payg_cas02",208,37,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",0;
-	if (GetCastleData("payg_cas02",11) == 1) guardian "payg_cas02",51,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",1;
-	if (GetCastleData("payg_cas02",12) == 1) guardian "payg_cas02",286,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",2;
-	if (GetCastleData("payg_cas02",13) == 1) guardian "payg_cas02",217,42,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",3;
-	if (GetCastleData("payg_cas02",14) == 1) guardian "payg_cas02",264,266,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",4;
-	if (GetCastleData("payg_cas02",15) == 1) guardian "payg_cas02",51,245,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",5;
-	if (GetCastleData("payg_cas02",16) == 1) guardian "payg_cas02",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",6;
-	if (GetCastleData("payg_cas02",17) == 1) guardian "payg_cas02",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",7;
+	killmonster "payg_cas02","Guardian_Py02::OnGuardianDied";
+	if (GetCastleData("payg_cas02",10) == 1) guardian "payg_cas02",237,54,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",0;
+	if (GetCastleData("payg_cas02",11) == 1) guardian "payg_cas02",228,72,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",1;
+	if (GetCastleData("payg_cas02",12) == 1) guardian "payg_cas02",210,41,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",2;
+	if (GetCastleData("payg_cas02",13) == 1) guardian "payg_cas02",57,241,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",3;
+	if (GetCastleData("payg_cas02",14) == 1) guardian "payg_cas02",42,241,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",4;
+	if (GetCastleData("payg_cas02",15) == 1) guardian "payg_cas02",287,257,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",5;
+	if (GetCastleData("payg_cas02",16) == 1) guardian "payg_cas02",264,272,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",6;
+	if (GetCastleData("payg_cas02",17) == 1) guardian "payg_cas02",27,20,"Guardian Knight",1286,"Guardian_Py02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "payg_cas02","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 payg_cas03,269,265,0	script	Guardian_Py03	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas03",10) == 1) guardian "payg_cas03",252,39,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",0; 
-	if (GetCastleData("payg_cas03",11) == 1) guardian "payg_cas03",23,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",1;
-	if (GetCastleData("payg_cas03",12) == 1) guardian "payg_cas03",34,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",2;
-	if (GetCastleData("payg_cas03",13) == 1) guardian "payg_cas03",57,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",3;
-	if (GetCastleData("payg_cas03",14) == 1) guardian "payg_cas03",20,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",4;
-	if (GetCastleData("payg_cas03",15) == 1) guardian "payg_cas03",34,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",5;
-	if (GetCastleData("payg_cas03",16) == 1) guardian "payg_cas03",23,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",6;
-	if (GetCastleData("payg_cas03",17) == 1) guardian "payg_cas03",28,253,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",7;
+	killmonster "payg_cas03","Guardian_Py03::OnGuardianDied";
+	if (GetCastleData("payg_cas03",10) == 1) guardian "payg_cas03",245,37,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",0; 
+	if (GetCastleData("payg_cas03",11) == 1) guardian "payg_cas03",269,51,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",1;
+	if (GetCastleData("payg_cas03",12) == 1) guardian "payg_cas03",36,39,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",2;
+	if (GetCastleData("payg_cas03",13) == 1) guardian "payg_cas03",41,39,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",3;
+	if (GetCastleData("payg_cas03",14) == 1) guardian "payg_cas03",39,65,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",4;
+	if (GetCastleData("payg_cas03",15) == 1) guardian "payg_cas03",19,276,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",5;
+	if (GetCastleData("payg_cas03",16) == 1) guardian "payg_cas03",37,277,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",6;
+	if (GetCastleData("payg_cas03",17) == 1) guardian "payg_cas03",268,244,"Guardian Knight",1286,"Guardian_Py03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "payg_cas03","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 payg_cas04,271,29,0	script	Guardian_Py04	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas04",10) == 1) guardian "payg_cas04",236,172,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",0;
-	if (GetCastleData("payg_cas04",11) == 1) guardian "payg_cas04",14,260,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",1;
-	if (GetCastleData("payg_cas04",12) == 1) guardian "payg_cas04",15,30,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",2;
-	if (GetCastleData("payg_cas04",13) == 1) guardian "payg_cas04",257,166,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",3;
-	if (GetCastleData("payg_cas04",14) == 1) guardian "payg_cas04",65,261,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",4;
-	if (GetCastleData("payg_cas04",15) == 1) guardian "payg_cas04",65,261,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",5;
-	if (GetCastleData("payg_cas04",16) == 1) guardian "payg_cas04",52,29,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",6;
-	if (GetCastleData("payg_cas04",17) == 1) guardian "payg_cas04",15,30,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",7;
+	killmonster "payg_cas04","Guardian_Py04::OnGuardianDied";
+	if (GetCastleData("payg_cas04",10) == 1) guardian "payg_cas04",251,212,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",0;
+	if (GetCastleData("payg_cas04",11) == 1) guardian "payg_cas04",232,212,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",1;
+	if (GetCastleData("payg_cas04",12) == 1) guardian "payg_cas04",231,175,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",2;
+	if (GetCastleData("payg_cas04",13) == 1) guardian "payg_cas04",32,287,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",3;
+	if (GetCastleData("payg_cas04",14) == 1) guardian "payg_cas04",32,232,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",4;
+	if (GetCastleData("payg_cas04",15) == 1) guardian "payg_cas04",35,45,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",5;
+	if (GetCastleData("payg_cas04",16) == 1) guardian "payg_cas04",36,17,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",6;
+	if (GetCastleData("payg_cas04",17) == 1) guardian "payg_cas04",270,41,"Guardian Knight",1286,"Guardian_Py04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "payg_cas04","A Guardian Has Fallen",17;
 	end;
 }
+
 //------------------------------------------------------------------------------
 payg_cas05,30,30,0	script	Guardian_Py05	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas05",10) == 1) guardian "payg_cas05",51,258,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",0;
-	if (GetCastleData("payg_cas05",11) == 1) guardian "payg_cas05",286,235,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",1;
-	if (GetCastleData("payg_cas05",12) == 1) guardian "payg_cas05",282,277,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",2;
-	if (GetCastleData("payg_cas05",13) == 1) guardian "payg_cas05",18,281,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",3;
-	if (GetCastleData("payg_cas05",14) == 1) guardian "payg_cas05",289,256,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",4;
-	if (GetCastleData("payg_cas05",15) == 1) guardian "payg_cas05",275,42,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",5;
-	if (GetCastleData("payg_cas05",16) == 1) guardian "payg_cas05",254,9,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",6;
-	if (GetCastleData("payg_cas05",17) == 1) guardian "payg_cas05",236,256,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",7;
+	killmonster "payg_cas05","Guardian_Py05::OnGuardianDied";
+	if (GetCastleData("payg_cas05",10) == 1) guardian "payg_cas05",19,279,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",0;
+	if (GetCastleData("payg_cas05",11) == 1) guardian "payg_cas05",33,260,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",1;
+	if (GetCastleData("payg_cas05",12) == 1) guardian "payg_cas05",266,234,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",2;
+	if (GetCastleData("payg_cas05",13) == 1) guardian "payg_cas05",266,279,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",3;
+	if (GetCastleData("payg_cas05",14) == 1) guardian "payg_cas05",263,37,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",4;
+	if (GetCastleData("payg_cas05",15) == 1) guardian "payg_cas05",263,21,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",5;
+	if (GetCastleData("payg_cas05",16) == 1) guardian "payg_cas05",250,22,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",6;
+	if (GetCastleData("payg_cas05",17) == 1) guardian "payg_cas05",36,36,"Guardian Knight",1286,"Guardian_Py05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "payg_cas05","A Guardian Has Fallen",17;
 	end;
 }
diff --git a/npc/guild/payg/payg_managers.txt b/npc/guild/payg/payg_managers.txt
index 76ee5282d..b2c23938c 100644
--- a/npc/guild/payg/payg_managers.txt
+++ b/npc/guild/payg/payg_managers.txt
@@ -4,101 +4,93 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
 //= 
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Updated Guardian positions and types. [L0ne_W0lf]
+//=	Updated manager names, and some additional info
 //============================================================
 
 
 // Castle 1 ==================================================================================
-payg_cas01,120,58,4	script	Grunday	55,{
-	if(callfunc("F_GldManager","Grunday","payg_cas01",290,7,"Py01") == 0) close;
+payg_cas01,120,58,4	script	Kurunnadi#pay1	55,{
+	if(callfunc("F_GldManager","Steward Kurunnadi","payg_cas01",295,8,"Py01") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas01",210,120,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas01",69,26,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas01",23,141,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas01",224,87,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas01",81,45,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas01",214,53,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas01",69,26,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas01",23,141,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",7;
-	mes "[ Grunday ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "payg_cas01",229,92,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "payg_cas01",225,80,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",1; 
+	if (@GDnum == 12) guardian "payg_cas01",222,111,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "payg_cas01",99,45,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "payg_cas01",65,31,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "payg_cas01",36,127,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "payg_cas01",51,144,"Guardian Archer",1285,"Guardian_Py01::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "payg_cas01",138,133,"Guardian Knight",1286,"Guardian_Py01::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 2 ==================================================================================
-payg_cas02,22,260,7	script	Cherrios	55,{
-	if(callfunc("F_GldManager","Cherrios","payg_cas02",145,143,"Py02") == 0) close;
+payg_cas02,22,260,7	script	Cherieos#pay2	55,{
+	if(callfunc("F_GldManager","Steward Cherieos","payg_cas02",141,149,"Py02") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas02",208,37,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas02",51,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas02",286,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas02",217,42,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas02",264,266,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas02",51,245,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas02",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas02",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",7;
-	mes "[ Cherrios ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "payg_cas02",237,54,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "payg_cas02",228,72,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "payg_cas02",210,41,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "payg_cas02",57,241,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "payg_cas02",42,241,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "payg_cas02",287,257,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "payg_cas02",264,272,"Guardian Archer",1285,"Guardian_Py02::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "payg_cas02",27,20,"Guardian Knight",1286,"Guardian_Py02::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 3 ==================================================================================
-payg_cas03,10,277,0	script	Garriet	55,{
-	if(callfunc("F_GldManager","Garriet","payg_cas03",158,168,"Py03") == 0) close;
+payg_cas03,10,277,0	script	Gheriot#pay3	55,{
+	if(callfunc("F_GldManager","Steward Gheriot","payg_cas03",163,167,"Py03") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas03",252,39,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas03",23,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas03",34,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas03",57,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas03",20,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas03",34,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas03",23,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas03",28,253,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",7;
-	mes "[ Garriet ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "payg_cas03",245,37,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",0; 
+	if (@GDnum == 11) guardian "payg_cas03",269,51,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "payg_cas03",36,39,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "payg_cas03",41,39,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "payg_cas03",39,65,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "payg_cas03",19,276,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "payg_cas03",37,277,"Guardian Archer",1285,"Guardian_Py03::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "payg_cas03",268,244,"Guardian Knight",1286,"Guardian_Py03::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 4 ==================================================================================
-payg_cas04,38,284,3	script	DJ	55,{
-	if(callfunc("F_GldManager","DJ","payg_cas04",146,48,"Py04") == 0) close;
+payg_cas04,38,284,3	script	DJ#pay4	55,{
+	if(callfunc("F_GldManager","Steward DJ","payg_cas04",151,47,"Py04") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas04",236,172,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas04",14,260,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas04",15,30,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas04",257,166,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas04",65,261,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas04",65,261,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas04",52,29,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas04",15,30,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",7;
-	mes "[ DJ ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "payg_cas04",251,212,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "payg_cas04",232,212,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "payg_cas04",231,175,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "payg_cas04",32,287,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "payg_cas04",32,232,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "payg_cas04",35,45,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "payg_cas04",36,17,"Guardian Archer",1285,"Guardian_Py04::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "payg_cas04",270,41,"Guardian Knight",1286,"Guardian_Py04::OnGuardianDied",7;
 	close;
 }
 
 
 // Castle 5 ==================================================================================
-payg_cas05,277,249,3	script	Najarf	55,{
-	if(callfunc("F_GldManager","Najarf","payg_cas05",156,131,"Py05") == 0) close;
+payg_cas05,277,249,3	script	Nahzarf#pay5	55,{
+	if(callfunc("F_GldManager","Steward Nahzarf","payg_cas05",153,137,"Py05") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas05",51,258,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas05",286,235,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas05",282,277,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas05",18,281,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas05",289,256,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas05",275,42,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas05",254,9,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas05",236,256,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",7;
-	mes "[ Najarf ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "payg_cas05",19,279,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "payg_cas05",33,260,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "payg_cas05",266,234,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "payg_cas05",266,279,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "payg_cas05",263,37,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "payg_cas05",263,21,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "payg_cas05",250,22,"Guardian Archer",1285,"Guardian_Py05::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "payg_cas05",36,36,"Guardian Knight",1286,"Guardian_Py05::OnGuardianDied",7;
 	close;
 }
diff --git a/npc/guild/payg/payg_treas.txt b/npc/guild/payg/payg_treas.txt
index c302ed9ad..d0e174215 100644
--- a/npc/guild/payg/payg_treas.txt
+++ b/npc/guild/payg/payg_treas.txt
@@ -11,6 +11,7 @@
 //=
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Removed announces when you open chests. [L0ne_W0lf]
 //============================================================
 
 
@@ -27,9 +28,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "payg_cas01","Treasure Chest Broken Open",17;
 	set $boxNumPy01, $boxNumPy01 -1;
-	if($boxNumPy01 == 0) mapannounce "payg_cas01", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -58,9 +57,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "payg_cas02","Treasure Chest Broken Open",17;
 	set $boxNumPy02, $boxNumPy02 -1;
-	if($boxNumPy02 == 0) mapannounce "payg_cas02", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -89,9 +86,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "payg_cas03","Treasure Chest Broken Open",17;
 	set $boxNumPy03, $boxNumPy03 -1;
-	if($boxNumPy03 == 0) mapannounce "payg_cas03", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -120,9 +115,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "payg_cas04","Treasure Chest Broken Open",17;
 	set $boxNumPy04, $boxNumPy04 -1;
-	if($boxNumPy04 == 0) mapannounce "payg_cas04", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -151,9 +144,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "payg_cas05","Treasure Chest Broken Open",17;
 	set $boxNumPy05, $boxNumPy05 -1;
-	if($boxNumPy05 == 0) mapannounce "payg_cas05", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
diff --git a/npc/guild/prtg/prtg_ev_agit.txt b/npc/guild/prtg/prtg_ev_agit.txt
index 22523f17c..3434fe801 100644
--- a/npc/guild/prtg/prtg_ev_agit.txt
+++ b/npc/guild/prtg/prtg_ev_agit.txt
@@ -4,7 +4,7 @@
 //= jAthena (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //===== Additional Comments: =================================
 //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88]
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
+//= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf]
 //============================================================
 
 
@@ -35,7 +36,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "prtg_cas01",GetCastleData("prtg_cas01",1),6;
-	Monster "prtg_cas01",197,197,"EMPERIUM",1288,1,"Agit_Pt01::OnAgitBreak";
+	Monster "prtg_cas01",197,197,"Emperium",1288,1,"Agit_Pt01::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","prtg_cas01","Pt01";
@@ -62,7 +63,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "prtg_cas02",GetCastleData("prtg_cas02",1),6;
-	Monster "prtg_cas02",158,174,"EMPERIUM",1288,1,"Agit_Pt02::OnAgitBreak";
+	Monster "prtg_cas02",158,174,"Emperium",1288,1,"Agit_Pt02::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","prtg_cas02","Pt02";
@@ -89,7 +90,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "prtg_cas03",GetCastleData("prtg_cas03",1),6;
-	Monster "prtg_cas03",17,221,"EMPERIUM",1288,1,"Agit_Pt03::OnAgitBreak";
+	Monster "prtg_cas03",17,221,"Emperium",1288,1,"Agit_Pt03::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","prtg_cas03","Pt03";
@@ -116,7 +117,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "prtg_cas04",GetCastleData("prtg_cas04",1),6;
-	Monster "prtg_cas04",292,14,"EMPERIUM",1288,1,"Agit_Pt04::OnAgitBreak";
+	Monster "prtg_cas04",292,14,"Emperium",1288,1,"Agit_Pt04::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","prtg_cas04","Pt04";
@@ -143,7 +144,7 @@ OnGuildBreak:
 	end;
 OnAgitEliminate:
 	MapRespawnGuildID "prtg_cas05",GetCastleData("prtg_cas05",1),6;
-	Monster "prtg_cas05",266,266,"EMPERIUM",1288,1,"Agit_Pt05::OnAgitBreak";
+	Monster "prtg_cas05",266,266,"Emperium",1288,1,"Agit_Pt05::OnAgitBreak";
 	end;
 OnAgitEnd:
 	callfunc "F_AgitEnd","prtg_cas05","Pt05";
diff --git a/npc/guild/prtg/prtg_guardians.txt b/npc/guild/prtg/prtg_guardians.txt
index 8932c43d8..fce1eb01c 100644
--- a/npc/guild/prtg/prtg_guardians.txt
+++ b/npc/guild/prtg/prtg_guardians.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= holyAngelX (1.0)
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -14,95 +14,98 @@
 //= 1.2 by Akaru and Valaris
 //= 1.2a Guardians for all prtg castles are now in this file.
 //= Minor optimizations.[kobra_k88]
+//= 1.3 Corrected what guardians will spawn, and where. [L0ne_W0lf]
+//=	All guardians will now die when OnAgiInit is run.
+//=	Removed announcment for when a guardian dies.
 //============================================================
 
 
 prtg_cas01,197,197,0	script	Guardian_Pt01	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas01",10) == 1) guardian "prtg_cas01",196,92,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas01",11) == 1) guardian "prtg_cas01",113,200,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas01",12) == 1) guardian "prtg_cas01",111,186,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas01",13) == 1) guardian "prtg_cas01",76,202,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas01",14) == 1) guardian "prtg_cas01",90,26,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas01",15) == 1) guardian "prtg_cas01",58,59,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas01",16) == 1) guardian "prtg_cas01",112,200,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas01",17) == 1) guardian "prtg_cas01",101,194,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",7;
+	killmonster "prtg_cas01","Guardian_Pt01::OnGuardianDied";
+	if (GetCastleData("prtg_cas01",10) == 1) guardian "prtg_cas01",182,62,"Guardian Soldier",1287,"Guardian_Pt01::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas01",11) == 1) guardian "prtg_cas01",182,116,"Guardian Soldier",1287,"Guardian_Pt01::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas01",12) == 1) guardian "prtg_cas01",153,86,"Guardian Soldier",1287,"Guardian_Pt01::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas01",13) == 1) guardian "prtg_cas01",59,28,"Guardian Archer",1285,"Guardian_Pt01::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas01",14) == 1) guardian "prtg_cas01",50,36,"Guardian Archer",1285,"Guardian_Pt01::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas01",15) == 1) guardian "prtg_cas01",184,183,"Guardian Knight",1286,"Guardian_Pt01::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas01",16) == 1) guardian "prtg_cas01",196,189,"Guardian Knight",1286,"Guardian_Pt01::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas01",17) == 1) guardian "prtg_cas01",107,179,"Guardian Knight",1286,"Guardian_Pt01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "prtg_cas01","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 prtg_cas02,158,174,0	script	Guardian_Pt02	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas02",10) == 1) guardian "prtg_cas02",75,71,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas02",11) == 1) guardian "prtg_cas02",56,31,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas02",12) == 1) guardian "prtg_cas02",42,223,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas02",13) == 1) guardian "prtg_cas02",44,195,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas02",14) == 1) guardian "prtg_cas02",197,22,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas02",15) == 1) guardian "prtg_cas02",68,71,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas02",16) == 1) guardian "prtg_cas02",202,27,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas02",17) == 1) guardian "prtg_cas02",59,24,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",7;
+	killmonster "prtg_cas02","Guardian_Pt02::OnGuardianDied";
+	if (GetCastleData("prtg_cas02",10) == 1) guardian "prtg_cas02",161,161,"Guardian Knight",1286,"Guardian_Pt02::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas02",11) == 1) guardian "prtg_cas02",153,161,"Guardian Knight",1286,"Guardian_Pt02::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas02",12) == 1) guardian "prtg_cas02",178,44,"Guardian Knight",1286,"Guardian_Pt02::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas02",13) == 1) guardian "prtg_cas02",71,75,"Guardian Soldier",1287,"Guardian_Pt02::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas02",14) == 1) guardian "prtg_cas02",49,28,"Guardian Soldier",1287,"Guardian_Pt02::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas02",15) == 1) guardian "prtg_cas02",64,186,"Guardian Archer",1285,"Guardian_Pt02::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas02",16) == 1) guardian "prtg_cas02",76,196,"Guardian Archer",1285,"Guardian_Pt02::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas02",17) == 1) guardian "prtg_cas02",75,175,"Guardian Archer",1285,"Guardian_Pt02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "prtg_cas02","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 prtg_cas03,17,221,0	script	Guardian_Pt03	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas03",10) == 1) guardian "prtg_cas03",165,55,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas03",11) == 1) guardian "prtg_cas03",161,181,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas03",12) == 1) guardian "prtg_cas03",165,199,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas03",13) == 1) guardian "prtg_cas03",169,22,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas03",14) == 1) guardian "prtg_cas03",165,191,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas03",15) == 1) guardian "prtg_cas03",175,13,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas03",16) == 1) guardian "prtg_cas03",169,180,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas03",17) == 1) guardian "prtg_cas03",142,217,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",7;
+	killmonster "prtg_cas03","Guardian_Pt03::OnGuardianDied";
+	if (GetCastleData("prtg_cas03",10) == 1) guardian "prtg_cas03",191,190,"Guardian Knight",1286,"Guardian_Pt03::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas03",11) == 1) guardian "prtg_cas03",137,190,"Guardian Knight",1286,"Guardian_Pt03::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas03",12) == 1) guardian "prtg_cas03",45,99,"Guardian Knight",1286,"Guardian_Pt03::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas03",13) == 1) guardian "prtg_cas03",50,87,"Guardian Soldier",1287,"Guardian_Pt03::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas03",14) == 1) guardian "prtg_cas03",41,87,"Guardian Soldier",1287,"Guardian_Pt03::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas03",15) == 1) guardian "prtg_cas03",191,42,"Guardian Archer",1285,"Guardian_Pt03::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas03",16) == 1) guardian "prtg_cas03",179,43,"Guardian Archer",1285,"Guardian_Pt03::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas03",17) == 1) guardian "prtg_cas03",191,72,"Guardian Archer",1285,"Guardian_Pt03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "prtg_cas03","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 prtg_cas04,292,14,0	script	Guardian_Pt04	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas04",10) == 1) guardian "prtg_cas04",30,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas04",11) == 1) guardian "prtg_cas04",38,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas04",12) == 1) guardian "prtg_cas04",63,26,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas04",13) == 1) guardian "prtg_cas04",253,274,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas04",14) == 1) guardian "prtg_cas04",269,256,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas04",15) == 1) guardian "prtg_cas04",267,271,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas04",16) == 1) guardian "prtg_cas04",34,281,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas04",17) == 1) guardian "prtg_cas04",33,232,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",7;
+	killmonster "prtg_cas04","Guardian_Pt04::OnGuardianDied";
+	if (GetCastleData("prtg_cas04",10) == 1) guardian "prtg_cas04",276,14,"Guardian Knight",1286,"Guardian_Pt04::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas04",11) == 1) guardian "prtg_cas04",274,35,"Guardian Knight",1286,"Guardian_Pt04::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas04",12) == 1) guardian "prtg_cas04",246,246,"Guardian Knight",1286,"Guardian_Pt04::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas04",13) == 1) guardian "prtg_cas04",38,240,"Guardian Soldier",1287,"Guardian_Pt04::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas04",14) == 1) guardian "prtg_cas04",29,240,"Guardian Soldier",1287,"Guardian_Pt04::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas04",15) == 1) guardian "prtg_cas04",33,258,"Guardian Soldier",1287,"Guardian_Pt04::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas04",16) == 1) guardian "prtg_cas04",78,48,"Guardian Archer",1285,"Guardian_Pt04::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas04",17) == 1) guardian "prtg_cas04",36,61,"Guardian Archer",1285,"Guardian_Pt04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "prtg_cas04","A Guardian Has Fallen",17;
 	end;
 }
 //------------------------------------------------------------------------------
 prtg_cas05,266,266,0	script	Guardian_Pt05	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas05",10) == 1) guardian "prtg_cas05",244,15,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas05",11) == 1) guardian "prtg_cas05",241,14,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas05",12) == 1) guardian "prtg_cas05",68,40,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas05",13) == 1) guardian "prtg_cas05",62,264,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas05",14) == 1) guardian "prtg_cas05",244,61,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas05",15) == 1) guardian "prtg_cas05",34,24,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas05",16) == 1) guardian "prtg_cas05",208,86,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas05",17) == 1) guardian "prtg_cas05",43,70,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",7;
+	killmonster "prtg_cas05","Guardian_Pt05::OnGuardianDied";
+	if (GetCastleData("prtg_cas05",10) == 1) guardian "prtg_cas05",266,262,"Guardian Knight",1286,"Guardian_Pt05::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas05",11) == 1) guardian "prtg_cas05",287,280,"Guardian Knight",1286,"Guardian_Pt05::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas05",12) == 1) guardian "prtg_cas05",245,250,"Guardian Knight",1286,"Guardian_Pt05::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas05",13) == 1) guardian "prtg_cas05",236,63,"Guardian Soldier",1287,"Guardian_Pt05::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas05",14) == 1) guardian "prtg_cas05",251,63,"Guardian Soldier",1287,"Guardian_Pt05::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas05",15) == 1) guardian "prtg_cas05",278,253,"Guardian Soldier",1287,"Guardian_Pt05::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas05",16) == 1) guardian "prtg_cas05",32,253,"Guardian Archer",1285,"Guardian_Pt05::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas05",17) == 1) guardian "prtg_cas05",44,248,"Guardian Archer",1285,"Guardian_Pt05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
 	// Event when Guardian dies
-	MapAnnounce "prtg_cas05","A Guardian Has Fallen",17;
 	end;
 }
diff --git a/npc/guild/prtg/prtg_managers.txt b/npc/guild/prtg/prtg_managers.txt
index c4e443b51..3248277f3 100644
--- a/npc/guild/prtg/prtg_managers.txt
+++ b/npc/guild/prtg/prtg_managers.txt
@@ -1,104 +1,96 @@
-//===== eAthena Script =======================================
+//===== eAthena Script == =====================================
 //= War of Emperium Managers for Prontera Guild Castles
-//===== By: ==================================================
+//===== By: == ================================================
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
+//===== Current Version: == ===================================
+//= 1.3
+//===== Compatible With: == ===================================
 //= eAthena 0.1+; RO Episode 4+
-//===== Description: =========================================
+//===== Description: == =======================================
 //= 
-//===== Additional Comments: =================================
+//===== Additional Comments: == ===============================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Updated Guardian positions and types. [L0ne_W0lf]
+//=	Updated manager names, and some additional info
 //============================================================
 
 
-// Castle 1 ==================================================================================
-prtg_cas01,112,181,0	script	Abrai	55,{
-	if(callfunc("F_GldManager","Abrai","prtg_cas01",15,209,"Pt01") == 0) close;
+// Castle 1 == ================================================================================
+prtg_cas01,112,181,0	script	Ahvray#prt1	55,{
+	if(callfunc("F_GldManager","Steward Ahvray","prtg_cas01",15,209,"Pt01") ==  0) close;
 
-	if(@GDnum==10) guardian "prtg_cas01",196,92,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas01",113,200,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas01",111,186,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas01",76,202,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas01",90,26,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas01",58,59,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas01",112,200,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas01",101,194,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",7;
-	mes "[ Abrai ]";
-	mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "prtg_cas01",182,62,"Guardian Soldier",1287,"Guardian_Pt01::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "prtg_cas01",182,116,"Guardian Soldier",1287,"Guardian_Pt01::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "prtg_cas01",153,86,"Guardian Soldier",1287,"Guardian_Pt01::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "prtg_cas01",59,28,"Guardian Archer",1285,"Guardian_Pt01::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "prtg_cas01",50,36,"Guardian Archer",1285,"Guardian_Pt01::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "prtg_cas01",184,183,"Guardian Knight",1286,"Guardian_Pt01::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "prtg_cas01",196,189,"Guardian Knight",1286,"Guardian_Pt01::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "prtg_cas01",107,179,"Guardian Knight",1286,"Guardian_Pt01::OnGuardianDied",7;
 	close;
 }
 
 
-// Castle 2 ==================================================================================
-prtg_cas02,94,61,0	script	Rhay	55,{
-	if(callfunc("F_GldManager","Rhay","prtg_cas02",201,229,"Pt02") == 0) close;
+// Castle 2 == ================================================================================
+prtg_cas02,94,61,4	script	Roy#prt2	55,{
+	if(callfunc("F_GldManager","Steward Roy","prtg_cas02",207,229,"Pt02") ==  0) close;
 
-	if(@GDnum==10) guardian "prtg_cas02",75,71,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas02",56,31,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas02",42,223,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas02",44,195,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas02",197,22,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas02",68,71,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas02",202,27,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas02",59,24,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",7;
-	mes "[ Rhay ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "prtg_cas02",161,161,"Guardian Knight",1286,"Guardian_Pt02::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "prtg_cas02",153,161,"Guardian Knight",1286,"Guardian_Pt02::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "prtg_cas02",178,44,"Guardian Knight",1286,"Guardian_Pt02::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "prtg_cas02",71,75,"Guardian Soldier",1287,"Guardian_Pt02::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "prtg_cas02",49,28,"Guardian Soldier",1287,"Guardian_Pt02::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "prtg_cas02",64,186,"Guardian Archer",1285,"Guardian_Pt02::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "prtg_cas02",76,196,"Guardian Archer",1285,"Guardian_Pt02::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "prtg_cas02",75,175,"Guardian Archer",1285,"Guardian_Pt02::OnGuardianDied",7;
 	close;
 }
 
 
-// Castle 3 ==================================================================================
-prtg_cas03,51,100,4	script	Stick	55,{
-	if(callfunc("F_GldManager","Stick","prtg_cas03",189,132,"Pt03") == 0) close;
+// Castle 3 == ================================================================================
+prtg_cas03,51,100,4	script	Sttick#prt3	55,{
+	if(callfunc("F_GldManager","Stick","prtg_cas03",190,130,"Pt03") ==  0) close;
 
-	if(@GDnum==10) guardian "prtg_cas03",165,55,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas03",161,181,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas03",165,199,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas03",169,22,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas03",165,191,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas03",175,13,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas03",169,180,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas03",142,217,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",7;
-	mes "[ Stick ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "prtg_cas03",191,190,"Guardian Knight",1286,"Guardian_Pt03::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "prtg_cas03",137,190,"Guardian Knight",1286,"Guardian_Pt03::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "prtg_cas03",45,99,"Guardian Knight",1286,"Guardian_Pt03::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "prtg_cas03",50,87,"Guardian Soldier",1287,"Guardian_Pt03::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "prtg_cas03",41,87,"Guardian Soldier",1287,"Guardian_Pt03::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "prtg_cas03",191,42,"Guardian Archer",1285,"Guardian_Pt03::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "prtg_cas03",179,43,"Guardian Archer",1285,"Guardian_Pt03::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "prtg_cas03",191,72,"Guardian Archer",1285,"Guardian_Pt03::OnGuardianDied",7;
 	close;
 }
 
 
-// Castle 4 ==================================================================================
-prtg_cas04,259,265,4	script	Bandred	55,{
-	if(callfunc("F_GldManager","Bandred","prtg_cas04",271,162,"Pt04") == 0) close;
+// Castle 4 == ================================================================================
+prtg_cas04,259,265,4	script	Van Dreth#prt4	55,{
+	if(callfunc("F_GldManager","Steward Van Dreth","prtg_cas04",275,160,"Pt04") ==  0) close;
 
-	if(@GDnum==10) guardian "prtg_cas04",30,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas04",38,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas04",63,26,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas04",253,274,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas04",269,256,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas04",267,271,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas04",34,281,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas04",33,232,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",7;
-	mes "[ Bandred ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "prtg_cas04",276,14,"Guardian Knight",1286,"Guardian_Pt04::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "prtg_cas04",274,35,"Guardian Knight",1286,"Guardian_Pt04::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "prtg_cas04",246,246,"Guardian Knight",1286,"Guardian_Pt04::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "prtg_cas04",38,240,"Guardian Soldier",1287,"Guardian_Pt04::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "prtg_cas04",29,240,"Guardian Soldier",1287,"Guardian_Pt04::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "prtg_cas04",33,258,"Guardian Soldier",1287,"Guardian_Pt04::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "prtg_cas04",78,48,"Guardian Archer",1285,"Guardian_Pt04::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "prtg_cas04",36,61,"Guardian Archer",1285,"Guardian_Pt04::OnGuardianDied",7;
 	close;
 }
 
 
-// Castle 5 ==================================================================================
-prtg_cas05,36,37,4	script	Reiner	55,{
-	if(callfunc("F_GldManager","Reiner","prtg_cas05",273,179,"Pt05") == 0) close;
+// Castle 5 == ================================================================================
+prtg_cas05,36,37,4	script	Raynor#prt5	55,{
+	if(callfunc("F_GldManager","Steward Raynor","prtg_cas05",281,176,"Pt05") ==  0) close;
 
-	if(@GDnum==10) guardian "prtg_cas05",244,15,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas05",241,14,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas05",68,40,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas05",62,264,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas05",244,61,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas05",34,24,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas05",208,86,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas05",43,70,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",7;
-	mes "[ Reiner ]";
-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	if (@GDnum == 10) guardian "prtg_cas05",266,262,"Guardian Knight",1286,"Guardian_Pt05::OnGuardianDied",0;
+	if (@GDnum == 11) guardian "prtg_cas05",287,280,"Guardian Knight",1286,"Guardian_Pt05::OnGuardianDied",1;
+	if (@GDnum == 12) guardian "prtg_cas05",245,250,"Guardian Knight",1286,"Guardian_Pt05::OnGuardianDied",2;
+	if (@GDnum == 13) guardian "prtg_cas05",236,63,"Guardian Soldier",1287,"Guardian_Pt05::OnGuardianDied",3;
+	if (@GDnum == 14) guardian "prtg_cas05",251,63,"Guardian Soldier",1287,"Guardian_Pt05::OnGuardianDied",4;
+	if (@GDnum == 15) guardian "prtg_cas05",278,253,"Guardian Soldier",1287,"Guardian_Pt05::OnGuardianDied",5;
+	if (@GDnum == 16) guardian "prtg_cas05",32,253,"Guardian Archer",1285,"Guardian_Pt05::OnGuardianDied",6;
+	if (@GDnum == 17) guardian "prtg_cas05",44,248,"Guardian Archer",1285,"Guardian_Pt05::OnGuardianDied",7;
 	close;
 }
diff --git a/npc/guild/prtg/prtg_treas.txt b/npc/guild/prtg/prtg_treas.txt
index 81a43f7d8..b7a9a5142 100644
--- a/npc/guild/prtg/prtg_treas.txt
+++ b/npc/guild/prtg/prtg_treas.txt
@@ -11,6 +11,7 @@
 //= 
 //===== Additional Comments: =================================
 //= v1.2 Optimized with functions.[kobra_k88]
+//= 1.3 Removed announces when you open chests. [L0ne_W0lf]
 //============================================================
 
 
@@ -27,9 +28,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "prtg_cas01","Treasure Chest Broken Open",17;
 	set $boxNumPt01, $boxNumPt01 -1;
-	if($boxNumPt01 == 0) mapannounce "prtg_cas01", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -59,9 +58,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "prtg_cas02","Treasure Chest Broken Open",17;
 	set $boxNumPt02, $boxNumPt02 -1;
-	if($boxNumPt02 == 0) mapannounce "prtg_cas02", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -91,9 +88,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "prtg_cas03","Treasure Chest Broken Open",17;
 	set $boxNumPt03, $boxNumPt03 -1;
-	if($boxNumPt03 == 0) mapannounce "prtg_cas03", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -123,9 +118,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "prtg_cas04","Treasure Chest Broken Open",17;
 	set $boxNumPt04, $boxNumPt04 -1;
-	if($boxNumPt04 == 0) mapannounce "prtg_cas04", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }
 
@@ -155,9 +148,7 @@ OnInit:
 	end;
 
 OnDied:
-	mapannounce "prtg_cas05","Treasure Chest Broken Open",17;
 	set $boxNumPt05, $boxNumPt05 -1;
-	if($boxNumPt05 == 0) mapannounce "prtg_cas05", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
 	end;
 }