- Some WoE 2.0 fixes

* Not investment per day reset bug.
* Not stop the emperium respawn if you take it in less than 10 seconds and woe ends.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12886 54d463be-8e91-2dee-dedb-b68131a5f0ec

9 files changed, 54 insertions, 28 deletions

diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index cadc91a67..685cee1d5 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -52,6 +52,7 @@ OnAgitEnd:
 	if (GetCastleData("arug_cas01",1)) {
 		KillMonster "arug_cas01","Steward#aru01::OnStartArena";
 		donpcevent "Manager#aru01_02::Onreset";
+		donpcevent "Steward#aru01::Onstop";
 	}
 	end;
 
@@ -102,8 +103,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("arug_cas01",1)) end;
-	killmonster "arug_cas01","Manager#aru01_02::OnMyTreasureDied";
-	// Reset daily investment limit.
+	killmonster "arug_cas01","Manager#aru01_02::OnTreasureDied";
+
+	setcastledata "arug_cas01",4,0;
+	setcastledata "arug_cas01",5,0;
+
 	set .@Treasure,GetCastleData("arug_cas01",2)/5+4;
 	if (.@Treasure) {
 		monster "arug_cas01",251,369,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied";
@@ -151,8 +155,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "arug_cas01",258,364,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied";
 	}
-	setcastledata "arug_cas01",4,0;
-	setcastledata "arug_cas01",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 0e7718d5c..c127b24e3 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -52,6 +52,7 @@ OnAgitEnd:
 	if (GetCastleData("arug_cas02",1)) {
 		KillMonster "arug_cas02","Steward#aru02::OnStartArena";
 		donpcevent "Manager#aru02_02::Onreset";
+		donpcevent "Steward#aru02::Onstop";
 	}
 	end;
 
@@ -102,7 +103,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("arug_cas02",1)) end;
-	killmonster "arug_cas02","Manager#aru02_02::OnMyTreasureDied";
+	killmonster "arug_cas02","Manager#aru02_02::OnTreasureDied";
+
+	setcastledata "arug_cas02",4,0;
+	setcastledata "arug_cas02",5,0;
+
 	set .@Treasure,GetCastleData("arug_cas02",2)/5+4;
 	if (.@Treasure) {
 		monster "arug_cas02",382,231,"Treasure Chest",1944,1,"Manager#aru02_02::OnTreasureDied";
@@ -150,8 +155,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "arug_cas02",389,224,"Treasure Chest",1324,1,"Manager#aru02_02::OnTreasureDied";
 	}
-	setcastledata "arug_cas02",4,0;
-	setcastledata "arug_cas02",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 05597ce9d..40f8ec810 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -53,6 +53,7 @@ OnAgitEnd:
 	if (GetCastleData("arug_cas03",1)) {
 		KillMonster "arug_cas03","Steward#aru03::OnStartArena";
 		donpcevent "Manager#aru03_02::Onreset";
+		donpcevent "Steward#aru03::Onstop";
 	}
 	end;
 
@@ -103,7 +104,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("arug_cas03",1)) end;
-	killmonster "arug_cas03","Manager#aru03_02::OnMyTreasureDied";
+	killmonster "arug_cas03","Manager#aru03_02::OnTreasureDied";
+
+	setcastledata "arug_cas03",4,0;
+	setcastledata "arug_cas03",5,0;
+
 	set .@Treasure,GetCastleData("arug_cas03",2)/5+4;
 	if (.@Treasure) {
 		monster "arug_cas03",291,276,"Treasure Chest",1945,1,"Manager#aru03_02::OnTreasureDied";
@@ -151,8 +156,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "arug_cas03",298,269,"Treasure Chest",1324,1,"Manager#aru03_02::OnTreasureDied";
 	}
-	setcastledata "arug_cas03",4,0;
-	setcastledata "arug_cas03",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index 26544d27b..ff5435d4b 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -52,6 +52,7 @@ OnAgitEnd:
 	if (GetCastleData("arug_cas04",1)) {
 		KillMonster "arug_cas04","Steward#aru04::OnStartArena";
 		donpcevent "Manager#aru04_02::Onreset";
+		donpcevent "Steward#aru04::Onstop";
 	}
 	end;
 
@@ -102,7 +103,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("arug_cas04",1)) end;
-	killmonster "arug_cas04","Manager#aru04_02::OnMyTreasureDied";
+	killmonster "arug_cas04","Manager#aru04_02::OnTreasureDied";
+
+	setcastledata "arug_cas04",4,0;
+	setcastledata "arug_cas04",5,0;
+
 	set .@Treasure,GetCastleData("arug_cas04",2)/5+4;
 	if (.@Treasure) {
 		monster "arug_cas04",291,276,"Treasure Chest",1946,1,"Manager#aru04_02::OnTreasureDied";
@@ -150,8 +155,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "arug_cas04",298,269,"Treasure Chest",1324,1,"Manager#aru04_02::OnTreasureDied";
 	}
-	setcastledata "arug_cas04",4,0;
-	setcastledata "arug_cas04",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 77fd06846..40e025927 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -52,6 +52,7 @@ OnAgitEnd:
 	if (GetCastleData("arug_cas05",1)) {
 		KillMonster "arug_cas05","Steward#aru05::OnStartArena";
 		donpcevent "Manager#aru05_02::Onreset";
+		donpcevent "Steward#aru05::Onstop";
 	}
 	end;
 
