* 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, 9 insertions, 5 deletions

diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index d3c17ec83..4124f0738 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -4,7 +4,7 @@
 //= Made by: Black Dragon
 //= Converted by: Shin
 //===== Current Version: ===================================== 
-//= 2.9a
+//= 3.0
 //===== Compatible With: ===================================== 
 //= eAthena  SVN
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //= 2.8 Fixed a little minor bug. [Samuray22]
 //= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf]
 //= 2.9a Deleted unused variables. [Samuray22]
+//= 3.0 Updated waiting room. (Removes global var) [L0ne_W0lf]
 //============================================================
 
 
@@ -1199,16 +1200,19 @@ job_cru,24,187,2	script	Waiting Room#cr1	700,{
 
 OnInit:
 	disablenpc "Waiting Room#cr1";
-	waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStart",1;
+	waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1;
+	enablewaitingroomevent;
 	end;
 
-OnStart:
-	if (getareausers("job_cru", 160, 16, 190, 190)) end;
-	if (!getwaitingroomstate(33)) end;
+OnStartArena:
 	warpwaitingpc "job_cru",168,21;
 	donpcevent "Monster Summon#cr0::OnStart";
+	disablewaitingroomevent;
 	end;
 
+OnStart:
+	enablewaitingroomevent;
+	end;
 }
 
 job_cru,168,17,0	script	Zombie Guide	-1,2,2,{