Fixed and cleaned Izlude Arena and some other scripts.

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

10 files changed, 505 insertions, 652 deletions

diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 483ba7f52..fd276ec33 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -57,12 +57,6 @@ OnInit:
 	end;
 
 OnTouch:
-    if ( zeny < 1000 ) {
-        mapannounce "que_bingo","Eukran: Oh it looks like "+strcharinfo(0)+" doesn't have enough money. I'm sorry but I must cancel the game~",1,0xFFAB54;
-        setnpctimer 201999,"start#bingo"; // manual reset
-        end;
-    }
-	set Zeny,Zeny -1000;
 	set @bingo_a1$,0;
 	set @bingo_a2$,0;
 	set @bingo_a3$,0;
@@ -171,6 +165,7 @@ OnTimer203000:
 	end;
 
 OnTimer204000:
+	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	disablenpc "out3#bingo";
 	set $hu_bingoa,0;
 	set $hu_bingob,0;
@@ -422,11 +417,7 @@ OnTimer445000:
 OnTimer460000:
 	mapannounce "que_bingo","Eukran: I'm sorry, but this game has ended without a winner. Thanks for playing, everyone~",1,0xFFAB54;
 	donpcevent "1a#bingo::OnInit";
-	donpcevent "player1#bingo::OnOut";
-	donpcevent "player2#bingo::OnOut";
-	donpcevent "player3#bingo::OnOut";
-	donpcevent "player4#bingo::OnOut";
-	donpcevent "player5#bingo::OnOut";
+	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	set $hu_bingoa,0;
 	donpcevent "Bingo Waiting Room::OnStart";
 	end;
@@ -875,9 +866,9 @@ OnTimer5000:
 	disablenpc "end1c#bingo";
 	disablenpc "end1d#bingo";
 	disablenpc "end1e#bingo";
+	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	set $hu_bingoa,0;
 	donpcevent "Bingo Waiting Room::OnStart";
-	areawarp "que_bingo",69,108,30,135,"hugel",59,207;
 	end;
 }
 
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 8d98f87e2..8b236fc76 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf]
 //= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //= 1.7 Updated Script from the Official. [Elias]
+//= 1.8 Optimized a bit. [Daegaladh]
 //============================================================
 
 // Floating mailbox npc that all NPCs duplicate from.
@@ -29,28 +30,22 @@
 	mes "to pay 130 zeny.";
 	mes "Would you like to use the service?";
 	next;
-	switch(select("Yes.","No.")) {
-	case 1:
+	mes "[Mailbox]";
+	if (select("Yes.:No.") == 1) {
 		if (Zeny < 130) {
-			mes "[Mailbox]";
 			mes "I am sorry, but you do not have enough money.";
 			mes "To use the mailbox service, you are required";
 			mes "to pay 130 zeny.";
-			break;
-		} else {
-			mes "[Mailbox]";
-			mes "Thank you, please come again.";
-			set Zeny,(Zeny - 130);
-			openmail;
-			break;
+			close;
 		}
-		
-	case 2:
-		mes "[Mailbox]";
 		mes "Thank you, please come again.";
-		break;
+		set Zeny,(Zeny - 130);
+		close2;
+		openmail;
+		end;
 	}
-close;
+	mes "Thank you, please come again.";
+	close;
 }
 
 // Prontera
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 6782c7473..cda9c2abe 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -428,7 +428,7 @@ OnTouch:
 	end;
 }
 
-pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1,{
+pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1
 pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	45,1,1
 pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	45,1,1
 pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff#4	45,1,1
diff --git a/npc/pre-re/other/arena/arena_aco.txt b/npc/pre-re/other/arena/arena_aco.txt
index 247e71b87..d0830135e 100644
--- a/npc/pre-re/other/arena/arena_aco.txt
+++ b/npc/pre-re/other/arena/arena_aco.txt
@@ -60,7 +60,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,61,147,3	script	arena_aco1	-1,{
+-	script	arena_aco1	-1,{
 Onstart:
 	donpcevent "Trocco#aco1::OnEnable";
 	end;
@@ -111,7 +111,7 @@ Onreset_09:
 	end;
 }
 
-force_5-1,80,60,3	script	Trocco#aco1	-1,{
+-	script	Trocco#aco1	-1,{
 OnEnable:
 	initnpctimer;
 	set $@arn_1,gettimetick(2);
@@ -279,7 +279,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,56,4	script	force_01mob#aco	111,{
+-	script	force_01mob#aco	-1,{
 OnEnable:
 	donpcevent "Trocco#aco1::On01_start";
 	monster "force_5-1",22,29,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
@@ -309,7 +309,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,57,4	script	force_02mob#aco	111,{
+-	script	force_02mob#aco	-1,{
 OnEnable:
 	donpcevent "Trocco#aco1::On02_start";
 	areamonster "force_5-1",22,69,29,130,"Drops",1572,20,"force_02mob#aco::OnMyMobDead";
@@ -334,7 +334,7 @@ OnTouch:
 	disablenpc "force_03start#aco";
 }
 
-force_5-1,10,58,4	script	force_03mob#aco	111,{
+-	script	force_03mob#aco	-1,{
 OnEnable:
 	donpcevent "Trocco#aco1::On03_start";
 	areamonster "force_5-1",9,157,41,190,"Zombie",1394,10,"force_03mob#aco::OnMyMobDead";
@@ -368,7 +368,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,59,4	script	force_05mob#aco	111,{
+-	script	force_05mob#aco	-1,{
 OnEnable:
 	donpcevent "Trocco#aco1::On05_start";
 	areamonster "force_5-1",159,157,187,190,"Orc Zombie",1463,8,"force_05mob#aco::OnMyMobDead";
@@ -394,7 +394,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,60,4	script	force_06mob#aco	111,{
+-	script	force_06mob#aco	-1,{
 OnEnable:
 	donpcevent "Trocco#aco1::On06_start";
 	monster "force_5-1",170,124,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
@@ -430,7 +430,7 @@ OnTouch:
 	disablenpc "force_07start#aco";
 }
 
-force_5-1,10,61,4	script	force_07mob#aco	111,{
+-	script	force_07mob#aco	-1,{
 OnEnable:
 	donpcevent "Trocco#aco1::On07_start";
 	monster "force_5-1",170,32,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
@@ -469,7 +469,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,62,4	script	force_09mob#aco	111,{
+-	script	force_09mob#aco	-1,{
 OnEnable:
 	monster "force_5-1",rand(88,111),rand(89,110),"Zombie Prisoner",1480,1,"force_09mob#aco::OnMyMobDead";
 	monster "force_5-1",rand(88,111),rand(89,110),"Skel Prisoner",1479,1,"force_09mob#aco::OnMyMobDead";
@@ -489,7 +489,7 @@ OnMyMobDead:
 	end;
 }
 
-force_5-1,61,148,3	script	arena_aco2	111,{
+-	script	arena_aco2	-1,{
 Onstart:
 	donpcevent "Trocco#aco2::OnEnable";
 	end;
@@ -539,7 +539,7 @@ Onreset_09:
 	enablenpc "force_exit#aco";
 }
 
-force_5-1,80,65,3	script	Trocco#aco2	111,{
+-	script	Trocco#aco2	-1,{
 OnEnable:
 	initnpctimer;
 	set $@arn_1,gettimetick(2);
@@ -715,7 +715,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,56,4	script	force_01mob#pri	111,{
+-	script	force_01mob#pri	-1,{
 OnEnable:
 	donpcevent "Trocco#aco2::On01_start";
 	areamonster "force_5-1",13,9,38,41,"Zombie",1394,10,"force_01mob#pri::OnMyMobDead";
@@ -745,7 +745,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,57,4	script	force_02mob#pri	111,{
+-	script	force_02mob#pri	-1,{
 OnOn1:
 	donpcevent "Trocco#aco2::On02_start";
 	areamonster "force_5-1",22,69,29,130,"Orc Skeleton",1462,5,"force_02mob#pri::OnMyMobDead";
@@ -775,7 +775,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,58,4	script	force_03mob#pri	111,{
+-	script	force_03mob#pri	-1,{
 OnEnable:
 	donpcevent "Trocco#aco2::On03_start";
 	areamonster "force_5-1",14,163,37,185,"Red Plant",1078,5,"force_03mob#pri::OnMyMobDead";
@@ -805,7 +805,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,59,4	script	force_04mob#pri	111,{
+-	script	force_04mob#pri	-1,{
 OnOn1:
 	donpcevent "Trocco#aco2::On04_start";
 	monster "force_5-1",rand(71,130),rand(170,178),"Evil Druid",1435,1,"force_04mob#pri::OnMyMobDead";
@@ -847,7 +847,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,60,4	script	force_05ex#pri	111,{
+-	script	force_05ex#pri	-1,{
 OnOn1:
 	areamonster "force_5-1",161,159,187,190,"Hydra",1579,10,"force_05ex#pri::OnMyMobDead";
 	end;
@@ -864,7 +864,7 @@ OnMyMobDead:
 	end;
 }
 
-force_5-1,10,61,4	script	force_05mob#pri	111,{
+-	script	force_05mob#pri	-1,{
 OnEnable:
 	donpcevent "Trocco#aco2::On05_start";
 	areamonster "force_5-1",161,159,187,190,"Gargoyle",1597,4,"force_05mob#pri::OnMyMobDead";
@@ -899,7 +899,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,62,4	script	force_06ex#pri	111,{
+-	script	force_06ex#pri	-1,{
 OnEnable:
 	areamonster "force_5-1",170,67,178,131,"Permeter",1314,5,"force_06ex#pri::OnMyMobDead";
 	end;
@@ -912,7 +912,7 @@ OnMyMobDead:
 	end;
 }
 
-force_5-1,10,63,4	script	force_06mob#pri	111,{
+-	script	force_06mob#pri	-1,{
 OnOn1:
 	donpcevent "Trocco#aco2::On06_start";
 	monster "force_5-1",rand(170,178),rand(67,131),"Khalitzburg",1438,1,"force_06mob#pri::OnMyMobDead";
@@ -948,7 +948,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,64,4	script	force_07mob#pri	111,{
+-	script	force_07mob#pri	-1,{
 OnEnable:
 	donpcevent "Trocco#aco2::On07_start";
 	monster "force_5-1",rand(160,188),rand(9,42),"Ancient Mummy",1522,1,"force_07mob#pri::OnMyMobDead";
@@ -993,7 +993,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,10,65,4	script	force_09mob#pri	111,{
+-	script	force_09mob#pri	-1,{
 OnOn1:
 	monster "force_5-1",rand(88,111),rand(89,110),"Mimic",1474,1,"force_09mob#pri::OnMyMobDead";
 	end;
@@ -1502,7 +1502,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 	}
 }
 
-prt_are_in,14,195,3	script	#arn_timer_aco	111,{
+-	script	#arn_timer_aco	-1,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -1550,7 +1550,7 @@ OnTouch:
 	end;
 }
 
-force_5-1,120,50,3	script	timer_aco2	111,{
+-	script	timer_aco2	-1,{
 OnEnable:
 	initnpctimer;
 	end;
@@ -1560,7 +1560,7 @@ Onstop:
 	end;
 }
 
-force_5-1,61,149,3	script	allkill#aco	111,{
+-	script	allkill#aco	-1,{
 OnEnable:
 	donpcevent "force_01mob#aco::Onreset";
 	donpcevent "force_02mob#aco::Onreset";
@@ -1686,7 +1686,7 @@ OnInit:
 	end;
 }
 
-arena_room,97,130,3	script	#Vendigos	111,{
+-	script	#Vendigos	-1,{
 Onlinerec_aco:
 	mapannounce "arena_room","Vendigos: "+$arn_acotopn$+" has made a new record in the Arena Time Force Battle - Acolyte Mode. Congratulations!",bc_map,"0xFFFF00";
 	end;
diff --git a/npc/pre-re/other/arena/arena_lvl50.txt b/npc/pre-re/other/arena/arena_lvl50.txt
index 73d15ef4c..87f61825b 100644
--- a/npc/pre-re/other/arena/arena_lvl50.txt
+++ b/npc/pre-re/other/arena/arena_lvl50.txt
@@ -17,7 +17,7 @@ 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,1000,50;
+	waitingroom "Individual; Level 50 to 69",50,"lvl 50s Waiting Room::OnStartArena",1,1000,50,69;
 	enablewaitingroomevent;
 	end;
 
@@ -34,29 +34,29 @@ Onstart:
 
 force_1-1,99,20,4	script	Heel and Toe#arena	124,{
 	end;
-	
+
 OnInit:
 	set $@mapcount50, 0;
 	end;
-	
+
 Onstart:
 	initnpctimer;
 	set $arena_min50st,gettime(2);
 	set $arena_sec50st,gettime(1);
 	end;
-	
+
 OnTimer3000:
 	mapannounce "force_1-1","Good day, my name is Heel and Toe, the guide of Time Force Battle for lvl 50s!",0;
 	end;
-	
+
 OnTimer4000:
 	mapannounce "force_1-1","Remember your right decision will save a lot of your time!",0;
 	end;
