Merge pull request #1 from Earisu/master

updating, with earisu's

13 files changed, 32 insertions, 41 deletions

diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt
index f37580617..cea4d2223 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Template File
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
-//= 1.3
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.4
 //===== Description: =========================================
 //= Like agit_main, this file is required
 //= for SE castles to function.
@@ -15,6 +13,7 @@
 //= 1.1 Fixed an incorrect label execution. [Euphy]
 //= 1.2 Hopefully fixed a processing error. [Euphy]
 //= 1.3 Fixed barricade issue in schg_cas02. [Cookie]
+//= 1.4 Added OnGuildBreak event and a spawn check. [Euphy]
 //============================================================
 
 // Core, triggers all other events
@@ -49,6 +48,7 @@ OnAgitStart2:
 	if (agitcheck2()) {
 		maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),2;
 		gvgon strnpcinfo(2);
+		setmapflag strnpcinfo(2),mf_zone,"GvG2";
 		donpcevent strnpcinfo(0)+"::OnStart";
 	}
 	else for(set .@i,0; .@i<4; set .@i,.@i+1)
@@ -58,6 +58,7 @@ OnAgitStart2:
 OnAgitEnd2:
 	if (strnpcinfo(2) == "template") end;
 	gvgoff strnpcinfo(2);
+	removemapflag strnpcinfo(2),mf_zone;
 	if (getcastledata(strnpcinfo(2),1)) {
 		set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
 		killmonster strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena";
@@ -66,6 +67,17 @@ OnAgitEnd2:
 	}
 	end;
 
+OnGuildBreak:
+	if (strnpcinfo(2) == "template") end;
+	killmonster strnpcinfo(2),"gard1#"+strnpcinfo(2)+"::OnGuardianDied";
+	killmonster strnpcinfo(2),"gard2#"+strnpcinfo(2)+"::OnGuardianDied";
+	disablenpc "Kafra Employee#"+substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
+	setcastledata strnpcinfo(2),1,0;
+	sleep 7000;
+	announce "Guild Base ["+getcastlename(strnpcinfo(2))+"] has been abandoned.",0;
+	donpcevent strnpcinfo(0)+"::OnRecvCastle2";
+	end;
+
 OnStart:
 	// $agit_ar0x[] - $agit_sc0x[]
 	// 1st Guardian stone, 2nd Guardian stone, Barrier 1, Barrier 2, Barrier 3, Summon Guardians
@@ -78,7 +90,10 @@ OnStart:
 		for(set .@i,0; .@i<4; set .@i,.@i+1)
 			donpcevent "RL"+.@i+"#"+strnpcinfo(2)+"::OnEnable";
 	}
+
 OnEmpSpawn:
+	set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
+	if (mobcount(strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena")) end;
 	if (compare(strnpcinfo(2),"arug")) {
 		if (strnpcinfo(2) == "arug_cas01") setarray .@i[0],87,219;
 		else if (strnpcinfo(2) == "arug_cas02") setarray .@i[0],89,256;
@@ -89,7 +104,7 @@ OnEmpSpawn:
 		else if (strnpcinfo(2) == "schg_cas03") setarray .@i[0],338,202;
 		else setarray .@i[0],120,272;	// Castles 1,4,5 are identical.
 	}
-	monster strnpcinfo(2),.@i[0],.@i[1],"Emperium",1288,1,"Steward#"+substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9)+"::OnStartArena";
+	monster strnpcinfo(2),.@i[0],.@i[1],"Emperium",1288,1,"Steward#"+.@str$+"::OnStartArena";
 	end;
 
 OnReset:
diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt
index 81e16ac36..ec9de3d9b 100644
--- a/npc/guild2/agit_start_se.txt
+++ b/npc/guild2/agit_start_se.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Auto-Start
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN; RO Episode 11.3
 //===== Description: =========================================
 //= Auto Start for War of Emperium
 //= To know how to set up WoE times, go to doc\woe_time_explanation.txt
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 1dcffa9c1..a2b929347 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Mardol
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 1d786902f..a6b7f0d55 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Cyr
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index fa25cffd3..bf11c9449 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Horn
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index e26ec613f..c46c7ff15 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Gefn
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 621ac8ad9..b250a9385 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Banadis
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt
index d7652f760..c5cf9bbc1 100644
--- a/npc/guild2/guild_flags.txt
+++ b/npc/guild2/guild_flags.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium Second Edition
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= WoE SE Guild Flags in Juno and Rachel
 //===== Additional Comments: =================================
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index bc26fb3d1..8200b49a0 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Himinn
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index e93aa17ad..0a39f484a 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Andlangr
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 9adfeeb1b..6adfa0ca1 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Vidblainn
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 9f83a5a28..8da46dec5 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Hljod
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index 09ecc1b7f..46b03e8bd 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= War of Emperium SE - Skidbladnir
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Additional Comments: =================================
 //= 1.0 Merged to template file.
 //============================================================