* Changed how waiting rooms work in the job quests.

- Implemented a checkweight in the alchemist job quest.
- Various other small updates to the 2-1 and 2-2 quests.

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

1 files changed, 17 insertions, 11 deletions

diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index e7c81de5a..39e3c4d98 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -5,7 +5,7 @@
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 2.7a
+//= 2.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -34,6 +34,7 @@
 //= 2.6 Corrected an improper areawarp destination. [L0ne_W0lf]
 //= 2.7 Deleted unused variables. [Samuray22]
 //= 2.7a Corrected a Typo error ";;". [Samuray22]
+//= 2.8 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
 //============================================================ 
 
 prt_in,88,101,4	script	Chivalry Captain#knt	56,{
@@ -1335,20 +1336,20 @@ job_knt,89,106,4	script	Windsor Benedict#knt	733,{
 OnInit:
 	disablenpc "Windsor Benedict#knt";
 	waitingroom "Waiting Room",20,"Windsor Benedict#knt::OnStartArena",1;
+	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-	set $@KntUsers, getareausers("job_knt", 24, 126, 63, 165);			// get user count for first lvl
-	set $@KntUsers, $@KntUsers + getareausers("job_knt", 24, 32, 63, 71);		// get user count for second lvl + first lvl
-	set $@KntUsers, $@KntUsers + getareausers("job_knt", 124, 132, 163, 171);	// get user count for third lvl + second lvl + first lvl
-	if($@KntUsers > 0) end;
-
-	if ((getwaitingroomstate(33)) == 0) end;	// stops the rest of the script from running if there is no one in the waiting room;
 	killmonster "job_knt", "Knight1::OnMyMobDead";
 	killmonster "job_knt", "Knight2::OnMyMobDead";
 	killmonster "job_knt", "Knight3::OnMyMobDead";
 	warpwaitingpc "job_knt",43,146;
 	donpcevent "Knight1::OnEnable";
+	disablewaitingroomevent;
+	end;
+
+OnStart:
+	enablewaitingroomevent;
 	end;
 }
 
@@ -1406,7 +1407,9 @@ OnTimer181000:
 	end;
 
 OnTimer182000:
-	donpcevent "Windsor Benedict#knt::OnEnable";
+	stopnpctimer;
+	donpcevent "Knight1::OnDisable";
+	donpcevent "Windsor Benedict#knt::OnStart";
 	end;
 }
 
@@ -1465,8 +1468,9 @@ OnTimer181000:
 	end;
 
 OnTimer182000:
+	stopnpctimer;
 	donpcevent "Knight2::OnDisable";
-	donpcevent "Windsor Benedict#knt::OnEnable";
+	donpcevent "Windsor Benedict#knt::OnStart";
 	end;
 }
 
@@ -1511,7 +1515,7 @@ OnMyMobDead:
 		set KNIGHT_Q,8;
 		warp "prt_in",80,100;
 		donpcevent "Knight3::OnDisable";
-		donpcevent "Windsor Benedict::OnEnable";
+		donpcevent "Windsor Benedict#knt::OnStart";
 		stopnpctimer;
 	}
 	end;
@@ -1525,7 +1529,9 @@ OnTimer181000:
 	end;
 
 OnTimer182000:
-	donpcevent "Windsor Benedict#knt::OnEnable";
+	stopnpctimer;
+	donpcevent "Knight3::OnDisable";
+	donpcevent "Windsor Benedict#knt::OnStart";
 	end;
 }