-	
+
 OnTimer5000:
 	mapannounce "force_1-1","In order to complete this battle course, you must start from the far left of this room to the clock wise direction. Please move to the far left side. You have 5 minutes from now.",0;
 	end;
-	
+
 OnTimer60000:
 	set $@mapcount50, getmapusers ("force_1-1");
 	if ($@mapcount50 == 0) {
@@ -64,7 +64,7 @@ OnTimer60000:
 	}
 	mapannounce "force_1-1","Remaining Time : 4 minutes ",0;
 	end;
-	
+
 OnTimer120000:
 	 set $@mapcount50, getmapusers ("force_1-1");
 	if ($@mapcount50 == 0) {
@@ -72,7 +72,7 @@ OnTimer120000:
 	}
 	mapannounce "force_1-1","Remaining Time : 3 minutes ",0;
 	end;
-	
+
 OnTimer180000:
 	 set $@mapcount50, getmapusers ("force_1-1");
 	if ($@mapcount50 == 0) {
@@ -87,11 +87,11 @@ OnTimer240000:
 	}
 	mapannounce "force_1-1","Remaining Time : 1 minute ",0;
 	end;
-	
+
 OnTimer300000:
 	mapannounce "force_1-1","Your time is over. I hope you had a good time~",0;
 	end;
-	
+
 OnTimer305000:
 OnTimer306000:
 OnTimer307000:
@@ -104,12 +104,12 @@ OnTimer313000:
 OnTimer314000:
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
 	end;
-	
+
 OnTimer315000:
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
 	donpcevent "Heel and Toe#arena::Onfailclearstage";
 	end;
-	
+
 Ontimeroff:
 	stopnpctimer;
 	end;
@@ -122,78 +122,78 @@ Onfailclearstage:
 	donpcevent "alloff#50::Onon";
 	donpcevent "lvl 50s Waiting Room::Onstart";
 	end;
-	
+
 On01_start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Smokies!",0;
 	end;
-	
+
 On01_end:
 	mapannounce "force_1-1","A door to the north room has opened!",0;
 	end;
-	
+
 On02_start:
 	mapannounce "force_1-1","Please escape to the door from monsters!",0;
 	end;
-	
+
 On02_end:
 	mapannounce "force_1-1","A door to the north room has opened!",0;
 	end;
-	
+
 On03_start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Karakasa!",0;
 	end;
-	
+
 On03_end:
 	mapannounce "force_1-1","Clear! A door to the east room has opened!",0;
 	end;
-	
+
 On04_start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Kobolds and escape to the east room!",0;
 	end;
-	
+
 On04_end:
 	mapannounce "force_1-1","A door to the east room has opened!",0;
 	end;
-	
+
 On05_start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all monsters except obstructor monsters!",0;
 	end;
-	
+
 On05_end:
 	mapannounce "force_1-1","Clear! A door to the south room has opened!",0;
 	end;
-	
+
 On06_start:
 	mapannounce "force_1-1","In order to clear this battle, you must kill all Drops and escape to the south room!",0;
 	end;
-	
+
 On06_end:
 	mapannounce "force_1-1","A door to the south room has opened!",0;
 	end;
-	
+
 On07_start:
 	mapannounce "force_1-1","In order to clear this battle, you must get rid of a Red Plant in the center of this room while dodging attacks from Hydras!",0;
 	end;
-	
+
 On07_end:
 	mapannounce "force_1-1","Clear! A door to the west room has opened!",0;
 	end;
-	
+
 On08_start:
 	mapannounce "force_1-1","Please escape to the north exit!",0;
 	end;
-	
+
 On09_start:
 	mapannounce "force_1-1","In order to clear this battle, you must defeat a Vocal!",0;
 	end;
-	
+
 On09_end:
 	mapannounce "force_1-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
 
 }
 
-force_1-1,10,56,4	script	arena#50	139,{
+-	script	arena#50	-1,{
 
 Onreset_01:
 	donpcevent "force_01ex#50::Onreset";
@@ -201,51 +201,51 @@ Onreset_01:
 	enablenpc "force_01_02#50";
 	enablenpc "force_02_03#50";
 	end;
-	
+
 Onreset_02:
 	donpcevent "force_02mob#50::Onreset";
 	donpcevent "force_03start#50::Onon";
 	end;
-	
+
 Onreset_03:
 	enablenpc "force_03_04#50";
 	donpcevent "force_04start#50::Onon";
 	donpcevent "force_03ex#50::Onreset";
 	end;
-	
+
 Onreset_04:
 	enablenpc "force_04_05#50";
 	donpcevent "force_05start#50::Onon";
 	donpcevent "force_04ex#50::Onreset";
 	end;
-	
+
 Onreset_05:
 	enablenpc "force_05_06#50";
 	donpcevent "force_06start#50::Onon";
 	donpcevent "force_05ex#50::Onreset";
 	end;
-	
+
 Onreset_06:
 	enablenpc "force_06_07#50";
 	donpcevent "force_07start#50::Onon";
 	donpcevent "force_06ex#50::Onreset";
 	end;
-	
+
 Onreset_07:
 	enablenpc "force_07_08#50";
 	donpcevent "force_07ex#50::Onreset";
 	donpcevent "force_08start#50::Onon";
 	end;
-	
+
 Onreset_08:
 	donpcevent "force_09start#50::Onon";
 	enablenpc "force_08_09#50";
 	end;
-	
+
 Onreset_09:
 	enablenpc "force_exit#50";
 	end;
-	
+
 Onstart:
 	disablenpc "force_01_02#50";
 	disablenpc "force_02_03#50";
@@ -277,7 +277,7 @@ Onstart:
 	donpcevent "force_01start#50::Onon";
 	donpcevent "Heel and Toe#arena::Onstart";
 	end;
-	
+
 Onreset_all:
 	donpcevent "force_01mob#50::Onreset";
 	donpcevent "force_02mob#50::Onreset";
@@ -392,19 +392,19 @@ OnTouch:
 
 }
 
-force_1-1,1,1,1	script	force_01start#50	-1,{
+-	script	force_01start#50	-1,{
 Onon:
 	donpcevent "force_01mob#50::Onon";
 end;
 
 }
 
-force_1-1,10,56,4	script	force_01ex#50	139,{
+-	script	force_01ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_01ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob1:
 	monster "force_1-1",25,26,"Drops",1572,1,"force_01ex#50::OnMobEx";
 	monster "force_1-1",15,25,"Drops",1572,1,"force_01ex#50::OnMobEx";
@@ -437,7 +437,7 @@ OnMobEx:
 
 }
 
-force_1-1,10,56,4	script	force_01mob#50	139,{
+-	script	force_01mob#50	-1,{
 
 Onon:
 	donpcevent "force_01ex#50::Onsummonmob1";
@@ -462,19 +462,19 @@ OnMobDeath:
 	end;
 }
 
-force_1-1,1,1,1	script	force_02start#50	-1,{
+-	script	force_02start#50	-1,{
 
 Onon:
 	donpcevent "force_02mob#50::Onsummonmob2";
 	end;
 }
 
-force_1-1,10,56,4	script	force_02mob#50	139,{
+-	script	force_02mob#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_02mob#50::OnMobEx";
 	end;
-	
+
 Onsummonmob2:
 	monster "force_1-1",24,76,"Familiar",1419,1,"force_02mob#50::OnMobEx";
 	monster "force_1-1",28,76,"Familiar",1419,1,"force_02mob#50::OnMobEx";
@@ -493,19 +493,19 @@ OnMobEx:
 	end;
 }
 
-force_1-1,1,1,1	script	force_03start#50	-1,{
+-	script	force_03start#50	-1,{
 
 Onon:
 	donpcevent "force_03mob#50::Onon";
 	end;
 }
 
-force_1-1,10,56,4	script	force_03ex#50	139,{
+-	script	force_03ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_03ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob_03:
 	monster "force_1-1",26,173,"Hydra",1579,1,"force_03ex#50::OnMobEx";
 	monster "force_1-1",21,173,"Hydra",1579,1,"force_03ex#50::OnMobEx";
@@ -521,7 +521,7 @@ OnMobEx:
 	end;
 }
 
-force_1-1,20,56,4	script	force_03mob#50	139,{
+-	script	force_03mob#50	-1,{
 
 Onon:
 	donpcevent "force_03ex#50::Onsummonmob_03";
@@ -547,7 +547,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-1,1,1,1	script	force_04start#50	-1,{
+-	script	force_04start#50	-1,{
 
 Onon:
 	donpcevent "force_04mob#50::Onon";
@@ -555,12 +555,12 @@ end;
 
 }
 
-force_1-1,10,56,4	script	force_04ex#50	139,{
+-	script	force_04ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_04ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob_04:
 	monster "force_1-1",99,174,"Familiar",1419,1,"force_04ex#50::OnMobEx";
 	monster "force_1-1",103,174,"Familiar",1419,1,"force_04ex#50::OnMobEx";
@@ -583,7 +583,7 @@ OnMobEx:
 
 }
 
-force_1-1,22,56,4	script	force_04mob#50	139,{
+-	script	force_04mob#50	-1,{
 
 Onon:
 	donpcevent "force_04ex#50::Onsummonmob_04";
@@ -595,7 +595,7 @@ Onon:
 Onreset:
 	killmonster "force_1-1","force_04mob#50::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_04_50,$force_04_50 -1;
 	if ($force_04_50 < 1) {
@@ -605,19 +605,19 @@ OnMobDeath:
 	end;
 }
 
-force_1-1,1,1,1	script	force_05start#50	-1,{
+-	script	force_05start#50	-1,{
 
 Onon:
 	donpcevent "force_05mob#50::Onon";
 	end;
 }
 
-force_1-1,10,56,4	script	force_05ex#50	139,{
+-	script	force_05ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_05ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob_05:
 	set $@randmonster50,rand(1,2);
 	switch($@randmonster50) {
@@ -634,7 +634,7 @@ OnMobEx:
 	end;
 }
 
-force_1-1,24,56,4	script	force_05mob#50	139,{
+-	script	force_05mob#50	-1,{
 
 Onon:
 	monster "force_1-1",173,166,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
@@ -662,19 +662,19 @@ OnMobDeath:
 
 }
 
-force_1-1,1,1,1	script	force_06start#50	-1,{
+-	script	force_06start#50	-1,{
 
 Onon:
 	donpcevent "force_06mob#50::Onon";
 	end;
 }
 
-force_1-1,10,56,4	script	force_06ex#50	139,{
+-	script	force_06ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_06ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob_06:
 	monster "force_1-1",173,118,"Smokie",1561,1,"force_06ex#50::OnMobEx";
 	monster "force_1-1",173,108,"Smokie",1561,1,"force_06ex#50::OnMobEx";
@@ -693,7 +693,7 @@ OnMobEx:
 	end;
 }
 
-force_1-1,18,56,4	script	force_06mob#50	139,{
+-	script	force_06mob#50	-1,{
 
 Onon:
 	donpcevent "force_06ex#50::Onsummonmob_06";
@@ -718,19 +718,19 @@ OnMobDeath:
 	end;
 }
 
-force_1-1,1,1,1	script	force_07start#50	-1,{
+-	script	force_07start#50	-1,{
 
 Onon:
 	donpcevent "force_07mob#50::Onon";
 	end;
 }
 
-force_1-1,12,56,4	script	force_07ex#50	139,{
+-	script	force_07ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_07ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob_07:
 	monster "force_1-1",163,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
 	monster "force_1-1",167,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
@@ -760,7 +760,7 @@ OnMobEx:
 	end;
 }
 
-force_1-1,18,56,4	script	force_07mob#50	139,{
+-	script	force_07mob#50	-1,{
 
 Onon:
 	donpcevent "force_07ex#50::Onsummonmob_07";
@@ -781,33 +781,33 @@ OnMobDeath:
 	end;
 }
 
-force_1-1,1,1,1	script	force_08start#50	-1,{
+-	script	force_08start#50	-1,{
 
 Onon:
 	donpcevent "force_08ex#50::Onon";
 	end;
 }
 
-force_1-1,18,56,4	script	force_08ex#50	139,{
+-	script	force_08ex#50	-1,{
 
 Onon:
 	donpcevent "arena#50::Onreset_08";
 	end;
 }
 
-force_1-1,1,1,1	script	force_09start#50	-1,{
+-	script	force_09start#50	-1,{
 
 Onon:
 	donpcevent "force_09mob#50::Onon";
 	end;
 }
 
-force_1-1,10,56,4	script	force_09ex#50	139,{
+-	script	force_09ex#50	-1,{
 
 Onreset:
 	killmonster "force_1-1","force_09ex#50::OnMobEx";
 	end;
-	
+
 Onsummonmob_09:
 	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMobEx";
 	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMobEx";
@@ -830,18 +830,18 @@ OnMobEx:
 	end;
 }
 
-force_1-1,16,56,4	script	force_09mob#50	139,{
+-	script	force_09mob#50	-1,{
 
 Onon:
 	monster "force_1-1",99,99,"Vocal",1581,1,"force_09mob#50::OnMobDeath";
 	donpcevent "force_09ex#50::Onsummonmob_09";
 	set $force_09_50,1;
 	end;
