Browse Source

- Modified the "guardian" spawn script command, it no longer receives a "amount" argument (since that only leads to trouble), if the class is negative, it'll pick a random class the same way the monster spawn script command does, and if you pass a spawn position with coordinates equal or less to 0, a random spot in the map will be taken. However you can't use "this" as a map name anymore since these script commands do not need an attached player.
- Guardian spawning will now fail if you attempt to spawn a guardian that already exists on the same position.
- Collapsed clif_party_main_info and clif_party_join_info into a single function: clif_party_member_info
- Collapsed config settings "sg_miracle_skill_min_duration" and "sg_miracle_skill_max_duration" into "sg_miracle_skill_duration", which defaults to an hour.
- Miracle of the Sun, Moon and Stars can now retrigger to lenghten it's effect, and it is cancelled on warp/map-change.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9871 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 18 years ago
parent
commit
dddd48f15d

+ 12 - 0
Changelog-Trunk.txt

@@ -3,6 +3,18 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/02/16
+	* Modified the "guardian" spawn script command, it no longer receives a
+	  "amount" argument (since that only leads to trouble), if the class is
+	  negative, it'll pick a random class the same way the monster spawn script
+	  command does, and if you pass a spawn position with coordinates equal or
+	  less to 0, a random spot in the map will be taken. However you can't use
+	  "this" as a map name anymore since these script commands do not need an
+	  attached player.
+	* Guardian spawning will now fail if you attempt to spawn a guardian that
+	  already exists on the same position.
+	* Miracle of the Sun, Moon and Stars can now retrigger to lenghten it's
+	  effect, and it is cancelled on warp/map-change. [Skotlex]
 2007/02/15
 	* Reverted some of my mobdb code
 	* Cleaned up clif_party_info a bit

+ 4 - 1
conf-tmpl/Changelog.txt

@@ -1,5 +1,8 @@
 Date	Added
-
+2007/02/16
+	* Collapsed config settings "sg_miracle_skill_min_duration" and
+	  "sg_miracle_skill_max_duration" into "sg_miracle_skill_duration", which
+	  defaults to an hour (skill.conf).
 2007/02/12
 	* Corrected the meaning of "skill_display_fail&2", made 2 the default
 	  setting. [Skotlex]

+ 2 - 3
conf-tmpl/battle/skill.conf

@@ -270,9 +270,8 @@ allow_es_magic_player: no
 //Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
 sg_miracle_skill_ratio: 1
 
-//Miracle of the Sun, Moon and Stars skill duration in miliseconds
-sg_miracle_skill_min_duration: 3600000
-sg_miracle_skill_max_duration: 9000000
+//Miracle of the Sun, Moon and Stars skill duration in milliseconds
+sg_miracle_skill_duration: 3600000
 
 //Angel of the Sun, Moon and Stars skill ratio (100% = 10000)
 sg_angel_skill_ratio: 10

+ 3 - 0
npc/Changelog.txt

@@ -26,6 +26,9 @@ KarLaeda
 
 Date		Added
 ======
+2007/02/17
+	* Updated WoE scripts since the "guardian" script command no longer has a
+	  "amount" argument. [Skotlex]
 2007/02/15
 	* Corrected all Schwarzwald typos (except for the WIP one) [ultramage]
 2007/01/30

+ 40 - 40
npc/guild/aldeg/aldeg_guardians.txt

@@ -19,14 +19,14 @@
 
 aldeg_cas01.gat,216,24,0	script	Guardian_A01	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas01.gat",10) == 1) guardian "aldeg_cas01.gat",18,219,"Soldier Guardian",1287,1,"Guardian_A01::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas01.gat",11) == 1) guardian "aldeg_cas01.gat",117,42,"Soldier Guardian",1287,1,"Guardian_A01::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas01.gat",12) == 1) guardian "aldeg_cas01.gat",207,153,"Soldier Guardian",1287,1,"Guardian_A01::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas01.gat",13) == 1) guardian "aldeg_cas01.gat",68,70,"Archer Guardian",1285,1,"Guardian_A01::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas01.gat",14) == 1) guardian "aldeg_cas01.gat",187,140,"Archer Guardian",1285,1,"Guardian_A01::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas01.gat",15) == 1) guardian "aldeg_cas01.gat",62,204,"Knight Guardian",1286,1,"Guardian_A01::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas01.gat",16) == 1) guardian "aldeg_cas01.gat",113,100,"Knight Guardian",1286,1,"Guardian_A01::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas01.gat",17) == 1) guardian "aldeg_cas01.gat",211,174,"Knight Guardian",1286,1,"Guardian_A01::OnGuardianDied",7;
+	if (GetCastleData("aldeg_cas01.gat",10) == 1) guardian "aldeg_cas01.gat",18,219,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas01.gat",11) == 1) guardian "aldeg_cas01.gat",117,42,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas01.gat",12) == 1) guardian "aldeg_cas01.gat",207,153,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas01.gat",13) == 1) guardian "aldeg_cas01.gat",68,70,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas01.gat",14) == 1) guardian "aldeg_cas01.gat",187,140,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas01.gat",15) == 1) guardian "aldeg_cas01.gat",62,204,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas01.gat",16) == 1) guardian "aldeg_cas01.gat",113,100,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas01.gat",17) == 1) guardian "aldeg_cas01.gat",211,174,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -40,14 +40,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 aldeg_cas02.gat,214,24,0	script	Guardian_A02	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas02.gat",10) == 1) guardian "aldeg_cas02.gat",22,186,"Soldier Guardian",1287,1,"Guardian_A02::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas02.gat",11) == 1) guardian "aldeg_cas02.gat",88,31,"Soldier Guardian",1287,1,"Guardian_A02::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas02.gat",12) == 1) guardian "aldeg_cas02.gat",207,176,"Soldier Guardian",1287,1,"Guardian_A02::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas02.gat",13) == 1) guardian "aldeg_cas02.gat",50,201,"Archer Guardian",1285,1,"Guardian_A02::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas02.gat",14) == 1) guardian "aldeg_cas02.gat",197,146,"Archer Guardian",1285,1,"Guardian_A02::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas02.gat",15) == 1) guardian "aldeg_cas02.gat",71,193,"Knight Guardian",1286,1,"Guardian_A02::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas02.gat",16) == 1) guardian "aldeg_cas02.gat",88,31,"Knight Guardian",1286,1,"Guardian_A02::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas02.gat",17) == 1) guardian "aldeg_cas02.gat",219,148,"Knight Guardian",1286,1,"Guardian_A02::OnGuardianDied",7;
+	if (GetCastleData("aldeg_cas02.gat",10) == 1) guardian "aldeg_cas02.gat",22,186,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas02.gat",11) == 1) guardian "aldeg_cas02.gat",88,31,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas02.gat",12) == 1) guardian "aldeg_cas02.gat",207,176,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas02.gat",13) == 1) guardian "aldeg_cas02.gat",50,201,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas02.gat",14) == 1) guardian "aldeg_cas02.gat",197,146,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas02.gat",15) == 1) guardian "aldeg_cas02.gat",71,193,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas02.gat",16) == 1) guardian "aldeg_cas02.gat",88,31,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas02.gat",17) == 1) guardian "aldeg_cas02.gat",219,148,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -58,14 +58,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 aldeg_cas03.gat,206,32,0	script	Guardian_A03	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas03.gat",10) == 1) guardian "aldeg_cas03.gat",57,216,"Soldier Guardian",1287,1,"Guardian_A03::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas03.gat",11) == 1) guardian "aldeg_cas03.gat",80,108,"Soldier Guardian",1287,1,"Guardian_A03::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas03.gat",12) == 1) guardian "aldeg_cas03.gat",199,183,"Soldier Guardian",1287,1,"Guardian_A03::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas03.gat",13) == 1) guardian "aldeg_cas03.gat",98,267,"Archer Guardian",1285,1,"Guardian_A03::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas03.gat",14) == 1) guardian "aldeg_cas03.gat",91,88,"Archer Guardian",1285,1,"Guardian_A03::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas03.gat",15) == 1) guardian "aldeg_cas03.gat",78,121,"Knight Guardian",1286,1,"Guardian_A03::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas03.gat",16) == 1) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,1,"Guardian_A03::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas03.gat",17) == 1) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,1,"Guardian_A03::OnGuardianDied",7;
+	if (GetCastleData("aldeg_cas03.gat",10) == 1) guardian "aldeg_cas03.gat",57,216,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas03.gat",11) == 1) guardian "aldeg_cas03.gat",80,108,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas03.gat",12) == 1) guardian "aldeg_cas03.gat",199,183,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas03.gat",13) == 1) guardian "aldeg_cas03.gat",98,267,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas03.gat",14) == 1) guardian "aldeg_cas03.gat",91,88,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas03.gat",15) == 1) guardian "aldeg_cas03.gat",78,121,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas03.gat",16) == 1) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas03.gat",17) == 1) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -76,14 +76,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 aldeg_cas04.gat,36,218,0	script	Guardian_A04	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas04.gat",10) == 1) guardian "aldeg_cas04.gat",181,33,"Soldier Guardian",1287,1,"Guardian_A04::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas04.gat",11) == 1) guardian "aldeg_cas04.gat",50,68,"Soldier Guardian",1287,1,"Guardian_A04::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas04.gat",12) == 1) guardian "aldeg_cas04.gat",50,119,"Soldier Guardian",1287,1,"Guardian_A04::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas04.gat",13) == 1) guardian "aldeg_cas04.gat",169,49,"Archer Guardian",1285,1,"Guardian_A04::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas04.gat",14) == 1) guardian "aldeg_cas04.gat",133,196,"Archer Guardian",1285,1,"Guardian_A04::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas04.gat",15) == 1) guardian "aldeg_cas04.gat",177,87,"Knight Guardian",1286,1,"Guardian_A04::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas04.gat",16) == 1) guardian "aldeg_cas04.gat",50,119,"Knight Guardian",1286,1,"Guardian_A04::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas04.gat",17) == 1) guardian "aldeg_cas04.gat",133,196,"Knight Guardian",1286,1,"Guardian_A04::OnGuardianDied",7;
+	if (GetCastleData("aldeg_cas04.gat",10) == 1) guardian "aldeg_cas04.gat",181,33,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas04.gat",11) == 1) guardian "aldeg_cas04.gat",50,68,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas04.gat",12) == 1) guardian "aldeg_cas04.gat",50,119,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas04.gat",13) == 1) guardian "aldeg_cas04.gat",169,49,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas04.gat",14) == 1) guardian "aldeg_cas04.gat",133,196,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas04.gat",15) == 1) guardian "aldeg_cas04.gat",177,87,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas04.gat",16) == 1) guardian "aldeg_cas04.gat",50,119,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas04.gat",17) == 1) guardian "aldeg_cas04.gat",133,196,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -94,14 +94,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 aldeg_cas05.gat,28,102,0	script	Guardian_A05	-1,{
 OnAgitInit:
-	if (GetCastleData("aldeg_cas05.gat",10) == 1) guardian "aldeg_cas05.gat",157,192,"Soldier Guardian",1287,1,"Guardian_A05::OnGuardianDied",0;
-	if (GetCastleData("aldeg_cas05.gat",11) == 1) guardian "aldeg_cas05.gat",194,46,"Soldier Guardian",1287,1,"Guardian_A05::OnGuardianDied",1;
-	if (GetCastleData("aldeg_cas05.gat",12) == 1) guardian "aldeg_cas05.gat",146,214,"Soldier Guardian",1287,1,"Guardian_A05::OnGuardianDied",2;
-	if (GetCastleData("aldeg_cas05.gat",13) == 1) guardian "aldeg_cas05.gat",223,95,"Archer Guardian",1285,1,"Guardian_A05::OnGuardianDied",3;
-	if (GetCastleData("aldeg_cas05.gat",14) == 1) guardian "aldeg_cas05.gat",131,223,"Archer Guardian",1285,1,"Guardian_A05::OnGuardianDied",4;
-	if (GetCastleData("aldeg_cas05.gat",15) == 1) guardian "aldeg_cas05.gat",191,68,"Knight Guardian",1286,1,"Guardian_A05::OnGuardianDied",5;
-	if (GetCastleData("aldeg_cas05.gat",16) == 1) guardian "aldeg_cas05.gat",160,194,"Knight Guardian",1286,1,"Guardian_A05::OnGuardianDied",6;
-	if (GetCastleData("aldeg_cas05.gat",17) == 1) guardian "aldeg_cas05.gat",49,225,"Knight Guardian",1286,1,"Guardian_A05::OnGuardianDied",7;
+	if (GetCastleData("aldeg_cas05.gat",10) == 1) guardian "aldeg_cas05.gat",157,192,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",0;
+	if (GetCastleData("aldeg_cas05.gat",11) == 1) guardian "aldeg_cas05.gat",194,46,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",1;
+	if (GetCastleData("aldeg_cas05.gat",12) == 1) guardian "aldeg_cas05.gat",146,214,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",2;
+	if (GetCastleData("aldeg_cas05.gat",13) == 1) guardian "aldeg_cas05.gat",223,95,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",3;
+	if (GetCastleData("aldeg_cas05.gat",14) == 1) guardian "aldeg_cas05.gat",131,223,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",4;
+	if (GetCastleData("aldeg_cas05.gat",15) == 1) guardian "aldeg_cas05.gat",191,68,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",5;
+	if (GetCastleData("aldeg_cas05.gat",16) == 1) guardian "aldeg_cas05.gat",160,194,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",6;
+	if (GetCastleData("aldeg_cas05.gat",17) == 1) guardian "aldeg_cas05.gat",49,225,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:

+ 40 - 40
npc/guild/aldeg/aldeg_managers.txt

@@ -20,14 +20,14 @@ aldeg_cas01.gat,218,175,0	script	Arl Fredo	55,{
 
 	if(callfunc("F_GldManager","Arl Fredo","aldeg_cas01",119,223,"A01") == 0) close;
 	
-	if(@GDnum==10) guardian "aldeg_cas01.gat",18,219,"Soldier Guardian",1287,1,"Guardian_A01::OnGuardianDied",0;
-	if(@GDnum==11) guardian "aldeg_cas01.gat",117,42,"Soldier Guardian",1287,1,"Guardian_A01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas01.gat",207,153,"Soldier Guardian",1287,1,"Guardian_A01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas01.gat",68,70,"Archer Guardian",1285,1,"Guardian_A01::OnGuardianDied",3;
-	if(@GDnum==14) guardian "aldeg_cas01.gat",187,140,"Archer Guardian",1285,1,"Guardian_A01::OnGuardianDied",4;
-	if(@GDnum==15) guardian "aldeg_cas01.gat",62,204,"Knight Guardian",1286,1,"Guardian_A01::OnGuardianDied",5;
-	if(@GDnum==16) guardian "aldeg_cas01.gat",113,100,"Knight Guardian",1286,1,"Guardian_A01::OnGuardianDied",6;
-	if(@GDnum==17) guardian "aldeg_cas01.gat",211,174,"Knight Guardian",1286,1,"Guardian_A01::OnGuardianDied",7;
+	if(@GDnum==10) guardian "aldeg_cas01.gat",18,219,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",0;
+	if(@GDnum==11) guardian "aldeg_cas01.gat",117,42,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "aldeg_cas01.gat",207,153,"Soldier Guardian",1287,"Guardian_A01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "aldeg_cas01.gat",68,70,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",3;
+	if(@GDnum==14) guardian "aldeg_cas01.gat",187,140,"Archer Guardian",1285,"Guardian_A01::OnGuardianDied",4;
+	if(@GDnum==15) guardian "aldeg_cas01.gat",62,204,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",5;
+	if(@GDnum==16) guardian "aldeg_cas01.gat",113,100,"Knight Guardian",1286,"Guardian_A01::OnGuardianDied",6;
+	if(@GDnum==17) guardian "aldeg_cas01.gat",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.";
 	close;
@@ -39,14 +39,14 @@ aldeg_cas02.gat,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.gat",22,186,"Soldier Guardian",1287,1,"Guardian_A02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas02.gat",88,31,"Soldier Guardian",1287,1,"Guardian_A02::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas02.gat",207,176,"Soldier Guardian",1287,1,"Guardian_A02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas02.gat",50,201,"Archer Guardian",1285,1,"Guardian_A02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas02.gat",197,146,"Archer Guardian",1285,1,"Guardian_A02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas02.gat",71,193,"Knight Guardian",1286,1,"Guardian_A02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas02.gat",88,31,"Knight Guardian",1286,1,"Guardian_A02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas02.gat",219,148,"Knight Guardian",1286,1,"Guardian_A02::OnGuardianDied",7;
+	if(@GDnum==10) guardian "aldeg_cas02.gat",22,186,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "aldeg_cas02.gat",88,31,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "aldeg_cas02.gat",207,176,"Soldier Guardian",1287,"Guardian_A02::OnGuardianDied",2;
+	if(@GDnum==13) guardian "aldeg_cas02.gat",50,201,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "aldeg_cas02.gat",197,146,"Archer Guardian",1285,"Guardian_A02::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "aldeg_cas02.gat",71,193,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "aldeg_cas02.gat",88,31,"Knight Guardian",1286,"Guardian_A02::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "aldeg_cas02.gat",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.";
 	close;
@@ -58,14 +58,14 @@ aldeg_cas03.gat,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.gat",57,216,"Soldier Guardian",1287,1,"Guardian_A03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas03.gat",80,108,"Soldier Guardian",1287,1,"Guardian_A03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas03.gat",199,183,"Soldier Guardian",1287,1,"Guardian_A03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas03.gat",98,267,"Archer Guardian",1285,1,"Guardian_A03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas03.gat",91,88,"Archer Guardian",1285,1,"Guardian_A03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas03.gat",78,121,"Knight Guardian",1286,1,"Guardian_A03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,1,"Guardian_A03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,1,"Guardian_A03::OnGuardianDied",7;
+	if(@GDnum==10) guardian "aldeg_cas03.gat",57,216,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "aldeg_cas03.gat",80,108,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "aldeg_cas03.gat",199,183,"Soldier Guardian",1287,"Guardian_A03::OnGuardianDied",2;
+	if(@GDnum==13) guardian "aldeg_cas03.gat",98,267,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "aldeg_cas03.gat",91,88,"Archer Guardian",1285,"Guardian_A03::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "aldeg_cas03.gat",78,121,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "aldeg_cas03.gat",200,164,"Knight Guardian",1286,"Guardian_A03::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "aldeg_cas03.gat",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.";
 	close;
@@ -78,14 +78,14 @@ aldeg_cas04.gat,53,89,0	script	Brimhemsen#01	55,{
 
 	if(callfunc("F_GldManager","Brimhemsen","aldeg_cas04",85,12,"A04") == 0) close;
 
-	if(@GDnum==10) guardian "aldeg_cas04.gat",181,33,"Soldier Guardian",1287,1,"Guardian_A04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas04.gat",50,68,"Soldier Guardian",1287,1,"Guardian_A04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas04.gat",50,119,"Soldier Guardian",1287,1,"Guardian_A04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas04.gat",169,49,"Archer Guardian",1285,1,"Guardian_A04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas04.gat",133,196,"Archer Guardian",1285,1,"Guardian_A04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas04.gat",177,87,"Knight Guardian",1286,1,"Guardian_A04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas04.gat",50,119,"Knight Guardian",1286,1,"Guardian_A04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas04.gat",133,196,"Knight Guardian",1286,1,"Guardian_A04::OnGuardianDied",7;
+	if(@GDnum==10) guardian "aldeg_cas04.gat",181,33,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "aldeg_cas04.gat",50,68,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "aldeg_cas04.gat",50,119,"Soldier Guardian",1287,"Guardian_A04::OnGuardianDied",2;
+	if(@GDnum==13) guardian "aldeg_cas04.gat",169,49,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "aldeg_cas04.gat",133,196,"Archer Guardian",1285,"Guardian_A04::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "aldeg_cas04.gat",177,87,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "aldeg_cas04.gat",50,119,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "aldeg_cas04.gat",133,196,"Knight Guardian",1286,"Guardian_A04::OnGuardianDied",7;
 	mes "[ Brimhemsen ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -97,14 +97,14 @@ aldeg_cas05.gat,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.gat",157,192,"Soldier Guardian",1287,1,"Guardian_A05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "aldeg_cas05.gat",194,46,"Soldier Guardian",1287,1,"Guardian_A05::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "aldeg_cas05.gat",146,214,"Soldier Guardian",1287,1,"Guardian_A05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "aldeg_cas05.gat",223,95,"Archer Guardian",1285,1,"Guardian_A05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "aldeg_cas05.gat",131,223,"Archer Guardian",1285,1,"Guardian_A05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "aldeg_cas05.gat",191,68,"Knight Guardian",1286,1,"Guardian_A05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "aldeg_cas05.gat",160,194,"Knight Guardian",1286,1,"Guardian_A05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "aldeg_cas05.gat",49,225,"Knight Guardian",1286,1,"Guardian_A05::OnGuardianDied",7;
+	if(@GDnum==10) guardian "aldeg_cas05.gat",157,192,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "aldeg_cas05.gat",194,46,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "aldeg_cas05.gat",146,214,"Soldier Guardian",1287,"Guardian_A05::OnGuardianDied",2;
+	if(@GDnum==13) guardian "aldeg_cas05.gat",223,95,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "aldeg_cas05.gat",131,223,"Archer Guardian",1285,"Guardian_A05::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "aldeg_cas05.gat",191,68,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "aldeg_cas05.gat",160,194,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "aldeg_cas05.gat",49,225,"Knight Guardian",1286,"Guardian_A05::OnGuardianDied",7;
 	mes "[ Brimhemsen ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;

+ 40 - 40
npc/guild/gefg/gefg_guardians.txt

@@ -19,14 +19,14 @@
 
 gefg_cas01.gat,198,182,0	script	Guardian_G01	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas01.gat",10) == 1) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas01.gat",11) == 1) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas01.gat",12) == 1) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas01.gat",13) == 1) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas01.gat",14) == 1) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas01.gat",15) == 1) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas01.gat",16) == 1) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas01.gat",17) == 1) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;
+	if (GetCastleData("gefg_cas01.gat",10) == 1) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas01.gat",11) == 1) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas01.gat",12) == 1) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas01.gat",13) == 1) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas01.gat",14) == 1) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas01.gat",15) == 1) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas01.gat",16) == 1) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas01.gat",17) == 1) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -37,14 +37,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 gefg_cas02.gat,176,178,0	script	Guardian_G02	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas02.gat",10) == 1) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas02.gat",11) == 1) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas02.gat",12) == 1) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas02.gat",13) == 1) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,1,"Guardian_G02::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas02.gat",14) == 1) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,1,"Guardian_G02::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas02.gat",15) == 1) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas02.gat",16) == 1) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas02.gat",17) == 1) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",7;
+	if (GetCastleData("gefg_cas02.gat",10) == 1) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,"Guardian_G02::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas02.gat",11) == 1) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,"Guardian_G02::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas02.gat",12) == 1) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,"Guardian_G02::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas02.gat",13) == 1) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,"Guardian_G02::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas02.gat",14) == 1) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,"Guardian_G02::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas02.gat",15) == 1) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,"Guardian_G02::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas02.gat",16) == 1) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,"Guardian_G02::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas02.gat",17) == 1) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,"Guardian_G02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -55,14 +55,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 gefg_cas03.gat,245,167,0	script	Guardian_G03	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas03.gat",10) == 1) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas03.gat",11) == 1) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas03.gat",12) == 1) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas03.gat",13) == 1) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas03.gat",14) == 1) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas03.gat",15) == 1) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas03.gat",16) == 1) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas03.gat",17) == 1) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",7;
+	if (GetCastleData("gefg_cas03.gat",10) == 1) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas03.gat",11) == 1) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas03.gat",12) == 1) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas03.gat",13) == 1) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas03.gat",14) == 1) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas03.gat",15) == 1) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas03.gat",16) == 1) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas03.gat",17) == 1) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -73,14 +73,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 gefg_cas04.gat,174,178,0	script	Guardian_G04	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas04.gat",10) == 1) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas04.gat",11) == 1) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas04.gat",12) == 1) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas04.gat",13) == 1) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas04.gat",14) == 1) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas04.gat",15) == 1) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas04.gat",16) == 1) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas04.gat",17) == 1) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",7;
+	if (GetCastleData("gefg_cas04.gat",10) == 1) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas04.gat",11) == 1) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas04.gat",12) == 1) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas04.gat",13) == 1) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas04.gat",14) == 1) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas04.gat",15) == 1) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas04.gat",16) == 1) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas04.gat",17) == 1) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -91,14 +91,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 gefg_cas05.gat,194,184,0	script	Guardian_G05	-1,{
 OnAgitInit:
