- 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, 32 insertions, 32 deletions

diff --git a/npc/guild/nguild/nguild_managers.txt b/npc/guild/nguild/nguild_managers.txt
index d5e134b48..8fb8cb4d6 100644
--- a/npc/guild/nguild/nguild_managers.txt
+++ b/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;