-	
+
 Onreset:
 	killmonster "force_1-1","force_09mob#50::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_09_50,$force_09_50 -1;
 	if ($force_09_50 < 1) {
@@ -1010,7 +1010,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 	}
 }
 
-prt_are_in,14,195,3	script	#arn_timer_50	139,{
+-	script	#arn_timer_50	-1,{
 
 Onon:
 	initnpctimer;
@@ -1035,21 +1035,21 @@ OnTimer60000:
 	donpcevent "alloff#50::Onon";
 	donpcevent "lvl 50s Waiting Room::Onstart";
 	end;
-	
+
 Onstop:
 	stopnpctimer;
 	end;
 
 }
 
-prt_are_in,1,1,1	script	arn_warp_50	-1,{
+-	script	arn_warp_50	-1,{
 
 Onout:
-	areawarp "prt_are_in",14,194,29,180,"arena_room",100,75;
+	areawarp "prt_are_in",14,195,29,178,"arena_room",100,75;
 	end;
 }
 
-force_1-1,10,55,4	script	cast#50	139,{
+-	script	cast#50	-1,{
 Ontimeover1:
 	mapannounce "force_1-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
@@ -1064,7 +1064,7 @@ Onnomal2:
 	end;
 }
 
-force_1-1,100,60,3	script	alloff#50	139,{
+-	script	alloff#50	-1,{
 
 Onon:
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
diff --git a/npc/pre-re/other/arena/arena_lvl60.txt b/npc/pre-re/other/arena/arena_lvl60.txt
index ba7a580e8..37d076683 100644
--- a/npc/pre-re/other/arena/arena_lvl60.txt
+++ b/npc/pre-re/other/arena/arena_lvl60.txt
@@ -15,38 +15,26 @@
 //============================================================
 
 arena_room,38,88,5	script	lvl 60s Waiting Room	124,{
+	end;
 
 OnInit:
-	waitingroom "Individual : lvl 60 or higher",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60;
+	waitingroom "Individual; Level 60 to 79",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60,79;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-	donpcevent "arena#60::Onstart";
-	enablenpc "ArenaFee#60";
 	warpwaitingpc "force_2-1",99,12;
+	donpcevent "arena#60::Onstart";
 	disablewaitingroomevent;
 	end;
 
 Onstart:
 	enablewaitingroomevent;
 	end;
-
-}
-
-force_2-1,99,12,1	script	ArenaFee#60	139,1,1,{
-
-OnInit:
-	disablenpc "ArenaFee#60";
-	end;
-
-OnTouch:
-	set Zeny,Zeny -1000;
-	disablenpc "ArenaFee#60";
-	end;
 }
 
 force_2-1,99,20,4	script	Minilover#arena	124,{
+	end;
 
 OnInit:
 	set $@mapcount60, 0;
@@ -61,15 +49,15 @@ Onstart:
 OnTimer3000:
 	mapannounce "force_2-1","Good day, my name is Minilover, the guide of Time Force Battle for lvl 60s!",0;
 	end;
-	
+
 OnTimer4000:
 	mapannounce "force_2-1","Remember your right decision will save a lot of your time!",0;
 	end;
-	
+
 OnTimer5000:
 	mapannounce "force_2-1","In order to complete this battle course, you must start from the far left of this room to the clock wise direction. Please move to the far left side. You have 6 minutes from now.",0;
 	end;
-	
+
 OnTimer60000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
@@ -77,7 +65,7 @@ OnTimer60000:
 	}
 	mapannounce "force_2-1","Remaining Time : 5 minutes ",0;
 	end;
-	
+
 OnTimer120000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
@@ -85,7 +73,7 @@ OnTimer120000:
 	}
 	mapannounce "force_2-1","Remaining Time : 4 minutes ",0;
 	end;
-	
+
 OnTimer180000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
@@ -93,7 +81,7 @@ OnTimer180000:
 	}
 	mapannounce "force_2-1","Remaining Time : 3 minutes ",0;
 	end;
-	
+
 OnTimer240000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
@@ -101,7 +89,7 @@ OnTimer240000:
 	}
 	mapannounce "force_2-1","Remaining Time : 2 minutes ",0;
 	end;
-	
+
 OnTimer300000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
@@ -109,11 +97,11 @@ OnTimer300000:
 	}
 	mapannounce "force_2-1","Remaining Time : 1 minute ",0;
 	end;
-	
+
 OnTimer360000:
 	mapannounce "force_2-1","Your time is over. I hope you had a good time~",0;
 	end;
-	
+
 OnTimer365000:
 OnTimer366000:
 OnTimer367000:
@@ -126,16 +114,16 @@ OnTimer373000:
 OnTimer374000:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
 	end;
-	
+
 OnTimer375000:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
 	donpcevent "Minilover#arena::Onfailclearstage";
 	end;
-	
+
 Ontimeroff:
 	stopnpctimer;
 	end;
-	
+
 Onfailclearstage:
  	donpcevent "cast#60::Ontimeover1";
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
@@ -144,78 +132,78 @@ Onfailclearstage:
 	donpcevent "alloff#60::Onon";
 	donpcevent "lvl 60s Waiting Room::Onstart";
 	end;
-	
+
 On01_start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill at least 5 Goblins while dodging Rotar Zairos!",0;
 	end;
-	
+
 On01_end:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
-	
+
 On02_start:
 	mapannounce "force_2-1","Escape to the north exit from the monsters!",0;
 	end;
-	
+
 On02_end:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
-	
+
 On03_start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Mantises!",0;
 	end;
-	
+
 On03_end:
 	mapannounce "force_2-1","Clear! A door to the east room has opened!",0;
 	end;
-	
+
 On04_start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all non-aggressive monsters while dodging aggressive monsters!",0;
 	end;
-	
+
 On04_end:
 	mapannounce "force_2-1","A door to the east room has opened!",0;
 	end;
-	
+
 On05_start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters except Hydras and Kaphas!",0;
 	end;
-	
+
 On05_end:
 	mapannounce "force_2-1","Clear! A door to the south room has opened!",0;
 	end;
-	
+
 On06_start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Miyabi Dolls and escape to the south exit!",0;
 	end;
-	
+
 On06_end:
 	mapannounce "force_2-1","A door to the south room has opened!",0;
 	end;
-	
+
 On07_start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters!",0;
 	end;
-	
+
 On07_end:
 	mapannounce "force_2-1","Clear! A door to the west room has opened!",0;
 	end;
-	
+
 On08_start:
 	mapannounce "force_2-1","Please escape to the north exit!",0;
 	end;
-	
+
 On09_start:
 	mapannounce "force_2-1","In order to clear this battle, you must defeat a Goblin Leader!",0;
 	end;
-	
+
 On09_end:
 	mapannounce "force_2-1","Boss Clear! - North exit has opened. Thank you.",0;
 	end;
 
 }
 
-force_2-1,10,56,4	script	arena#60	139,{
+-	script	arena#60	-1,{
 
 Onreset_01:
 	donpcevent "force_01ex#60::Onreset";
@@ -406,19 +394,19 @@ OnTouch:
 	end;
 }
 
-force_2-1,1,1,1	script	force_01start#60	-1,{
+-	script	force_01start#60	-1,{
 
 Onon:
 	donpcevent "force_01mob#60::Onon";
 end;
 }
 
-force_2-1,10,56,4	script	force_01ex#60	139,{
+-	script	force_01ex#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_01ex#60::OnMobEx";
 	end;
-	
+
 Onon:
 	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMobEx";
 	end;
@@ -427,12 +415,12 @@ OnMobEx:
 	end;
 }
 
-force_2-1,10,55,4	script	force_01mob#60	139,{
+-	script	force_01mob#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_01mob#60::OnMobDeath";
 	end;
-	
+
 Onon:
 	donpcevent "force_01ex#60::Onon";
 	monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
@@ -457,14 +445,14 @@ OnMobDeath:
 	end;
 }
 
-force_2-1,1,1,1	script	force_02start#60	-1,{
+-	script	force_02start#60	-1,{
 
 Onon:
 	donpcevent "force_02mob#60::Onon";
 	end;
 }
 
-force_2-1,10,54,4	script	force_02mob#60	139,{
+-	script	force_02mob#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_02mob#60::OnMobEx";
@@ -506,19 +494,19 @@ OnMobEx:
 	end;
 }
 
-force_2-1,1,1,1	script	force_03start#60	-1,{
+-	script	force_03start#60	-1,{
 
 Onon:
 	donpcevent "force_03mob#60::Onon";
 	end;
 }
 
-force_2-1,10,53,4	script	force_03ex#60	139,{
+-	script	force_03ex#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_03ex#60::OnMobEx";
 	end;
-	
+
 Onon:
 	monster "force_2-1",26,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
 	monster "force_2-1",21,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
@@ -536,7 +524,7 @@ OnMobEx:
 	end;
 }
 
-force_2-1,11,56,4	script	force_03mob#60	139,{
+-	script	force_03mob#60	-1,{
 
 Onon:
 	donpcevent "force_03ex#60::Onon";
@@ -560,14 +548,14 @@ OnMobDeath:
 	end;
 }
 
-force_2-1,1,1,1	script	force_04start#60	-1,{
+-	script	force_04start#60	-1,{
 
 Onon:
 	donpcevent "force_04mob#60::Onon";
 	end;
 }
 
-force_2-1,10,56,4	script	force_04ex#60	139,{
+-	script	force_04ex#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_04ex#60::OnMobEx";
@@ -587,7 +575,7 @@ OnMobEx:
 	end;
 }
 
-force_2-1,11,57,4	script	force_04mob#60	139,{
+-	script	force_04mob#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_04mob#60::OnMobDeath";
@@ -610,19 +598,19 @@ OnMobDeath:
 	end;
 }
 
-force_2-1,1,1,1	script	force_05start#60	-1,{
+-	script	force_05start#60	-1,{
 
 Onon:
 	donpcevent "force_05mob#60::Onon";
 	end;
 }
 
-force_2-1,12,56,4	script	force_05ex#60	139,{
+-	script	force_05ex#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_05ex#60::OnMobEx";
 	end;
-	
+
 Onsummonmob_05:
 	monster "force_2-1",168,177,"Hydra",1579,1,"force_05ex#60::OnMobEx";
 	monster "force_2-1",170,179,"Hydra",1579,1,"force_05ex#60::OnMobEx";
@@ -642,12 +630,12 @@ OnMobEx:
 	end;
 }
 
-force_2-1,24,56,4	script	force_05mob#60	139,{
+-	script	force_05mob#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_05mob#60::OnMobDeath";
 	end;
-	
+
 Onon:
 	donpcevent "force_05ex#60::Onsummonmob_05";
 	monster "force_2-1",163,173,"Drainliar",1434,1,"force_05mob#60::OnMobDeath";
@@ -667,14 +655,14 @@ OnMobDeath:
 	end;
 }
 
-force_2-1,1,1,1	script	force_06start#60	-1,{
+-	script	force_06start#60	-1,{
 
 Onon:
 	donpcevent "force_06mob#60::Onon";
 	end;
 }
 
-force_2-1,10,56,4	script	force_06ex#60	139,{
+-	script	force_06ex#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_06ex#60::OnMobEx";
@@ -706,7 +694,7 @@ Onon:
 	monster "force_2-1",169,75,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
 	monster "force_2-1",178,75,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
 	end;
-	
+
 Onsubon:
 	set $@randmonster60,rand(1,3);
 	switch($@randmonster60) {
@@ -726,7 +714,7 @@ OnMobEx:
 	end;
 }
 
-force_2-1,18,56,4	script	force_06mob#60	139,{
+-	script	force_06mob#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_06mob#60::OnMobDeath";
@@ -750,19 +738,19 @@ OnMobDeath:
 	end;
 }
 
-force_2-1,1,1,1	script	force_07start#60	-1,{
+-	script	force_07start#60	-1,{
 
 Onon:
 	donpcevent "force_07mob#60::Onon";
 	end;
 }
 
-force_2-1,19,56,4	script	force_07mob#60	139,{
+-	script	force_07mob#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_07mob#60::OnMobDeath";
 	end;
-	
+
 Onon:
 	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
 	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
@@ -780,33 +768,33 @@ OnMobDeath:
 	end;
 }
 
-force_2-1,1,1,1	script	force_08start#60	-1,{
+-	script	force_08start#60	-1,{
 
 Onon:
 	donpcevent "force_08ex#60::Onon";
 	end;
 }
 
-force_2-1,18,57,4	script	force_08ex#60	139,{
+-	script	force_08ex#60	-1,{
 
 Onon:
 	donpcevent "arena#60::Onreset_08";
 	end;
 }
 
-force_2-1,1,1,1	script	force_09start#60	-1,{
+-	script	force_09start#60	-1,{
 
 Onon:
 	donpcevent "force_09mob#60::Onon";
 	end;
 }
 
-force_2-1,10,59,4	script	force_09ex#60	139,{
+-	script	force_09ex#60	-1,{
 
 Onreset:
 	killmonster "force_2-1","force_09ex#60::OnMobEx";
 	end;