-	if (GetCastleData("gefg_cas05.gat",10) == 1) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",0;
-	if (GetCastleData("gefg_cas05.gat",11) == 1) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",1;
-	if (GetCastleData("gefg_cas05.gat",12) == 1) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",2;
-	if (GetCastleData("gefg_cas05.gat",13) == 1) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",3;
-	if (GetCastleData("gefg_cas05.gat",14) == 1) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",4;
-	if (GetCastleData("gefg_cas05.gat",15) == 1) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",5;
-	if (GetCastleData("gefg_cas05.gat",16) == 1) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",6;
-	if (GetCastleData("gefg_cas05.gat",17) == 1) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",7;
+	if (GetCastleData("gefg_cas05.gat",10) == 1) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas05.gat",11) == 1) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas05.gat",12) == 1) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas05.gat",13) == 1) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas05.gat",14) == 1) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas05.gat",15) == 1) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas05.gat",16) == 1) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas05.gat",17) == 1) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:

+ 40 - 40
npc/guild/gefg/gefg_managers.txt

@@ -18,14 +18,14 @@
 gefg_cas01.gat,40,48,5	script	Gnaucher	55,{
 	if(callfunc("F_GldManager","Gnaucher","gefg_cas01",155,112,"G01") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;
+	if(@GDnum==10) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",7;
 	mes "[ Gnaucher ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -36,14 +36,14 @@ gefg_cas01.gat,40,48,5	script	Gnaucher	55,{
 gefg_cas02.gat,12,66,5	script	Esmark	55,{
 	if(callfunc("F_GldManager","Esmark","gefg_cas02",141,115,"G02") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;
+	if(@GDnum==10) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,"Guardian_G01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,"Guardian_G01::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,"Guardian_G01::OnGuardianDied",7;
 	mes "[ Esmark ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -54,14 +54,14 @@ gefg_cas02.gat,12,66,5	script	Esmark	55,{
 gefg_cas03.gat,106,23,5	script	Jyang	55,{
 	if(callfunc("F_GldManager","Jyang","gefg_cas03",270,290,"G03") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",0;
-	if(@GDnum==11) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",7;
+	if(@GDnum==10) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",0;
+	if(@GDnum==11) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,"Guardian_G03::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,"Guardian_G03::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,"Guardian_G03::OnGuardianDied",7;
 	mes "[ Jyang ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -72,14 +72,14 @@ gefg_cas03.gat,106,23,5	script	Jyang	55,{
 gefg_cas04.gat,73,46,5	script	Kelbany	55,{
 	if(callfunc("F_GldManager","Kelbany","gefg_cas04",116,118,"G04") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",7;
+	if(@GDnum==10) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,"Guardian_G04::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,"Guardian_G04::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,"Guardian_G04::OnGuardianDied",7;
 	mes "[ Kelbany ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -90,14 +90,14 @@ gefg_cas04.gat,73,46,5	script	Kelbany	55,{
 gefg_cas05.gat,70,52,5	script	Beeor	55,{
 	if(callfunc("F_GldManager","Beeor","gefg_cas05",144,110,"G05") == 0) close;
 
-	if(@GDnum==10) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",1;
-	if(@GDnum==12) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",7;
+	if(@GDnum==10) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,"Guardian_G05::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,"Guardian_G05::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,"Guardian_G05::OnGuardianDied",7;
 	mes "[ Beeor ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;

+ 32 - 32
npc/guild/nguild/nguild_guardians.txt

@@ -17,14 +17,14 @@
 //------------------------------------------------------------------------------
 nguild_alde.gat,216,24,0	script	Guardian_N01	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_alde.gat",10) == 1) guardian "nguild_alde.gat",18,219,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",0;
-	if (GetCastleData("nguild_alde.gat",11) == 1) guardian "nguild_alde.gat",117,42,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",1;
-	if (GetCastleData("nguild_alde.gat",12) == 1) guardian "nguild_alde.gat",207,153,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",2;
-	if (GetCastleData("nguild_alde.gat",13) == 1) guardian "nguild_alde.gat",68,70,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",3;
-	if (GetCastleData("nguild_alde.gat",14) == 1) guardian "nguild_alde.gat",187,140,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",4;
-	if (GetCastleData("nguild_alde.gat",15) == 1) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",5;
-	if (GetCastleData("nguild_alde.gat",16) == 1) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",6;
-	if (GetCastleData("nguild_alde.gat",17) == 1) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",7;
+	if (GetCastleData("nguild_alde.gat",10) == 1) guardian "nguild_alde.gat",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0;
+	if (GetCastleData("nguild_alde.gat",11) == 1) guardian "nguild_alde.gat",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1;
+	if (GetCastleData("nguild_alde.gat",12) == 1) guardian "nguild_alde.gat",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2;
+	if (GetCastleData("nguild_alde.gat",13) == 1) guardian "nguild_alde.gat",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3;
+	if (GetCastleData("nguild_alde.gat",14) == 1) guardian "nguild_alde.gat",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4;
+	if (GetCastleData("nguild_alde.gat",15) == 1) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5;
+	if (GetCastleData("nguild_alde.gat",16) == 1) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6;
+	if (GetCastleData("nguild_alde.gat",17) == 1) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -36,14 +36,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 nguild_gef.gat,198,182,0	script	Guardian_N02	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_gef.gat",10) == 1) guardian "nguild_gef.gat",30,178,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",0;
-	if (GetCastleData("nguild_gef.gat",11) == 1) guardian "nguild_gef.gat",64,180,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",1;
-	if (GetCastleData("nguild_gef.gat",12) == 1) guardian "nguild_gef.gat",61,25,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",2;
-	if (GetCastleData("nguild_gef.gat",13) == 1) guardian "nguild_gef.gat",61,44,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",3;
-	if (GetCastleData("nguild_gef.gat",14) == 1) guardian "nguild_gef.gat",189,43,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",4;
-	if (GetCastleData("nguild_gef.gat",15) == 1) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",5;
-	if (GetCastleData("nguild_gef.gat",16) == 1) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",6;
-	if (GetCastleData("nguild_gef.gat",17) == 1) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",7;
+	if (GetCastleData("nguild_gef.gat",10) == 1) guardian "nguild_gef.gat",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0;
+	if (GetCastleData("nguild_gef.gat",11) == 1) guardian "nguild_gef.gat",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1;
+	if (GetCastleData("nguild_gef.gat",12) == 1) guardian "nguild_gef.gat",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2;
+	if (GetCastleData("nguild_gef.gat",13) == 1) guardian "nguild_gef.gat",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3;
+	if (GetCastleData("nguild_gef.gat",14) == 1) guardian "nguild_gef.gat",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4;
+	if (GetCastleData("nguild_gef.gat",15) == 1) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5;
+	if (GetCastleData("nguild_gef.gat",16) == 1) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6;
+	if (GetCastleData("nguild_gef.gat",17) == 1) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -54,14 +54,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 nguild_pay.gat,139,139,0	script	Guardian_N03	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_pay.gat",10) == 1) guardian "nguild_pay.gat",210,120,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",0;
-	if (GetCastleData("nguild_pay.gat",11) == 1) guardian "nguild_pay.gat",69,26,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",1; 
-	if (GetCastleData("nguild_pay.gat",12) == 1) guardian "nguild_pay.gat",23,141,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",2;
-	if (GetCastleData("nguild_pay.gat",13) == 1) guardian "nguild_pay.gat",224,87,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",3;
-	if (GetCastleData("nguild_pay.gat",14) == 1) guardian "nguild_pay.gat",81,45,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",4;
-	if (GetCastleData("nguild_pay.gat",15) == 1) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",5;
-	if (GetCastleData("nguild_pay.gat",16) == 1) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",6;
-	if (GetCastleData("nguild_pay.gat",17) == 1) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",7;
+	if (GetCastleData("nguild_pay.gat",10) == 1) guardian "nguild_pay.gat",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0;
+	if (GetCastleData("nguild_pay.gat",11) == 1) guardian "nguild_pay.gat",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; 
+	if (GetCastleData("nguild_pay.gat",12) == 1) guardian "nguild_pay.gat",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2;
+	if (GetCastleData("nguild_pay.gat",13) == 1) guardian "nguild_pay.gat",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3;
+	if (GetCastleData("nguild_pay.gat",14) == 1) guardian "nguild_pay.gat",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4;
+	if (GetCastleData("nguild_pay.gat",15) == 1) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5;
+	if (GetCastleData("nguild_pay.gat",16) == 1) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6;
+	if (GetCastleData("nguild_pay.gat",17) == 1) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -72,14 +72,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 nguild_prt.gat,197,197,0	script	Guardian_N04	-1,{
 OnAgitInit:
-	if (GetCastleData("nguild_prt.gat",10) == 1) guardian "nguild_prt.gat",196,92,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",0;
-	if (GetCastleData("nguild_prt.gat",11) == 1) guardian "nguild_prt.gat",113,200,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",1;
-	if (GetCastleData("nguild_prt.gat",12) == 1) guardian "nguild_prt.gat",111,186,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",2;
-	if (GetCastleData("nguild_prt.gat",13) == 1) guardian "nguild_prt.gat",76,202,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",3;
-	if (GetCastleData("nguild_prt.gat",14) == 1) guardian "nguild_prt.gat",90,26,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",4;
-	if (GetCastleData("nguild_prt.gat",15) == 1) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",5;
-	if (GetCastleData("nguild_prt.gat",16) == 1) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",6;
-	if (GetCastleData("nguild_prt.gat",17) == 1) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",7;
+	if (GetCastleData("nguild_prt.gat",10) == 1) guardian "nguild_prt.gat",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0;
+	if (GetCastleData("nguild_prt.gat",11) == 1) guardian "nguild_prt.gat",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1;
+	if (GetCastleData("nguild_prt.gat",12) == 1) guardian "nguild_prt.gat",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2;
+	if (GetCastleData("nguild_prt.gat",13) == 1) guardian "nguild_prt.gat",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3;
+	if (GetCastleData("nguild_prt.gat",14) == 1) guardian "nguild_prt.gat",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4;
+	if (GetCastleData("nguild_prt.gat",15) == 1) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5;
+	if (GetCastleData("nguild_prt.gat",16) == 1) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6;
+	if (GetCastleData("nguild_prt.gat",17) == 1) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:

+ 32 - 32
npc/guild/nguild/nguild_managers.txt

@@ -17,14 +17,14 @@
 nguild_alde.gat,218,175,0	script	Frolo	55,{
 	if(callfunc("F_GldManager","Frolo","nguild_alde",119,223,"N01") == 0) close;
 	
-	if(@GDnum==10) guardian "nguild_alde.gat",18,219,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",0;
-	if(@GDnum==11) guardian "nguild_alde.gat",117,42,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "nguild_alde.gat",207,153,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "nguild_alde.gat",68,70,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",3;
-	if(@GDnum==14) guardian "nguild_alde.gat",187,140,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",4;
-	if(@GDnum==15) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",5;
-	if(@GDnum==16) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",6;
-	if(@GDnum==17) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",7;
+	if(@GDnum==10) guardian "nguild_alde.gat",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0;
+	if(@GDnum==11) guardian "nguild_alde.gat",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "nguild_alde.gat",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "nguild_alde.gat",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3;
+	if(@GDnum==14) guardian "nguild_alde.gat",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4;
+	if(@GDnum==15) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5;
+	if(@GDnum==16) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6;
+	if(@GDnum==17) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7;
 	mes "[Frolo]";
 	mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
 	close;
@@ -35,14 +35,14 @@ nguild_alde.gat,218,175,0	script	Frolo	55,{
 nguild_gef.gat,40,48,5	script	Leiber	55,{
 	if(callfunc("F_GldManager","Leiber","nguild_gef",155,112,"N02") == 0) close;
 
-	if(@GDnum==10) guardian "nguild_gef.gat",30,178,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "nguild_gef.gat",64,180,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",1;
-	if(@GDnum==12) guardian "nguild_gef.gat",61,25,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "nguild_gef.gat",61,44,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "nguild_gef.gat",189,43,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",7;
+	if(@GDnum==10) guardian "nguild_gef.gat",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "nguild_gef.gat",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1;
+	if(@GDnum==12) guardian "nguild_gef.gat",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2;
+	if(@GDnum==13) guardian "nguild_gef.gat",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "nguild_gef.gat",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7;
 	mes "[Leiber]";
 	mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
 	close;
@@ -53,14 +53,14 @@ nguild_gef.gat,40,48,5	script	Leiber	55,{
 nguild_pay.gat,120,58,4	script	Dundar	55,{
 	if(callfunc("F_GldManager","Dundar","nguild_pay",290,7,"N03") == 0) close;
 
-	if(@GDnum==10) guardian "nguild_pay.gat",210,120,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "nguild_pay.gat",69,26,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "nguild_pay.gat",23,141,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "nguild_pay.gat",224,87,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "nguild_pay.gat",81,45,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",7;
+	if(@GDnum==10) guardian "nguild_pay.gat",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "nguild_pay.gat",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "nguild_pay.gat",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2;
+	if(@GDnum==13) guardian "nguild_pay.gat",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "nguild_pay.gat",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7;
 	mes "[Dundar]";
 	mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
 	close;
@@ -71,14 +71,14 @@ nguild_pay.gat,120,58,4	script	Dundar	55,{
 nguild_prt.gat,112,181,0	script	Thefton	55,{
 	if(callfunc("F_GldManager","Thefton","nguild_prt",15,209,"N04") == 0) close;
 
-	if(@GDnum==10) guardian "nguild_prt.gat",196,92,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "nguild_prt.gat",113,200,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "nguild_prt.gat",111,186,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "nguild_prt.gat",76,202,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "nguild_prt.gat",90,26,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",7;
+	if(@GDnum==10) guardian "nguild_prt.gat",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "nguild_prt.gat",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "nguild_prt.gat",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2;
+	if(@GDnum==13) guardian "nguild_prt.gat",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "nguild_prt.gat",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7;
 	mes "[Thefton]";
 	mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
 	close;

+ 40 - 40
npc/guild/payg/payg_guardians.txt

@@ -19,14 +19,14 @@
 
 payg_cas01.gat,139,139,0	script	Guardian_Py01	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas01.gat",10) == 1) guardian "payg_cas01.gat",210,120,"Soldier Guardian",1287,1,"Guardian_Py01::OnGuardianDied",0;
-	if (GetCastleData("payg_cas01.gat",11) == 1) guardian "payg_cas01.gat",69,26,"Soldier Guardian",1287,1,"Guardian_Py01::OnGuardianDied",1; 
-	if (GetCastleData("payg_cas01.gat",12) == 1) guardian "payg_cas01.gat",23,141,"Soldier Guardian",1287,1,"Guardian_Py01::OnGuardianDied",2;
-	if (GetCastleData("payg_cas01.gat",13) == 1) guardian "payg_cas01.gat",224,87,"Archer Guardian",1285,1,"Guardian_Py01::OnGuardianDied",3;
-	if (GetCastleData("payg_cas01.gat",14) == 1) guardian "payg_cas01.gat",81,45,"Archer Guardian",1285,1,"Guardian_Py01::OnGuardianDied",4;
-	if (GetCastleData("payg_cas01.gat",15) == 1) guardian "payg_cas01.gat",214,53,"Knight Guardian",1286,1,"Guardian_Py01::OnGuardianDied",5;
-	if (GetCastleData("payg_cas01.gat",16) == 1) guardian "payg_cas01.gat",69,26,"Knight Guardian",1286,1,"Guardian_Py01::OnGuardianDied",6;
-	if (GetCastleData("payg_cas01.gat",17) == 1) guardian "payg_cas01.gat",23,141,"Knight Guardian",1286,1,"Guardian_Py01::OnGuardianDied",7;
+	if (GetCastleData("payg_cas01.gat",10) == 1) guardian "payg_cas01.gat",210,120,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",0;
+	if (GetCastleData("payg_cas01.gat",11) == 1) guardian "payg_cas01.gat",69,26,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",1; 
+	if (GetCastleData("payg_cas01.gat",12) == 1) guardian "payg_cas01.gat",23,141,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",2;
+	if (GetCastleData("payg_cas01.gat",13) == 1) guardian "payg_cas01.gat",224,87,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",3;
+	if (GetCastleData("payg_cas01.gat",14) == 1) guardian "payg_cas01.gat",81,45,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",4;
+	if (GetCastleData("payg_cas01.gat",15) == 1) guardian "payg_cas01.gat",214,53,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",5;
+	if (GetCastleData("payg_cas01.gat",16) == 1) guardian "payg_cas01.gat",69,26,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",6;
+	if (GetCastleData("payg_cas01.gat",17) == 1) guardian "payg_cas01.gat",23,141,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -37,14 +37,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 payg_cas02.gat,39,25,0	script	Guardian_Py02	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas02.gat",10) == 1) guardian "payg_cas02.gat",208,37,"Soldier Guardian",1287,1,"Guardian_Py02::OnGuardianDied",0;
-	if (GetCastleData("payg_cas02.gat",11) == 1) guardian "payg_cas02.gat",51,245,"Soldier Guardian",1287,1,"Guardian_Py02::OnGuardianDied",1;
-	if (GetCastleData("payg_cas02.gat",12) == 1) guardian "payg_cas02.gat",286,245,"Soldier Guardian",1287,1,"Guardian_Py02::OnGuardianDied",2;
-	if (GetCastleData("payg_cas02.gat",13) == 1) guardian "payg_cas02.gat",217,42,"Archer Guardian",1285,1,"Guardian_Py02::OnGuardianDied",3;
-	if (GetCastleData("payg_cas02.gat",14) == 1) guardian "payg_cas02.gat",264,266,"Archer Guardian",1285,1,"Guardian_Py02::OnGuardianDied",4;
-	if (GetCastleData("payg_cas02.gat",15) == 1) guardian "payg_cas02.gat",51,245,"Knight Guardian",1286,1,"Guardian_Py02::OnGuardianDied",5;
-	if (GetCastleData("payg_cas02.gat",16) == 1) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,1,"Guardian_Py02::OnGuardianDied",6;
-	if (GetCastleData("payg_cas02.gat",17) == 1) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,1,"Guardian_Py02::OnGuardianDied",7;
+	if (GetCastleData("payg_cas02.gat",10) == 1) guardian "payg_cas02.gat",208,37,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",0;
+	if (GetCastleData("payg_cas02.gat",11) == 1) guardian "payg_cas02.gat",51,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",1;
+	if (GetCastleData("payg_cas02.gat",12) == 1) guardian "payg_cas02.gat",286,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",2;
+	if (GetCastleData("payg_cas02.gat",13) == 1) guardian "payg_cas02.gat",217,42,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",3;
+	if (GetCastleData("payg_cas02.gat",14) == 1) guardian "payg_cas02.gat",264,266,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",4;
+	if (GetCastleData("payg_cas02.gat",15) == 1) guardian "payg_cas02.gat",51,245,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",5;
+	if (GetCastleData("payg_cas02.gat",16) == 1) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",6;
+	if (GetCastleData("payg_cas02.gat",17) == 1) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -55,14 +55,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 payg_cas03.gat,269,265,0	script	Guardian_Py03	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas03.gat",10) == 1) guardian "payg_cas03.gat",252,39,"Soldier Guardian",1287,1,"Guardian_Py03::OnGuardianDied",0; 
-	if (GetCastleData("payg_cas03.gat",11) == 1) guardian "payg_cas03.gat",23,283,"Soldier Guardian",1287,1,"Guardian_Py03::OnGuardianDied",1;
-	if (GetCastleData("payg_cas03.gat",12) == 1) guardian "payg_cas03.gat",34,283,"Soldier Guardian",1287,1,"Guardian_Py03::OnGuardianDied",2;
-	if (GetCastleData("payg_cas03.gat",13) == 1) guardian "payg_cas03.gat",57,36,"Archer Guardian",1285,1,"Guardian_Py03::OnGuardianDied",3;
-	if (GetCastleData("payg_cas03.gat",14) == 1) guardian "payg_cas03.gat",20,36,"Archer Guardian",1285,1,"Guardian_Py03::OnGuardianDied",4;
-	if (GetCastleData("payg_cas03.gat",15) == 1) guardian "payg_cas03.gat",34,283,"Knight Guardian",1286,1,"Guardian_Py03::OnGuardianDied",5;
-	if (GetCastleData("payg_cas03.gat",16) == 1) guardian "payg_cas03.gat",23,283,"Knight Guardian",1286,1,"Guardian_Py03::OnGuardianDied",6;
-	if (GetCastleData("payg_cas03.gat",17) == 1) guardian "payg_cas03.gat",28,253,"Knight Guardian",1286,1,"Guardian_Py03::OnGuardianDied",7;
+	if (GetCastleData("payg_cas03.gat",10) == 1) guardian "payg_cas03.gat",252,39,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",0; 
+	if (GetCastleData("payg_cas03.gat",11) == 1) guardian "payg_cas03.gat",23,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",1;
+	if (GetCastleData("payg_cas03.gat",12) == 1) guardian "payg_cas03.gat",34,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",2;
+	if (GetCastleData("payg_cas03.gat",13) == 1) guardian "payg_cas03.gat",57,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",3;
+	if (GetCastleData("payg_cas03.gat",14) == 1) guardian "payg_cas03.gat",20,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",4;
+	if (GetCastleData("payg_cas03.gat",15) == 1) guardian "payg_cas03.gat",34,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",5;
+	if (GetCastleData("payg_cas03.gat",16) == 1) guardian "payg_cas03.gat",23,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",6;
+	if (GetCastleData("payg_cas03.gat",17) == 1) guardian "payg_cas03.gat",28,253,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -73,14 +73,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 payg_cas04.gat,271,29,0	script	Guardian_Py04	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas04.gat",10) == 1) guardian "payg_cas04.gat",236,172,"Soldier Guardian",1287,1,"Guardian_Py04::OnGuardianDied",0;
-	if (GetCastleData("payg_cas04.gat",11) == 1) guardian "payg_cas04.gat",14,260,"Soldier Guardian",1287,1,"Guardian_Py04::OnGuardianDied",1;
-	if (GetCastleData("payg_cas04.gat",12) == 1) guardian "payg_cas04.gat",15,30,"Soldier Guardian",1287,1,"Guardian_Py04::OnGuardianDied",2;
-	if (GetCastleData("payg_cas04.gat",13) == 1) guardian "payg_cas04.gat",257,166,"Archer Guardian",1285,1,"Guardian_Py04::OnGuardianDied",3;
-	if (GetCastleData("payg_cas04.gat",14) == 1) guardian "payg_cas04.gat",65,261,"Archer Guardian",1285,1,"Guardian_Py04::OnGuardianDied",4;
-	if (GetCastleData("payg_cas04.gat",15) == 1) guardian "payg_cas04.gat",65,261,"Knight Guardian",1286,1,"Guardian_Py04::OnGuardianDied",5;
-	if (GetCastleData("payg_cas04.gat",16) == 1) guardian "payg_cas04.gat",52,29,"Knight Guardian",1286,1,"Guardian_Py04::OnGuardianDied",6;
-	if (GetCastleData("payg_cas04.gat",17) == 1) guardian "payg_cas04.gat",15,30,"Knight Guardian",1286,1,"Guardian_Py04::OnGuardianDied",7;
+	if (GetCastleData("payg_cas04.gat",10) == 1) guardian "payg_cas04.gat",236,172,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",0;
+	if (GetCastleData("payg_cas04.gat",11) == 1) guardian "payg_cas04.gat",14,260,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",1;
+	if (GetCastleData("payg_cas04.gat",12) == 1) guardian "payg_cas04.gat",15,30,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",2;
+	if (GetCastleData("payg_cas04.gat",13) == 1) guardian "payg_cas04.gat",257,166,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",3;
+	if (GetCastleData("payg_cas04.gat",14) == 1) guardian "payg_cas04.gat",65,261,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",4;
+	if (GetCastleData("payg_cas04.gat",15) == 1) guardian "payg_cas04.gat",65,261,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",5;
+	if (GetCastleData("payg_cas04.gat",16) == 1) guardian "payg_cas04.gat",52,29,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",6;
+	if (GetCastleData("payg_cas04.gat",17) == 1) guardian "payg_cas04.gat",15,30,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -91,14 +91,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 payg_cas05.gat,30,30,0	script	Guardian_Py05	-1,{
 OnAgitInit:
-	if (GetCastleData("payg_cas05.gat",10) == 1) guardian "payg_cas05.gat",51,258,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",0;
-	if (GetCastleData("payg_cas05.gat",11) == 1) guardian "payg_cas05.gat",286,235,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",1;
-	if (GetCastleData("payg_cas05.gat",12) == 1) guardian "payg_cas05.gat",282,277,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",2;
-	if (GetCastleData("payg_cas05.gat",13) == 1) guardian "payg_cas05.gat",18,281,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",3;
-	if (GetCastleData("payg_cas05.gat",14) == 1) guardian "payg_cas05.gat",289,256,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",4;
-	if (GetCastleData("payg_cas05.gat",15) == 1) guardian "payg_cas05.gat",275,42,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",5;
-	if (GetCastleData("payg_cas05.gat",16) == 1) guardian "payg_cas05.gat",254,9,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",6;
-	if (GetCastleData("payg_cas05.gat",17) == 1) guardian "payg_cas05.gat",236,256,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",7;
+	if (GetCastleData("payg_cas05.gat",10) == 1) guardian "payg_cas05.gat",51,258,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",0;
+	if (GetCastleData("payg_cas05.gat",11) == 1) guardian "payg_cas05.gat",286,235,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",1;
+	if (GetCastleData("payg_cas05.gat",12) == 1) guardian "payg_cas05.gat",282,277,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",2;
+	if (GetCastleData("payg_cas05.gat",13) == 1) guardian "payg_cas05.gat",18,281,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",3;
+	if (GetCastleData("payg_cas05.gat",14) == 1) guardian "payg_cas05.gat",289,256,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",4;
+	if (GetCastleData("payg_cas05.gat",15) == 1) guardian "payg_cas05.gat",275,42,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",5;
+	if (GetCastleData("payg_cas05.gat",16) == 1) guardian "payg_cas05.gat",254,9,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",6;
+	if (GetCastleData("payg_cas05.gat",17) == 1) guardian "payg_cas05.gat",236,256,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:

+ 40 - 40
npc/guild/payg/payg_managers.txt

@@ -18,14 +18,14 @@
 payg_cas01.gat,120,58,4	script	Grunday	55,{
 	if(callfunc("F_GldManager","Grunday","payg_cas01",290,7,"Py01") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas01.gat",210,120,"Soldier Guardian",1287,1,"Guardian_Py01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas01.gat",69,26,"Soldier Guardian",1287,1,"Guardian_Py01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas01.gat",23,141,"Soldier Guardian",1287,1,"Guardian_Py01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas01.gat",224,87,"Archer Guardian",1285,1,"Guardian_Py01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas01.gat",81,45,"Archer Guardian",1285,1,"Guardian_Py01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas01.gat",214,53,"Knight Guardian",1286,1,"Guardian_Py01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas01.gat",69,26,"Knight Guardian",1286,1,"Guardian_Py01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas01.gat",23,141,"Knight Guardian",1286,1,"Guardian_Py01::OnGuardianDied",7;
+	if(@GDnum==10) guardian "payg_cas01.gat",210,120,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "payg_cas01.gat",69,26,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "payg_cas01.gat",23,141,"Soldier Guardian",1287,"Guardian_Py01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "payg_cas01.gat",224,87,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "payg_cas01.gat",81,45,"Archer Guardian",1285,"Guardian_Py01::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "payg_cas01.gat",214,53,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "payg_cas01.gat",69,26,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "payg_cas01.gat",23,141,"Knight Guardian",1286,"Guardian_Py01::OnGuardianDied",7;
 	mes "[ Grunday ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -36,14 +36,14 @@ payg_cas01.gat,120,58,4	script	Grunday	55,{
 payg_cas02.gat,22,260,7	script	Cherrios	55,{
 	if(callfunc("F_GldManager","Cherrios","payg_cas02",145,143,"Py02") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas02.gat",208,37,"Soldier Guardian",1287,1,"Guardian_Py02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas02.gat",51,245,"Soldier Guardian",1287,1,"Guardian_Py02::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas02.gat",286,245,"Soldier Guardian",1287,1,"Guardian_Py02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas02.gat",217,42,"Archer Guardian",1285,1,"Guardian_Py02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas02.gat",264,266,"Archer Guardian",1285,1,"Guardian_Py02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas02.gat",51,245,"Knight Guardian",1286,1,"Guardian_Py02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,1,"Guardian_Py02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,1,"Guardian_Py02::OnGuardianDied",7;
+	if(@GDnum==10) guardian "payg_cas02.gat",208,37,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "payg_cas02.gat",51,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "payg_cas02.gat",286,245,"Soldier Guardian",1287,"Guardian_Py02::OnGuardianDied",2;
+	if(@GDnum==13) guardian "payg_cas02.gat",217,42,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "payg_cas02.gat",264,266,"Archer Guardian",1285,"Guardian_Py02::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "payg_cas02.gat",51,245,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "payg_cas02.gat",279,263,"Knight Guardian",1286,"Guardian_Py02::OnGuardianDied",7;
 	mes "[ Cherrios ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -54,14 +54,14 @@ payg_cas02.gat,22,260,7	script	Cherrios	55,{
 payg_cas03.gat,10,277,0	script	Garriet	55,{
 	if(callfunc("F_GldManager","Garriet","payg_cas03",158,168,"Py03") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas03.gat",252,39,"Soldier Guardian",1287,1,"Guardian_Py03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas03.gat",23,283,"Soldier Guardian",1287,1,"Guardian_Py03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas03.gat",34,283,"Soldier Guardian",1287,1,"Guardian_Py03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas03.gat",57,36,"Archer Guardian",1285,1,"Guardian_Py03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas03.gat",20,36,"Archer Guardian",1285,1,"Guardian_Py03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas03.gat",34,283,"Knight Guardian",1286,1,"Guardian_Py03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas03.gat",23,283,"Knight Guardian",1286,1,"Guardian_Py03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas03.gat",28,253,"Knight Guardian",1286,1,"Guardian_Py03::OnGuardianDied",7;
+	if(@GDnum==10) guardian "payg_cas03.gat",252,39,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "payg_cas03.gat",23,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "payg_cas03.gat",34,283,"Soldier Guardian",1287,"Guardian_Py03::OnGuardianDied",2;
+	if(@GDnum==13) guardian "payg_cas03.gat",57,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "payg_cas03.gat",20,36,"Archer Guardian",1285,"Guardian_Py03::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "payg_cas03.gat",34,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "payg_cas03.gat",23,283,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "payg_cas03.gat",28,253,"Knight Guardian",1286,"Guardian_Py03::OnGuardianDied",7;
 	mes "[ Garriet ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -72,14 +72,14 @@ payg_cas03.gat,10,277,0	script	Garriet	55,{
 payg_cas04.gat,38,284,3	script	DJ	55,{
 	if(callfunc("F_GldManager","DJ","payg_cas04",146,48,"Py04") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas04.gat",236,172,"Soldier Guardian",1287,1,"Guardian_Py04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas04.gat",14,260,"Soldier Guardian",1287,1,"Guardian_Py04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas04.gat",15,30,"Soldier Guardian",1287,1,"Guardian_Py04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas04.gat",257,166,"Archer Guardian",1285,1,"Guardian_Py04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas04.gat",65,261,"Archer Guardian",1285,1,"Guardian_Py04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas04.gat",65,261,"Knight Guardian",1286,1,"Guardian_Py04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas04.gat",52,29,"Knight Guardian",1286,1,"Guardian_Py04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas04.gat",15,30,"Knight Guardian",1286,1,"Guardian_Py04::OnGuardianDied",7;
+	if(@GDnum==10) guardian "payg_cas04.gat",236,172,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "payg_cas04.gat",14,260,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "payg_cas04.gat",15,30,"Soldier Guardian",1287,"Guardian_Py04::OnGuardianDied",2;
+	if(@GDnum==13) guardian "payg_cas04.gat",257,166,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "payg_cas04.gat",65,261,"Archer Guardian",1285,"Guardian_Py04::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "payg_cas04.gat",65,261,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "payg_cas04.gat",52,29,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "payg_cas04.gat",15,30,"Knight Guardian",1286,"Guardian_Py04::OnGuardianDied",7;
 	mes "[ DJ ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -90,14 +90,14 @@ payg_cas04.gat,38,284,3	script	DJ	55,{
 payg_cas05.gat,277,249,3	script	Najarf	55,{
 	if(callfunc("F_GldManager","Najarf","payg_cas05",156,131,"Py05") == 0) close;
 
-	if(@GDnum==10) guardian "payg_cas05.gat",51,258,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "payg_cas05.gat",286,235,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "payg_cas05.gat",282,277,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "payg_cas05.gat",18,281,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "payg_cas05.gat",289,256,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "payg_cas05.gat",275,42,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "payg_cas05.gat",254,9,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "payg_cas05.gat",236,256,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",7;
+	if(@GDnum==10) guardian "payg_cas05.gat",51,258,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "payg_cas05.gat",286,235,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "payg_cas05.gat",282,277,"Soldier Guardian",1287,"Guardian_Py05::OnGuardianDied",2;
+	if(@GDnum==13) guardian "payg_cas05.gat",18,281,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "payg_cas05.gat",289,256,"Archer Guardian",1285,"Guardian_Py05::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "payg_cas05.gat",275,42,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "payg_cas05.gat",254,9,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "payg_cas05.gat",236,256,"Knight Guardian",1286,"Guardian_Py05::OnGuardianDied",7;
 	mes "[ Najarf ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;

+ 40 - 40
npc/guild/prtg/prtg_guardians.txt

@@ -19,14 +19,14 @@
 
 prtg_cas01.gat,197,197,0	script	Guardian_Pt01	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas01.gat",10) == 1) guardian "prtg_cas01.gat",196,92,"Soldier Guardian",1287,1,"Guardian_Pt01::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas01.gat",11) == 1) guardian "prtg_cas01.gat",113,200,"Soldier Guardian",1287,1,"Guardian_Pt01::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas01.gat",12) == 1) guardian "prtg_cas01.gat",111,186,"Soldier Guardian",1287,1,"Guardian_Pt01::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas01.gat",13) == 1) guardian "prtg_cas01.gat",76,202,"Archer Guardian",1285,1,"Guardian_Pt01::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas01.gat",14) == 1) guardian "prtg_cas01.gat",90,26,"Archer Guardian",1285,1,"Guardian_Pt01::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas01.gat",15) == 1) guardian "prtg_cas01.gat",58,59,"Knight Guardian",1286,1,"Guardian_Pt01::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas01.gat",16) == 1) guardian "prtg_cas01.gat",112,200,"Knight Guardian",1286,1,"Guardian_Pt01::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas01.gat",17) == 1) guardian "prtg_cas01.gat",101,194,"Knight Guardian",1286,1,"Guardian_Pt01::OnGuardianDied",7;
+	if (GetCastleData("prtg_cas01.gat",10) == 1) guardian "prtg_cas01.gat",196,92,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas01.gat",11) == 1) guardian "prtg_cas01.gat",113,200,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas01.gat",12) == 1) guardian "prtg_cas01.gat",111,186,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas01.gat",13) == 1) guardian "prtg_cas01.gat",76,202,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas01.gat",14) == 1) guardian "prtg_cas01.gat",90,26,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas01.gat",15) == 1) guardian "prtg_cas01.gat",58,59,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas01.gat",16) == 1) guardian "prtg_cas01.gat",112,200,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas01.gat",17) == 1) guardian "prtg_cas01.gat",101,194,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -37,14 +37,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 prtg_cas02.gat,158,174,0	script	Guardian_Pt02	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas02.gat",10) == 1) guardian "prtg_cas02.gat",75,71,"Soldier Guardian",1287,1,"Guardian_Pt02::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas02.gat",11) == 1) guardian "prtg_cas02.gat",56,31,"Soldier Guardian",1287,1,"Guardian_Pt02::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas02.gat",12) == 1) guardian "prtg_cas02.gat",42,223,"Soldier Guardian",1287,1,"Guardian_Pt02::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas02.gat",13) == 1) guardian "prtg_cas02.gat",44,195,"Archer Guardian",1285,1,"Guardian_Pt02::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas02.gat",14) == 1) guardian "prtg_cas02.gat",197,22,"Archer Guardian",1285,1,"Guardian_Pt02::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas02.gat",15) == 1) guardian "prtg_cas02.gat",68,71,"Knight Guardian",1286,1,"Guardian_Pt02::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas02.gat",16) == 1) guardian "prtg_cas02.gat",202,27,"Knight Guardian",1286,1,"Guardian_Pt02::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas02.gat",17) == 1) guardian "prtg_cas02.gat",59,24,"Knight Guardian",1286,1,"Guardian_Pt02::OnGuardianDied",7;
+	if (GetCastleData("prtg_cas02.gat",10) == 1) guardian "prtg_cas02.gat",75,71,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas02.gat",11) == 1) guardian "prtg_cas02.gat",56,31,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas02.gat",12) == 1) guardian "prtg_cas02.gat",42,223,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas02.gat",13) == 1) guardian "prtg_cas02.gat",44,195,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas02.gat",14) == 1) guardian "prtg_cas02.gat",197,22,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas02.gat",15) == 1) guardian "prtg_cas02.gat",68,71,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas02.gat",16) == 1) guardian "prtg_cas02.gat",202,27,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas02.gat",17) == 1) guardian "prtg_cas02.gat",59,24,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -55,14 +55,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 prtg_cas03.gat,17,221,0	script	Guardian_Pt03	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas03.gat",10) == 1) guardian "prtg_cas03.gat",165,55,"Soldier Guardian",1287,1,"Guardian_Pt03::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas03.gat",11) == 1) guardian "prtg_cas03.gat",161,181,"Soldier Guardian",1287,1,"Guardian_Pt03::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas03.gat",12) == 1) guardian "prtg_cas03.gat",165,199,"Soldier Guardian",1287,1,"Guardian_Pt03::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas03.gat",13) == 1) guardian "prtg_cas03.gat",169,22,"Archer Guardian",1285,1,"Guardian_Pt03::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas03.gat",14) == 1) guardian "prtg_cas03.gat",165,191,"Archer Guardian",1285,1,"Guardian_Pt03::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas03.gat",15) == 1) guardian "prtg_cas03.gat",175,13,"Knight Guardian",1286,1,"Guardian_Pt03::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas03.gat",16) == 1) guardian "prtg_cas03.gat",169,180,"Knight Guardian",1286,1,"Guardian_Pt03::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas03.gat",17) == 1) guardian "prtg_cas03.gat",142,217,"Knight Guardian",1286,1,"Guardian_Pt03::OnGuardianDied",7;
+	if (GetCastleData("prtg_cas03.gat",10) == 1) guardian "prtg_cas03.gat",165,55,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas03.gat",11) == 1) guardian "prtg_cas03.gat",161,181,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas03.gat",12) == 1) guardian "prtg_cas03.gat",165,199,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas03.gat",13) == 1) guardian "prtg_cas03.gat",169,22,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas03.gat",14) == 1) guardian "prtg_cas03.gat",165,191,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas03.gat",15) == 1) guardian "prtg_cas03.gat",175,13,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas03.gat",16) == 1) guardian "prtg_cas03.gat",169,180,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas03.gat",17) == 1) guardian "prtg_cas03.gat",142,217,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -73,14 +73,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 prtg_cas04.gat,292,14,0	script	Guardian_Pt04	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas04.gat",10) == 1) guardian "prtg_cas04.gat",30,234,"Soldier Guardian",1287,1,"Guardian_Pt04::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas04.gat",11) == 1) guardian "prtg_cas04.gat",38,234,"Soldier Guardian",1287,1,"Guardian_Pt04::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas04.gat",12) == 1) guardian "prtg_cas04.gat",63,26,"Soldier Guardian",1287,1,"Guardian_Pt04::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas04.gat",13) == 1) guardian "prtg_cas04.gat",253,274,"Archer Guardian",1285,1,"Guardian_Pt04::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas04.gat",14) == 1) guardian "prtg_cas04.gat",269,256,"Archer Guardian",1285,1,"Guardian_Pt04::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas04.gat",15) == 1) guardian "prtg_cas04.gat",267,271,"Knight Guardian",1286,1,"Guardian_Pt04::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas04.gat",16) == 1) guardian "prtg_cas04.gat",34,281,"Knight Guardian",1286,1,"Guardian_Pt04::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas04.gat",17) == 1) guardian "prtg_cas04.gat",33,232,"Knight Guardian",1286,1,"Guardian_Pt04::OnGuardianDied",7;
+	if (GetCastleData("prtg_cas04.gat",10) == 1) guardian "prtg_cas04.gat",30,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas04.gat",11) == 1) guardian "prtg_cas04.gat",38,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas04.gat",12) == 1) guardian "prtg_cas04.gat",63,26,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas04.gat",13) == 1) guardian "prtg_cas04.gat",253,274,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas04.gat",14) == 1) guardian "prtg_cas04.gat",269,256,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas04.gat",15) == 1) guardian "prtg_cas04.gat",267,271,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas04.gat",16) == 1) guardian "prtg_cas04.gat",34,281,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas04.gat",17) == 1) guardian "prtg_cas04.gat",33,232,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:
@@ -91,14 +91,14 @@ OnGuardianDied:
 //------------------------------------------------------------------------------
 prtg_cas05.gat,266,266,0	script	Guardian_Pt05	-1,{
 OnAgitInit:
-	if (GetCastleData("prtg_cas05.gat",10) == 1) guardian "prtg_cas05.gat",244,15,"Soldier Guardian",1287,1,"Guardian_Pt05::OnGuardianDied",0;
-	if (GetCastleData("prtg_cas05.gat",11) == 1) guardian "prtg_cas05.gat",241,14,"Soldier Guardian",1287,1,"Guardian_Pt05::OnGuardianDied",1;
-	if (GetCastleData("prtg_cas05.gat",12) == 1) guardian "prtg_cas05.gat",68,40,"Soldier Guardian",1287,1,"Guardian_Pt05::OnGuardianDied",2;
-	if (GetCastleData("prtg_cas05.gat",13) == 1) guardian "prtg_cas05.gat",62,264,"Archer Guardian",1285,1,"Guardian_Pt05::OnGuardianDied",3;
-	if (GetCastleData("prtg_cas05.gat",14) == 1) guardian "prtg_cas05.gat",244,61,"Archer Guardian",1285,1,"Guardian_Pt05::OnGuardianDied",4;
-	if (GetCastleData("prtg_cas05.gat",15) == 1) guardian "prtg_cas05.gat",34,24,"Knight Guardian",1286,1,"Guardian_Pt05::OnGuardianDied",5;
-	if (GetCastleData("prtg_cas05.gat",16) == 1) guardian "prtg_cas05.gat",208,86,"Knight Guardian",1286,1,"Guardian_Pt05::OnGuardianDied",6;
-	if (GetCastleData("prtg_cas05.gat",17) == 1) guardian "prtg_cas05.gat",43,70,"Knight Guardian",1286,1,"Guardian_Pt05::OnGuardianDied",7;
+	if (GetCastleData("prtg_cas05.gat",10) == 1) guardian "prtg_cas05.gat",244,15,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",0;
+	if (GetCastleData("prtg_cas05.gat",11) == 1) guardian "prtg_cas05.gat",241,14,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",1;
+	if (GetCastleData("prtg_cas05.gat",12) == 1) guardian "prtg_cas05.gat",68,40,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",2;
+	if (GetCastleData("prtg_cas05.gat",13) == 1) guardian "prtg_cas05.gat",62,264,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",3;
+	if (GetCastleData("prtg_cas05.gat",14) == 1) guardian "prtg_cas05.gat",244,61,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",4;
+	if (GetCastleData("prtg_cas05.gat",15) == 1) guardian "prtg_cas05.gat",34,24,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",5;
+	if (GetCastleData("prtg_cas05.gat",16) == 1) guardian "prtg_cas05.gat",208,86,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",6;
+	if (GetCastleData("prtg_cas05.gat",17) == 1) guardian "prtg_cas05.gat",43,70,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",7;
 	end;
 
 OnGuardianDied:

+ 40 - 40
npc/guild/prtg/prtg_managers.txt

@@ -18,14 +18,14 @@
 prtg_cas01.gat,112,181,0	script	Abrai	55,{
 	if(callfunc("F_GldManager","Abrai","prtg_cas01",15,209,"Pt01") == 0) close;
 
-	if(@GDnum==10) guardian "prtg_cas01.gat",196,92,"Soldier Guardian",1287,1,"Guardian_Pt01::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas01.gat",113,200,"Soldier Guardian",1287,1,"Guardian_Pt01::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas01.gat",111,186,"Soldier Guardian",1287,1,"Guardian_Pt01::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas01.gat",76,202,"Archer Guardian",1285,1,"Guardian_Pt01::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas01.gat",90,26,"Archer Guardian",1285,1,"Guardian_Pt01::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas01.gat",58,59,"Knight Guardian",1286,1,"Guardian_Pt01::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas01.gat",112,200,"Knight Guardian",1286,1,"Guardian_Pt01::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas01.gat",101,194,"Knight Guardian",1286,1,"Guardian_Pt01::OnGuardianDied",7;
+	if(@GDnum==10) guardian "prtg_cas01.gat",196,92,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "prtg_cas01.gat",113,200,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "prtg_cas01.gat",111,186,"Soldier Guardian",1287,"Guardian_Pt01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "prtg_cas01.gat",76,202,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "prtg_cas01.gat",90,26,"Archer Guardian",1285,"Guardian_Pt01::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "prtg_cas01.gat",58,59,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "prtg_cas01.gat",112,200,"Knight Guardian",1286,"Guardian_Pt01::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "prtg_cas01.gat",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.";
 	close;
@@ -36,14 +36,14 @@ prtg_cas01.gat,112,181,0	script	Abrai	55,{
 prtg_cas02.gat,94,61,0	script	Rhay	55,{
 	if(callfunc("F_GldManager","Rhay","prtg_cas02",201,229,"Pt02") == 0) close;
 
-	if(@GDnum==10) guardian "prtg_cas02.gat",75,71,"Soldier Guardian",1287,1,"Guardian_Pt02::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas02.gat",56,31,"Soldier Guardian",1287,1,"Guardian_Pt02::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas02.gat",42,223,"Soldier Guardian",1287,1,"Guardian_Pt02::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas02.gat",44,195,"Archer Guardian",1285,1,"Guardian_Pt02::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas02.gat",197,22,"Archer Guardian",1285,1,"Guardian_Pt02::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas02.gat",68,71,"Knight Guardian",1286,1,"Guardian_Pt02::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas02.gat",202,27,"Knight Guardian",1286,1,"Guardian_Pt02::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas02.gat",59,24,"Knight Guardian",1286,1,"Guardian_Pt02::OnGuardianDied",7;
+	if(@GDnum==10) guardian "prtg_cas02.gat",75,71,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "prtg_cas02.gat",56,31,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "prtg_cas02.gat",42,223,"Soldier Guardian",1287,"Guardian_Pt02::OnGuardianDied",2;
+	if(@GDnum==13) guardian "prtg_cas02.gat",44,195,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "prtg_cas02.gat",197,22,"Archer Guardian",1285,"Guardian_Pt02::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "prtg_cas02.gat",68,71,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "prtg_cas02.gat",202,27,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "prtg_cas02.gat",59,24,"Knight Guardian",1286,"Guardian_Pt02::OnGuardianDied",7;
 	mes "[ Rhay ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -54,14 +54,14 @@ prtg_cas02.gat,94,61,0	script	Rhay	55,{
 prtg_cas03.gat,51,100,4	script	Stick	55,{
 	if(callfunc("F_GldManager","Stick","prtg_cas03",189,132,"Pt03") == 0) close;
 
-	if(@GDnum==10) guardian "prtg_cas03.gat",165,55,"Soldier Guardian",1287,1,"Guardian_Pt03::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas03.gat",161,181,"Soldier Guardian",1287,1,"Guardian_Pt03::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas03.gat",165,199,"Soldier Guardian",1287,1,"Guardian_Pt03::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas03.gat",169,22,"Archer Guardian",1285,1,"Guardian_Pt03::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas03.gat",165,191,"Archer Guardian",1285,1,"Guardian_Pt03::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas03.gat",175,13,"Knight Guardian",1286,1,"Guardian_Pt03::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas03.gat",169,180,"Knight Guardian",1286,1,"Guardian_Pt03::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas03.gat",142,217,"Knight Guardian",1286,1,"Guardian_Pt03::OnGuardianDied",7;
+	if(@GDnum==10) guardian "prtg_cas03.gat",165,55,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "prtg_cas03.gat",161,181,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "prtg_cas03.gat",165,199,"Soldier Guardian",1287,"Guardian_Pt03::OnGuardianDied",2;
+	if(@GDnum==13) guardian "prtg_cas03.gat",169,22,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "prtg_cas03.gat",165,191,"Archer Guardian",1285,"Guardian_Pt03::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "prtg_cas03.gat",175,13,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "prtg_cas03.gat",169,180,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "prtg_cas03.gat",142,217,"Knight Guardian",1286,"Guardian_Pt03::OnGuardianDied",7;
 	mes "[ Stick ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -72,14 +72,14 @@ prtg_cas03.gat,51,100,4	script	Stick	55,{
 prtg_cas04.gat,259,265,4	script	Bandred	55,{
 	if(callfunc("F_GldManager","Bandred","prtg_cas04",271,162,"Pt04") == 0) close;
 
-	if(@GDnum==10) guardian "prtg_cas04.gat",30,234,"Soldier Guardian",1287,1,"Guardian_Pt04::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas04.gat",38,234,"Soldier Guardian",1287,1,"Guardian_Pt04::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas04.gat",63,26,"Soldier Guardian",1287,1,"Guardian_Pt04::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas04.gat",253,274,"Archer Guardian",1285,1,"Guardian_Pt04::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas04.gat",269,256,"Archer Guardian",1285,1,"Guardian_Pt04::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas04.gat",267,271,"Knight Guardian",1286,1,"Guardian_Pt04::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas04.gat",34,281,"Knight Guardian",1286,1,"Guardian_Pt04::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas04.gat",33,232,"Knight Guardian",1286,1,"Guardian_Pt04::OnGuardianDied",7;
+	if(@GDnum==10) guardian "prtg_cas04.gat",30,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "prtg_cas04.gat",38,234,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "prtg_cas04.gat",63,26,"Soldier Guardian",1287,"Guardian_Pt04::OnGuardianDied",2;
+	if(@GDnum==13) guardian "prtg_cas04.gat",253,274,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "prtg_cas04.gat",269,256,"Archer Guardian",1285,"Guardian_Pt04::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "prtg_cas04.gat",267,271,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "prtg_cas04.gat",34,281,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "prtg_cas04.gat",33,232,"Knight Guardian",1286,"Guardian_Pt04::OnGuardianDied",7;
 	mes "[ Bandred ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;
@@ -90,14 +90,14 @@ prtg_cas04.gat,259,265,4	script	Bandred	55,{
 prtg_cas05.gat,36,37,4	script	Reiner	55,{
 	if(callfunc("F_GldManager","Reiner","prtg_cas05",273,179,"Pt05") == 0) close;
 
-	if(@GDnum==10) guardian "prtg_cas05.gat",244,15,"Soldier Guardian",1287,1,"Guardian_Pt05::OnGuardianDied",0; 
-	if(@GDnum==11) guardian "prtg_cas05.gat",241,14,"Soldier Guardian",1287,1,"Guardian_Pt05::OnGuardianDied",1; 
-	if(@GDnum==12) guardian "prtg_cas05.gat",68,40,"Soldier Guardian",1287,1,"Guardian_Pt05::OnGuardianDied",2;
-	if(@GDnum==13) guardian "prtg_cas05.gat",62,264,"Archer Guardian",1285,1,"Guardian_Pt05::OnGuardianDied",3; 
-	if(@GDnum==14) guardian "prtg_cas05.gat",244,61,"Archer Guardian",1285,1,"Guardian_Pt05::OnGuardianDied",4; 
-	if(@GDnum==15) guardian "prtg_cas05.gat",34,24,"Knight Guardian",1286,1,"Guardian_Pt05::OnGuardianDied",5; 
-	if(@GDnum==16) guardian "prtg_cas05.gat",208,86,"Knight Guardian",1286,1,"Guardian_Pt05::OnGuardianDied",6; 
-	if(@GDnum==17) guardian "prtg_cas05.gat",43,70,"Knight Guardian",1286,1,"Guardian_Pt05::OnGuardianDied",7;
+	if(@GDnum==10) guardian "prtg_cas05.gat",244,15,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "prtg_cas05.gat",241,14,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",1; 
+	if(@GDnum==12) guardian "prtg_cas05.gat",68,40,"Soldier Guardian",1287,"Guardian_Pt05::OnGuardianDied",2;
+	if(@GDnum==13) guardian "prtg_cas05.gat",62,264,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "prtg_cas05.gat",244,61,"Archer Guardian",1285,"Guardian_Pt05::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "prtg_cas05.gat",34,24,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "prtg_cas05.gat",208,86,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "prtg_cas05.gat",43,70,"Knight Guardian",1286,"Guardian_Pt05::OnGuardianDied",7;
 	mes "[ Reiner ]";
 	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
 	close;

+ 0 - 1
src/map/atcommand.c

@@ -7670,7 +7670,6 @@ int atcommand_changeleader(const int fd, struct map_session_data* sd, const char
 
 	intif_party_leaderchange(p->party.party_id,p->party.member[pl_mi].account_id,p->party.member[pl_mi].char_id);
 	//Update info.
-	clif_party_main_info(p,-1);
 	clif_party_info(p,NULL);
 	
 	return 0;  

+ 2 - 15
src/map/battle.c

@@ -3839,8 +3839,7 @@ static const struct battle_data_int {
 	{ "night_duration",                    &battle_config.night_duration	}, // added by [Yor]
 	{ "max_heal",                          &battle_config.max_heal },
 	{ "mob_remove_delay",                  &battle_config.mob_remove_delay	},
-	{ "sg_miracle_skill_min_duration",		&battle_config.sg_miracle_skill_duration_min },
-	{ "sg_miracle_skill_max_duration",		&battle_config.sg_miracle_skill_duration_max },
+	{ "sg_miracle_skill_duration",         &battle_config.sg_miracle_skill_duration },
 	{ "hvan_explosion_intimate",				&battle_config.hvan_explosion_intimate },	//[orn]
 };
 
@@ -4220,8 +4219,7 @@ void battle_set_defaults() {
 	battle_config.mob_max_sc_def = 5000;
 	battle_config.sg_miracle_skill_ratio=1;
 	battle_config.sg_angel_skill_ratio=1;
-	battle_config.sg_miracle_skill_duration_min=3000000;
-	battle_config.sg_miracle_skill_duration_max=9000000;
+	battle_config.sg_miracle_skill_duration=3600000;
 	battle_config.autospell_stacking = 0;
 	battle_config.override_mob_names = 0;
 	battle_config.min_chat_delay = 0;
@@ -4398,18 +4396,7 @@ void battle_validate_conf() {
 
 	if (battle_config.sg_miracle_skill_ratio > 10000)
 		battle_config.sg_miracle_skill_ratio = 10000;
-
 	
-	if (battle_config.sg_miracle_skill_duration_min < 1000)
-		battle_config.sg_miracle_skill_duration_min = 1000;
-
-	//Store duration variation in the max setting
-	battle_config.sg_miracle_skill_duration_max -=
-		battle_config.sg_miracle_skill_duration_min;
-
-	if (battle_config.sg_miracle_skill_duration_max < 2000)
-		battle_config.sg_miracle_skill_duration_max = 2000;
-
 	if (battle_config.skill_steal_max_tries >= UCHAR_MAX)
 		battle_config.skill_steal_max_tries = UCHAR_MAX;	
 

+ 1 - 2
src/map/battle.h

@@ -425,8 +425,7 @@ extern struct Battle_Config {
 
 	unsigned short sg_angel_skill_ratio;
 	unsigned short sg_miracle_skill_ratio;
-	int sg_miracle_skill_duration_min;
-	int sg_miracle_skill_duration_max;
+	int sg_miracle_skill_duration;
 	unsigned short autospell_stacking; //Enables autospell cards to stack. [Skotlex]
 	unsigned short override_mob_names; //Enables overriding spawn mob names with the mob_db names. [Skotlex]
 	unsigned short min_chat_delay; //Minimum time between client messages. [Skotlex]

+ 10 - 39
src/map/clif.c

@@ -5681,56 +5681,27 @@ int clif_party_created(struct map_session_data *sd,int flag)
 	return 0;
 }
 
-int clif_party_main_info(struct party_data *p, int fd)
+int clif_party_member_info(struct party_data *p, struct map_session_data *sd)
 {
-	struct map_session_data *sd;
-	int i;
 	unsigned char buf[96];
-	
-	for (i=0; i<MAX_PARTY && !p->party.member[i].leader; i++);
-	if (i >= MAX_PARTY) return 0; //Should never happen...
-	sd = p->data[i].sd;
-	WBUFW(buf,0)=0x1e9;
-	WBUFL(buf,2)= p->party.member[i].account_id;
-	WBUFL(buf,6)= 0; //We don't know yet what this long is about.
-	WBUFW(buf,10)=sd?sd->bl.x:0;
-	WBUFW(buf,12)=sd?sd->bl.y:0;
-	WBUFB(buf,14)=(p->party.member[i].online)?0:1;	//This byte is also unconfirmed...
-	memcpy(WBUFP(buf,15), p->party.name, NAME_LENGTH);
-	memcpy(WBUFP(buf,39), p->party.member[i].name, NAME_LENGTH);
-	memcpy(WBUFP(buf,63), mapindex_id2name(p->party.member[i].map), MAP_NAME_LENGTH);
-	WBUFB(buf,79) = (p->party.item&1)?1:0;
-	WBUFB(buf,80) = (p->party.item&2)?1:0;
-	if(fd>=0){
-		WFIFOHEAD(fd,packet_len(0x1e9));
-		memcpy(WFIFOP(fd,0),buf,packet_len(0x1e9));
-		WFIFOSET(fd,packet_len(0x1e9));
-		return 1;
-	}
-	if (!sd) {
-		for (i=0; i<MAX_PARTY && !p->data[i].sd; i++)
+	if (!sd) { //Pick any party member (this call is used when changing item share rules)
+		int i;
+		for (i=0; i<MAX_PARTY && !p->data[i].sd; i++);
 		if (i >= MAX_PARTY) return 0; //Should never happen...
-		sd=p->data[i].sd;
+		sd = p->data[i].sd;
 	}
-	clif_send(buf,packet_len(0x1e9),&sd->bl,PARTY);
-	return 1;
-}
-
-int clif_party_join_info(struct party *p, struct map_session_data *sd)
-{
-	unsigned char buf[96];
 	WBUFW(buf,0)=0x1e9;
 	WBUFL(buf,2)= sd->status.account_id;
 	WBUFL(buf,6)= 0; //Apparently setting this to 1 makes you adoptable.
 	WBUFW(buf,10)=sd->bl.x;
 	WBUFW(buf,12)=sd->bl.y;
-	WBUFB(buf,14)=0; //Unconfirmed byte.
-	memcpy(WBUFP(buf,15), p->name, NAME_LENGTH);
+	WBUFB(buf,14)=0; //Unconfirmed byte, could be online/offline.
+	memcpy(WBUFP(buf,15), p->party.name, NAME_LENGTH);
 	memcpy(WBUFP(buf,39), sd->status.name, NAME_LENGTH);
 	memcpy(WBUFP(buf,63), mapindex_id2name(sd->mapindex), MAP_NAME_LENGTH);
-	WBUFB(buf,79) = (p->item&1)?1:0;
-	WBUFB(buf,80) = (p->item&2)?1:0;
-	clif_send(buf,packet_len(0x1e9),&sd->bl,PARTY_WOS);
+	WBUFB(buf,79) = (p->party.item&1)?1:0;
+	WBUFB(buf,80) = (p->party.item&2)?1:0;
+	clif_send(buf,packet_len(0x1e9),&sd->bl,PARTY);
 	return 1;
 }
 

+ 1 - 2
src/map/clif.h

@@ -253,8 +253,7 @@ int clif_movetoattack(struct map_session_data *sd,struct block_list *bl);
 
 // party
 int clif_party_created(struct map_session_data *sd,int flag);
-int clif_party_main_info(struct party_data *p, int fd);
-int clif_party_join_info(struct party *p, struct map_session_data *sd);
+int clif_party_member_info(struct party_data *p, struct map_session_data *sd);
 int clif_party_info(struct party_data *p, struct map_session_data *sd);
 int clif_party_invite(struct map_session_data *sd,struct map_session_data *tsd);
 int clif_party_inviteack(struct map_session_data *sd,char *nick,int flag);

+ 40 - 35
src/map/mob.c

@@ -456,28 +456,30 @@ static int mob_spawn_guardian_sub(int tid,unsigned int tick,int id,int data)
  * Summoning Guardians [Valaris]
  *------------------------------------------
  */
-int mob_spawn_guardian(struct map_session_data *sd,char *mapname,
-	int x,int y,const char *mobname,int class_,int amount,const char *event,int guardian)
+int mob_spawn_guardian(char *mapname,short x,short y,const char *mobname,int class_,const char *event,int guardian)
 {
 	struct mob_data *md=NULL;
 	struct spawn_data data;
 	struct guild *g=NULL;
 	struct guild_castle *gc;
-	int m, count;
+	int m;
 	memset(&data, 0, sizeof(struct spawn_data));
 	data.num = 1;
 
-	if( sd && strcmp(mapname,"this")==0)
-		m=sd->bl.m;
-	else
-		m=map_mapname2mapid(mapname);
+	m=map_mapname2mapid(mapname);
 
-	if(m<0 || amount<=0)
+	if(m<0)
+	{
+		ShowWarning("mob_spawn_guardian: Map [%s] not found.\n", mapname);
 		return 0;
+	}
 	data.m = m;
-	data.num = amount;
-	if(class_<0)
-		return 0;
+	data.num = 1;
+	if(class_<=0) {
+		class_ = mob_get_random_id(-class_-1, 1, 99);
+		if (!class_) return 0;
+	}
+
 	data.class_ = class_;
 
 	if(guardian < 0 || guardian >= MAX_GUARDIANS)
@@ -485,15 +487,12 @@ int mob_spawn_guardian(struct map_session_data *sd,char *mapname,
 		ShowError("mob_spawn_guardian: Invalid guardian index %d for guardian %d (castle map %s)\n", guardian, class_, map[m].name);
 		return 0;
 	}
-	if (amount > 1)
-		ShowWarning("mob_spawn_guardian: Spawning %d guardians in position %d (castle map %s)\n", amount, map[m].name);
 	
-	if(sd){
-		if(x<=0) x=sd->bl.x;
-		if(y<=0) y=sd->bl.y;
+	if((x<=0 || y<=0) && !map_search_freecell(NULL, m, &x, &y, -1,-1, 0))
+	{
+		ShowWarning("mob_spawn_guardian: Couldn't locate a spawn cell for guardian class %d (index %d) at castle map %s\n",class_, guardian, map[m].name);
+		return 0;
 	}
-	else if(x<=0 || y<=0)
-		ShowWarning("mob_spawn_guardian: Invalid coordinates (%d,%d)\n",x,y);
 	data.x = x;
 	data.y = y;
 	strncpy(data.name, mobname, NAME_LENGTH-1);
@@ -513,26 +512,32 @@ int mob_spawn_guardian(struct map_session_data *sd,char *mapname,
 		g = guild_search(gc->guild_id);
 
 	if (gc->guardian[guardian].id)
-		ShowWarning("mob_spawn_guardian: Spawning guardian in position %d which already has a guardian (castle map %s)\n", guardian, map[m].name);
-	
-	for(count=0;count<data.num;count++){
-		md= mob_spawn_dataset(&data);
-		md->guardian_data = aCalloc(1, sizeof(struct guardian_data));
-		md->guardian_data->number = guardian;
-		md->guardian_data->guild_id = gc->guild_id;
-		md->guardian_data->castle = gc;
-		gc->guardian[guardian].id = md->bl.id;
-		if (g)
+  	{	//Check if guardian already exists, refuse to spawn if so.
+		struct mob_data *md2 = (TBL_MOB*)map_id2bl(gc->guardian[guardian].id);
+		if (md2 && md2->bl.type == BL_MOB &&
+			md2->guardian_data && md2->guardian_data->number == guardian)
 		{
-			md->guardian_data->emblem_id = g->emblem_id;
-			memcpy (md->guardian_data->guild_name, g->name, NAME_LENGTH);
-			md->guardian_data->guardup_lv = guild_checkskill(g,GD_GUARDUP);
-		} else if (md->guardian_data->guild_id)
-			add_timer(gettick()+5000,mob_spawn_guardian_sub,md->bl.id,md->guardian_data->guild_id);
-		mob_spawn(md);
+			ShowError("mob_spawn_guardian: Attempted to spawn guardian in position %d which already has a guardian (castle map %s)\n", guardian, map[m].name);
+			return 0;
+		}
 	}
 
-	return (amount>0)?md->bl.id:0;
+	md= mob_spawn_dataset(&data);
+	md->guardian_data = aCalloc(1, sizeof(struct guardian_data));
+	md->guardian_data->number = guardian;
+	md->guardian_data->guild_id = gc->guild_id;
+	md->guardian_data->castle = gc;
+	gc->guardian[guardian].id = md->bl.id;
+	if (g)
+	{
+		md->guardian_data->emblem_id = g->emblem_id;
+		memcpy (md->guardian_data->guild_name, g->name, NAME_LENGTH);
+		md->guardian_data->guardup_lv = guild_checkskill(g,GD_GUARDUP);
+	} else if (md->guardian_data->guild_id)
+		add_timer(gettick()+5000,mob_spawn_guardian_sub,md->bl.id,md->guardian_data->guild_id);
+	mob_spawn(md);
+
+	return md->bl.id;
 }
 
 /*==========================================

+ 1 - 2
src/map/mob.h

@@ -157,8 +157,7 @@ int mob_once_spawn_area(struct map_session_data *sd,char *mapname,
 	int x0,int y0,int x1,int y1,
 	const char *mobname,int class_,int amount,const char *event);
 
-int mob_spawn_guardian(struct map_session_data *sd,char *mapname,	// Spawning Guardians [Valaris]
-	int x,int y,const char *mobname,int class_,int amount,const char *event,int guardian);	// Spawning Guardians [Valaris]
+int mob_spawn_guardian(char *mapname,short x,short y,const char *mobname,int class_,const char *event,int guardian);	// Spawning Guardians [Valaris]
 int mob_guardian_guildchange(struct block_list *bl,va_list ap); //Change Guardian's ownership. [Skotlex]
 
 int mob_randomwalk(struct mob_data *md,int tick);

+ 4 - 4
src/map/party.c

@@ -242,7 +242,7 @@ int party_recv_info(struct party *sp)
 		sd = p->data[i].sd;
 		if(!sd || sd->state.party_sent)
 			continue;
-		clif_party_main_info(p,-1);
+		clif_party_member_info(p,sd);
 		clif_party_option(p,sd,0x100);
 		clif_party_info(p,NULL);
 		sd->state.party_sent=1;
@@ -339,7 +339,7 @@ int party_member_added(int party_id,int account_id,int char_id, int flag)
 		sd->state.party_sent=0;
 		sd->status.party_id=party_id;
 		party_check_conflict(sd);
-		clif_party_join_info(&p->party,sd);
+		clif_party_member_info(p,sd);
 		clif_party_hp(sd);
 		clif_party_xy(sd);
 		clif_charnameupdate(sd); //Update char name's display [Skotlex]
@@ -472,7 +472,7 @@ int party_optionchanged(int party_id,int account_id,int exp,int item,int flag)
 	}
 	if(!(flag&0x10) && p->party.item != item) {
 		p->party.item=item;
-		clif_party_main_info(p,-1);
+		clif_party_member_info(p,sd);
 	}
 	if(flag&0x01) //Send denied message
 		clif_party_option(p,sd,flag);
@@ -538,7 +538,7 @@ void party_send_movemap(struct map_session_data *sd)
 	if(p){
 		party_check_member(&p->party);
 		if(sd->status.party_id==p->party.party_id){
-			clif_party_main_info(p,sd->fd);
+			clif_party_member_info(p,sd);
 			clif_party_option(p,sd,0x100);
 			clif_party_info(p,sd);
 			sd->state.party_sent=1;

+ 11 - 13
src/map/script.c

@@ -4010,7 +4010,7 @@ struct script_function buildin_func[] = {
 	BUILDIN_DEF(soundeffect,"si"),
 	BUILDIN_DEF(soundeffectall,"si*"),	// SoundEffectAll [Codemaster]
 	BUILDIN_DEF(strmobinfo,"ii"),	// display mob data [Valaris]
-	BUILDIN_DEF(guardian,"siisii??"),	// summon guardians
+	BUILDIN_DEF(guardian,"siisi??"),	// summon guardians
 	BUILDIN_DEF(guardianinfo,"i"),	// display guardian data [Valaris]
 	BUILDIN_DEF(petskillbonus,"iiii"), // [Valaris]
 	BUILDIN_DEF(petrecovery,"ii"), // [Valaris]
@@ -9626,12 +9626,12 @@ BUILDIN_FUNC(strmobinfo)
 
 /*==========================================
  * Summon guardians [Valaris]
- * guardian "<map name>",<x>,<y>,"<name to show>",<mob id>,<amount>{,"<event label>"}{,<guardian index>};
+ * guardian "<map name>",<x>,<y>,"<name to show>",<mob id>,{,"<event label>"}{,<guardian index>};
  *------------------------------------------
  */
 BUILDIN_FUNC(guardian)
 {
-	int class_=0,amount=1,x=0,y=0,guardian=0;
+	int class_=0,x=0,y=0,guardian=0;
 	char *str,*map,*evt="";
 	struct script_data *data;
 
@@ -9640,21 +9640,20 @@ BUILDIN_FUNC(guardian)
 	y	  =conv_num(st,script_getdata(st,4));
 	str	  =conv_str(st,script_getdata(st,5));
 	class_=conv_num(st,script_getdata(st,6));
-	amount=conv_num(st,script_getdata(st,7));
 
-	if( script_hasdata(st,9) )
+	if( script_hasdata(st,8) )
 	{// "<event label>",<guardian index>
-		evt=conv_str(st,script_getdata(st,8));
-		guardian=conv_num(st,script_getdata(st,9));
-	} else if( script_hasdata(st,8) ){
-		data=script_getdata(st,8);
+		evt=conv_str(st,script_getdata(st,7));
+		guardian=conv_num(st,script_getdata(st,8));
+	} else if( script_hasdata(st,7) ){
+		data=script_getdata(st,7);
 		get_val(st,data);
 		if( data_isstring(data) )
 		{// "<event label>"
-			evt=conv_str(st,script_getdata(st,8));
+			evt=conv_str(st,script_getdata(st,7));
 		} else if( data_isint(data) )
 		{// <guardian index>
-			guardian=conv_num(st,script_getdata(st,8));
+			guardian=conv_num(st,script_getdata(st,7));
 		} else {
 			ShowError("buildin_guardian: invalid data type for argument #8 (%d).", data->type);
 			report_src(st);
@@ -9663,8 +9662,7 @@ BUILDIN_FUNC(guardian)
 	}
 
 	check_event(st, evt);
-
-	mob_spawn_guardian(map_id2sd(st->rid),map,x,y,str,class_,amount,evt,guardian);
+	mob_spawn_guardian(map,x,y,str,class_,evt,guardian);
 
 	return 0;
 }

+ 4 - 7
src/map/unit.c

@@ -183,15 +183,10 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data)
 		}
 		if (
 			(sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR &&
-			sd->sc.data[SC_MIRACLE].timer==-1 &&
 			!(ud->walk_count%WALK_SKILL_INTERVAL) &&
 			rand()%10000 < battle_config.sg_miracle_skill_ratio
-		) {	//SG_MIRACLE [Komurka]
-			clif_displaymessage(sd->fd,"[Miracle of the Sun, Moon and Stars]");
-			sc_start(&sd->bl,SC_MIRACLE,100,1,
-				battle_config.sg_miracle_skill_duration_min+
-				rand()%battle_config.sg_miracle_skill_duration_max);
-		}
+		)	//SG_MIRACLE [Komurka]
+			sc_start(&sd->bl,SC_MIRACLE,100,1,battle_config.sg_miracle_skill_duration);
 	} else if (md) {
 		if(battle_config.mob_warp&1 && map_getcell(bl->m,x,y,CELL_CHKNPC) &&
 			npc_touch_areanpc2(bl)) // Enable mobs to step on warps. [Skotlex]
@@ -1656,6 +1651,8 @@ int unit_remove_map(struct block_list *bl, int clrtype) {
 			status_change_end(bl, SC_GOSPEL, -1);
 		if (sc->data[SC_CHANGE].timer!=-1)
 			status_change_end(bl, SC_CHANGE, -1);
+		if (sc->data[SC_MIRACLE].timer!=-1)
+			status_change_end(bl, SC_MIRACLE, -1);
 	}
 
 	if (bl->type&BL_CHAR) {