- Lot's of Bugreport fixes and stuff.

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

4 files changed, 4 insertions, 43 deletions

diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index 12df84255..817501a3a 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -17,12 +17,11 @@ arena_room,64,138,5	script	lvl 50s Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Individual ; lvl 50 or higher",50,"lvl 50s Waiting Room::OnStartArena",1;
+	waitingroom "Individual : lvl 50 or higher",50,"lvl 50s Waiting Room::OnStartArena",1,1000,50;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-	enablenpc "ArenaFee#50";
 	warpwaitingpc "force_1-1",99,12;
 	donpcevent "arena#50::Onstart";
 	disablewaitingroomevent;
@@ -33,18 +32,6 @@ Onstart:
 	end;
 }
 
-force_1-1,99,12,1	script	ArenaFee#50	139,1,1,{
-
-OnInit:
-	disablenpc "ArenaFee#50";
-	end;
-
-OnTouch:
-	set Zeny,Zeny -1000;
-	disablenpc "ArenaFee#50";
-	end;
-}
-
 force_1-1,99,20,4	script	Heel and Toe#arena	124,{
 	end;
 	
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index 72fc78819..9224898cd 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -17,7 +17,7 @@
 arena_room,38,88,5	script	lvl 60s Waiting Room	124,{
 
 OnInit:
-	waitingroom "Individual ; lvl 60 or higher",50,"lvl 60s Waiting Room::OnStartArena",1;
+	waitingroom "Individual : lvl 60 or higher",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60;
 	enablewaitingroomevent;
 	end;
 
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index cc2e5cfd5..aa24b02a9 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -17,12 +17,11 @@ arena_room,52,42,7	script	lvl 70s Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Individual ; lvl 70 or higher",50,"lvl 70s Waiting Room::OnStartArena",1;
+	waitingroom "Individual : lvl 70 or higher",50,"lvl 70s Waiting Room::OnStartArena",1,1000,70;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-	enablenpc "ArenaFee#70";
 	warpwaitingpc "force_3-1",99,12;
 	donpcevent "arena#70::Onstart";
 	disablewaitingroomevent;
@@ -33,18 +32,6 @@ Onstart:
 	end;
 }
 
-force_3-1,99,12,1	script	ArenaFee#70	139,1,1,{
-
-OnInit:
-	disablenpc "ArenaFee#70";
-	end;
-
-OnTouch:
-	set Zeny,Zeny -1000;
-	disablenpc "ArenaFee#70";
-	end;
-}
-
 force_3-1,99,20,4	script	Cadillac#arena	124,{
 	end;
 	
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 501cb11c2..dbdecba73 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -17,12 +17,11 @@ arena_room,147,42,1	script	lvl 80s Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Individual ; lvl 80 or higher",50,"lvl 80s Waiting Room::OnStartArena",1;
+	waitingroom "Individual : lvl 80 or higher",50,"lvl 80s Waiting Room::OnStartArena",1,1000,80;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-	enablenpc "ArenaFee#80";
 	warpwaitingpc "force_4-1",99,12;
 	donpcevent "arena#80::Onstart";
 	disablewaitingroomevent;
@@ -33,18 +32,6 @@ Onstart:
 	end;
 }
 
-force_4-1,99,12,1	script	ArenaFee#80	139,1,1,{
-
-OnInit:
-	disablenpc "ArenaFee#80";
-	end;
-
-OnTouch:
-	set Zeny,Zeny -1000;
-	disablenpc "ArenaFee#80";
-	end;
-}
-
 force_4-1,99,20,4	script	Octus#arena	124,{
 	end;