-	
+
 Onsummonmob_09:
 	monster "force_2-1",90,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
 	monster "force_2-1",92,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
@@ -840,14 +828,14 @@ OnMobEx:
 	end;
 }
 
-force_2-1,16,56,4	script	force_09mob#60	139,{
+-	script	force_09mob#60	-1,{
 
 Onon:
 	donpcevent "force_09ex#60::Onsummonmob_09";
 	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMobDeath";
 	set $force_09_60,1;
 	end;
-	
+
 Onreset:
 	killmonster "force_2-1","force_09mob#60::OnMobDeath";
 	end;
@@ -1021,7 +1009,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 
 }
 
-prt_are_in,14,143,3	script	#arn_timer_60	139,{
+-	script	#arn_timer_60	-1,{
 
 Onon:
 	initnpctimer;
@@ -1052,14 +1040,14 @@ Onstop:
 	end; 
 }
 
-prt_are_in,1,1,1	script	arn_warp_60	-1,{
+-	script	arn_warp_60	-1,{
 
 Onout:
-	areawarp "prt_are_in",14,143,29,128,"arena_room",100,75;
+	areawarp "prt_are_in",14,143,29,126,"arena_room",100,75;
 	end;
 }
 
-force_2-1,10,55,4	script	cast#60	139,{
+-	script	cast#60	-1,{
 
 Ontimeover1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
@@ -1078,7 +1066,7 @@ Ontimeover2:
 	end;
 }
 
-force_2-1,100,60,3	script	alloff#60	139,{
+-	script	alloff#60	-1,{
 
 Onon:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
diff --git a/npc/pre-re/other/arena/arena_lvl70.txt b/npc/pre-re/other/arena/arena_lvl70.txt
index 66412693d..c5ca4d1e2 100644
--- a/npc/pre-re/other/arena/arena_lvl70.txt
+++ b/npc/pre-re/other/arena/arena_lvl70.txt
@@ -17,7 +17,7 @@ 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,1000,70;
+	waitingroom "Individual; Level 70 to 89",50,"lvl 70s Waiting Room::OnStartArena",1,1000,70,89;
 	enablewaitingroomevent;
 	end;
 
@@ -34,29 +34,29 @@ Onstart:
 
 force_3-1,99,20,4	script	Cadillac#arena	124,{
 	end;
-	
+
 OnInit:
 	set $@mapcount70, 0;
 	end;
-	
+
 Onstart:
 	initnpctimer;
 	set $arena_min70st,gettime(2);
 	set $arena_sec70st,gettime(1);
 	end;
-	
+
 OnTimer3000:
 	mapannounce "force_3-1","Good day, my name is Cadillac, the guide of Time Force Battle for lvl 70s!",0;
 	end;
-	
+
 OnTimer4000:
 	mapannounce "force_3-1","Remember your right decision will save a lot of your time!",0;
 	end;
-	
+
 OnTimer7000:
 	mapannounce "force_3-1","In order to complete this battle course, you must start from the far left of this room to the clock wise direction. Please move to the far left side. You have 7 minutes from now.",0;
 	end;
-	
+
 OnTimer60000:
 	set $@mapcount70, getmapusers ("force_3-1");
 	if ($@mapcount70 == 0) {
@@ -64,7 +64,7 @@ OnTimer60000:
 	}
 	mapannounce "force_3-1","Remaining Time : 6 minutes ",0;
 	end;
-	
+
 OnTimer120000:
 	 set $@mapcount70, getmapusers ("force_3-1");
 	if ($@mapcount70 == 0) {
@@ -72,7 +72,7 @@ OnTimer120000:
 	}
 	mapannounce "force_3-1","Remaining Time : 5 minutes ",0;
 	end;
-	
+
 OnTimer180000:
 	 set $@mapcount70, getmapusers ("force_3-1");
 	if ($@mapcount70 == 0) {
@@ -103,11 +103,11 @@ OnTimer360000:
 	}
 	mapannounce "force_3-1","Remaining Time : 1 minute ",0;
 	end;
-	
+
 OnTimer420000:
 	mapannounce "force_3-1","Your time is over. I hope you had a good time~",0;
 	end;
-	
+
 OnTimer425000:
 OnTimer426000:
 OnTimer427000:
@@ -120,12 +120,12 @@ OnTimer433000:
 OnTimer434000:
 	mapwarp "force_3-1","prt_are_in",126,87,0,0;
 	end;
-	
+
 OnTimer435000:
 	mapwarp "force_3-1","prt_are_in",126,87,0,0;
 	donpcevent "Cadillac#arena::Onfailclearstage";
 	end;
-	
+
 Ontimeroff:
 	stopnpctimer;
 	end;
@@ -138,130 +138,130 @@ Onfailclearstage:
 	donpcevent "alloff#70::Onon";
 	donpcevent "lvl 70s Waiting Room::Onstart";
 	end;
-	
+
 On01_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Kobolds!",0;
 	end;
-	
+
 On01_end:
 	mapannounce "force_3-1","A door to the north room has opened!",0;
 	end;
-	
+
 On02_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Horongs and escape!",0;
 	end;
-	
+
 On02_end:
 	mapannounce "force_3-1","A door to the north room has opened!",0;
 	end;
-	
+
 On03_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all monsters except Enchanted Peach Trees!",0;
 	end;
-	
+
 On03_end:
 	mapannounce "force_3-1","Clear! A door to the east room has opened!",0;
 	end;
-	
+
 On04_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Stem Worms while dodging Bathories!",0;
 	end;
-	
+
 On04_end:
 	mapannounce "force_3-1","A door to the east room has opened!",0;
 	end;
-	
+
 On05_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Argiopes!",0;
 	end;
-	
+
 On05_end:
 	mapannounce "force_3-1","Clear! A door to the south room has opened!",0;
 	end;
-	
+
 On06_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill all Hammer Goblins!",0;
 	end;
-	
+
 On06_end:
 	mapannounce "force_3-1","A door to the south room has opened!",0;
 	end;
-	
+
 On07_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill an Alice in the center!",0;
 	end;
-	
+
 On07_end:
 	mapannounce "force_3-1","Clear! A door to the west room has opened!",0;
 	end;
-	
+
 On08_start:
 	mapannounce "force_3-1","Please escape to the north exit!",0;
 	end;
-	
+
 On09_start:
 	mapannounce "force_3-1","In order to clear this battle, you must kill a Kobold Leader and all Kobolds!",0;
 	end;
-	
+
 On09_end:
 	mapannounce "force_3-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
 
 }
 
-force_3-1,10,56,4	script	arena#70	139,{
+-	script	arena#70	-1,{
 
 Onreset_01:
 	donpcevent "force_01ex#70::Onreset";
 	donpcevent "force_02start#70::Onon";
 	enablenpc "force_01_02#70";
 	end;
-	
+
 Onreset_02:
 	donpcevent "force_02ex#70::Onreset";
 	donpcevent "force_03start#70::Onon";
 	enablenpc "force_02_03#70";
 	end;
-	
+
 Onreset_03:
 	enablenpc "force_03_04#70";
 	donpcevent "force_04start#70::Onon";
 	donpcevent "force_03ex#70::Onreset";
 	end;
-	
+
 Onreset_04:
 	enablenpc "force_04_05#70";
 	donpcevent "force_05start#70::Onon";
 	donpcevent "force_04ex#70::Onreset";
 	end;
-	
+
 Onreset_05:
 	enablenpc "force_05_06#70";
 	donpcevent "force_06start#70::Onon";
 	donpcevent "force_05ex#70::Onreset";
 	end;
-	
+
 Onreset_06:
 	enablenpc "force_06_07#70";
 	donpcevent "force_07start#70::Onon";
 	donpcevent "force_06ex#70::Onreset";
 	end;
-	
+
 Onreset_07:
 	enablenpc "force_07_08#70";
 	donpcevent "force_07ex#70::Onreset";
 	donpcevent "force_08start#70::Onon";
 	end;
-	
+
 Onreset_08:
 	donpcevent "force_09start#70::Onon";
 	enablenpc "force_08_09#70";
 	end;
-	
+
 Onreset_09:
 	enablenpc "force_exit#70";
 	end;
-	
+
 Onstart:
 	disablenpc "force_01_02#70";
 	disablenpc "force_02_03#70";
@@ -296,7 +296,7 @@ Onstart:
 	donpcevent "force_01start#70::Onon";
 	donpcevent "Cadillac#arena::Onstart";
 	end;
-	
+
 Onreset_all:
 	donpcevent "force_01mob#70::Onreset";
 	donpcevent "force_02mob#70::Onreset";
@@ -411,14 +411,14 @@ OnTouch:
 
 }
 
-force_3-1,1,1,1	script	force_01start#70	-1,{
+-	script	force_01start#70	-1,{
 Onon:
 	donpcevent "force_01mob#70::Onon";
 end;
 
 }
 
-force_3-1,10,56,4	script	force_01mob#70	139,{
+-	script	force_01mob#70	-1,{
 
 Onon:
 	monster "force_3-1",25,36,"Kobold",1545,1,"force_01mob#70::OnMobDeath";
@@ -442,19 +442,19 @@ OnMobDeath:
 	end;
 }
 
-force_3-1,1,1,1	script	force_02start#70	-1,{
+-	script	force_02start#70	-1,{
 
 Onon:
 	donpcevent "force_02mob#70::Onon";
 	end;
 }
 
-force_3-1,10,56,4	script	force_02ex#70	139,{
+-	script	force_02ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_02ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob2:
 	monster "force_3-1",21,78,"Archer Skeleton",1420,1,"force_02ex#70::OnMobEx";
 	monster "force_3-1",22,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMobEx";
@@ -474,12 +474,12 @@ OnMobEx:
 	end;
 }
 
-force_3-1,10,56,4	script	force_02mob#70	139,{
+-	script	force_02mob#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_02mob#70::OnMobDeath";
 	end;
-	
+
 Onon:
 	monster "force_3-1",25,79,"Horong",1578,1,"force_02mob#70::OnMobDeath";
 	monster "force_3-1",29,114,"Horong",1578,1,"force_02mob#70::OnMobDeath";
@@ -496,19 +496,19 @@ OnMobDeath:
 	end;
 }
 
-force_3-1,1,1,1	script	force_03start#70	-1,{
+-	script	force_03start#70	-1,{
 
 Onon:
 	donpcevent "force_03mob#70::Onon";
 	end;
 }
 
-force_3-1,10,56,4	script	force_03ex#70	139,{
+-	script	force_03ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_03ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob_03:
 	monster "force_3-1",10,170,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMobEx";
 	monster "force_3-1",26,180,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMobEx";
@@ -518,7 +518,7 @@ OnMobEx:
 	end;
 }
 
-force_3-1,20,56,4	script	force_03mob#70	139,{
+-	script	force_03mob#70	-1,{
 
 Onon:
 	donpcevent "force_03ex#70::Onsummonmob_03";
@@ -542,7 +542,7 @@ OnMobDeath:
 	end;
 }
 
-force_3-1,1,1,1	script	force_04start#70	-1,{
+-	script	force_04start#70	-1,{
 
 Onon:
 	donpcevent "force_04mob#70::Onon";
@@ -550,12 +550,12 @@ end;
 
 }
 
-force_3-1,10,56,4	script	force_04ex#70	139,{
+-	script	force_04ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_04ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob_04:
 	monster "force_3-1",94,179,"Bathory",1525,1,"force_04ex#70::OnMobEx";
 	monster "force_3-1",110,179,"Bathory",1525,1,"force_04ex#70::OnMobEx";
@@ -570,7 +570,7 @@ OnMobEx:
 
 }
 
-force_3-1,22,56,4	script	force_04mob#70	139,{
+-	script	force_04mob#70	-1,{
 
 Onon:
 	donpcevent "force_04ex#70::Onsummonmob_04";
@@ -582,7 +582,7 @@ Onon:
 Onreset:
 	killmonster "force_3-1","force_04mob#70::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_04_70,$force_04_70 -1;
 	if ($force_04_70 < 1) {
@@ -592,19 +592,19 @@ OnMobDeath:
 	end;
 }
 
-force_3-1,1,1,1	script	force_05start#70	-1,{
+-	script	force_05start#70	-1,{
 
 Onon:
 	donpcevent "force_05mob#70::Onon";
 	end;
 }
 
-force_3-1,10,56,4	script	force_05ex#70	139,{
+-	script	force_05ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_05ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob_05:
 	set $@randmonster70,rand(1,2);
 	switch($@randmonster70) {
@@ -621,7 +621,7 @@ OnMobEx:
 	end;
 }
 
-force_3-1,24,56,4	script	force_05mob#70	139,{
+-	script	force_05mob#70	-1,{
 
 Onon:
 	monster "force_3-1",164,183,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
@@ -647,19 +647,19 @@ OnMobDeath:
 
 }
 
-force_3-1,1,1,1	script	force_06start#70	-1,{
+-	script	force_06start#70	-1,{
 
 Onon:
 	donpcevent "force_06mob#70::Onon";
 	end;
 }
 
