- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9871 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 40 insertions, 40 deletions

diff --git a/npc/guild/prtg/prtg_managers.txt b/npc/guild/prtg/prtg_managers.txt
index dea0a99e4..b5983ab8f 100644
--- a/npc/guild/prtg/prtg_managers.txt
+++ b/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;