* 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, 121 insertions, 134 deletions

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;
 }