Fixed Warlock Quest chamber never opens for second try (bugreport:5294)

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

1 files changed, 61 insertions, 1 deletions

diff --git a/npc/jobs/3-1/warlock.txt b/npc/jobs/3-1/warlock.txt
index 43845777a..03c60d93b 100644
--- a/npc/jobs/3-1/warlock.txt
+++ b/npc/jobs/3-1/warlock.txt
@@ -1538,11 +1538,13 @@ job3_war01,29,25,0	script	Ebein#WRR	437,{
 		warp "spl_in02",79,102;
 		end;
 	}
+end;
+
 }
 
 job3_war01,29,25,5	script	The chamber of magic	437,{
 	end;
-
+	
 OnInit:
 	disablenpc "The chamber of magic";
 	waitingroom "The chamber of magic",20,"The chamber of magic::OnStartArena",1;
@@ -1552,8 +1554,22 @@ OnInit:
 OnStartArena:
 	warpwaitingpc "job3_war02",29,25;
 	donpcevent "The chamber of magic#W::OnEnable";
+	initnpctimer;
 	disablewaitingroomevent;
 	end;
+	
+OnTimer10000:
+	if(getmapusers("job3_war02")==0)
+	{
+		donpcevent "The chamber of magic#W::OnResetNPC";
+		donpcevent "The chamber of magic#W2::OnResetNPC";
+		donpcevent "The chamber of magic#W3::OnResetNPC";
+		donpcevent "Hollow Stone#W::OnResetNPC";
+		stopnpctimer;
+		enablewaitingroomevent;
+	}
+	initnpctimer;
+end;
 
 OnEnable:
 	enablewaitingroomevent;
@@ -1660,6 +1676,16 @@ OnTimer305000:
 	donpcevent "The chamber of magic::OnEnable";
 	stopnpctimer;
 	end;
+	
+OnResetNPC:
+		donpcevent "The chamber of magic#W::OnReset";
+		donpcevent "The chamber of magic#W2::OnReset";
+		donpcevent "The chamber of magic#W3::OnReset";
+		donpcevent "The chamber of magic#W::OnDisable";
+		donpcevent "The chamber of magic#W2::OnDisable";
+		donpcevent "The chamber of magic#W3::OnDisable";
+		stopnpctimer "The chamber of magic#W";
+end;
 }
 
 job3_war02,1,2,0	script	The chamber of magic#W2	66,{
@@ -1754,6 +1780,18 @@ OnTimer305000:
 	donpcevent "The chamber of magic::OnEnable";
 	stopnpctimer;
 	end;
+	
+
+OnResetNPC:
+		donpcevent "The chamber of magic#W::OnReset";
+		donpcevent "The chamber of magic#W2::OnReset";
+		donpcevent "The chamber of magic#W3::OnReset";
+		donpcevent "The chamber of magic#W::OnDisable";
+		donpcevent "The chamber of magic#W2::OnDisable";
+		donpcevent "The chamber of magic#W3::OnDisable";
+		stopnpctimer "The chamber of magic#W2";
+end;
+	
 }
 
 job3_war02,1,3,0	script	The chamber of magic#W3	66,{
@@ -1836,6 +1874,17 @@ OnTimer65000:
 	donpcevent "The chamber of magic::OnEnable";
 	stopnpctimer;
 	end;
+	
+
+OnResetNPC:
+		donpcevent "The chamber of magic#W::OnReset";
+		donpcevent "The chamber of magic#W2::OnReset";
+		donpcevent "The chamber of magic#W3::OnReset";
+		donpcevent "The chamber of magic#W::OnDisable";
+		donpcevent "The chamber of magic#W2::OnDisable";
+		donpcevent "The chamber of magic#W3::OnDisable";
+		stopnpctimer "The chamber of magic#W3";
+end;	
 }
 
 job3_war02,1,4,0	script	Hollow Stone#W	66,{
@@ -1913,6 +1962,7 @@ OnTimer573000:
 	end;
 
 OnTimer583000:
+
 	mapannounce "job3_war02","There's 20 seconds left to crystallize the stone....",bc_map;
 	end;
 
@@ -1920,6 +1970,7 @@ OnTimer593000:
 	mapannounce "job3_war02","There's 10 seconds left to crystallize the stone....",bc_map;
 	end;
 
+
 OnTimer603000:
 	mapannounce "job3_war02","The Hollow Stone Crystalization has failed.",bc_map;
 	donpcevent "Hollow Stone#W::OnReset";
@@ -1934,6 +1985,12 @@ OnTimer607000:
 	stopnpctimer;
 	donpcevent "The chamber of magic::OnEnable";
 	end;
+	
+OnResetNPC:
+	donpcevent "Hollow Stone#W::OnReset";
+	donpcevent "Hollow Stone#W::OnDisable";
+	stopnpctimer "Hollow Stone#W";
+end;
 }
 
 job3_war01,1,1,0	script	Ebein#E	66,{
@@ -1945,6 +2002,7 @@ OnInit:
 
 OnEnable:
 	initnpctimer;
+	enablenpc "Ebein#E";
 	end;
 
 OnDisable:
@@ -1964,6 +2022,7 @@ OnTimer6000:
 	stopnpctimer;
 	donpcevent "The chamber of magic::OnEnable";
 	end;
+	
 }
 
 job3_war02,1,1,0	script	Ebein#E2	66,{
@@ -1975,6 +2034,7 @@ OnInit:
 
 OnEnable:
 	initnpctimer;
+	enablenpc "Ebein#E2";
 	end;
 
 OnDisable: