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

1 files changed, 72 insertions, 84 deletions

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;