@@ -102,7 +103,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("arug_cas05",1)) end;
-	killmonster "arug_cas05","Manager#aru05_02::OnMyTreasureDied";
+	killmonster "arug_cas05","Manager#aru05_02::OnTreasureDied";
+
+	setcastledata "arug_cas05",4,0;
+	setcastledata "arug_cas05",5,0;
+
 	set .@Treasure,GetCastleData("arug_cas05",2)/5+4;
 	if (.@Treasure) {
 		monster "arug_cas05",291,276,"Treasure Chest",1945,1,"Manager#aru05_02::OnTreasureDied";
@@ -150,8 +155,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "arug_cas05",298,269,"Treasure Chest",1324,1,"Manager#aru05_02::OnTreasureDied";
 	}
-	setcastledata "arug_cas05",4,0;
-	setcastledata "arug_cas05",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index 352981ab1..8492b78e9 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -54,6 +54,7 @@ OnAgitEnd:
 	if (GetCastleData("schg_cas01",1)) {
 		KillMonster "schg_cas01","Steward#sch01::OnStartArena";
 		donpcevent "Manager#sch01_02::Onreset";
+		donpcevent "Steward#sch01::Onstop";
 	}
 	end;
 
@@ -104,7 +105,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("schg_cas01",1)) end;
-	killmonster "schg_cas01","Manager#sch01_02::OnMyTreasureDied";
+	killmonster "schg_cas01","Manager#sch01_02::OnTreasureDied";
+
+	setcastledata "schg_cas01",4,0;
+	setcastledata "schg_cas01",5,0;
+
 	set .@Treasure,GetCastleData("schg_cas01",2)/5+4;
 	if (.@Treasure) {
 		monster "schg_cas01",388,388,"Treasure Chest",1938,1,"Manager#sch01_02::OnTreasureDied";
@@ -152,8 +157,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "schg_cas01",386,386,"Treasure Chest",1324,1,"Manager#sch01_02::OnTreasureDied";
 	}
-	setcastledata "schg_cas01",4,0;
-	setcastledata "schg_cas01",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 4e70bfc61..112791ba3 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -56,6 +56,7 @@ OnAgitEnd:
 	if (GetCastleData("schg_cas03",1)) {
 		KillMonster "schg_cas03","Steward#sch03::OnStartArena";
 		donpcevent "Manager#sch03_02::Onreset";
+		donpcevent "Steward#sch03::Onstop";
 	}
 	end;
 
@@ -106,7 +107,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("schg_cas03",1)) end;
-	killmonster "schg_cas03","Manager#sch03_02::OnMyTreasureDied";
+	killmonster "schg_cas03","Manager#sch03_02::OnTreasureDied";
+
+	setcastledata "schg_cas03",4,0;
+	setcastledata "schg_cas03",5,0;
+
 	set .@Treasure,GetCastleData("schg_cas03",2)/5+4;
 	if (.@Treasure) {
 		monster "schg_cas03",189,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
@@ -154,8 +159,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "schg_cas03",194,15,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
 	}
-	setcastledata "schg_cas03",4,0;
-	setcastledata "schg_cas03",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 597d26479..d98277985 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -52,6 +52,7 @@ OnAgitEnd:
 	if (GetCastleData("schg_cas04",1)) {
 		KillMonster "schg_cas04","Steward#sch04::OnStartArena";
 		donpcevent "Manager#sch04_02::Onreset";
+		donpcevent "Steward#sch04::Onstop";
 	}
 	end;
 
@@ -102,7 +103,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("schg_cas04",1)) end;
-	killmonster "schg_cas04","Manager#sch04_02::OnMyTreasureDied";
+	killmonster "schg_cas04","Manager#sch04_02::OnTreasureDied";
+
+	setcastledata "schg_cas04",4,0;
+	setcastledata "schg_cas04",5,0;
+
 	set .@Treasure,GetCastleData("schg_cas04",2)/5+4;
 	if (.@Treasure) {
 		monster "schg_cas04",388,388,"Treasure Chest",1941,1,"Manager#sch04_02::OnTreasureDied";
@@ -150,8 +155,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "schg_cas04",386,386,"Treasure Chest",1324,1,"Manager#sch04_02::OnTreasureDied";
 	}
-	setcastledata "schg_cas04",4,0;
-	setcastledata "schg_cas04",5,0;
 	end;
 
 OnTreasureDied:
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index 725cabe1d..8bc0b6aea 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -52,6 +52,7 @@ OnAgitEnd:
 	if (GetCastleData("schg_cas05",1)) {
 		KillMonster "schg_cas05","Steward#sch05::OnStartArena";
 		donpcevent "Manager#sch05_02::Onreset";
+		donpcevent "Steward#sch05::Onstop";
 	}
 	end;
 
@@ -102,7 +103,11 @@ Onchange:
 
 OnClock0001:
 	if (!GetCastleData("schg_cas05",1)) end;
-	killmonster "schg_cas05","Manager#sch05_02::OnMyTreasureDied";
+	killmonster "schg_cas05","Manager#sch05_02::OnTreasureDied";
+
+	setcastledata "schg_cas05",4,0;
+	setcastledata "schg_cas05",5,0;
+
 	set .@Treasure,GetCastleData("schg_cas05",2)/5+4;
 	if (.@Treasure) {
 		monster "schg_cas05",388,388,"Treasure Chest",1942,1,"Manager#sch05_02::OnTreasureDied";
@@ -150,8 +155,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "schg_cas05",386,386,"Treasure Chest",1324,1,"Manager#sch05_02::OnTreasureDied";
 	}
-	setcastledata "schg_cas05",4,0;
-	setcastledata "schg_cas05",5,0;
 	end;
 
 OnTreasureDied: