* 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

4 files changed, 122 insertions, 136 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;
 }