-force_3-1,10,56,4	script	force_06ex#70	139,{
+-	script	force_06ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_06ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob_06:
 	monster "force_3-1",176,99,"Goblin",1534,1,"force_06ex#70::OnMobEx";
 	monster "force_3-1",170,86,"Goblin",1535,1,"force_06ex#70::OnMobEx";
@@ -677,7 +677,7 @@ OnMobEx:
 	end;
 }
 
-force_3-1,18,56,4	script	force_06mob#70	139,{
+-	script	force_06mob#70	-1,{
 
 Onon:
 	donpcevent "force_06ex#70::Onsummonmob_06";
@@ -702,19 +702,19 @@ OnMobDeath:
 	end;
 }
 
-force_3-1,1,1,1	script	force_07start#70	-1,{
+-	script	force_07start#70	-1,{
 
 Onon:
 	donpcevent "force_07mob#70::Onon";
 	end;
 }
 
-force_3-1,12,56,4	script	force_07ex#70	139,{
+-	script	force_07ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_07ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob_07:
 	monster "force_3-1",168,26,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
 	monster "force_3-1",186,23,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
@@ -735,7 +735,7 @@ OnMobEx:
 	end;
 }
 
-force_3-1,18,56,4	script	force_07mob#70	139,{
+-	script	force_07mob#70	-1,{
 
 Onon:
 	donpcevent "force_07ex#70::Onsummonmob_07";
@@ -756,33 +756,33 @@ OnMobDeath:
 	end;
 }
 
-force_3-1,1,1,1	script	force_08start#70	-1,{
+-	script	force_08start#70	-1,{
 
 Onon:
 	donpcevent "force_08ex#70::Onon";
 	end;
 }
 
-force_3-1,18,56,4	script	force_08ex#70	139,{
+-	script	force_08ex#70	-1,{
 
 Onon:
 	donpcevent "arena#70::Onreset_08";
 	end;
 }
 
-force_3-1,1,1,1	script	force_09start#70	-1,{
+-	script	force_09start#70	-1,{
 
 Onon:
 	donpcevent "force_09mob#70::Onon";
 	end;
 }
 
-force_3-1,10,56,4	script	force_09ex#70	139,{
+-	script	force_09ex#70	-1,{
 
 Onreset:
 	killmonster "force_3-1","force_09ex#70::OnMobEx";
 	end;
-	
+
 Onsummonmob_09:
 	monster "force_3-1",93,100,"Familiar",1419,1,"force_09ex#70::OnMobEx";
 	monster "force_3-1",94,100,"Familiar",1419,1,"force_09ex#70::OnMobEx";
@@ -804,7 +804,7 @@ OnMobEx:
 	end;
 }
 
-force_3-1,16,56,4	script	force_09mob#70	139,{
+-	script	force_09mob#70	-1,{
 
 Onon:
 	monster "force_3-1",99,99,"Kobold Leader",1548,1,"force_09mob#70::OnMobDeath";
@@ -814,11 +814,11 @@ Onon:
 	donpcevent "force_09ex#70::Onsummonmob_09";
 	set $force_09_70,4;
 	end;
-	
+
 Onreset:
 	killmonster "force_3-1","force_09mob#70::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_09_70,$force_09_70 -1;
 	if ($force_09_70 < 1) {
@@ -987,7 +987,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 	}
 }
 
-prt_are_in,14,195,3	script	#arn_timer_70	139,{
+-	script	#arn_timer_70	-1,{
 
 Onon:
 	initnpctimer;
@@ -1012,21 +1012,21 @@ OnTimer60000:
 	donpcevent "alloff#70::Onon";
 	donpcevent "lvl 70s Waiting Room::Onstart";
 	end;
-	
+
 Onstop:
 	stopnpctimer;
 	end;
 
 }
 
-prt_are_in,1,1,1	script	arn_warp_70	-1,{
+-	script	arn_warp_70	-1,{
 
 Onout:
-	areawarp "prt_are_in",14,91,29,76,"arena_room",100,75;
+	areawarp "prt_are_in",14,91,29,74,"arena_room",100,75;
 	end;
 }
 
-force_3-1,10,55,4	script	cast#70	139,{
+-	script	cast#70	-1,{
 Ontimeover1:
 	mapannounce "force_3-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
@@ -1041,7 +1041,7 @@ Onnomal2:
 	end;
 }
 
-force_3-1,100,60,3	script	alloff#70	139,{
+-	script	alloff#70	-1,{
 
 Onon:
 	mapwarp "force_3-1","prt_are_in",126,190,0,0;
diff --git a/npc/pre-re/other/arena/arena_lvl80.txt b/npc/pre-re/other/arena/arena_lvl80.txt
index ae7d429be..796d668e1 100644
--- a/npc/pre-re/other/arena/arena_lvl80.txt
+++ b/npc/pre-re/other/arena/arena_lvl80.txt
@@ -17,7 +17,7 @@ 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,1000,80;
+	waitingroom "Individual; Level 80 to 99",50,"lvl 80s Waiting Room::OnStartArena",1,1000,80,99;
 	enablewaitingroomevent;
 	end;
 
@@ -34,29 +34,29 @@ Onstart:
 
 force_4-1,99,20,4	script	Octus#arena	124,{
 	end;
-	
+
 OnInit:
 	set $@mapcount80, 0;
 	end;
-	
+
 Onstart:
 	initnpctimer;
 	set $arena_min80st,gettime(2);
 	set $arena_sec80st,gettime(1);
 	end;
-	
+
 OnTimer3000:
 	mapannounce "force_4-1","Good day, my name is Octus, the guide of Time Force Battle for lvl 80s!",0;
 	end;
-	
+
 OnTimer4000:
 	mapannounce "force_4-1","Remember your right decision will save a lot of your time!",0;
 	end;
-	
+
 OnTimer8000:
 	mapannounce "force_4-1","In order to complete this battle course, you must start from the far left of this room to the clock wise direction. Please move to the far left side. You have 7 minutes from now.",0;
 	end;
-	
+
 OnTimer60000:
 	set $@mapcount80, getmapusers ("force_4-1");
 	if ($@mapcount80 == 0) {
@@ -64,7 +64,7 @@ OnTimer60000:
 	}
 	mapannounce "force_4-1","Remaining Time : 7 minutes ",0;
 	end;
-	
+
 OnTimer120000:
 	 set $@mapcount80, getmapusers ("force_4-1");
 	if ($@mapcount80 == 0) {
@@ -72,7 +72,7 @@ OnTimer120000:
 	}
 	mapannounce "force_4-1","Remaining Time : 6 minutes ",0;
 	end;
-	
+
 OnTimer180000:
 	 set $@mapcount80, getmapusers ("force_4-1");
 	if ($@mapcount80 == 0) {
@@ -103,7 +103,7 @@ OnTimer360000:
 	}
 	mapannounce "force_4-1","Remaining Time : 2 minutes ",0;
 	end;
-	
+
 OnTimer420000:
 	 set $@mapcount80, getmapusers ("force_4-1");
 	if ($@mapcount80 == 0) {
@@ -111,11 +111,11 @@ OnTimer420000:
 	}
 	mapannounce "force_4-1","Remaining Time : 1 minute ",0;
 	end;
-	
+
 OnTimer480000:
 	mapannounce "force_4-1","Your time is over. I hope you had a good time~",0;
 	end;
-	
+
 OnTimer485000:
 OnTimer486000:
 OnTimer487000:
@@ -128,12 +128,12 @@ OnTimer493000:
 OnTimer494000:
 	mapwarp "force_4-1","prt_are_in",178,190,0,0;
 	end;
-	
+
 OnTimer495000:
 	mapwarp "force_4-1","prt_are_in",178,190,0,0;
 	donpcevent "Octus#arena::Onfailclearstage";
 	end;
-	
+
 Ontimeroff:
 	stopnpctimer;
 	end;
@@ -146,130 +146,130 @@ Onfailclearstage:
 	donpcevent "alloff#80::Onon";
 	donpcevent "lvl 80s Waiting Room::Onstart";
 	end;
-	
+
 On01_start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Nightmares!",0;
 	end;
-	
+
 On01_end:
 	mapannounce "force_4-1","A door to the north room has opened!",0;
 	end;
-	
+
 On02_start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all monsters!",0;
 	end;
-	
+
 On02_end:
 	mapannounce "force_4-1","A door to the north room has opened!",0;
 	end;
-	
+
 On03_start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Assaulters!",0;
 	end;
-	
+
 On03_end:
 	mapannounce "force_4-1","Clear! A door to the east room has opened!",0;
 	end;
-	
+
 On04_start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Nine Tails!",0;
 	end;
-	
+
 On04_end:
 	mapannounce "force_4-1","A door to the east room has opened!",0;
 	end;
-	
+
 On05_start:
 	mapannounce "force_4-1","In order to clear this battle, you must kill all Walking Petites!",0;
 	end;
-	
+
 On05_end:
 	mapannounce "force_4-1","Clear! A door to the south room has opened!",0;
 	end;
-	
+
 On06_start:
 	mapannounce "force_4-1","In order to clear this battle, kill all monsters in this room!",0;
 	end;
-	
+
 On06_end:
 	mapannounce "force_4-1","A door to the south room has opened!",0;
 	end;
-	
+
 On07_start:
 	mapannounce "force_4-1","In order to clear this battle, kill all Fur-Seals while dodging Mermen!",0;
 	end;
-	
+
 On07_end:
 	mapannounce "force_4-1","Clear! A door to the west room has opened!",0;
 	end;
-	
+
 On08_start:
 	mapannounce "force_4-1","Please escape to the north exit!",0;
 	end;
-	
+
 On09_start:
 	mapannounce "force_4-1","In order to clear this battle, you must defeat an Ancient Mummy!",0;
 	end;
-	
+
 On09_end:
 	mapannounce "force_4-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
 
 }
 
-force_4-1,10,56,4	script	arena#80	139,{
+-	script	arena#80	-1,{
 
 Onreset_01:
 	donpcevent "force_01ex#80::Onreset";
 	donpcevent "force_02start#80::Onon";
 	enablenpc "force_01_02#80";
 	end;
-	
+
 Onreset_02:
 	donpcevent "force_02mob#80::Onreset";
 	donpcevent "force_03start#80::Onon";
 	enablenpc "force_02_03#80";
 	end;
-	
+
 Onreset_03:
 	enablenpc "force_03_04#80";
 	donpcevent "force_04start#80::Onon";
 	donpcevent "force_03ex#80::Onreset";
 	end;
-	
+
 Onreset_04:
 	enablenpc "force_04_05#80";
 	donpcevent "force_05start#80::Onon";
 	donpcevent "force_04ex#80::Onreset";
 	end;
-	
+
 Onreset_05:
 	enablenpc "force_05_06#80";
 	donpcevent "force_06start#80::Onon";
 	donpcevent "force_05ex#80::Onreset";
 	end;
-	
+
 Onreset_06:
 	enablenpc "force_06_07#80";
 	donpcevent "force_07start#80::Onon";
 	donpcevent "force_06ex#80::Onreset";
 	end;
-	
+
 Onreset_07:
 	enablenpc "force_07_08#80";
 	donpcevent "force_07ex#80::Onreset";
 	donpcevent "force_08start#80::Onon";
 	end;
-	
+
 Onreset_08:
 	donpcevent "force_09start#80::Onon";
 	enablenpc "force_08_09#80";
 	end;
-	
+
 Onreset_09:
 	enablenpc "force_exit#80";
 	end;
-	
+
 Onstart:
 	disablenpc "force_01_02#80";
 	disablenpc "force_02_03#80";
@@ -302,7 +302,7 @@ Onstart:
 	donpcevent "force_01start#80::Onon";
 	donpcevent "Octus#arena::Onstart";
 	end;
-	
+
 Onreset_all:
 	donpcevent "force_01mob#80::Onreset";
 	donpcevent "force_02mob#80::Onreset";
@@ -415,19 +415,19 @@ OnTouch:
 
 }
 
-force_4-1,1,1,1	script	force_01start#80	-1,{
+-	script	force_01start#80	-1,{
 Onon:
 	donpcevent "force_01mob#80::Onon";
 end;
 
 }
 
-force_4-1,10,56,4	script	force_01ex#80	139,{
+-	script	force_01ex#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_01ex#80::OnMobEx";
 	end;
-	
+
 Onsummonmob1:
 	monster "force_4-1",11,25,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
 	monster "force_4-1",22,22,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
@@ -441,7 +441,7 @@ OnMobEx:
 
 }
 
-force_4-1,10,56,4	script	force_01mob#80	139,{
+-	script	force_01mob#80	-1,{
 
 Onon:
 	monster "force_4-1",35,13,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
@@ -466,19 +466,19 @@ OnMobDeath:
 	end;
 }
 
-force_4-1,1,1,1	script	force_02start#80	-1,{
+-	script	force_02start#80	-1,{
 
 Onon:
 	donpcevent "force_02mob#80::Onon";
 	end;
 }
 
-force_4-1,10,56,4	script	force_02mob#80	139,{
+-	script	force_02mob#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_02mob#80::OnMobDeath";
 	end;
-	
+
 Onon:
 	monster "force_4-1",24,80,"Marionette",1459,1,"force_02mob#80::OnMobDeath";
 	monster "force_4-1",23,110,"Marionette",1459,1,"force_02mob#80::OnMobDeath";
@@ -507,19 +507,19 @@ OnMobDeath:
 	end;
 }
 
-force_4-1,1,1,1	script	force_03start#80	-1,{
+-	script	force_03start#80	-1,{
 
 Onon:
 	donpcevent "force_03mob#80::Onon";
 	end;
 }
 
-force_4-1,10,56,4	script	force_03ex#80	139,{
+-	script	force_03ex#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_03ex#80::OnMobEx";
 	end;
-	
+
 Onsummonmob_03:
 	monster "force_4-1",26,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMobEx";
 	monster "force_4-1",21,173,"Marionette",1459,1,"force_03ex#80::OnMobEx";
@@ -535,7 +535,7 @@ OnMobEx:
 	end;
 }
 
-force_4-1,20,56,4	script	force_03mob#80	139,{
+-	script	force_03mob#80	-1,{
 
 Onon:
 	donpcevent "force_03ex#80::Onsummonmob_03";
@@ -558,7 +558,7 @@ OnMobDeath:
 	end;
 }
 
-force_4-1,1,1,1	script	force_04start#80	-1,{
+-	script	force_04start#80	-1,{
 
 Onon:
 	donpcevent "force_04mob#80::Onon";
@@ -566,12 +566,12 @@ end;
 
 }
 
-force_4-1,10,56,4	script	force_04ex#80	139,{
+-	script	force_04ex#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_04ex#80::OnMobEx";
 	end;
-	
+
 Onsummonmob_04:
 	monster "force_4-1",99,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
 	monster "force_4-1",101,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
@@ -589,7 +589,7 @@ OnMobEx:
 
 }
 
-force_4-1,22,56,4	script	force_04mob#80	139,{
+-	script	force_04mob#80	-1,{
 
 Onon:
 	donpcevent "force_04ex#80::Onsummonmob_04";
@@ -602,7 +602,7 @@ Onon:
 Onreset:
 	killmonster "force_4-1","force_04mob#80::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_04_80,$force_04_80 -1;
 	if ($force_04_80 < 1) {
@@ -612,19 +612,19 @@ OnMobDeath:
 	end;
 }
 
-force_4-1,1,1,1	script	force_05start#80	-1,{
+-	script	force_05start#80	-1,{
 
 Onon:
 	donpcevent "force_05mob#80::Onon";
 	end;
 }
 
-force_4-1,10,56,4	script	force_05ex#80	139,{
+-	script	force_05ex#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_05ex#80::OnMobEx";
 	end;
-	
+
 Onsummonmob_05:
 	monster "force_4-1",168,190,"Petite",1466,1,"force_05ex#80::OnMobEx";
 	monster "force_4-1",173,166,"Petite",1466,1,"force_05ex#80::OnMobEx";
@@ -636,7 +636,7 @@ OnMobEx:
 	end;
 }
 
-force_4-1,24,56,4	script	force_05mob#80	139,{
+-	script	force_05mob#80	-1,{
 
 Onon:
 	monster "force_4-1",164,174,"Petite",1465,1,"force_05mob#80::OnMobDeath";
@@ -661,14 +661,14 @@ OnMobDeath:
 
 }
 
-force_4-1,1,1,1	script	force_06start#80	-1,{
+-	script	force_06start#80	-1,{
 
 Onon:
 	donpcevent "force_06mob#80::Onon";
 	end;
 }
 
-force_4-1,18,56,4	script	force_06mob#80	139,{
+-	script	force_06mob#80	-1,{
 
 Onon:
 	monster "force_4-1",173,118,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
@@ -695,19 +695,19 @@ OnMobDeath:
 	end;
 }
 
-force_4-1,1,1,1	script	force_07start#80	-1,{
+-	script	force_07start#80	-1,{
 
 Onon:
 	donpcevent "force_07mob#80::Onon";
 	end;
 }
 
-force_4-1,12,56,4	script	force_07ex#80	139,{
+-	script	force_07ex#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_07ex#80::OnMobEx";
 	end;
-	
+
 Onsummonmob_07:
 	monster "force_4-1",160,34,"Merman",1451,1,"force_07ex#80::OnMobEx";
 	monster "force_4-1",163,27,"Merman",1451,1,"force_07ex#80::OnMobEx";
@@ -718,7 +718,7 @@ OnMobEx:
 	end;
 }
 
-force_4-1,18,56,4	script	force_07mob#80	139,{
+-	script	force_07mob#80	-1,{
 
 Onon:
 	donpcevent "force_07ex#80::Onsummonmob_07";
@@ -741,33 +741,33 @@ OnMobDeath:
 	end;
 }
 
-force_4-1,1,1,1	script	force_08start#80	-1,{
+-	script	force_08start#80	-1,{
 
 Onon:
 	donpcevent "force_08ex#80::Onon";
 	end;
 }
 
-force_4-1,18,56,4	script	force_08ex#80	139,{
+-	script	force_08ex#80	-1,{
 
 Onon:
 	donpcevent "arena#80::Onreset_08";
 	end;
 }
 
-force_4-1,1,1,1	script	force_09start#80	-1,{
+-	script	force_09start#80	-1,{
 
 Onon:
 	donpcevent "force_09mob#80::Onon";
 	end;
 }
 
-force_4-1,10,56,4	script	force_09ex#80	139,{
+-	script	force_09ex#80	-1,{
 
 Onreset:
 	killmonster "force_4-1","force_09ex#80::OnMobEx";
 	end;
-	
+
 Onsummonmob_09:
 	monster "force_4-1",91,99,"Argos",1430,1,"force_09ex#80::OnMobEx";
 	monster "force_4-1",95,105,"Argos",1430,1,"force_09ex#80::OnMobEx";
@@ -780,18 +780,18 @@ OnMobEx:
 	end;
 }
 
-force_4-1,16,56,4	script	force_09mob#80	139,{
+-	script	force_09mob#80	-1,{
 
 Onon:
 	monster "force_4-1",99,99,"Ancient Mummy",1522,1,"force_09mob#80::OnMobDeath";
 	donpcevent "force_09ex#80::Onsummonmob_09";
 	set $force_09_80,1;
 	end;
-	
+
 Onreset:
 	killmonster "force_4-1","force_09mob#80::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_09_80,$force_09_80 -1;
 	if ($force_09_80 < 1) {
@@ -960,7 +960,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 	}
 }
 
-prt_are_in,14,195,3	script	#arn_timer_80	139,{
+-	script	#arn_timer_80	-1,{
 
 Onon:
 	initnpctimer;
@@ -985,21 +985,21 @@ OnTimer60000:
 	donpcevent "alloff#80::Onon";
 	donpcevent "lvl 80s Waiting Room::Onstart";
 	end;
-	
+
 Onstop:
 	stopnpctimer;
 	end;
 
 }
 
-prt_are_in,1,1,1	script	arn_warp_80	-1,{
+-	script	arn_warp_80	-1,{
 
 Onout:
-	areawarp "prt_are_in",66,195,81,180,"arena_room",100,75;
+	areawarp "prt_are_in",66,195,81,178,"arena_room",100,75;
 	end;
 }
 
-force_4-1,10,55,4	script	cast#80	139,{
+-	script	cast#80	-1,{
 Ontimeover1:
 	mapannounce "force_4-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
@@ -1014,7 +1014,7 @@ Onnomal2:
 	end;
 }
 
-force_4-1,100,60,3	script	alloff#80	139,{
+-	script	alloff#80	-1,{
 
 Onon:
 	mapwarp "force_4-1","prt_are_in",126,190,0,0;
diff --git a/npc/pre-re/other/arena/arena_party.txt b/npc/pre-re/other/arena/arena_party.txt
index 13e56508c..e907b0890 100644
--- a/npc/pre-re/other/arena/arena_party.txt
+++ b/npc/pre-re/other/arena/arena_party.txt
@@ -18,9 +18,9 @@
 
 arena_room,162,88,3	script	Ponox	124,{
 	end;
-	
+
 OnInit:
-	waitingroom "Time Force Battle - Last Party !",11,"Ponox::OnStartArena",5;
+	waitingroom "Party Mode - 5 Member Parties",11,"Ponox::OnStartArena",5,0,10,99;
 	enablewaitingroomevent;
 	end;
 
@@ -60,7 +60,7 @@ prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
 				mes "I see.";
 				mes "However, please remember you have only a limited amount of time.";
 				close;
-		
+
 			case 2:
 				mes "[Helper Iriff]";
 				mes "Thank you, let me start a battle.";
@@ -78,7 +78,7 @@ prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
 OnEnter:
 	enablenpc "Helper#party";
 	end;
-	
+
 OnStop:
 	disablenpc "Helper#party";
 	end;
@@ -88,12 +88,12 @@ OnInit:
 	end;
 }
 
-prt_are_in,73,78,0	script	toarena#party	139,20,20,{
+prt_are_in,73,78,0	script	toarena#party	-1,20,20,{
 
 OnInit:
 	disablenpc "toarena#party";
 	end;
-	
+
 OnTouch:
 	if(Zeny < 1000) warp "arena_room",100,75;
 	else
@@ -103,27 +103,27 @@ OnTouch:
 		donpcevent "toout#party::OnStop";
 		warp "force_1-2",99,26;
 	}
-	
+
 OnEnter:
 	enablenpc "toarena#party";
 	end;
 }
 
-prt_are_in,73,79,0	script	toout#party	139,20,20,{
+prt_are_in,73,79,0	script	toout#party	-1,20,20,{
 
 OnInit:
 	disablenpc "toout#party";
 	end;
-	
+
 OnTimer:
 	initnpctimer;
 	end;
-	
+
 OnTimer60000:
 	set $arn_partywait,0;
 	enablenpc "toout#party";
 	end;
-	
+
 OnTimer70000:
 	donpcevent "toout#party::OnStop";
 	donpcevent "Ponox::Onstart";
@@ -143,7 +143,7 @@ OnStop:
 	end;
 }
 
-prt_are_in,73,74,0	script	arena_out	139,1,1,{
+prt_are_in,73,74,0	script	arena_out	-1,1,1,{
 
 OnTouch:
 	set $arn_partywait,0;
@@ -162,16 +162,16 @@ OnStart:
 	set $arena_minptst,gettime(2);
 	set $arena_secptst,gettime(1);
 	end;
-	
+
 OnTimer2000:
 	mapannounce "force_1-2","Good day, my name is Slipslowrun! I am here to assist you in the party arena battles!",bc_all;
 	donpcevent "arena_compass::OnStart";
 	end;
-	
+
 OnTimer3000:
 	mapannounce "force_1-2","The goal of the party arena is eliminating every monster in each room.",bc_all;
 	end;
-	
+
 OnTimer4000:
 	mapannounce "force_1-2","There is no order to enter one among 3 rooms at 3 direction. But remember you will eliminate all monsters in a room in order to procceed to the next step.",bc_all;
 	end;
@@ -179,7 +179,7 @@ OnTimer4000:
 OnTimer5000:
 	mapannounce "force_1-2","You have 10 minutes from now. I expect you will do your best! ",bc_all;
 	end;
-	
+
 OnTimer60000:
 	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 9 minutes ",bc_all;
@@ -194,7 +194,7 @@ OnTimer180000:
 	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 7 minutes ",bc_all;
 	end;
-	
+
 OnTimer240000:
 	if(!getmapusers("force_1-2")) donpcevent "Slipslowrun#party::OnFail";
 	mapannounce "force_1-2","Remaining Time : 6 minutes ",bc_all;
@@ -228,12 +228,12 @@ OnTimer540000:
 OnTimer600000:
 	mapannounce "force_1-2","Time is over! Please make sure you do not leave anything behind you before you leave .",bc_all;
 	end;
-	
+
 OnTimer605000:
 	donpcevent "arena_p::OnReset";
 	mapwarp "force_1-2","prt_are_in",177,138;
 	end;
-	
+
 OnTimer606000:
 OnTimer607000:
 OnTimer608000:
@@ -244,12 +244,12 @@ OnTimer612000:
 OnTimer613000:
 	mapwarp "force_1-2","prt_are_in",177,138;
 	end;
-	
+
 OnTimer614000:
 	mapwarp "force_1-2","prt_are_in",177,138;
 	donpcevent "Slipslowrun#party::OnFail";
 	end;
-	
+
 OnFail:
 	donpcevent "Slipslowrun#party::OnTimeoff";
 	mapwarp "force_1-2","prt_are_in",177,138;
@@ -257,7 +257,7 @@ OnFail:
 	donpcevent "alloff#party::OnInit";
 	donpcevent "Ponox::Onstart";
 	end;
-	
+
 OnTimeoff:
 	stopnpctimer;
 	end;
@@ -305,17 +305,17 @@ On07_end:
 On08_end:
 	mapannounce "force_1-2","A door to the west hall has opened~",bc_all;
 	end;
-	
+
 On09_end:
 	mapannounce "force_1-2","A west exit has opened!",bc_all;
 	end;
-	
+
 On10_end:
 	mapannounce "force_1-2","Boss stage cleared! An exit at the east has opened! Thank you.",bc_all;
 	end;
 }
 
-force_1-2,62,104,4	script	arena_p	111,1,1,{
+-	script	arena_p	-1,{
 
 OnStart:
 	mapwarp "force_1-2","prt_are_in",177,138;
@@ -360,43 +360,43 @@ OnStart:
 	set $arn_partyc,0;
 	set $arn_partywait,0;
 	end;
-	
+
 On04_start:
 	enablenpc "force_03_04";
 	enablenpc "force_04start#party";
 	end;
-	
+
 On06_start:
 	enablenpc "force_05_06";
 	enablenpc "force_06start#party";
 	end;
-	
+
 On07_start:
 	enablenpc "force_06_07";
 	enablenpc "force_07start#party";
 	end;
-	
+
 On08_start:
 	enablenpc "force_07_08";
 	enablenpc "force_08start#party";
 	end;
-	
+
 On09_start:
 	enablenpc "force_08_09";
 	enablenpc "force_09start#party";
 	end;
-	
+
 On10_start:
 	enablenpc "force_09_10";
 	enablenpc "force_10start#party";
 	end;
-	
+
 Onexit:
 	enablenpc "force_10_09";
 	enablenpc "force_09_exit";
 	enablenpc "force_exit#party";
 	end;
-	
+
 OnReset:
 	donpcevent "force_01mob#party::OnReset";
 	donpcevent "force_02mob#party::OnReset";
@@ -536,7 +536,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,36,26,0	script	force_01start#party	139,1,1,{
+force_1-2,36,26,0	script	force_01start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_01mob#party::Onon";
@@ -544,7 +544,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,104,1	script	force_01mob#party	111,{
+-	script	force_01mob#party	-1,{
 
 Onon:
 	monster "force_1-2",15,35,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
@@ -575,7 +575,7 @@ Onon:
 	monster "force_1-2",33,30,"Incubus",1580,1,"force_01mob#party::OnMobDeath";
 	set $force_01_pt,26;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_01mob#party::OnMobDeath";
 	end;
@@ -597,7 +597,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,162,26,0	script	force_02start#party	139,1,1,{
+force_1-2,162,26,0	script	force_02start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_02mob#party::Onon";
@@ -605,7 +605,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,103,1	script	force_02mob#party	111,{
+-	script	force_02mob#party	-1,{
 
 Onon:
 	monster "force_1-2",163,36,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
@@ -640,11 +640,11 @@ Onon:
 	monster "force_1-2",181,25,"Arclouse",1477,1,"force_02mob#party::OnMobDeath";
 	set $force_02_pt,30;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_02mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_02_pt,$force_02_pt -1;
 	if($force_02_pt < 1)
@@ -662,7 +662,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,99,66,0	script	force_03start#party	139,1,1,{
+force_1-2,99,66,0	script	force_03start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_03mob#party::Onon";
@@ -670,7 +670,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,102,1	script	force_03mob#party	111,{
+-	script	force_03mob#party	-1,{
 
 Onon:
 	monster "force_1-2",89,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
@@ -701,11 +701,11 @@ Onon:
 	monster "force_1-2",108,69,"Wanderer",1490,1,"force_03mob#party::OnMobDeath";
 	set $force_03_pt,26;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_03mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_03_pt,$force_03_pt -1;
 	if($force_03_pt < 1)
@@ -723,7 +723,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,162,78,0	script	force_04start#party	139,3,3,{
+force_1-2,162,78,0	script	force_04start#party	-1,3,3,{
 
 OnTouch:
 	donpcevent "force_04mob#party::Onon";
@@ -731,7 +731,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,101,1	script	force_04mob#party	111,{
+-	script	force_04mob#party	-1,{
 
 Onon:
 	monster "force_1-2",174,78,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
@@ -758,11 +758,11 @@ Onon:
 	monster "force_1-2",177,72,"Assaulter",1364,1,"force_04mob#party::OnMobDeath";
 	set $force_04_pt,22;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_04mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_04_pt,$force_04_pt -1;
 	if($force_04_pt < 1)
@@ -775,7 +775,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,36,77,0	script	force_05start#party	139,1,1,{
+force_1-2,36,77,0	script	force_05start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_05mob#party::Onon";
@@ -783,7 +783,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,100,1	script	force_05mob#party	111,{
+-	script	force_05mob#party	-1,{
 
 Onon:
 	monster "force_1-2",25,68,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
@@ -812,11 +812,11 @@ Onon:
 	monster "force_1-2",24,71,"Cramp",1570,1,"force_05mob#party::OnMobDeath";
 	set $force_05_pt,24;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_05mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_05_pt,$force_05_pt -1;
 	if($force_05_pt < 1)
@@ -827,7 +827,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,26,118,0	script	force_06start#party	139,1,1,{
+force_1-2,26,118,0	script	force_06start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_06mob#party::Onon";
@@ -835,7 +835,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,99,1	script	force_06mob#party	111,{
+-	script	force_06mob#party	-1,{
 
 Onon:
 	monster "force_1-2",19,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
@@ -862,11 +862,11 @@ Onon:
 	monster "force_1-2",16,120,"Wicked Nymph",1564,1,"force_06mob#party::OnMobDeath";
 	set $force_06_pt,22;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_06mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_06_pt,$force_06_pt -1;
 	if($force_06_pt < 1)
@@ -878,7 +878,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,92,124,0	script	force_07start#party	139,1,1,{
+force_1-2,92,124,0	script	force_07start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_07mob#party::Onon";
@@ -886,7 +886,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,98,1	script	force_07mob#party	111,{
+-	script	force_07mob#party	-1,{
 
 Onon:
 	monster "force_1-2",104,134,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
@@ -903,11 +903,11 @@ Onon:
 	monster "force_1-2",108,140,"Chimera",1456,1,"force_07mob#party::OnMobDeath";
 	set $force_07_pt,12;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_07mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_07_pt,$force_07_pt -1;
 	if($force_07_pt < 1)
@@ -919,7 +919,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,173,118,0	script	force_08start#party	139,1,1,{
+force_1-2,173,118,0	script	force_08start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_08mob#party::Onon";
@@ -927,7 +927,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,97,1	script	force_08mob#party	111,{
+-	script	force_08mob#party	-1,{
 
 Onon:
 	monster "force_1-2",172,154,"Khalitzburg",1438,1,"force_08mob#party::OnMobDeath";
@@ -966,11 +966,11 @@ Onon:
 		set $force_08_pt,$force_08_pt +1;
 	}
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_08mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_08_pt,$force_08_pt -1;
 	if($force_08_pt < 1)
@@ -982,7 +982,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,133,178,0	script	force_09start#party	139,1,1,{
+force_1-2,133,178,0	script	force_09start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_09mob#party::Onon";
@@ -990,7 +990,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,97,1	script	force_09mob#party	111,{
+-	script	force_09mob#party	-1,{
 
 Onon:
 	monster "force_1-2",86,180,"Elder",1573,1,"force_09mob#party::OnMobDeath";
@@ -1010,11 +1010,11 @@ Onon:
 	monster "force_1-2",122,177,"Anolian",1488,1,"force_09mob#party::OnMobDeath";
 	set $force_09_pt,15;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_09mob#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_09_pt,$force_09_pt -1;
 	if($force_09_pt < 1)
@@ -1026,7 +1026,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,29,178,0	script	force_10start#party	139,1,1,{
+force_1-2,29,178,0	script	force_10start#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_10mob-1#party::Onon1";
@@ -1034,7 +1034,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,95,1	script	force_10mob-1#party	111,{
+-	script	force_10mob-1#party	-1,{
 
 Onon1:
 	switch(rand(1,2))
@@ -1042,25 +1042,25 @@ Onon1:
 		case 1:
 			monster "force_1-2",16,179,"Evil Snake Lord",1529,1,"force_10mob-1#party::OnMobDeath";
 			break;
-			
+
 		case 2:
 			monster "force_1-2",24,179,"Dracula",1530,1,"force_10mob-1#party::OnMobDeath";
 			break;
 	}
 	set $force_10_1_pt,1;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_10mob-1#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_10_1_pt,$force_10_1_pt -1;
 	if($force_10_1_pt < 1) donpcevent "force_10mob-2#party::Onon2";
 	end;
 }
 
-force_1-2,63,96,1	script	force_10mob-2#party	111,{
+-	script	force_10mob-2#party	-1,{
 
 Onon2:
 	monster "force_1-2",16,179,"Samurai Spector",1542,1,"force_10mob-2#party::OnMobDeath";
@@ -1071,11 +1071,11 @@ Onon2:
 	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
 	set $force_10_2_pt,6;
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_10mob-2#party::OnMobDeath";
 	end;
-	
+
 OnMobDeath:
 	set $force_10_2_pt,$force_10_2_pt -1;
 	if($force_10_2_pt < 1)
@@ -1087,7 +1087,7 @@ OnMobDeath:
 	end;
 }
 
-force_1-2,59,178,0	script	force_exit#party	139,1,1,{
+force_1-2,59,178,0	script	force_exit#party	-1,1,1,{
 
 OnTouch:
 	donpcevent "force_exitmob#party::Onon-1";
@@ -1095,7 +1095,7 @@ OnTouch:
 	end;
 }
 
-force_1-2,63,94,1	script	force_exitmob#party	111,{
+-	script	force_exitmob#party	-1,{
 
 Onon:
 	monster "force_1-2",95,177,"Farewell",1393,1,"force_exitmob#party::OnMobDeath";
@@ -1128,7 +1128,7 @@ Onon:
 	monster "force_1-2",95,177,"Book[3]",1478,1,"force_exitmob#party::OnMobDeath";
 	monster "force_1-2",95,177,"Exchange Diary",1478,1,"force_exitmob#party::OnMobDeath";
 	end;
-	
+
 OnReset:
 	killmonster "force_1-2","force_exitmob#party::OnMobDeath";
 	end;
@@ -1275,12 +1275,12 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 							mes "Your record has been entered.";
 							next;
 							break;
-							
+
 						case 2:
 							mes "[Staff]";
 							mes "Please take your time and think up a nice name.";
 							close;
-						
+
 					}
 					break;
 
@@ -1288,9 +1288,9 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 					mes "[Staff]";
 					mes "Please take your time and think up a nice name.";
 					close;
-				
+
 			}
-			
+
 
 		}
 		if (arena_point > 29900) {
@@ -1335,7 +1335,7 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 
 }
 
-prt_are_in,66,143,3	script	#arn_timer_pt	139,{
+-	script	#arn_timer_pt	-1,{
 
 OnEnter:
 	initnpctimer;
@@ -1366,14 +1366,14 @@ Onstop:
 	end; 
 }
 
-prt_are_in,1,1,1	script	arn_warp_pt	-1,{
+-	script	arn_warp_pt	-1,{
 
 Onout:
-	areawarp "prt_are_in",66,143,81,128,"arena_room",100,75;
+	areawarp "prt_are_in",66,143,81,126,"arena_room",100,75;
 	end;
 }
 
-force_1-2,62,104,4	script	cast#pt	139,{
+-	script	cast#pt	-1,{
 
 Ontimeover1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
@@ -1392,7 +1392,7 @@ Ontimeover2:
 	end;
 }
 
-force_1-2,100,60,3	script	alloff#pt	139,{
+-	script	alloff#pt	-1,{
 
 Onon:
 	mapwarp "force_1-2","prt_are_in",126,139,0,0;
diff --git a/npc/pre-re/other/arena/arena_room.txt b/npc/pre-re/other/arena/arena_room.txt
index 3cfa7ba64..3156d5c57 100644
--- a/npc/pre-re/other/arena/arena_room.txt
+++ b/npc/pre-re/other/arena/arena_room.txt
@@ -40,7 +40,7 @@ L_Menu:
 			mes "There are the NPCs for Player Mode Stages from 12 o'clock direction to the reversed clock direction.";
 			mes "While you're waiting in a chat room, you will be automatically guided to an arena room by the waiting order.";
 			break;
-		
+
 		case 2:
 			mes "[Vendigos]";
 			mes "Let me explain about the ^3131FFArena Point^000000.";
@@ -74,22 +74,22 @@ L_Menu:
 	mes "[Vendigos]";
 	mes "Is there anything I can help you more?";
 	goto L_Menu;
-	
+
 Onlinerec_50:
 	mapannounce "arena_room",""+$arena_50topn$+" has renewed the top record in the Arena Time Force Battle level 50. Congratulations!",0;
 	end;
-	
+
 Onlinerec_60:
 	mapannounce "arena_room",""+$arena_60topn$+" has renewed the top record in the Arena Time Force Battle level 60. Congratulations!",0;
 	end;
-	
+
 Onlinerec_70:
 	mapannounce "arena_room",""+$arena_70topn$+" has renewed the top record in the Arena Time Force Battle level 70. Congratulations!",0;
 	end;
 Onlinerec_80:
 	mapannounce "arena_room",""+$arena_80topn$+" has renewed the top record in the Arena Time Force Battle level 80. Congratulations!",0;
 	end;
-	
+
 Onlinerec_pt:
 	mapannounce "arena_room","Party "+$arena_pttopn$+" has renewed the top record in the Arena Time Force Battle. Congratulations!",0;
 	end;
@@ -471,13 +471,13 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 						mes "[Arena Manager]";
 						mes "The arena stage has been successfuly reactivated.";
 						close;
-					
+
 					case 2:
 						mes "[Arena Manager]";
 						mes "Command has been canceled.";
 						close;
 				}
-				
+
 			case 2:
 				mes "[Arena Manager]";
 				mes "== Caution ==";
@@ -499,7 +499,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 1:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds..";
+								mes "If not, please enter a value for minutes first and then seconds.";
 								next;
 								input .@arenamin;
 								set $top_50min,.@arenamin;
@@ -511,7 +511,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 2:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds..";
+								mes "If not, please enter a value for minutes first and then seconds.";
 								next;
 								input .@arenamin;
 								set $top_60min,.@arenamin;
@@ -523,7 +523,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 3:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds..";
+								mes "If not, please enter a value for minutes first and then seconds.";
 								next;
 								input .@arenamin;
 								set $top_70min,.@arenamin;
@@ -535,7 +535,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 4:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds..";
+								mes "If not, please enter a value for minutes first and then seconds.";
 								next;
 								input .@arenamin;
 								set $top_80min,.@arenamin;
@@ -547,7 +547,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 5:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please enter a value for minutes first and then seconds..";
+								mes "If not, please enter a value for minutes first and then seconds.";
 								next;
 								input .@arenamin;
 								set $top_ptmin,.@arenamin;
@@ -586,13 +586,13 @@ sec_in02,79,171,3	script	Reward Manager#arena	802,{
 				mes "[Reward Manager]";
 				mes "You have canceled the command.";
 				close;
-		
+
 			case 2:
 				mes "[Reward Manager]";
 				mes "NPC has been hidden";
 				disablenpc "Teleporter#arena";
 				close;
-				
+
 			case 3:
 				mes "[Reward Manager]";
 				mes "NPC has been enabled.";
@@ -666,7 +666,7 @@ prt_are_in,98,14,3	script	Givu#arena	728,{
 				case 9: callfunc "Func_Are_Rew",617,1,300;
 				case 10: callfunc "Func_Are_Rew",616,1,1000;
 			}
-			
+
 		case 2:
 			mes "[Givu]";
 			mes "Would you like to exchange your arena points with experience points?";
@@ -678,7 +678,7 @@ prt_are_in,98,14,3	script	Givu#arena	728,{
 					mes "[Givu]";
 					mes "You have canceled your request.";
 					close;
-				
+
 				case 2:
 					if(arena_point < 40)
 					{
@@ -688,10 +688,10 @@ prt_are_in,98,14,3	script	Givu#arena	728,{
 						close;
 					}
 					set arena_point,arena_point -40;
-					if(BaseLevel < 70) getexp 300,0;
-					else if(BaseLevel < 80) getexp 900,0;
-					else if(BaseLevel < 90) getexp 1000,0;
-					else if(BaseLevel < 151) getexp 3000,0;
+					if(BaseLevel < 70) getexp 3000,0;
+					else if(BaseLevel < 80) getexp 9000,0;
+					else if(BaseLevel < 90) getexp 10000,0;
+					else if(BaseLevel < 100) getexp 30000,0;
 					mes "[Givu]";
 					mes "You have gained experience points. Thank you.";
 					close;
@@ -777,7 +777,7 @@ prt_are_in,98,14,3	script	Givu#arena	728,{
 							close;
 					}
 			}
-			
+
 		case 4:
 			mes "[Givu]";
 			mes "Let me check "+strcharinfo(0)+"'s current arena points.";
@@ -794,7 +794,7 @@ OnInit:
 
 prt_are_in,1,1,5	script	#arena_1039	1039,{
 	end;
-	
+
 OnInit:
 	disablenpc "#arena_6969";
 	disablenpc "#arena_ss_2";
@@ -844,36 +844,36 @@ prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1251	1251
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_1159	1159
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_7777	811
 
-prt_are_in,130,30,3	script	npctime#arena	139,{
+-	script	npctime#arena	-1,{
 
 OnStop:
 	stopnpctimer;
 	end;
-	
+
 OnStart:
 	initnpctimer;
 	end;
-	
+
 OnTimer2000:
 	mapannounce "prt_are_in","Givu : You should keep time with popping emotion icons~",1,0xFFCE00;
 	end;
-	
+
 OnTimer5000:
 	mapannounce "prt_are_in","Emoticon : /lv",1,0xFFCE00;
 	end;
-	
+
 OnTimer7000:
 	mapannounce "prt_are_in"," 3 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer8000:
 	mapannounce "prt_are_in"," 2 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer9000:
 	mapannounce "prt_are_in"," 1 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer10000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
 	donpcevent "#arena_"+$@arenapic+"::OnHeart";
@@ -884,23 +884,23 @@ OnTimer10000:
 		donpcevent "#arena_ss_4::OnHeart";
 	}
 	end;
-	
+
 OnTimer15000:
 	mapannounce "prt_are_in","Emoticon : /gawi",1,0xFFCE00;
 	end;
-	
+
 OnTimer17000:
 	mapannounce "prt_are_in"," 3 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer18000:
 	mapannounce "prt_are_in"," 2 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer19000:
 	mapannounce "prt_are_in"," 1 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer20000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
 	donpcevent "#arena_"+$@arenapic+"::OnSci";
@@ -911,23 +911,23 @@ OnTimer20000:
 		donpcevent "#arena_ss_4::OnSci";
 	}
 	end;
-	
+
 OnTimer25000:
 	mapannounce "prt_are_in","Emoticon : /no1",1,0xFFCE00;
 	end;
-	
+
 OnTimer27000:
 	mapannounce "prt_are_in"," 3 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer28000:
 	mapannounce "prt_are_in"," 2 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer29000:
 	mapannounce "prt_are_in"," 1 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer30000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
 	donpcevent "#arena_"+$@arenapic+"::OnBest";
@@ -938,23 +938,23 @@ OnTimer30000:
 		donpcevent "#arena_ss_4::OnBest";
 	}
 	end;
-	
+
 OnTimer35000:
 	mapannounce "prt_are_in","Emoticon : /huk",1,0xFFCE00;
 	end;
-	
+
 OnTimer37000:
 	mapannounce "prt_are_in"," 3 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer38000:
 	mapannounce "prt_are_in"," 2 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer39000:
 	mapannounce "prt_are_in"," 1 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer40000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
 	donpcevent "#arena_"+$@arenapic+"::OnOmg";
@@ -965,23 +965,23 @@ OnTimer40000:
 		donpcevent "#arena_ss_4::OnOmg";
 	}
 	end;
-	
+
 OnTimer45000:
 	mapannounce "prt_are_in","Emoticon : /gg",1,0xFFCE00;
 	end;
-	
+
 OnTimer47000:
 	mapannounce "prt_are_in"," 3 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer48000:
 	mapannounce "prt_are_in"," 2 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer49000:
 	mapannounce "prt_are_in"," 1 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer50000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
 	donpcevent "#arena_"+$@arenapic+"::OnKik";
@@ -992,11 +992,11 @@ OnTimer50000:
 		donpcevent "#arena_ss_4::OnKik";
 	}
 	end;
-	
+
 OnTimer55000:
 	mapannounce "prt_are_in","Emoticon : /kis",1,0xFFCE00;
 	end;
-	
+
 OnTimer57000:
 	mapannounce "prt_are_in"," 3 ",1,0xFFCE00;
 	end;
@@ -1004,11 +1004,11 @@ OnTimer57000:
 OnTimer58000:
 	mapannounce "prt_are_in"," 2 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer59000:
 	mapannounce "prt_are_in"," 1 ",1,0xFFCE00;
 	end;
-	
+
 OnTimer60000:
 	mapannounce "prt_are_in"," ",1,0xFFCE00;
 	donpcevent "#arena_"+$@arenapic+"::OnKis";
@@ -1019,7 +1019,7 @@ OnTimer60000:
 		donpcevent "#arena_ss_4::OnKis";
 	}
 	end;
-	
+
 OnTimer62000:
 	mapannounce "prt_are_in","Time is over. Thank you for using my services.",1,0xFFCE00;
 	movenpc "#arena_"+$@arenapic+"",1,1;
@@ -1077,7 +1077,7 @@ sec_in02,76,176,5	script	Live Broadcast#arena	802,{
 }
 
 function	script	Func_Are_Rew	{
-				
+
 	mes "[Givu]";
 	mes "Would you like to exchange your arena points with "+getitemname(getarg(0))+"?";
 	mes "You can exchange ^3131FF"+getarg(2)+" arena points with "+getarg(1)+" "+getitemname(getarg(0))+"^000000.";
@@ -1089,7 +1089,7 @@ function	script	Func_Are_Rew	{
 		mes "[Givu]";
 		mes "You have canceled your request.";
 		close;
-	
+
 	}
 	else if(.@reward > 1500)
 	{
@@ -1110,124 +1110,3 @@ function	script	Func_Are_Rew	{
 	mes "Thank you, please come again.";
 	close;
 }
-
-arena_room,63,126,0	script	LevelCheck#50	139,5,5,{
-
-OnTouch:
-	if(BaseLevel < 50 || BaseLevel > 69)
-	{
-		mes "[Helper Pat]";
-		mes "I'm sorry but that place is";
-		mes "only available to people from";
-		mes "level ^FF000050^000000 to ^FF000069^000000. I'm afraid you";
-		mes "have to leave immediately.";
-		mes "Please proceed to your proper";
-		mes "arenas. Have fun !";
-		close2;
-		warp "arena_room",100,75;
-	}
-	else if(Zeny < 1000)
-	{
-		mes "[Helper Pat]";
-		mes "Oh! That's too bad!";
-		mes "You have the required level";
-		mes "to attempt this arena but";
-		mes "it costs 1000 zeny to enter.";
-		mes "Please come back when you'll";
-		mes "have them!";
-		close2;
-		warp "arena_room",100,75;
-	}
-	end;
-}
-
-arena_room,49,87,0	script	LevelCheck#60	139,5,5,{
-
-OnTouch:
-	if(BaseLevel < 60 || BaseLevel > 79)
-	{
-		mes "[Helper Ben]";
-		mes "I'm sorry but that place is";
-		mes "only available to people from";
-		mes "level ^FF000060^000000 to ^FF000079^000000. I'm afraid you";
-		mes "have to leave immediately.";
-		mes "Please proceed to your proper";
-		mes "arenas. Have fun !";
-		close2;
-		warp "arena_room",100,75;
-	}
-	else if(Zeny < 1000)
-	{
-		mes "[Helper Ben]";
-		mes "Oh! That's too bad!";
-		mes "You have the required level";
-		mes "to attempt this arena but";
-		mes "it costs 1000 zeny to enter.";
-		mes "Please come back when you'll";
-		mes "have them!";
-		close2;
-		warp "arena_room",100,75;
-	}
-	end;
-}
-
-arena_room,63,53,0	script	LevelCheck#70	139,5,5,{
-
-OnTouch:
-	if(BaseLevel < 70 || BaseLevel > 89)
-	{
-		mes "[Helper Vicious]";
-		mes "I'm sorry but that place is";
-		mes "only available to people from";
-		mes "level ^FF000070^000000 to ^FF000089^000000. I'm afraid you";
-		mes "have to leave immediately.";
-		mes "Please proceed to your proper";
-		mes "arenas. Have fun !";
-		close2;
-		warp "arena_room",100,75;
-	}
-	else if(Zeny < 1000)
-	{
-		mes "[Helper Vicious]";
-		mes "Oh! That's too bad!";
-		mes "You have the required level";
-		mes "to attempt this arena but";
-		mes "it costs 1000 zeny to enter.";
-		mes "Please come back when you'll";
-		mes "have them!";
-		close2;
-		warp "arena_room",100,75;
-	}
-	end;
-}
-
-arena_room,136,53,0	script	LevelCheck#80	139,5,5,{
-
-OnTouch:
-	if(BaseLevel < 80)
-	{
-		mes "[Helper Epin]";
-		mes "I'm sorry but that place is";
-		mes "only available to people from";
-		mes "level ^FF000080^000000 to ^FF000099^000000. I'm afraid you";
-		mes "have to leave immediately.";
-		mes "Please proceed to your proper";
-		mes "arenas. Have fun !";
-		close2;
-		warp "arena_room",100,75;
-	}
-	else if(Zeny < 1000)
-	{
-		mes "[Helper Epin]";
-		mes "Oh! That's too bad!";
-		mes "You have the required level";
-		mes "to attempt this arena but";
-		mes "it costs 1000 zeny to enter.";
-		mes "Please come back when you'll";
-		mes "have them!";
-		close2;
-		warp "arena_room",100,75;
-	}
-	end;
-
-}