Przeglądaj źródła

* Izlude Arena updates.
- Added new Izlude coordinates and warps. (follow-up 400d0f0)
- Replaced many permanent global variables with mobcount() command.
- Removed some unnecessary global variables and OnInit labels.
- Commented all invalid label executions.
- Brought scripts up to standard with scripting conventions (label naming, spacing, etc.).
- Moved all warps from scripts into warps/ folder.

Signed-off-by: Euphy <euphy@rathena.org>

Euphy 11 lat temu
rodzic
commit
13b281b31e

+ 18 - 28
npc/other/arena/arena_aco.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -13,11 +13,12 @@
 //= 1.1 Corrected variable typos. (bugreport:4374) [L0ne_w0lf]
 //= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.3 Label standardization. [Euphy]
+//= 1.4 Script updates, and removed two level restrictions. [Euphy]
 //============================================================
 
 arena_room,114,102,0	script	onlyaco#arena	45,1,1,{
 OnTouch:
-	if (BaseClass == Job_Acolyte && BaseLevel > 9) {
+	if (BaseClass == Job_Acolyte) {
 		warp "arena_room",135,129;
 		end;
 	}
@@ -27,13 +28,11 @@ OnTouch:
 	}
 }
 
-arena_room,135,126,0	warp	byeaco#arena	1,1,arena_room,111,99
-
 arena_room,136,138,3	script	Acolyte Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Personal Force, Acolyte Class",50,"Acolyte Waiting Room::OnStartArena",1,1000,10,99;
+	waitingroom "Personal Force, Acolyte Class",50,"Acolyte Waiting Room::OnStartArena",1,1000,10;
 	enablewaitingroomevent;
 	end;
 
@@ -51,7 +50,7 @@ OnStart:
 force_5-1,100,12,0	script	arena#aco	-1,5,5,{
 OnTouch:
 	donpcevent "allkill#aco::OnEnable";
-	if (basejob == job_acolyte) {
+	if (BaseJob == Job_Acolyte) {
 		donpcevent "arena_aco1::OnStart";
 	}
 	else {
@@ -208,7 +207,7 @@ OnTimerOff:
 OnFailClearStage:
 	mapwarp "force_5-1","prt_are_in",177,86;
 	donpcevent "Trocco#aco1::OnTimerOff";
-	donpcevent "arena_aco1::OnReset";
+	//donpcevent "arena_aco1::OnReset";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
@@ -636,7 +635,7 @@ OnTimerOff:
 OnFailClearStage:
 	mapwarp "force_5-1","prt_are_in",177,86;
 	donpcevent "Trocco#aco2::OnTimerOff";
-	donpcevent "arena_aco2::OnReset";
+	//donpcevent "arena_aco2::OnReset";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
@@ -1029,7 +1028,7 @@ OnMyMobDead:
 force_5-1,62,26,0	script	force_08_01#aco	45,1,1,{
 OnTouch:
 	warp "force_5-1",40,26;
-	if (basejob == job_acolyte) {
+	if (BaseJob == Job_Acolyte) {
 		enablenpc "force_01start#aco";
 	}
 	else {
@@ -1038,15 +1037,6 @@ OnTouch:
 	end;
 }
 
-force_5-1,25,44,0	warp	force_01_02#aco	1,1,force_5-1,25,69
-force_5-1,25,134,0	warp	force_02_03#aco	1,1,force_5-1,25,159
-force_5-1,44,174,0	warp	force_03_04#aco	1,1,force_5-1,69,174
-force_5-1,134,174,0	warp	force_04_05#aco	1,1,force_5-1,159,174
-force_5-1,174,155,0	warp	force_05_06#aco	1,1,force_5-1,174,130
-force_5-1,174,65,0	warp	force_06_07#aco	1,1,force_5-1,174,40
-force_5-1,155,26,0	warp	force_07_08#aco	1,1,force_5-1,132,26
-force_5-1,99,54,0	warp	force_08_09#aco	1,1,force_5-1,99,82
-
 force_5-1,99,124,0	script	force_exit#aco	45,1,1,{
 OnTouch:
 	donpcevent "Trocco#aco1::OnTimerOff";
@@ -1150,7 +1140,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 		end;
 	}
 	else {
-		if (basejob == job_acolyte) {
+		if (BaseJob == Job_Acolyte) {
 			set .@acotop_t,$arn_acotop;
 			set .@acotop_n$,$arn_acotopn$;
 		}
@@ -1206,7 +1196,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			mes "name will now be listed";
 			mes "under the Time Force Battle";
 			mes "Arena - Acolyte Class Record!";
-			if (basejob == job_acolyte) {
+			if (BaseJob == Job_Acolyte) {
 				set $arn_acotop,.@record_timeaco;
 				set $arn_acotopn$, strcharinfo(0);
 				donpcevent "Vendigos::OnLineRec_aco";
@@ -1365,7 +1355,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			mes "the Time Force Battle Arena";
 			mes "Acolyte Class Records.";
 			mes "Congratulations~";
-			if (basejob == job_acolyte) {
+			if (BaseJob == Job_Acolyte) {
 				set $arn_acotop,.@record_timeaco;
 				set $arn_acotopn$, strcharinfo(0);
 				donpcevent "#Vendigos::OnLineRec_aco";
@@ -1449,7 +1439,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
-		close;
+		end;
 	}
 }
 
@@ -1557,8 +1547,8 @@ OnEnable:
 	disablenpc "force_08_09#aco";
 	disablenpc "force_exit#aco";
 	disablenpc "arn_warp_aco"; //050630
-	donpcevent "Trocco#aco1::OnStop";
-	donpcevent "Trocco#aco2::OnStop";
+	donpcevent "Trocco#aco1::OnTimerOff";
+	donpcevent "Trocco#aco2::OnTimerOff";
 	donpcevent "#arn_timer_aco::OnStop";
 	end;
 }
@@ -1579,7 +1569,7 @@ arena_room,94,82,7	script	Arena Record Staff#aco	79,{
 	mes "Class Arena Challenges?";
 	mes "Please choose from the menu.";
 	next;
-	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ 99")) {
+	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ "+(checkre(0)?"160":"99"))) {
 	case 1:
 		set .@acotop_t,$arn_acotop;
 		set .@acotop_n$,$arn_acotopn$;
@@ -1655,7 +1645,7 @@ OnLineRec_pri80:
 	end;
 
 OnLineRec_pri90:
-	mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~99. Congratulations!",bc_map,"0xFFFF00";
+	mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~"+(checkre(0)?"160":"99")+". Congratulations!",bc_map,"0xFFFF00";
 	end;
 }
 
@@ -1702,7 +1692,7 @@ arena_room,140,136,3	script	Guide Alias	729,{
 	mes "entire stage, you will be";
 	mes "warped to the ^3131DDFinale Waiting";
 	mes "Room^000000 where you'll be rewarded";
-	mes "with Arena Points. But you must^FFFFFFaaaa^000000 get your points within 1 minute.";
+	mes "with Arena Points. But you must get your points within 1 minute.";
 	next;
 	mes "[Alias]";
 	mes "Once you're automatically";
@@ -1733,7 +1723,7 @@ arena_room,195,5,3	script	log-on-aco#arena	802,{
 		mes "particular mode in the";
 		mes "Arena Acolyte Class Mode.^000000";
 		next;
-		switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level 99")) {
+		switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level "+(checkre(0)?"160":"99"))) {
 		case 1:
 			mes "^3355FFCommand has";
 			mes "been canceled.^000000";

+ 197 - 292
npc/other/arena/arena_lvl50.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //= 1.0 First version.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
 //= 1.2 Label standardization. [Euphy]
+//= 1.3 Script updates. [Euphy]
 //============================================================
 
 arena_room,64,138,5	script	Lv50 Waiting Room	124,{
@@ -36,10 +37,6 @@ 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);
@@ -59,32 +56,28 @@ OnTimer5000:
 	end;
 
 OnTimer60000:
-	set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
+	if (getmapusers("force_1-1") == 0) {
 		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer120000:
-	 set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
+	if (getmapusers("force_1-1") == 0) {
 		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer180000:
-	 set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
+	if (getmapusers("force_1-1") == 0) {
 		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer240000:
-	 set $@mapcount50, getmapusers ("force_1-1");
-	if ($@mapcount50 == 0) {
+	if (getmapusers("force_1-1") == 0) {
 		donpcevent "Heel and Toe#arena::OnFailClearStage";
 	}
 	mapannounce "force_1-1","Remaining Time : 1 minute ",0;
@@ -192,11 +185,9 @@ On09_Start:
 On09_End:
 	mapannounce "force_1-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
-
 }
 
 -	script	arena#50	-1,{
-
 OnReset_01:
 	donpcevent "force_01ex#50::OnReset";
 	donpcevent "force_02start#50::OnEnable";
@@ -273,7 +264,7 @@ OnStart:
 	donpcevent "force_05ex#50::OnReset";
 	donpcevent "force_06ex#50::OnReset";
 	donpcevent "force_07ex#50::OnReset";
-	donpcevent "force_08ex#50::OnReset";
+	//donpcevent "force_08ex#50::OnReset";
 	donpcevent "force_09ex#50::OnReset";
 	enablenpc "force_08_01#50";
 	donpcevent "force_01start#50::OnEnable";
@@ -295,169 +286,142 @@ OnReset_All:
 	donpcevent "force_05ex#50::OnReset";
 	donpcevent "force_06ex#50::OnReset";
 	donpcevent "force_07ex#50::OnReset";
-	donpcevent "force_08ex#50::OnReset";
+	//donpcevent "force_08ex#50::OnReset";
 	donpcevent "force_09ex#50::OnReset";
 	end;
-
 }
 
 force_1-1,62,26,1	script	force_08_01#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On01_Start";
 	warp "force_1-1",40,26;
 	end;
-
 }
 
 force_1-1,25,44,1	script	force_01_02#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On02_Start";
 	warp "force_1-1",25,69;
 	end;
-
 }
 
 force_1-1,25,134,1	script	force_02_03#50	45,1,1,{
-
 OnTouch:
 	donpcevent "arena#50::OnReset_02";
 	donpcevent "Heel and Toe#arena::On03_Start";
 	warp "force_1-1",25,159;
 	end;
-
 }
 
 force_1-1,44,174,1	script	force_03_04#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On04_Start";
 	warp "force_1-1",69,174;
 	end;
-
 }
 
 force_1-1,134,174,1	script	force_04_05#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On05_Start";
 	warp "force_1-1",159,174;
 	end;
-
 }
 
 force_1-1,174,155,1	script	force_05_06#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On06_Start";
 	warp "force_1-1",174,130;
 	end;
-
 }
 
 force_1-1,174,65,1	script	force_06_07#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On07_Start";
 	warp "force_1-1",174,40;
 	end;
-
 }
 
 force_1-1,155,26,1	script	force_07_08#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On08_Start";
 	warp "force_1-1",132,26;
 	enablenpc "force_08_09#50";
 	end;
-
 }
 
 force_1-1,99,54,1	script	force_08_09#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::On09_Start";
 	warp "force_1-1",99,82;
 	end;
-
 }
 
 force_1-1,99,124,1	script	force_exit#50	45,1,1,{
-
 OnTouch:
 	donpcevent "Heel and Toe#arena::OnTimerOff";
 	donpcevent "#arn_timer_50::OnEnable";
 	mapwarp "force_1-1","prt_are_in",22,191,0,0;
 	end;
-
 }
 
 -	script	force_01start#50	-1,{
-
 OnEnable:
 	donpcevent "force_01mob#50::OnEnable";
 	end;
 }
 
 -	script	force_01ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_01ex#50::OnMobEx";
+	killmonster "force_1-1","force_01ex#50::OnMyMobDead";
 	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";
-	monster "force_1-1",30,25,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",25,31,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",24,19,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",25,28,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",18,23,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",24,25,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,18,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",20,18,"Drops",1572,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,31,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,28,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,25,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",35,21,"Hydra",1579,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",26,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",26,15,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",26,14,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,17,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,18,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",29,20,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",23,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",19,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	monster "force_1-1",32,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_1-1",25,26,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",15,25,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",30,25,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",25,31,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",24,19,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",25,28,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",18,23,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",24,25,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,18,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",20,18,"Drops",1572,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,31,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,28,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,25,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",35,21,"Hydra",1579,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",26,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",26,15,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",26,14,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,17,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,18,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",29,20,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",23,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",19,16,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	monster "force_1-1",32,19,"Poisonous Toad",1556,1,"force_01ex#50::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_01mob#50	-1,{
-
 OnEnable:
 	donpcevent "force_01ex#50::OnSummonMob1";
-	monster "force_1-1",25,25,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",18,25,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",32,25,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",25,32,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	monster "force_1-1",25,18,"Smokie",1561,1,"force_01mob#50::OnMobDeath";
-	set $force_01_50,5;
+	monster "force_1-1",25,25,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",18,25,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",32,25,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",25,32,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
+	monster "force_1-1",25,18,"Smokie",1561,1,"force_01mob#50::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-1","force_01mob#50::OnMobDeath";
+	killmonster "force_1-1","force_01mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_50,$force_01_50 -1;
-	if ($force_01_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_1-1","force_01mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On01_End";
 		donpcevent "arena#50::OnReset_01";
 	}
@@ -465,84 +429,77 @@ OnMobDeath:
 }
 
 -	script	force_02start#50	-1,{
-
 OnEnable:
 	donpcevent "force_02mob#50::OnSummonMob2";
 	end;
 }
 
 -	script	force_02mob#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_02mob#50::OnMobEx";
+	killmonster "force_1-1","force_02mob#50::OnMyMobDead";
 	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";
-	monster "force_1-1",24,86,"Familiar",1419,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",26,86,"Ghoul",1423,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",25,100,"Ghoul",1423,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",26,118,"Ghoul",1423,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,79,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",23,87,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,99,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",23,112,"Mummy",1393,1,"force_02mob#50::OnMobEx";
-	monster "force_1-1",28,128,"Mummy",1393,1,"force_02mob#50::OnMobEx";
+	monster "force_1-1",24,76,"Familiar",1419,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,76,"Familiar",1419,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",24,86,"Familiar",1419,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",26,86,"Ghoul",1423,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",25,100,"Ghoul",1423,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",26,118,"Ghoul",1423,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,79,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",23,87,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,99,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",23,112,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
+	monster "force_1-1",28,128,"Mummy",1393,1,"force_02mob#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03start#50	-1,{
-
 OnEnable:
 	donpcevent "force_03mob#50::OnEnable";
 	end;
 }
 
 -	script	force_03ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_03ex#50::OnMobEx";
+	killmonster "force_1-1","force_03ex#50::OnMyMobDead";
 	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";
-	monster "force_1-1",31,173,"Hydra",1579,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",26,186,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",26,161,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",13,173,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",38,173,"Marse",1551,1,"force_03ex#50::OnMobEx";
-	monster "force_1-1",29,174,"Marse",1551,1,"force_03ex#50::OnMobEx";
+	monster "force_1-1",26,173,"Hydra",1579,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",21,173,"Hydra",1579,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",31,173,"Hydra",1579,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",26,186,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",26,161,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",13,173,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",38,173,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
+	monster "force_1-1",29,174,"Marse",1551,1,"force_03ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#50	-1,{
-
 OnEnable:
 	donpcevent "force_03ex#50::OnSummonMob_03";
-	monster "force_1-1",23,174,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",18,173,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",33,173,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",26,181,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	monster "force_1-1",26,166,"Karakasa",1544,1,"force_03mob#50::OnMobDeath";
-	set $force_03_50,5;
+	monster "force_1-1",23,174,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",18,173,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",33,173,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",26,181,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
+	monster "force_1-1",26,166,"Karakasa",1544,1,"force_03mob#50::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-1","force_03mob#50::OnMobDeath";
+	killmonster "force_1-1","force_03mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_50,$force_03_50 -1;
-	donpcevent "force_03mob#50::OnSummonMob_03";
-	if ($force_03_50 < 1) {
+OnMyMobDead:
+	//donpcevent "force_03mob#50::OnSummonMob_03";
+	if (mobcount("force_1-1","force_03mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On03_End";
 		donpcevent "arena#50::OnReset_03";
 	}
@@ -550,56 +507,50 @@ OnMobDeath:
 }
 
 -	script	force_04start#50	-1,{
-
 OnEnable:
 	donpcevent "force_04mob#50::OnEnable";
 	end;
 }
 
 -	script	force_04ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_04ex#50::OnMobEx";
+	killmonster "force_1-1","force_04ex#50::OnMyMobDead";
 	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";
-	monster "force_1-1",107,174,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",111,176,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",115,176,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",119,172,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",95,178,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",100,178,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",105,172,"Familiar",1419,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",110,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",115,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",120,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",125,172,"Flora",1575,1,"force_04ex#50::OnMobEx";
-	monster "force_1-1",105,178,"Flora",1575,1,"force_04ex#50::OnMobEx";
+	monster "force_1-1",99,174,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",103,174,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",107,174,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",111,176,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",115,176,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",119,172,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",95,178,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",100,178,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",105,172,"Familiar",1419,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",110,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",115,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",120,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",125,172,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
+	monster "force_1-1",105,178,"Flora",1575,1,"force_04ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_04mob#50	-1,{
-
 OnEnable:
 	donpcevent "force_04ex#50::OnSummonMob_04";
-	monster "force_1-1",85,172,"Kobold",1547,1,"force_04mob#50::OnMobDeath";
-	monster "force_1-1",95,172,"Kobold",1547,1,"force_04mob#50::OnMobDeath";
-	monster "force_1-1",120,172,"Kobold",1545,1,"force_04mob#50::OnMobDeath";
-	set $force_04_50,3;
+	monster "force_1-1",85,172,"Kobold",1547,1,"force_04mob#50::OnMyMobDead";
+	monster "force_1-1",95,172,"Kobold",1547,1,"force_04mob#50::OnMyMobDead";
+	monster "force_1-1",120,172,"Kobold",1545,1,"force_04mob#50::OnMyMobDead";
 	end;
 OnReset:
-	killmonster "force_1-1","force_04mob#50::OnMobDeath";
+	killmonster "force_1-1","force_04mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_50,$force_04_50 -1;
-	if ($force_04_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_1-1","force_04mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On04_End";
 		donpcevent "arena#50::OnReset_04";
 	}
@@ -607,112 +558,100 @@ OnMobDeath:
 }
 
 -	script	force_05start#50	-1,{
-
 OnEnable:
 	donpcevent "force_05mob#50::OnEnable";
 	end;
 }
 
 -	script	force_05ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_05ex#50::OnMobEx";
+	killmonster "force_1-1","force_05ex#50::OnMyMobDead";
 	end;
 
 OnSummonMob_05:
-	set $@randmonster50,rand(1,2);
-	switch($@randmonster50) {
+	switch(rand(1,2)) {
 	case 1:
-		monster "force_1-1",174,174,"Desert Wolf",1432,1,"force_05ex#50::OnMobEx";
+		monster "force_1-1",174,174,"Desert Wolf",1432,1,"force_05ex#50::OnMyMobDead";
 		break;
 	case 2:
-		monster "force_1-1",173,173,"Zerom",1470,1,"force_05ex#50::OnMobEx";
+		monster "force_1-1",173,173,"Zerom",1470,1,"force_05ex#50::OnMyMobDead";
 		break;
 	}
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#50	-1,{
-
 OnEnable:
-	monster "force_1-1",173,166,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",171,170,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",177,170,"Hydra",1579,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",183,173,"Orc Lady",1452,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",173,173,"Orc Lady",1452,1,"force_05mob#50::OnMobDeath";
-	monster "force_1-1",181,173,"Golem",1540,1,"force_05mob#50::OnMobDeath";
- 	monster "force_1-1",171,177,"Golem",1540,1,"force_05mob#50::OnMobDeath";
-	set $force_05_50,7;
+	monster "force_1-1",173,166,"Hydra",1579,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",171,170,"Hydra",1579,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",177,170,"Hydra",1579,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",183,173,"Orc Lady",1452,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",173,173,"Orc Lady",1452,1,"force_05mob#50::OnMyMobDead";
+	monster "force_1-1",181,173,"Golem",1540,1,"force_05mob#50::OnMyMobDead";
+ 	monster "force_1-1",171,177,"Golem",1540,1,"force_05mob#50::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-1","force_05mob#50::OnMobDeath";
+	killmonster "force_1-1","force_05mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_50,$force_05_50 -1;
-	if ($force_05_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_1-1","force_05mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On05_End";
 		donpcevent "arena#50::OnReset_05";
 	}
 	else donpcevent "force_05ex#50::OnSummonMob_05";
 	end;
-
 }
 
 -	script	force_06start#50	-1,{
-
 OnEnable:
 	donpcevent "force_06mob#50::OnEnable";
 	end;
 }
 
 -	script	force_06ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_06ex#50::OnMobEx";
+	killmonster "force_1-1","force_06ex#50::OnMyMobDead";
 	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";
-	monster "force_1-1",173,99,"Smokie",1561,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,108,"Golem",1540,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,99,"Skel Worker",1469,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,85,"Skel Worker",1469,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,90,"Golem",1540,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",171,79,"Scorpion",1559,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",175,118,"Scorpion",1559,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",175,108,"Sandman",1558,1,"force_06ex#50::OnMobEx";
-	monster "force_1-1",175,99,"Sandman",1558,1,"force_06ex#50::OnMobEx";
+	monster "force_1-1",173,118,"Smokie",1561,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",173,108,"Smokie",1561,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",173,99,"Smokie",1561,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,108,"Golem",1540,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,99,"Skel Worker",1469,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,85,"Skel Worker",1469,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,90,"Golem",1540,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",171,79,"Scorpion",1559,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",175,118,"Scorpion",1559,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",175,108,"Sandman",1558,1,"force_06ex#50::OnMyMobDead";
+	monster "force_1-1",175,99,"Sandman",1558,1,"force_06ex#50::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_06mob#50	-1,{
-
 OnEnable:
 	donpcevent "force_06ex#50::OnSummonMob_06";
-	monster "force_1-1",173,90,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",173,79,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",172,70,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",175,70,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	monster "force_1-1",171,118,"Drops",1572,1,"force_06mob#50::OnMobDeath";
-	set $force_06_50,5;
+	monster "force_1-1",173,90,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",173,79,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",172,70,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",175,70,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
+	monster "force_1-1",171,118,"Drops",1572,1,"force_06mob#50::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-1","force_06mob#50::OnMobDeath";
+	killmonster "force_1-1","force_06mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_50,$force_06_50 -1;
-	if ($force_06_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_1-1","force_06mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On06_End";
 		donpcevent "arena#50::OnReset_06";
 	}
@@ -720,62 +659,57 @@ OnMobDeath:
 }
 
 -	script	force_07start#50	-1,{
-
 OnEnable:
 	donpcevent "force_07mob#50::OnEnable";
 	end;
 }
 
 -	script	force_07ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_07ex#50::OnMobEx";
+	killmonster "force_1-1","force_07ex#50::OnMyMobDead";
 	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";
-	monster "force_1-1",171,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",175,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",179,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,36,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,32,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,28,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,24,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,20,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",183,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",179,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",175,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",171,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",167,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,16,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,20,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,24,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,28,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,32,"Hydra",1579,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,31,"Punk",1481,1,"force_07ex#50::OnMobEx";
-	monster "force_1-1",163,23,"Punk",1481,1,"force_07ex#50::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_1-1",163,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",167,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",171,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",175,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",179,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,36,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,32,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,28,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,24,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,20,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",183,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",179,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",175,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",171,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",167,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,16,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,20,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,24,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,28,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,32,"Hydra",1579,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,31,"Punk",1481,1,"force_07ex#50::OnMyMobDead";
+	monster "force_1-1",163,23,"Punk",1481,1,"force_07ex#50::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_07mob#50	-1,{
-
 OnEnable:
 	donpcevent "force_07ex#50::OnSummonMob_07";
-	monster "force_1-1",174,25,"Red Plant",1078,1,"force_07mob#50::OnMobDeath";
-	set $force_07_50,1;
+	monster "force_1-1",174,25,"Red Plant",1078,1,"force_07mob#50::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_1-1","force_07mob#50::OnMobDeath";
+	killmonster "force_1-1","force_07mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_50,$force_07_50 -1;
-	if ($force_07_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_1-1","force_07mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On07_End";
 		donpcevent "arena#50::OnReset_07";
 	}
@@ -783,69 +717,62 @@ OnMobDeath:
 }
 
 -	script	force_08start#50	-1,{
-
 OnEnable:
 	donpcevent "force_08ex#50::OnEnable";
 	end;
 }
 
 -	script	force_08ex#50	-1,{
-
 OnEnable:
 	donpcevent "arena#50::OnReset_08";
 	end;
 }
 
 -	script	force_09start#50	-1,{
-
 OnEnable:
 	donpcevent "force_09mob#50::OnEnable";
 	end;
 }
 
 -	script	force_09ex#50	-1,{
-
 OnReset:
-	killmonster "force_1-1","force_09ex#50::OnMobEx";
+	killmonster "force_1-1","force_09ex#50::OnMyMobDead";
 	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";
-	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	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";
-	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	monster "force_1-1",105,94,"Familiar",1419,1,"force_09ex#50::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",110,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,110,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",89,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",110,89,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",105,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,105,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",94,94,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	monster "force_1-1",105,94,"Familiar",1419,1,"force_09ex#50::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#50	-1,{
-
 OnEnable:
-	monster "force_1-1",99,99,"Vocal",1581,1,"force_09mob#50::OnMobDeath";
+	monster "force_1-1",99,99,"Vocal",1581,1,"force_09mob#50::OnMyMobDead";
 	donpcevent "force_09ex#50::OnSummonMob_09";
-	set $force_09_50,1;
 	end;
 
 OnReset:
-	killmonster "force_1-1","force_09mob#50::OnMobDeath";
+	killmonster "force_1-1","force_09mob#50::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_50,$force_09_50 -1;
-	if ($force_09_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_1-1","force_09mob#50::OnMyMobDead") < 1) {
 		donpcevent "Heel and Toe#arena::On09_End";
 		donpcevent "arena#50::OnReset_09";
 		donpcevent "arena#50::OnReset_All";
@@ -856,7 +783,6 @@ OnMobDeath:
 }
 
 prt_are_in,129,188,3	script	Staff#50-1	67,{
-
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -878,29 +804,19 @@ prt_are_in,129,188,3	script	Staff#50-1	67,{
 }
 
 prt_are_in,25,188,3	script	Staff#50-2	67,{
-
-	if($arena_min50end < $arena_min50st)
-	{
-		if($arena_sec50end < $arena_sec50st)
-		{
+	if($arena_min50end < $arena_min50st) {
+		if($arena_sec50end < $arena_sec50st) {
 			set @record_min50,60 - $arena_min50st + $arena_min50end -1;
 			set @record_sec50,60 - $arena_sec50st + $arena_sec50end;
-		}
-		else
-		{
+		} else {
 			set @record_min50,60 - $arena_min50st + $arena_min50end;
 			set @record_sec50,$arena_sec50end - $arena_sec50st;
 		}
-	}
-	else
-	{
-		if($arena_sec50end < $arena_sec50st)
-		{
+	} else {
+		if($arena_sec50end < $arena_sec50st) {
 			set @record_min50,$arena_min50end - $arena_min50st -1;
 			set @record_sec50,60 - $arena_sec50st + $arena_sec50end;
-		}
-		else
-		{
+		} else {
 			set @record_min50,$arena_min50end - $arena_min50st;
 			set @record_sec50,$arena_sec50end - $arena_sec50st;
 		}
@@ -937,9 +853,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -957,9 +871,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 		donpcevent "alloff#50::OnEnable";
 		donpcevent "Lv50 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -984,9 +896,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -1012,7 +922,6 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 }
 
 -	script	#arn_timer_50	-1,{
-
 OnEnable:
 	initnpctimer;
 	end;
@@ -1040,11 +949,9 @@ OnTimer60000:
 OnStop:
 	stopnpctimer;
 	end;
-
 }
 
 -	script	arn_warp_50	-1,{
-
 OnOut:
 	areawarp "prt_are_in",14,195,29,178,"arena_room",100,75;
 	end;
@@ -1066,7 +973,6 @@ OnNomal2:
 }
 
 -	script	alloff#50	-1,{
-
 OnEnable:
 	mapwarp "force_1-1","prt_are_in",126,190,0,0;
 	donpcevent "force_01mob#50::OnReset";
@@ -1083,7 +989,7 @@ OnEnable:
 	donpcevent "force_05ex#50::OnReset";
 	donpcevent "force_06ex#50::OnReset";
 	donpcevent "force_07ex#50::OnReset";
-	donpcevent "force_08ex#50::OnReset";
+	//donpcevent "force_08ex#50::OnReset";
 	donpcevent "force_09ex#50::OnReset";
 	donpcevent "Heel and Toe#arena::OnTimerOff";
 	disablenpc "Heel and Toe#arena";
@@ -1105,5 +1011,4 @@ OnEnable:
 OnInit:
 	if(!$top_50min && !$top_50sec) set $top_50min,5;
 	end;
-
 }

+ 213 - 297
npc/other/arena/arena_lvl60.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //= 1.1 Fixed coordinate typo. (bugreport:1663) [L0ne_W0lf]
 //= 1.2 Replaced effect numerics with constants. [Samuray22]
 //= 1.3 Label standardization. [Euphy]
+//= 1.4 Script updates. [Euphy]
 //============================================================
 
 arena_room,38,88,5	script	Lv60 Waiting Room	124,{
@@ -37,10 +38,6 @@ OnStart:
 force_2-1,99,20,4	script	Minilover#arena	124,{
 	end;
 
-OnInit:
-	set $@mapcount60, 0;
-	end;
-
 OnStart:
 	initnpctimer;
 	set $arena_min60st,gettime(2);
@@ -60,40 +57,35 @@ OnTimer5000:
 	end;
 
 OnTimer60000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
+	if (getmapusers("force_2-1") == 0) {
 		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 5 minutes ",0;
 	end;
 
 OnTimer120000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
+	if (getmapusers("force_2-1") == 0) {
 		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer180000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
+	if (getmapusers("force_2-1") == 0) {
 		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer240000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
+	if (getmapusers("force_2-1") == 0) {
 		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer300000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
+	if (getmapusers("force_2-1") == 0) {
 		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 1 minute ",0;
@@ -201,11 +193,9 @@ On09_Start:
 On09_End:
 	mapannounce "force_2-1","Boss Clear! - North exit has opened. Thank you.",0;
 	end;
-
 }
 
 -	script	arena#60	-1,{
-
 OnReset_01:
 	donpcevent "force_01ex#60::OnReset";
 	donpcevent "force_01mob#60::OnReset";
@@ -277,14 +267,14 @@ OnStart:
 	donpcevent "force_05mob#60::OnReset";
 	donpcevent "force_06mob#60::OnReset";
 	donpcevent "force_07mob#60::OnReset";
-	donpcevent "force_08mob#60::OnReset";
+	//donpcevent "force_08mob#60::OnReset";
 	donpcevent "force_09mob#60::OnReset";
 	donpcevent "force_01ex#60::OnReset";
 	donpcevent "force_03ex#60::OnReset";
 	donpcevent "force_04ex#60::OnReset";
 	donpcevent "force_05ex#60::OnReset";
 	donpcevent "force_06ex#60::OnReset";
-	donpcevent "force_08ex#60::OnReset";
+	//donpcevent "force_08ex#60::OnReset";
 	donpcevent "force_09ex#60::OnReset";
 	enablenpc "force_08_01#60";
 	donpcevent "force_01start#60::OnEnable";
@@ -299,21 +289,19 @@ OnReset_All:
 	donpcevent "force_05mob#60::OnReset";
 	donpcevent "force_06mob#60::OnReset";
 	donpcevent "force_07mob#60::OnReset";
-	donpcevent "force_08mob#60::OnReset";
+	//donpcevent "force_08mob#60::OnReset";
 	donpcevent "force_09mob#60::OnReset";
 	donpcevent "force_01ex#60::OnReset";
 	donpcevent "force_03ex#60::OnReset";
 	donpcevent "force_04ex#60::OnReset";
 	donpcevent "force_05ex#60::OnReset";
 	donpcevent "force_06ex#60::OnReset";
-	donpcevent "force_08ex#60::OnReset";
+	//donpcevent "force_08ex#60::OnReset";
 	donpcevent "force_09ex#60::OnReset";
 	end;
-
 }
 
 force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
@@ -321,7 +309,6 @@ OnTouch:
 }
 
 force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
@@ -329,7 +316,6 @@ OnTouch:
 }
 
 force_2-1,25,134,1	script	force_02_03#60	45,1,1,{
-
 OnTouch:
 	donpcevent "arena#60::OnReset_02";
 	donpcevent "Minilover#arena::On03_Start";
@@ -338,7 +324,6 @@ OnTouch:
 }
 
 force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
@@ -346,7 +331,6 @@ OnTouch:
 }
 
 force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
@@ -354,7 +338,6 @@ OnTouch:
 }
 
 force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
@@ -362,7 +345,6 @@ OnTouch:
 }
 
 force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
@@ -370,7 +352,6 @@ OnTouch:
 }
 
 force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
@@ -379,7 +360,6 @@ OnTouch:
 }
 
 force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
@@ -387,7 +367,6 @@ OnTouch:
 }
 
 force_2-1,99,124,1	script	force_exit#60	45,1,1,{
-
 OnTouch:
 	donpcevent "Minilover#arena::OnTimerOff";
 	donpcevent "#arn_timer_60::OnEnable";
@@ -396,50 +375,45 @@ OnTouch:
 }
 
 -	script	force_01start#60	-1,{
-
 OnEnable:
 	donpcevent "force_01mob#60::OnEnable";
 	end;
 }
 
 -	script	force_01ex#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_01ex#60::OnMobEx";
+	killmonster "force_2-1","force_01ex#60::OnMyMobDead";
 	end;
 
 OnEnable:
-	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMobEx";
+	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_01mob#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_01mob#60::OnMobDeath";
+	killmonster "force_2-1","force_01mob#60::OnMyMobDead";
 	end;
 
 OnEnable:
 	donpcevent "force_01ex#60::OnEnable";
-	monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",21,26,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,36,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,15,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",40,30,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,24,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",25,9,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",28,15,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",12,33,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
-	monster "force_2-1",24,20,"Goblin",1535,1,"force_01mob#60::OnMobDeath";
-	set $force_01_60,5;
-	end;
-
-OnMobDeath:
-	set $force_01_60,$force_01_60 -1;
-	if ($force_01_60 < 1) {
+	monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",21,26,"Goblin",1534,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,36,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,15,"Goblin",1534,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",40,30,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,24,"Goblin",1534,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",25,9,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",28,15,"Goblin Archer",1577,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",12,33,"Goblin",1536,1,"force_01mob#60::OnMyMobDead";
+	monster "force_2-1",24,20,"Goblin",1535,1,"force_01mob#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("force_2-1","force_01mob#60::OnMyMobDead") < 6) {
 		donpcevent "Minilover#arena::On01_End";
 		donpcevent "arena#60::OnReset_01";
 	}
@@ -447,102 +421,95 @@ OnMobDeath:
 }
 
 -	script	force_02start#60	-1,{
-
 OnEnable:
 	donpcevent "force_02mob#60::OnEnable";
 	end;
 }
 
 -	script	force_02mob#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_02mob#60::OnMobEx";
+	killmonster "force_2-1","force_02mob#60::OnMyMobDead";
 	end;
 OnEnable:
-	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",23,76,"Requiem",1468,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",27,76,"Requiem",1468,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",25,86,"Requiem",1468,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",26,86,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,79,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",23,87,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,99,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",23,112,"Zerom",1470,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",23,76,"Requiem",1468,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",27,76,"Requiem",1468,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",25,86,"Requiem",1468,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",26,86,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",25,100,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",26,118,"Ghoul",1423,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,79,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",23,87,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,99,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",23,112,"Zerom",1470,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Orc Zombie",1463,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	monster "force_2-1",28,128,"Matyr",1460,1,"force_02mob#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03start#60	-1,{
-
 OnEnable:
 	donpcevent "force_03mob#60::OnEnable";
 	end;
 }
 
 -	script	force_03ex#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_03ex#60::OnMobEx";
+	killmonster "force_2-1","force_03ex#60::OnMyMobDead";
 	end;
 
 OnEnable:
-	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";
-	monster "force_2-1",31,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",26,178,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",21,178,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",31,178,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",19,174,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",26,161,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",13,173,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",38,173,"Obeaune",1425,1,"force_03ex#60::OnMobEx";
+	monster "force_2-1",26,173,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",21,173,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",31,173,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",26,178,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",21,178,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",31,178,"Hydra",1579,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",19,174,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",26,161,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",13,173,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
+	monster "force_2-1",38,173,"Obeaune",1425,1,"force_03ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#60	-1,{
-
 OnEnable:
 	donpcevent "force_03ex#60::OnEnable";
-	monster "force_2-1",23,174,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	monster "force_2-1",18,173,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	monster "force_2-1",33,173,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	monster "force_2-1",26,181,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
-	set $force_03_60,4;
+	monster "force_2-1",23,174,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
+	monster "force_2-1",18,173,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
+	monster "force_2-1",33,173,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
+	monster "force_2-1",26,181,"Mantis",1457,1,"force_03mob#60::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_2-1","force_mob01#60::OnMobDeath";
+	killmonster "force_2-1","force_mob01#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_60,$force_03_60 -1;
-	if ($force_03_60 < 1) {
+OnMyMobDead:
+	if (mobcount("force_2-1","force_03mob#60::OnMyMobDead") < 1) {
 		donpcevent "Minilover#arena::On03_End";
 		donpcevent "arena#60::OnReset_03";
 	}
@@ -550,48 +517,43 @@ OnMobDeath:
 }
 
 -	script	force_04start#60	-1,{
-
 OnEnable:
 	donpcevent "force_04mob#60::OnEnable";
 	end;
 }
 
 -	script	force_04ex#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_04ex#60::OnMobEx";
+	killmonster "force_2-1","force_04ex#60::OnMyMobDead";
 	end;
 
 OnEnable:
-	monster "force_2-1",84,177,"Sasquatch",1442,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",125,170,"Sasquatch",1442,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",109,172,"Baby Leopard",1524,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",121,172,"Baby Leopard",1524,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",104,173,"Chepet",1444,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",75,174,"Dokebi",1491,1,"force_04ex#60::OnMobEx";
-	monster "force_2-1",102,176,"Dokebi",1491,1,"force_04ex#60::OnMobEx";
+	monster "force_2-1",84,177,"Sasquatch",1442,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",125,170,"Sasquatch",1442,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",109,172,"Baby Leopard",1524,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",121,172,"Baby Leopard",1524,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",104,173,"Chepet",1444,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",75,174,"Dokebi",1491,1,"force_04ex#60::OnMyMobDead";
+	monster "force_2-1",102,176,"Dokebi",1491,1,"force_04ex#60::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_04mob#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_04mob#60::OnMobDeath";
+	killmonster "force_2-1","force_04mob#60::OnMyMobDead";
 	end;
 
 OnEnable:
 	donpcevent "force_04ex#60::OnEnable";
-	monster "force_2-1",79,174,"Golem",1540,1,"force_04mob#60::OnMobDeath";
-	monster "force_2-1",131,178,"Marse",1551,1,"force_04mob#60::OnMobDeath";
-	set $force_04_60,2;
+	monster "force_2-1",79,174,"Golem",1540,1,"force_04mob#60::OnMyMobDead";
+	monster "force_2-1",131,178,"Marse",1551,1,"force_04mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_60,$force_04_60 -1;
-	if ($force_04_60 < 1) {
+OnMyMobDead:
+	if (mobcount("force_2-1","force_04mob#60::OnMyMobDead") < 1) {
 		donpcevent "force_04ex#60::OnReset";
 		donpcevent "Minilover#arena::On04_End";
 		donpcevent "arena#60::OnReset_04";
@@ -600,56 +562,51 @@ OnMobDeath:
 }
 
 -	script	force_05start#60	-1,{
-
 OnEnable:
 	donpcevent "force_05mob#60::OnEnable";
 	end;
 }
 
 -	script	force_05ex#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_05ex#60::OnMobEx";
+	killmonster "force_2-1","force_05ex#60::OnMyMobDead";
 	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";
-	monster "force_2-1",177,179,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",179,178,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",179,170,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",177,168,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",170,168,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",173,174,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",174,174,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",173,173,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",174,173,"Hydra",1579,1,"force_05ex#60::OnMobEx";
-	monster "force_2-1",173,181,"Kapha",1543,1,"force_05ex#60::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_2-1",168,177,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",170,179,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",177,179,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",179,178,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",179,170,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",177,168,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",170,168,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",173,174,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",174,174,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",173,173,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",174,173,"Hydra",1579,1,"force_05ex#60::OnMyMobDead";
+	monster "force_2-1",173,181,"Kapha",1543,1,"force_05ex#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_05mob#60::OnMobDeath";
+	killmonster "force_2-1","force_05mob#60::OnMyMobDead";
 	end;
 
 OnEnable:
 	donpcevent "force_05ex#60::OnSummonMob_05";
-	monster "force_2-1",163,173,"Drainliar",1434,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",173,173,"Myst",1553,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",181,173,"Orc Skeleton",1462,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",171,177,"Orc Skeleton",1462,1,"force_05mob#60::OnMobDeath";
-	monster "force_2-1",173,181,"Raggler",1445,1,"force_05mob#60::OnMobDeath";
-	set $force_05_60,5;
+	monster "force_2-1",163,173,"Drainliar",1434,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",173,173,"Myst",1553,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",181,173,"Orc Skeleton",1462,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",171,177,"Orc Skeleton",1462,1,"force_05mob#60::OnMyMobDead";
+	monster "force_2-1",173,181,"Raggler",1445,1,"force_05mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_60,$force_05_60 -1;
-	if ($force_05_60 < 1) {
+OnMyMobDead:
+	if (mobcount("force_2-1","force_05mob#60::OnMyMobDead") < 1) {
 		donpcevent "Minilover#arena::On05_End";
 		donpcevent "arena#60::OnReset_05";
 	}
@@ -657,112 +614,101 @@ OnMobDeath:
 }
 
 -	script	force_06start#60	-1,{
-
 OnEnable:
 	donpcevent "force_06mob#60::OnEnable";
 	end;
 }
 
 -	script	force_06ex#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_06ex#60::OnMobEx";
+	killmonster "force_2-1","force_06ex#60::OnMyMobDead";
 	end;
 
 OnEnable:
-	monster "force_2-1",169,130,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,130,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,125,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,125,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,120,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,120,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,115,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,115,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,110,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,110,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,105,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,105,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,100,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,100,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,95,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,95,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,90,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,90,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,85,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,85,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",169,80,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	monster "force_2-1",178,80,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
-	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) {
+	monster "force_2-1",169,130,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,130,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,125,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,125,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,120,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,120,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,115,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,115,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,110,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,110,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,105,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,105,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,100,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,100,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,95,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,95,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,90,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,90,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,85,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,85,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,80,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,80,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",169,75,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	monster "force_2-1",178,75,"Greatest General",1541,1,"force_06ex#60::OnMyMobDead";
+	end;
+
+OnSubOn:
+	switch(rand(1,3)) {
 	case 1:
-		monster "force_2-1",rand(170,177),rand(70,120),"Sidewinder",1424,1,"force_06ex#60::OnMobEx";
+		monster "force_2-1",rand(170,177),rand(70,120),"Sidewinder",1424,1,"force_06ex#60::OnMyMobDead";
 		break;
 	case 2:
-		monster "force_2-1",rand(170,177),rand(70,120),"Hermit Plant",1565,1,"force_06ex#60::OnMobEx";
+		monster "force_2-1",rand(170,177),rand(70,120),"Hermit Plant",1565,1,"force_06ex#60::OnMyMobDead";
 		break;
 	case 3:
-		monster "force_2-1",rand(170,177),rand(70,120),"Cruiser",1443,1,"force_06ex#60::OnMobEx";
+		monster "force_2-1",rand(170,177),rand(70,120),"Cruiser",1443,1,"force_06ex#60::OnMyMobDead";
 		break;
 	}
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_06mob#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_06mob#60::OnMobDeath";
+	killmonster "force_2-1","force_06mob#60::OnMyMobDead";
 	end;
 
 OnEnable:
 	donpcevent "force_06ex#60::OnEnable";
-	monster "force_2-1",174,100,"Miyabi Doll",1552,1,"force_06mob#60::OnMobDeath";
-	monster "force_2-1",174,80,"Miyabi Doll",1552,1,"force_06mob#60::OnMobDeath";
-	set $force_06_60,2;
+	monster "force_2-1",174,100,"Miyabi Doll",1552,1,"force_06mob#60::OnMyMobDead";
+	monster "force_2-1",174,80,"Miyabi Doll",1552,1,"force_06mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_60,$force_06_60 -1;
-	if ($force_06_60 < 1) {
-		set door, 1;
+OnMyMobDead:
+	if (mobcount("force_2-1","force_06mob#60::OnMyMobDead") < 1) {
 		donpcevent "Minilover#arena::On06_End";
 		donpcevent "arena#60::OnReset_06";
 	}
-	else donpcevent "force_06ex#60::Onsubon";
+	else donpcevent "force_06ex#60::OnSubOn";
 	end;
 }
 
 -	script	force_07start#60	-1,{
-
 OnEnable:
 	donpcevent "force_07mob#60::OnEnable";
 	end;
 }
 
 -	script	force_07mob#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_07mob#60::OnMobDeath";
+	killmonster "force_2-1","force_07mob#60::OnMyMobDead";
 	end;
 
 OnEnable:
-	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";
-	monster "force_2-1",175,25,"Myst",1553,1,"force_07mob#60::OnMobDeath";
-	monster "force_2-1",179,25,"Isis",1421,1,"force_07mob#60::OnMobDeath";
-	set $force_07_50,4;
+	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMyMobDead";
+	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMyMobDead";
+	monster "force_2-1",175,25,"Myst",1553,1,"force_07mob#60::OnMyMobDead";
+	monster "force_2-1",179,25,"Isis",1421,1,"force_07mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_50,$force_07_50 -1;
-	if ($force_07_50 < 1) {
+OnMyMobDead:
+	if (mobcount("force_2-1","force_07mob#60::OnMyMobDead") < 1) {
 		donpcevent "Minilover#arena::On07_End";
 		donpcevent "arena#60::OnReset_07";
 	}
@@ -770,80 +716,73 @@ OnMobDeath:
 }
 
 -	script	force_08start#60	-1,{
-
 OnEnable:
 	donpcevent "force_08ex#60::OnEnable";
 	end;
 }
 
 -	script	force_08ex#60	-1,{
-
 OnEnable:
 	donpcevent "arena#60::OnReset_08";
 	end;
 }
 
 -	script	force_09start#60	-1,{
-
 OnEnable:
 	donpcevent "force_09mob#60::OnEnable";
 	end;
 }
 
 -	script	force_09ex#60	-1,{
-
 OnReset:
-	killmonster "force_2-1","force_09ex#60::OnMobEx";
+	killmonster "force_2-1","force_09ex#60::OnMyMobDead";
 	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";
-	monster "force_2-1",99,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",105,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,104,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,96,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",91,92,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",95,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",99,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",100,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",104,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,108,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,104,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,96,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",108,92,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",104,102,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",196,102,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",114,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",121,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",85,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",78,100,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",96,118,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",103,118,"Greatest General",1541,1,"force_09ex#60::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_2-1",90,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",92,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",99,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",105,100,"Horong",1578,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,104,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,96,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",91,92,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",95,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",99,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",100,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",104,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,108,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,104,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,96,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",108,92,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",104,102,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",196,102,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",114,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",121,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",85,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",78,100,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",96,118,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	monster "force_2-1",103,118,"Greatest General",1541,1,"force_09ex#60::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#60	-1,{
-
 OnEnable:
 	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;
+	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_2-1","force_09mob#60::OnMobDeath";
+	killmonster "force_2-1","force_09mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_60,$force_09_60 -1;
-	if ($force_09_60 < 1) {
+OnMyMobDead:
+	if (mobcount("force_2-1","force_09mob#60::OnMyMobDead") < 1) {
 		donpcevent "Minilover#arena::On09_End";
 		donpcevent "arena#60::OnReset_09";
 		donpcevent "arena#60::OnReset_All";
@@ -854,7 +793,6 @@ OnMobDeath:
 }
 
 prt_are_in,129,135,3	script	Staff#60-1	67,{
-
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -876,29 +814,19 @@ prt_are_in,129,135,3	script	Staff#60-1	67,{
 }
 
 prt_are_in,25,135,3	script	Staff#60-2	67,{
-
-	if($arena_min60end < $arena_min60st)
-	{
-		if($arena_sec60end < $arena_sec60st)
-		{
+	if($arena_min60end < $arena_min60st) {
+		if($arena_sec60end < $arena_sec60st) {
 			set @record_min60,60 - $arena_min60st + $arena_min60end -1;
 			set @record_sec60,60 - $arena_sec60st + $arena_sec60end;
-		}
-		else
-		{
+		} else {
 			set @record_min60,60 - $arena_min60st + $arena_min60end;
 			set @record_sec60,$arena_sec60end - $arena_sec60st;
 		}
-	}
-	else
-	{
-		if($arena_sec60end < $arena_sec60st)
-		{
+	} else {
+		if($arena_sec60end < $arena_sec60st) {
 			set @record_min60,$arena_min60end - $arena_min60st -1;
 			set @record_sec60,60 - $arena_sec60st + $arena_sec60end;
-		}
-		else
-		{
+		} else {
 			set @record_min60,$arena_min60end - $arena_min60st;
 			set @record_sec60,$arena_sec60end - $arena_sec60st;
 		}
@@ -935,9 +863,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -955,9 +881,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 		donpcevent "alloff#60::OnEnable";
 		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -982,9 +906,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -1007,11 +929,9 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
 	}
-
 }
 
 -	script	#arn_timer_60	-1,{
-
 OnEnable:
 	initnpctimer;
 	end;
@@ -1030,7 +950,7 @@ OnTimer4000:
 
 OnTimer60000:
  	donpcevent "cast#60::OnTimeOver2";
-	donpcevent "arn_warp_60::Onout";
+	donpcevent "arn_warp_60::OnOut";
 	donpcevent "#arn_timer_60::OnStop";
 	donpcevent "alloff#60::OnEnable";
 	donpcevent "Lv60 Waiting Room::OnStart";
@@ -1042,14 +962,12 @@ OnStop:
 }
 
 -	script	arn_warp_60	-1,{
-
-Onout:
+OnOut:
 	areawarp "prt_are_in",14,143,29,126,"arena_room",100,75;
 	end;
 }
 
 -	script	cast#60	-1,{
-
 OnTimeOver1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
@@ -1068,7 +986,6 @@ OnTimeOver2:
 }
 
 -	script	alloff#60	-1,{
-
 OnEnable:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
 	donpcevent "force_01mob#60::OnReset";
@@ -1078,14 +995,14 @@ OnEnable:
 	donpcevent "force_05mob#60::OnReset";
 	donpcevent "force_06mob#60::OnReset";
 	donpcevent "force_07mob#60::OnReset";
-	donpcevent "force_08mob#60::OnReset";
+	//donpcevent "force_08mob#60::OnReset";
 	donpcevent "force_09mob#60::OnReset";
 	donpcevent "force_01ex#60::OnReset";
 	donpcevent "force_03ex#60::OnReset";
 	donpcevent "force_04ex#60::OnReset";
 	donpcevent "force_05ex#60::OnReset";
 	donpcevent "force_06ex#60::OnReset";
-	donpcevent "force_08ex#60::OnReset";
+	//donpcevent "force_08ex#60::OnReset";
 	donpcevent "force_09ex#60::OnReset";
 	donpcevent "Minilover#arena::OnTimerOff";
 	disablenpc "Minilover#arena";
@@ -1107,5 +1024,4 @@ OnEnable:
 OnInit:
 	if(!$top_60min && !$top_60sec) set $top_60min,6;
 	end;
-
 }

+ 161 - 260
npc/other/arena/arena_lvl70.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //= 1.0 First version.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
 //= 1.2 Label standardization. [Euphy]
+//= 1.3 Script updates. [Euphy]
 //============================================================
 
 arena_room,52,42,7	script	Lv70 Waiting Room	124,{
@@ -36,10 +37,6 @@ OnStart:
 force_3-1,99,20,4	script	Cadillac#arena	124,{
 	end;
 
-OnInit:
-	set $@mapcount70, 0;
-	end;
-
 OnStart:
 	initnpctimer;
 	set $arena_min70st,gettime(2);
@@ -59,48 +56,42 @@ OnTimer7000:
 	end;
 
 OnTimer60000:
-	set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
+	if (getmapusers("force_3-1") == 0) {
 		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 6 minutes ",0;
 	end;
 
 OnTimer120000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
+	if (getmapusers("force_3-1") == 0) {
 		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 5 minutes ",0;
 	end;
 
 OnTimer180000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
+	if (getmapusers("force_3-1") == 0) {
 		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer240000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
+	if (getmapusers("force_3-1") == 0) {
 		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer300000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
+	if (getmapusers("force_3-1") == 0) {
 		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer360000:
-	 set $@mapcount70, getmapusers ("force_3-1");
-	if ($@mapcount70 == 0) {
+	if (getmapusers("force_3-1") == 0) {
 		donpcevent "Cadillac#arena::OnFailClearStage";
 	}
 	mapannounce "force_3-1","Remaining Time : 1 minute ",0;
@@ -208,13 +199,11 @@ On09_Start:
 On09_End:
 	mapannounce "force_3-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
-
 }
 
 -	script	arena#70	-1,{
-
 OnReset_01:
-	donpcevent "force_01ex#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
 	donpcevent "force_02start#70::OnEnable";
 	enablenpc "force_01_02#70";
 	end;
@@ -275,7 +264,7 @@ OnStart:
 	disablenpc "force_08_09#70";
 	disablenpc "force_exit#70";
 	donpcevent "Cadillac#arena::OnTimerOff";
-	donpcevent "force_09mob#70::OnTimerOff";
+	//donpcevent "force_09mob#70::OnTimerOff";
 	donpcevent "force_01mob#70::OnReset";
 	donpcevent "force_02mob#70::OnReset";
 	donpcevent "force_03mob#70::OnReset";
@@ -283,16 +272,16 @@ OnStart:
 	donpcevent "force_05mob#70::OnReset";
 	donpcevent "force_06mob#70::OnReset";
 	donpcevent "force_07mob#70::OnReset";
-	donpcevent "force_08mob#70::OnReset";
+	//donpcevent "force_08mob#70::OnReset";
 	donpcevent "force_09mob#70::OnReset";
-	donpcevent "force_01ex#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
 	donpcevent "force_02ex#70::OnReset";
 	donpcevent "force_03ex#70::OnReset";
 	donpcevent "force_04ex#70::OnReset";
 	donpcevent "force_05ex#70::OnReset";
 	donpcevent "force_06ex#70::OnReset";
 	donpcevent "force_07ex#70::OnReset";
-	donpcevent "force_08ex#70::OnReset";
+	//donpcevent "force_08ex#70::OnReset";
 	donpcevent "force_09ex#70::OnReset";
 	enablenpc "force_08_01#70";
 	donpcevent "force_01start#70::OnEnable";
@@ -308,136 +297,111 @@ OnReset_All:
 	donpcevent "force_06mob#70::OnReset";
 	donpcevent "force_07mob#70::OnReset";
 	donpcevent "force_09mob#70::OnReset";
-	donpcevent "force_01ex#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
 	donpcevent "force_02ex#70::OnReset";
 	donpcevent "force_03ex#70::OnReset";
 	donpcevent "force_04ex#70::OnReset";
 	donpcevent "force_05ex#70::OnReset";
 	donpcevent "force_06ex#70::OnReset";
 	donpcevent "force_07ex#70::OnReset";
-	donpcevent "force_08ex#70::OnReset";
+	//donpcevent "force_08ex#70::OnReset";
 	donpcevent "force_09ex#70::OnReset";
 	end;
-
 }
 
 force_3-1,62,26,1	script	force_08_01#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On01_Start";
 	warp "force_3-1",40,26;
 	end;
-
 }
 
 force_3-1,25,44,1	script	force_01_02#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On02_Start";
 	warp "force_3-1",25,69;
 	end;
-
 }
 
 force_3-1,25,134,1	script	force_02_03#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On03_Start";
 	warp "force_3-1",25,159;
 	end;
-
 }
 
 force_3-1,44,174,1	script	force_03_04#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On04_Start";
 	warp "force_3-1",69,174;
 	end;
-
 }
 
 force_3-1,134,174,1	script	force_04_05#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On05_Start";
 	warp "force_3-1",159,174;
 	end;
-
 }
 
 force_3-1,174,155,1	script	force_05_06#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On06_Start";
 	warp "force_3-1",174,130;
 	end;
-
 }
 
 force_3-1,174,65,1	script	force_06_07#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On07_Start";
 	warp "force_3-1",174,40;
 	end;
-
 }
 
 force_3-1,155,26,1	script	force_07_08#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On08_Start";
 	warp "force_3-1",132,26;
 	enablenpc "force_08_09#70";
 	end;
-
 }
 
 force_3-1,99,54,1	script	force_08_09#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::On09_Start";
 	warp "force_3-1",99,82;
 	end;
-
 }
 
 force_3-1,99,124,1	script	force_exit#70	45,1,1,{
-
 OnTouch:
 	donpcevent "Cadillac#arena::OnTimerOff";
 	donpcevent "#arn_timer_70::OnEnable";
 	mapwarp "force_3-1","prt_are_in",22,87,0,0;
 	end;
-
 }
 
 -	script	force_01start#70	-1,{
-
 OnEnable:
 	donpcevent "force_01mob#70::OnEnable";
 	end;
 }
 
 -	script	force_01mob#70	-1,{
-
 OnEnable:
-	monster "force_3-1",25,36,"Kobold",1545,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",20,36,"Kobold",1545,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",25,20,"Kobold",1546,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",30,36,"Kobold",1547,1,"force_01mob#70::OnMobDeath";
-	monster "force_3-1",28,15,"Kobold",1547,1,"force_01mob#70::OnMobDeath";
-	set $force_01_70,5;
+	monster "force_3-1",25,36,"Kobold",1545,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",20,36,"Kobold",1545,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",25,20,"Kobold",1546,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",30,36,"Kobold",1547,1,"force_01mob#70::OnMyMobDead";
+	monster "force_3-1",28,15,"Kobold",1547,1,"force_01mob#70::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_3-1","force_01mob#70::OnMobDeath";
+	killmonster "force_3-1","force_01mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_70,$force_01_70 -1;
-	if ($force_01_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_01mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On01_End";
 		donpcevent "arena#70::OnReset_01";
 	}
@@ -445,53 +409,48 @@ OnMobDeath:
 }
 
 -	script	force_02start#70	-1,{
-
 OnEnable:
 	donpcevent "force_02mob#70::OnEnable";
 	end;
 }
 
 -	script	force_02ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_02ex#70::OnMobEx";
+	killmonster "force_3-1","force_02ex#70::OnMyMobDead";
 	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";
-	monster "force_3-1",29,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",25,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",26,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",27,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",28,101,"Mummy",1393,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",24,104,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",24,113,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",29,120,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",29,126,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	monster "force_3-1",30,110,"Ghoul",1423,1,"force_02ex#70::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_3-1",21,78,"Archer Skeleton",1420,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",22,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",29,93,"Archer Skeleton",1420,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",25,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",26,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",27,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",28,101,"Mummy",1393,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",24,104,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",24,113,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",29,120,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",29,126,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	monster "force_3-1",30,110,"Ghoul",1423,1,"force_02ex#70::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_02mob#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_02mob#70::OnMobDeath";
+	killmonster "force_3-1","force_02mob#70::OnMyMobDead";
 	end;
 
 OnEnable:
-	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";
+	monster "force_3-1",25,79,"Horong",1578,1,"force_02mob#70::OnMyMobDead";
+	monster "force_3-1",29,114,"Horong",1578,1,"force_02mob#70::OnMyMobDead";
 	donpcevent "force_02ex#70::OnSummonMob2";
-	set $force_02_70,2;
 	end;
 
-OnMobDeath:
-	set $force_02_70,$force_02_70 -1;
-	if ($force_02_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_02mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On02_End";
 		donpcevent "arena#70::OnReset_02";
 	}
@@ -499,45 +458,40 @@ OnMobDeath:
 }
 
 -	script	force_03start#70	-1,{
-
 OnEnable:
 	donpcevent "force_03mob#70::OnEnable";
 	end;
 }
 
 -	script	force_03ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_03ex#70::OnMobEx";
+	killmonster "force_3-1","force_03ex#70::OnMyMobDead";
 	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";
+	monster "force_3-1",10,170,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMyMobDead";
+	monster "force_3-1",26,180,"Enchanted Peach Tree",1550,1,"force_03ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#70	-1,{
-
 OnEnable:
 	donpcevent "force_03ex#70::OnSummonMob_03";
-	monster "force_3-1",23,174,"Parasite",1555,1,"force_03mob#70::OnMobDeath";
-	monster "force_3-1",33,173,"Parasite",1555,1,"force_03mob#70::OnMobDeath";
-	monster "force_3-1",26,166,"Blood Butterfly",1526,1,"force_03mob#70::OnMobDeath";
-	set $force_03_70,3;
+	monster "force_3-1",23,174,"Parasite",1555,1,"force_03mob#70::OnMyMobDead";
+	monster "force_3-1",33,173,"Parasite",1555,1,"force_03mob#70::OnMyMobDead";
+	monster "force_3-1",26,166,"Blood Butterfly",1526,1,"force_03mob#70::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_3-1","force_03mob#70::OnMobDeath";
+	killmonster "force_3-1","force_03mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_70,$force_03_70 -1;
+OnMyMobDead:
 	donpcevent "force_03ex#70::OnSummonMob_03";
-	if ($force_03_70 < 1) {
+	if (mobcount("force_3-1","force_03mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On03_End";
 		donpcevent "arena#70::OnReset_03";
 	}
@@ -545,49 +499,42 @@ OnMobDeath:
 }
 
 -	script	force_04start#70	-1,{
-
 OnEnable:
 	donpcevent "force_04mob#70::OnEnable";
-end;
-
+	end;
 }
 
 -	script	force_04ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_04ex#70::OnMobEx";
+	killmonster "force_3-1","force_04ex#70::OnMyMobDead";
 	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";
-	monster "force_3-1",90,170,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",100,170,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",125,178,"Bathory",1525,1,"force_04ex#70::OnMobEx";
-	monster "force_3-1",125,169,"Bathory",1525,1,"force_04ex#70::OnMobEx";
+	monster "force_3-1",94,179,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",110,179,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",90,170,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",100,170,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",125,178,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
+	monster "force_3-1",125,169,"Bathory",1525,1,"force_04ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_04mob#70	-1,{
-
 OnEnable:
 	donpcevent "force_04ex#70::OnSummonMob_04";
-	monster "force_3-1",87,174,"Stem Worm",1440,1,"force_04mob#70::OnMobDeath";
-	monster "force_3-1",103,174,"Stem Worm",1440,1,"force_04mob#70::OnMobDeath";
-	monster "force_3-1",96,170,"Stem Worm",1440,1,"force_04mob#70::OnMobDeath";
-	set $force_04_70,3;
+	monster "force_3-1",87,174,"Stem Worm",1440,1,"force_04mob#70::OnMyMobDead";
+	monster "force_3-1",103,174,"Stem Worm",1440,1,"force_04mob#70::OnMyMobDead";
+	monster "force_3-1",96,170,"Stem Worm",1440,1,"force_04mob#70::OnMyMobDead";
 	end;
 OnReset:
-	killmonster "force_3-1","force_04mob#70::OnMobDeath";
+	killmonster "force_3-1","force_04mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_70,$force_04_70 -1;
-	if ($force_04_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_04mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On04_End";
 		donpcevent "arena#70::OnReset_04";
 	}
@@ -595,109 +542,97 @@ OnMobDeath:
 }
 
 -	script	force_05start#70	-1,{
-
 OnEnable:
 	donpcevent "force_05mob#70::OnEnable";
 	end;
 }
 
 -	script	force_05ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_05ex#70::OnMobEx";
+	killmonster "force_3-1","force_05ex#70::OnMyMobDead";
 	end;
 
 OnSummonMob_05:
-	set $@randmonster70,rand(1,2);
-	switch($@randmonster70) {
+	switch(rand(1,2)) {
 	case 1:
-		monster "force_3-1",174,174,"Ride Word",1478,1,"force_05ex#70::OnMobEx";
+		monster "force_3-1",174,174,"Ride Word",1478,1,"force_05ex#70::OnMyMobDead";
 		break;
 	case 2:
-		monster "force_3-1",173,173,"Mantis",1457,1,"force_05ex#70::OnMobEx";
+		monster "force_3-1",173,173,"Mantis",1457,1,"force_05ex#70::OnMyMobDead";
 		break;
 	}
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#70	-1,{
-
 OnEnable:
-	monster "force_3-1",164,183,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",168,158,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",175,174,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",176,179,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	monster "force_3-1",183,160,"Argiope",1429,1,"force_05mob#70::OnMobDeath";
-	set $force_05_70,5;
+	monster "force_3-1",164,183,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",168,158,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",175,174,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",176,179,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
+	monster "force_3-1",183,160,"Argiope",1429,1,"force_05mob#70::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_3-1","force_05mob#70::OnMobDeath";
+	killmonster "force_3-1","force_05mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_70,$force_05_70 -1;
-	if ($force_05_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_05mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On05_End";
 		donpcevent "arena#70::OnReset_05";
 	}
 	else donpcevent "force_05ex#70::OnSummonMob_05";
 	end;
-
 }
 
 -	script	force_06start#70	-1,{
-
 OnEnable:
 	donpcevent "force_06mob#70::OnEnable";
 	end;
 }
 
 -	script	force_06ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_06ex#70::OnMobEx";
+	killmonster "force_3-1","force_06ex#70::OnMyMobDead";
 	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";
-	monster "force_3-1",176,97,"Goblin",1535,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",170,108,"Goblin",1535,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",176,112,"Goblin",1536,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",173,120,"Goblin",1536,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",177,74,"Goblin",1536,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",173,118,"Goblin",1538,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",171,101,"Goblin",1538,1,"force_06ex#70::OnMobEx";
-	monster "force_3-1",174,118,"Goblin",1538,1,"force_06ex#70::OnMobEx";
+	monster "force_3-1",176,99,"Goblin",1534,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",170,86,"Goblin",1535,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",176,97,"Goblin",1535,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",170,108,"Goblin",1535,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",176,112,"Goblin",1536,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",173,120,"Goblin",1536,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",177,74,"Goblin",1536,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",173,118,"Goblin",1538,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",171,101,"Goblin",1538,1,"force_06ex#70::OnMyMobDead";
+	monster "force_3-1",174,118,"Goblin",1538,1,"force_06ex#70::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_06mob#70	-1,{
-
 OnEnable:
 	donpcevent "force_06ex#70::OnSummonMob_06";
-	monster "force_3-1",173,90,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",173,79,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",172,70,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",175,70,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	monster "force_3-1",171,118,"Goblin",1537,1,"force_06mob#70::OnMobDeath";
-	set $force_06_70,5;
+	monster "force_3-1",173,90,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",173,79,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",172,70,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",175,70,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
+	monster "force_3-1",171,118,"Goblin",1537,1,"force_06mob#70::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_3-1","force_06mob#70::OnMobDeath";
+	killmonster "force_3-1","force_06mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_70,$force_06_70 -1;
-	if ($force_06_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_06mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On06_End";
 		donpcevent "arena#70::OnReset_06";
 	}
@@ -705,53 +640,49 @@ OnMobDeath:
 }
 
 -	script	force_07start#70	-1,{
-
 OnEnable:
 	donpcevent "force_07mob#70::OnEnable";
 	end;
 }
 
 -	script	force_07ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_07ex#70::OnMobEx";
+	killmonster "force_3-1","force_07ex#70::OnMyMobDead";
 	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";
-	monster "force_3-1",160,23,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",188,33,"Nightmare",1427,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",174,13,"Raydric",1453,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",163,15,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",164,15,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",163,16,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",164,16,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",187,13,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",187,14,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMobEx";
-
-
-OnMobEx:
+	monster "force_3-1",168,26,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",186,23,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",160,23,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",188,33,"Nightmare",1427,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",174,13,"Raydric",1453,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",163,15,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",164,15,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",163,16,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",164,16,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",187,13,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",187,14,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	monster "force_3-1",186,14,"Farmiliar",1419,1,"force_07ex#70::OnMyMobDead";
+	end;
+
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_07mob#70	-1,{
-
 OnEnable:
 	donpcevent "force_07ex#70::OnSummonMob_07";
-	monster "force_3-1",174,25,"Alice",1521,1,"force_07mob#70::OnMobDeath";
-	set $force_07_70,1;
+	monster "force_3-1",174,25,"Alice",1521,1,"force_07mob#70::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_3-1","force_07mob#70::OnMobDeath";
+	killmonster "force_3-1","force_07mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_70,$force_07_70 -1;
-	if ($force_07_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_07mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On07_End";
 		donpcevent "arena#70::OnReset_07";
 	}
@@ -759,71 +690,64 @@ OnMobDeath:
 }
 
 -	script	force_08start#70	-1,{
-
 OnEnable:
 	donpcevent "force_08ex#70::OnEnable";
 	end;
 }
 
 -	script	force_08ex#70	-1,{
-
 OnEnable:
 	donpcevent "arena#70::OnReset_08";
 	end;
 }
 
 -	script	force_09start#70	-1,{
-
 OnEnable:
 	donpcevent "force_09mob#70::OnEnable";
 	end;
 }
 
 -	script	force_09ex#70	-1,{
-
 OnReset:
-	killmonster "force_3-1","force_09ex#70::OnMobEx";
+	killmonster "force_3-1","force_09ex#70::OnMyMobDead";
 	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";
-	monster "force_3-1",93,99,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",87,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",89,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",91,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",93,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",95,114,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,112,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,110,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,108,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,106,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	monster "force_3-1",85,104,"Familiar",1419,1,"force_09ex#70::OnMobEx";
-	end;
-
-OnMobEx:
+	monster "force_3-1",93,100,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",94,100,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",93,99,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",87,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",89,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",91,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",93,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",95,114,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,112,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,110,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,108,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,106,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	monster "force_3-1",85,104,"Familiar",1419,1,"force_09ex#70::OnMyMobDead";
+	end;
+
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#70	-1,{
-
 OnEnable:
-	monster "force_3-1",99,99,"Kobold Leader",1548,1,"force_09mob#70::OnMobDeath";
-	monster "force_3-1",98,99,"Kobold",1545,1,"force_09mob#70::OnMobDeath";
-	monster "force_3-1",100,99,"Kobold",1546,1,"force_09mob#70::OnMobDeath";
-	monster "force_3-1",99,98,"Kobold",1547,1,"force_09mob#70::OnMobDeath";
+	monster "force_3-1",99,99,"Kobold Leader",1548,1,"force_09mob#70::OnMyMobDead";
+	monster "force_3-1",98,99,"Kobold",1545,1,"force_09mob#70::OnMyMobDead";
+	monster "force_3-1",100,99,"Kobold",1546,1,"force_09mob#70::OnMyMobDead";
+	monster "force_3-1",99,98,"Kobold",1547,1,"force_09mob#70::OnMyMobDead";
 	donpcevent "force_09ex#70::OnSummonMob_09";
-	set $force_09_70,4;
 	end;
 
 OnReset:
-	killmonster "force_3-1","force_09mob#70::OnMobDeath";
+	killmonster "force_3-1","force_09mob#70::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_70,$force_09_70 -1;
-	if ($force_09_70 < 1) {
+OnMyMobDead:
+	if (mobcount("force_3-1","force_09mob#70::OnMyMobDead") < 1) {
 		donpcevent "Cadillac#arena::On09_End";
 		donpcevent "arena#70::OnReset_09";
 		donpcevent "arena#70::OnReset_All";
@@ -834,7 +758,6 @@ OnMobDeath:
 }
 
 prt_are_in,129,83,3	script	Staff#70-1	67,{
-
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -856,29 +779,19 @@ prt_are_in,129,83,3	script	Staff#70-1	67,{
 }
 
 prt_are_in,25,84,3	script	Staff#70-2	67,{
-
-	if($arena_min70end < $arena_min70st)
-	{
-		if($arena_sec70end < $arena_sec70st)
-		{
+	if($arena_min70end < $arena_min70st) {
+		if($arena_sec70end < $arena_sec70st) {
 			set @record_min70,60 - $arena_min70st + $arena_min70end -1;
 			set @record_sec70,60 - $arena_sec70st + $arena_sec70end;
-		}
-		else
-		{
+		} else {
 			set @record_min70,60 - $arena_min70st + $arena_min70end;
 			set @record_sec70,$arena_sec70end - $arena_sec70st;
 		}
-	}
-	else
-	{
-		if($arena_sec70end < $arena_sec70st)
-		{
+	} else {
+		if($arena_sec70end < $arena_sec70st) {
 			set @record_min70,$arena_min70end - $arena_min70st -1;
 			set @record_sec70,60 - $arena_sec70st + $arena_sec70end;
-		}
-		else
-		{
+		} else {
 			set @record_min70,$arena_min70end - $arena_min70st;
 			set @record_sec70,$arena_sec70end - $arena_sec70st;
 		}
@@ -915,9 +828,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -935,9 +846,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 		donpcevent "alloff#70::OnEnable";
 		donpcevent "Lv70 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -962,9 +871,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -990,7 +897,6 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 }
 
 -	script	#arn_timer_70	-1,{
-
 OnEnable:
 	initnpctimer;
 	end;
@@ -1018,11 +924,9 @@ OnTimer60000:
 OnStop:
 	stopnpctimer;
 	end;
-
 }
 
 -	script	arn_warp_70	-1,{
-
 OnOut:
 	areawarp "prt_are_in",14,91,29,74,"arena_room",100,75;
 	end;
@@ -1044,7 +948,6 @@ OnNomal2:
 }
 
 -	script	alloff#70	-1,{
-
 OnEnable:
 	mapwarp "force_3-1","prt_are_in",126,190,0,0;
 	donpcevent "force_01mob#70::OnReset";
@@ -1054,16 +957,16 @@ OnEnable:
 	donpcevent "force_05mob#70::OnReset";
 	donpcevent "force_06mob#70::OnReset";
 	donpcevent "force_07mob#70::OnReset";
-	donpcevent "force_08mob#70::OnReset";
+	//donpcevent "force_08mob#70::OnReset";
 	donpcevent "force_09mob#70::OnReset";
-	donpcevent "force_01ex#70::OnReset";
+	//donpcevent "force_01ex#70::OnReset";
 	donpcevent "force_02ex#70::OnReset";
 	donpcevent "force_03ex#70::OnReset";
 	donpcevent "force_04ex#70::OnReset";
 	donpcevent "force_05ex#70::OnReset";
 	donpcevent "force_06ex#70::OnReset";
 	donpcevent "force_07ex#70::OnReset";
-	donpcevent "force_08ex#70::OnReset";
+	//donpcevent "force_08ex#70::OnReset";
 	donpcevent "force_09ex#70::OnReset";
 	donpcevent "Cadillac#arena::OnTimerOff";
 	disablenpc "Cadillac#arena";
@@ -1085,6 +988,4 @@ OnEnable:
 OnInit:
 	if(!$top_70min && !$top_70sec) set $top_70min,7;
 	end;
-
 }
-

+ 146 - 236
npc/other/arena/arena_lvl80.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,13 +12,14 @@
 //= 1.0 First version.
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
 //= 1.2 Label standardization. [Euphy]
+//= 1.3 Script updates, and removed a level restriction. [Euphy]
 //============================================================
 
 arena_room,147,42,1	script	Lv80 Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 80 to 99",50,"Lv80 Waiting Room::OnStartArena",1,1000,80,99;
+	waitingroom "Individual; Level 80 to "+(checkre(0)?"160":"99"),50,"Lv80 Waiting Room::OnStartArena",1,1000,80;
 	enablewaitingroomevent;
 	end;
 
@@ -36,10 +37,6 @@ OnStart:
 force_4-1,99,20,4	script	Octus#arena	124,{
 	end;
 
-OnInit:
-	set $@mapcount80, 0;
-	end;
-
 OnStart:
 	initnpctimer;
 	set $arena_min80st,gettime(2);
@@ -59,56 +56,49 @@ OnTimer8000:
 	end;
 
 OnTimer60000:
-	set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 7 minutes ",0;
 	end;
 
 OnTimer120000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 6 minutes ",0;
 	end;
 
 OnTimer180000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 5 minutes ",0;
 	end;
 
 OnTimer240000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 4 minutes ",0;
 	end;
 
 OnTimer300000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 3 minutes ",0;
 	end;
 
 OnTimer360000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 2 minutes ",0;
 	end;
 
 OnTimer420000:
-	 set $@mapcount80, getmapusers ("force_4-1");
-	if ($@mapcount80 == 0) {
+	if (getmapusers("force_4-1") == 0) {
 		donpcevent "Octus#arena::OnFailClearStage";
 	}
 	mapannounce "force_4-1","Remaining Time : 1 minute ",0;
@@ -216,11 +206,9 @@ On09_Start:
 On09_End:
 	mapannounce "force_4-1","Boss Clear! - A door at the north has opened. Thank you. ",0;
 	end;
-
 }
 
 -	script	arena#80	-1,{
-
 OnReset_01:
 	donpcevent "force_01ex#80::OnReset";
 	donpcevent "force_02start#80::OnEnable";
@@ -254,7 +242,7 @@ OnReset_05:
 OnReset_06:
 	enablenpc "force_06_07#80";
 	donpcevent "force_07start#80::OnEnable";
-	donpcevent "force_06ex#80::OnReset";
+	//donpcevent "force_06ex#80::OnReset";
 	end;
 
 OnReset_07:
@@ -283,7 +271,7 @@ OnStart:
 	disablenpc "force_08_09#80";
 	disablenpc "force_exit#80";
 	donpcevent "Octus#arena::OnTimerOff";
-	donpcevent "force_09mob#80::OnTimerOff";
+	//donpcevent "force_09mob#80::OnTimerOff";
 	donpcevent "force_01mob#80::OnReset";
 	donpcevent "force_02mob#80::OnReset";
 	donpcevent "force_03mob#80::OnReset";
@@ -291,14 +279,14 @@ OnStart:
 	donpcevent "force_05mob#80::OnReset";
 	donpcevent "force_06mob#80::OnReset";
 	donpcevent "force_07mob#80::OnReset";
-	donpcevent "force_08mob#80::OnReset";
+	//donpcevent "force_08mob#80::OnReset";
 	donpcevent "force_09mob#80::OnReset";
 	donpcevent "force_01ex#80::OnReset";
 	donpcevent "force_03ex#80::OnReset";
 	donpcevent "force_04ex#80::OnReset";
 	donpcevent "force_05ex#80::OnReset";
 	donpcevent "force_07ex#80::OnReset";
-	donpcevent "force_08ex#80::OnReset";
+	//donpcevent "force_08ex#80::OnReset";
 	donpcevent "force_09ex#80::OnReset";
 	enablenpc "force_08_01#80";
 	donpcevent "force_01start#80::OnEnable";
@@ -319,41 +307,33 @@ OnReset_All:
 	donpcevent "force_04ex#80::OnReset";
 	donpcevent "force_05ex#80::OnReset";
 	donpcevent "force_07ex#80::OnReset";
-	donpcevent "force_08ex#80::OnReset";
+	//donpcevent "force_08ex#80::OnReset";
 	donpcevent "force_09ex#80::OnReset";
 	end;
-
 }
 
 force_4-1,62,26,1	script	force_08_01#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On01_Start";
 	warp "force_4-1",40,26;
 	end;
-
 }
 
 force_4-1,25,44,1	script	force_01_02#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On02_Start";
 	warp "force_4-1",25,69;
 	end;
-
 }
 
 force_4-1,25,134,1	script	force_02_03#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On03_Start";
 	warp "force_4-1",25,159;
 	end;
-
 }
 
 force_4-1,44,174,1	script	force_03_04#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On04_Start";
 	warp "force_4-1",69,174;
@@ -362,106 +342,88 @@ OnTouch:
 }
 
 force_4-1,134,174,1	script	force_04_05#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On05_Start";
 	warp "force_4-1",159,174;
 	end;
-
 }
 
 force_4-1,174,155,1	script	force_05_06#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On06_Start";
 	warp "force_4-1",174,130;
 	end;
-
 }
 
 force_4-1,174,65,1	script	force_06_07#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On07_Start";
 	warp "force_4-1",174,40;
 	end;
-
 }
 
 force_4-1,155,26,1	script	force_07_08#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On08_Start";
 	warp "force_4-1",132,26;
 	enablenpc "force_08_09#80";
 	end;
-
 }
 
 force_4-1,99,54,1	script	force_08_09#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::On09_Start";
 	warp "force_4-1",99,82;
 	end;
-
 }
 
 force_4-1,99,124,1	script	force_exit#80	45,1,1,{
-
 OnTouch:
 	donpcevent "Octus#arena::OnTimerOff";
 	donpcevent "#arn_timer_80::OnEnable";
 	mapwarp "force_4-1","prt_are_in",73,192,0,0;
 	end;
-
 }
 
 -	script	force_01start#80	-1,{
-
 OnEnable:
 	donpcevent "force_01mob#80::OnEnable";
 	end;
 }
 
 -	script	force_01ex#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_01ex#80::OnMobEx";
+	killmonster "force_4-1","force_01ex#80::OnMyMobDead";
 	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";
-	monster "force_4-1",25,25,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
-	monster "force_4-1",35,13,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
-	monster "force_4-1",18,33,"Hunter Fly",1422,1,"force_01ex#80::OnMobEx";
+	monster "force_4-1",11,25,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",22,22,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",25,25,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",35,13,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
+	monster "force_4-1",18,33,"Hunter Fly",1422,1,"force_01ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
-
 }
 
 -	script	force_01mob#80	-1,{
-
 OnEnable:
-	monster "force_4-1",35,13,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",25,36,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",22,23,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",25,17,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	monster "force_4-1",25,15,"Nightmare",1427,1,"force_01mob#80::OnMobDeath";
-	set $force_01_80,5;
+	monster "force_4-1",35,13,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",25,36,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",22,23,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",25,17,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
+	monster "force_4-1",25,15,"Nightmare",1427,1,"force_01mob#80::OnMyMobDead";
 	donpcevent "force_01ex#80::OnSummonMob1";
 	end;
 
 OnReset:
-	killmonster "force_4-1","force_01mob#80::OnMobDeath";
+	killmonster "force_4-1","force_01mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_01_80,$force_01_80 -1;
-	if ($force_01_80 < 1) {
+OnMyMobDead:
+	if (mobcount("force_4-1","force_01mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On01_End";
 		donpcevent "arena#80::OnReset_01";
 	}
@@ -469,40 +431,36 @@ OnMobDeath:
 }
 
 -	script	force_02start#80	-1,{
-
 OnEnable:
 	donpcevent "force_02mob#80::OnEnable";
 	end;
 }
 
 -	script	force_02mob#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_02mob#80::OnMobDeath";
+	killmonster "force_4-1","force_02mob#80::OnMyMobDead";
 	end;
 
 OnEnable:
-	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";
-	monster "force_4-1",26,90,"Marionette",1459,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,75,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",24,90,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,85,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",24,82,"Deviruchi",1433,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,86,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",27,73,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",26,118,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",25,127,"Skel Prisoner",1479,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,128,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",27,100,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",29,90,"Zombie",1394,1,"force_02mob#80::OnMobDeath";
-	monster "force_4-1",28,128,"Raydric Archer",1453,1,"force_02mob#80::OnMobDeath";
-	set $force_02_80,15;
-	end;
-
-OnMobDeath:
-	set $force_02_80,$force_02_80 -1;
-	if ($force_02_80 < 1) {
+	monster "force_4-1",24,80,"Marionette",1459,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",23,110,"Marionette",1459,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",26,90,"Marionette",1459,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,75,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",24,90,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,85,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",24,82,"Deviruchi",1433,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,86,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",27,73,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",26,118,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",25,127,"Skel Prisoner",1479,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,128,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",27,100,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",29,90,"Zombie",1394,1,"force_02mob#80::OnMyMobDead";
+	monster "force_4-1",28,128,"Raydric Archer",1453,1,"force_02mob#80::OnMyMobDead";
+	end;
+
+OnMyMobDead:
+	if (mobcount("force_4-1","force_02mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On02_End";
 		donpcevent "arena#80::OnReset_02";
 	}
@@ -510,50 +468,45 @@ OnMobDeath:
 }
 
 -	script	force_03start#80	-1,{
-
 OnEnable:
 	donpcevent "force_03mob#80::OnEnable";
 	end;
 }
 
 -	script	force_03ex#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_03ex#80::OnMobEx";
+	killmonster "force_4-1","force_03ex#80::OnMyMobDead";
 	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";
-	monster "force_4-1",31,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",26,178,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",21,178,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",31,178,"Marionette",1459,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",26,186,"Sidewinder",1424,1,"force_03ex#80::OnMobEx";
-	monster "force_4-1",26,161,"Sidewinder",1424,1,"force_03ex#80::OnMobEx";
+	monster "force_4-1",26,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",21,173,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",31,173,"Clock Tower Keeper",1527,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",26,178,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",21,178,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",31,178,"Marionette",1459,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",26,186,"Sidewinder",1424,1,"force_03ex#80::OnMyMobDead";
+	monster "force_4-1",26,161,"Sidewinder",1424,1,"force_03ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_03mob#80	-1,{
-
 OnEnable:
 	donpcevent "force_03ex#80::OnSummonMob_03";
-	monster "force_4-1",23,174,"Assaulter",1364,1,"force_03mob#80::OnMobDeath";
-	monster "force_4-1",18,173,"Assaulter",1364,1,"force_03mob#80::OnMobDeath";
-	set $force_03_80,2;
+	monster "force_4-1",23,174,"Assaulter",1364,1,"force_03mob#80::OnMyMobDead";
+	monster "force_4-1",18,173,"Assaulter",1364,1,"force_03mob#80::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_4-1","force_03mob#80::OnMobDeath";
+	killmonster "force_4-1","force_03mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_80,$force_03_80 -1;
+OnMyMobDead:
 	donpcevent "force_03ex#80::OnSummonMob_03";
-	if ($force_03_80 < 1) {
+	if (mobcount("force_4-1","force_03mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On03_End";
 		donpcevent "arena#80::OnReset_03";
 	}
@@ -561,52 +514,47 @@ OnMobDeath:
 }
 
 -	script	force_04start#80	-1,{
-
 OnEnable:
 	donpcevent "force_04mob#80::OnEnable";
 	end;
 }
 
 -	script	force_04ex#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_04ex#80::OnMobEx";
+	killmonster "force_4-1","force_04ex#80::OnMyMobDead";
 	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";
-	monster "force_4-1",103,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",105,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",107,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",109,177,"Pasana",1464,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",99,170,"Minorous",1461,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",111,170,"Minorous",1461,1,"force_04ex#80::OnMobEx";
-	monster "force_4-1",110,170,"Lava Golem",1549,1,"force_04ex#80::OnMobEx";
+	monster "force_4-1",99,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",101,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",103,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",105,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",107,174,"Archer Skeleton",1420,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",109,177,"Pasana",1464,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",99,170,"Minorous",1461,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",111,170,"Minorous",1461,1,"force_04ex#80::OnMyMobDead";
+	monster "force_4-1",110,170,"Lava Golem",1549,1,"force_04ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 
 }
 
 -	script	force_04mob#80	-1,{
-
 OnEnable:
 	donpcevent "force_04ex#80::OnSummonMob_04";
-	monster "force_4-1",80,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	monster "force_4-1",105,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	monster "force_4-1",90,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	monster "force_4-1",117,172,"Nine Tails",1471,1,"force_04mob#80::OnMobDeath";
-	set $force_04_80,4;
+	monster "force_4-1",80,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
+	monster "force_4-1",105,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
+	monster "force_4-1",90,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
+	monster "force_4-1",117,172,"Nine Tails",1471,1,"force_04mob#80::OnMyMobDead";
 	end;
 OnReset:
-	killmonster "force_4-1","force_04mob#80::OnMobDeath";
+	killmonster "force_4-1","force_04mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_04_80,$force_04_80 -1;
-	if ($force_04_80 < 1) {
+OnMyMobDead:
+	if (mobcount("force_4-1","force_04mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On04_End";
 		donpcevent "arena#80::OnReset_04";
 	}
@@ -614,46 +562,41 @@ OnMobDeath:
 }
 
 -	script	force_05start#80	-1,{
-
 OnEnable:
 	donpcevent "force_05mob#80::OnEnable";
 	end;
 }
 
 -	script	force_05ex#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_05ex#80::OnMobEx";
+	killmonster "force_4-1","force_05ex#80::OnMyMobDead";
 	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";
-	monster "force_4-1",171,176,"Petite",1466,1,"force_05ex#80::OnMobEx";
-	monster "force_4-1",188,167,"Petite",1466,1,"force_05ex#80::OnMobEx";
+	monster "force_4-1",168,190,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
+	monster "force_4-1",173,166,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
+	monster "force_4-1",171,176,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
+	monster "force_4-1",188,167,"Petite",1466,1,"force_05ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#80	-1,{
-
 OnEnable:
-	monster "force_4-1",164,174,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	monster "force_4-1",169,159,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	monster "force_4-1",174,183,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	monster "force_4-1",177,170,"Petite",1465,1,"force_05mob#80::OnMobDeath";
-	set $force_05_80,4;
+	monster "force_4-1",164,174,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
+	monster "force_4-1",169,159,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
+	monster "force_4-1",174,183,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
+	monster "force_4-1",177,170,"Petite",1465,1,"force_05mob#80::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_4-1","force_05mob#80::OnMobDeath";
+	killmonster "force_4-1","force_05mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_05_80,$force_05_80 -1;
-	if ($force_05_80 < 1) {
+OnMyMobDead:
+	if (mobcount("force_4-1","force_05mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On05_End";
 		donpcevent "arena#80::OnReset_05";
 	}
@@ -663,33 +606,35 @@ OnMobDeath:
 }
 
 -	script	force_06start#80	-1,{
-
 OnEnable:
 	donpcevent "force_06mob#80::OnEnable";
 	end;
 }
 
--	script	force_06mob#80	-1,{
+-	script	force_06ex#80	-1,{
+OnEnable:
+	donpcevent "Octus#arena::On06_start";
+	end;
+}
 
+-	script	force_06mob#80	-1,{
 OnEnable:
-	monster "force_4-1",173,118,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",173,90,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",177,72,"Baphomet Jr.",1431,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",171,108,"Deviruchi",1433,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",171,85,"Deviruchi",1433,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",171,79,"Alice",1521,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",175,118,"Alice",1521,1,"force_06mob#80::OnMobDeath";
-	monster "force_4-1",175,99,"Alice",1521,1,"force_06mob#80::OnMobDeath";
-	set $force_06_80,8;
+	monster "force_4-1",173,118,"Baphomet Jr.",1431,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",173,90,"Baphomet Jr.",1431,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",177,72,"Baphomet Jr.",1431,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",171,108,"Deviruchi",1433,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",171,85,"Deviruchi",1433,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",171,79,"Alice",1521,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",175,118,"Alice",1521,1,"force_06mob#80::OnMyMobDead";
+	monster "force_4-1",175,99,"Alice",1521,1,"force_06mob#80::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_4-1","force_06mob#80::OnMobDeath";
+	killmonster "force_4-1","force_06mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_06_80,$force_06_80 -1;
-	if ($force_06_80 < 1) {
+OnMyMobDead:
+	if (mobcount("force_4-1","force_06mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On06_End";
 		donpcevent "arena#80::OnReset_06";
 	}
@@ -697,45 +642,40 @@ OnMobDeath:
 }
 
 -	script	force_07start#80	-1,{
-
 OnEnable:
 	donpcevent "force_07mob#80::OnEnable";
 	end;
 }
 
 -	script	force_07ex#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_07ex#80::OnMobEx";
+	killmonster "force_4-1","force_07ex#80::OnMyMobDead";
 	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";
-	monster "force_4-1",163,23,"Merman",1451,1,"force_07ex#80::OnMobEx";
+	monster "force_4-1",160,34,"Merman",1451,1,"force_07ex#80::OnMyMobDead";
+	monster "force_4-1",163,27,"Merman",1451,1,"force_07ex#80::OnMyMobDead";
+	monster "force_4-1",163,23,"Merman",1451,1,"force_07ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_07mob#80	-1,{
-
 OnEnable:
 	donpcevent "force_07ex#80::OnSummonMob_07";
-	monster "force_4-1",165,27,"Fur-Seal",1533,1,"force_07mob#80::OnMobDeath";
-	monster "force_4-1",184,23,"Fur-Seal",1533,1,"force_07mob#80::OnMobDeath";
-	monster "force_4-1",174,19,"Fur-Seal",1533,1,"force_07mob#80::OnMobDeath";
-	set $force_07_80,3;
+	monster "force_4-1",165,27,"Fur-Seal",1533,1,"force_07mob#80::OnMyMobDead";
+	monster "force_4-1",184,23,"Fur-Seal",1533,1,"force_07mob#80::OnMyMobDead";
+	monster "force_4-1",174,19,"Fur-Seal",1533,1,"force_07mob#80::OnMyMobDead";
 	end;
 
 OnReset:
-	killmonster "force_4-1","force_07mob#80::OnMobDeath";
+	killmonster "force_4-1","force_07mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_07_80,$force_07_80 -1;
-	if ($force_07_80 < 1) {
+OnMyMobDead:
+	if (mobcount("force_4-1","force_07mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On07_End";
 		donpcevent "arena#80::OnReset_07";
 	}
@@ -743,59 +683,52 @@ OnMobDeath:
 }
 
 -	script	force_08start#80	-1,{
-
 OnEnable:
 	donpcevent "force_08ex#80::OnEnable";
 	end;
 }
 
 -	script	force_08ex#80	-1,{
-
 OnEnable:
 	donpcevent "arena#80::OnReset_08";
 	end;
 }
 
 -	script	force_09start#80	-1,{
-
 OnEnable:
 	donpcevent "force_09mob#80::OnEnable";
 	end;
 }
 
 -	script	force_09ex#80	-1,{
-
 OnReset:
-	killmonster "force_4-1","force_09ex#80::OnMobEx";
+	killmonster "force_4-1","force_09ex#80::OnMyMobDead";
 	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";
-	monster "force_4-1",122,99,"Argos",1430,1,"force_09ex#80::OnMobEx";
-	monster "force_4-1",88,107,"Argos",1430,1,"force_09ex#80::OnMobEx";
-	monster "force_4-1",85,104,"Argos",1430,1,"force_09ex#80::OnMobEx";
+	monster "force_4-1",91,99,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",95,105,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",122,99,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",88,107,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
+	monster "force_4-1",85,104,"Argos",1430,1,"force_09ex#80::OnMyMobDead";
 	end;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_09mob#80	-1,{
-
 OnEnable:
-	monster "force_4-1",99,99,"Ancient Mummy",1522,1,"force_09mob#80::OnMobDeath";
+	monster "force_4-1",99,99,"Ancient Mummy",1522,1,"force_09mob#80::OnMyMobDead";
 	donpcevent "force_09ex#80::OnSummonMob_09";
-	set $force_09_80,1;
 	end;
 
 OnReset:
-	killmonster "force_4-1","force_09mob#80::OnMobDeath";
+	killmonster "force_4-1","force_09mob#80::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_80,$force_09_80 -1;
-	if ($force_09_80 < 1) {
+OnMyMobDead:
+	if (mobcount("force_4-1","force_09mob#80::OnMyMobDead") < 1) {
 		donpcevent "Octus#arena::On09_End";
 		donpcevent "arena#80::OnReset_09";
 		donpcevent "arena#80::OnReset_All";
@@ -806,7 +739,6 @@ OnMobDeath:
 }
 
 prt_are_in,181,188,3	script	Staff#80-1	67,{
-
 	mes "[Staff]";
 	mes "You did a good job.";
 	mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -828,29 +760,19 @@ prt_are_in,181,188,3	script	Staff#80-1	67,{
 }
 
 prt_are_in,77,187,3	script	Staff#80-2	67,{
-
-	if($arena_min80end < $arena_min80st)
-	{
-		if($arena_sec80end < $arena_sec80st)
-		{
+	if($arena_min80end < $arena_min80st) {
+		if($arena_sec80end < $arena_sec80st) {
 			set @record_min80,60 - $arena_min80st + $arena_min80end -1;
 			set @record_sec80,60 - $arena_sec80st + $arena_sec80end;
-		}
-		else
-		{
+		} else {
 			set @record_min80,60 - $arena_min80st + $arena_min80end;
 			set @record_sec80,$arena_sec80end - $arena_sec80st;
 		}
-	}
-	else
-	{
-		if($arena_sec80end < $arena_sec80st)
-		{
+	} else {
+		if($arena_sec80end < $arena_sec80st) {
 			set @record_min80,$arena_min80end - $arena_min80st -1;
 			set @record_sec80,60 - $arena_sec80st + $arena_sec80end;
-		}
-		else
-		{
+		} else {
 			set @record_min80,$arena_min80end - $arena_min80st;
 			set @record_sec80,$arena_sec80end - $arena_sec80st;
 		}
@@ -887,9 +809,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			set arena_point, arena_point + 20;
 			mes "[Staff]";
 			mes "Let me reward you some arena points.";
@@ -907,9 +827,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 		donpcevent "alloff#80::OnEnable";
 		donpcevent "Lv80 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -934,9 +852,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 			mes "I hope you had a good time and let me guide you to the entrance of arena.";
 			mes "Thank you.";
 			close2;
-		}
-		else
-		{
+		} else {
 			mes "[Staff]";
 			mes "Let me reward you with some arena points.";
 			mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time.";
@@ -962,7 +878,6 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 }
 
 -	script	#arn_timer_80	-1,{
-
 OnEnable:
 	initnpctimer;
 	end;
@@ -990,11 +905,9 @@ OnTimer60000:
 OnStop:
 	stopnpctimer;
 	end;
-
 }
 
 -	script	arn_warp_80	-1,{
-
 OnOut:
 	areawarp "prt_are_in",66,195,81,178,"arena_room",100,75;
 	end;
@@ -1016,7 +929,6 @@ OnNomal2:
 }
 
 -	script	alloff#80	-1,{
-
 OnEnable:
 	mapwarp "force_4-1","prt_are_in",126,190,0,0;
 	donpcevent "force_01mob#80::OnReset";
@@ -1026,14 +938,14 @@ OnEnable:
 	donpcevent "force_05mob#80::OnReset";
 	donpcevent "force_06mob#80::OnReset";
 	donpcevent "force_07mob#80::OnReset";
-	donpcevent "force_08mob#80::OnReset";
+	//donpcevent "force_08mob#80::OnReset";
 	donpcevent "force_09mob#80::OnReset";
 	donpcevent "force_01ex#80::OnReset";
 	donpcevent "force_03ex#80::OnReset";
 	donpcevent "force_04ex#80::OnReset";
 	donpcevent "force_05ex#80::OnReset";
 	donpcevent "force_07ex#80::OnReset";
-	donpcevent "force_08ex#80::OnReset";
+	//donpcevent "force_08ex#80::OnReset";
 	donpcevent "force_09ex#80::OnReset";
 	donpcevent "Octus#arena::OnTimerOff";
 	disablenpc "Octus#arena";
@@ -1055,6 +967,4 @@ OnEnable:
 OnInit:
 	if(!$top_80min && !$top_80sec) set $top_80min,8;
 	end;
-
 }
-

Plik diff jest za duży
+ 290 - 381
npc/other/arena/arena_party.txt


Plik diff jest za duży
+ 346 - 409
npc/other/arena/arena_room.txt


+ 1 - 0
npc/pre-re/scripts_warps.conf

@@ -19,4 +19,5 @@ npc: npc/pre-re/warps/fields/veins_fild.txt
 npc: npc/pre-re/warps/fields/yuno_fild.txt
 
 // --------------------------- Others ---------------------------
+npc: npc/pre-re/warps/other/arena.txt
 npc: npc/pre-re/warps/other/sign.txt

+ 16 - 0
npc/pre-re/warps/other/arena.txt

@@ -0,0 +1,16 @@
+//===== rAthena Script =======================================
+//= Arena Warps
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal warps.
+//============================================================
+
+izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220

+ 1 - 0
npc/re/scripts_warps.conf

@@ -35,6 +35,7 @@ npc: npc/re/warps/fields/veins_fild.txt
 npc: npc/re/warps/fields/yuno_fild.txt
 
 // --------------------------- Others ---------------------------
+npc: npc/re/warps/other/arena.txt
 npc: npc/re/warps/other/jobquests.txt
 npc: npc/re/warps/other/paradise.txt
 npc: npc/re/warps/other/s_workshop.txt

+ 20 - 0
npc/re/warps/other/arena.txt

@@ -0,0 +1,20 @@
+//===== rAthena Script =======================================
+//= Arena Warps
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal warps.
+//============================================================
+
+izlude,213,161,0	warp	welcome_arena	1,1,arena_room,100,30
+izlude_a,213,161,0	warp	welcome_arena_a	1,1,arena_room,100,30
+izlude_b,213,161,0	warp	welcome_arena_b	1,1,arena_room,100,30
+izlude_c,213,161,0	warp	welcome_arena_c	1,1,arena_room,100,30
+izlude_d,213,161,0	warp	welcome_arena_d	1,1,arena_room,100,30
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,209,161

+ 54 - 31
npc/warps/other/arena.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,10 +12,11 @@
 //= 1.0 First version, done by SinSloth. [MasterOfMuppets]
 //= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus]
 //= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth]
+//= 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy]
 //============================================================
 
-izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
-arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
+// Main Room Warps
+//============================================================
 arena_room,84,103,0	warp	arn_room_11_1	1,1,arena_room,63,130
 arena_room,63,126,0	warp	arn_room_11_2	1,1,arena_room,87,100
 arena_room,76,87,0	warp	arn_room_9_1	1,1,arena_room,46,87
@@ -28,44 +29,66 @@ arena_room,123,88,0	warp	arn_room_3_1	1,1,arena_room,153,87
 arena_room,150,87,0	warp	arn_room_3_2	1,1,arena_room,120,87
 prt_are_in,54,13,0	warp	toarn_room	1,1,arena_room,100,77
 
-sec_in02,79,180,3	script	#arenacontrol	81,{
+// Acolyte Warps
+//============================================================
+arena_room,135,126,0	warp	byeaco#arena	1,1,arena_room,111,99
+force_5-1,25,44,0	warp	force_01_02#aco	1,1,force_5-1,25,69
+force_5-1,25,134,0	warp	force_02_03#aco	1,1,force_5-1,25,159
+force_5-1,44,174,0	warp	force_03_04#aco	1,1,force_5-1,69,174
+force_5-1,134,174,0	warp	force_04_05#aco	1,1,force_5-1,159,174
+force_5-1,174,155,0	warp	force_05_06#aco	1,1,force_5-1,174,130
+force_5-1,174,65,0	warp	force_06_07#aco	1,1,force_5-1,174,40
+force_5-1,155,26,0	warp	force_07_08#aco	1,1,force_5-1,132,26
+force_5-1,99,54,0	warp	force_08_09#aco	1,1,force_5-1,99,82
+
+// Party Warps
+//============================================================
+force_1-2,85,26,0	warp	force_00_01	1,1,force_1-2,37,26
+force_1-2,114,26,0	warp	force_00_02	1,1,force_1-2,162,26
+force_1-2,99,40,0	warp	force_00_03	1,1,force_1-2,99,66
+force_1-2,41,26,0	warp	force_01_00	1,1,force_1-2,89,26
+force_1-2,158,26,0	warp	force_02_00	1,1,force_1-2,110,26
+force_1-2,99,63,0	warp	force_03_00	1,1,force_1-2,99,36
+force_1-2,84,78,0	warp	force_03_05	1,1,force_1-2,37,78
+force_1-2,115,78,0	warp	force_03_04	1,1,force_1-2,162,78
+force_1-2,158,77,0	warp	force_04_03	1,1,force_1-2,110,78
+force_1-2,41,77,0	warp	force_05_03	1,1,force_1-2,37,78
+force_1-2,25,93,0	warp	force_05_06	1,1,force_1-2,26,118
+force_1-2,49,130,0	warp	force_06_07	1,1,force_1-2,91,125
+force_1-2,107,145,0	warp	force_07_08	1,1,force_1-2,173,118
+force_1-2,158,178,0	warp	force_08_09	1,1,force_1-2,133,178
+force_1-2,55,178,0	warp	force_09_10	1,1,force_1-2,29,178
+force_1-2,33,178,0	warp	force_10_09	1,1,force_1-2,59,178
 
-DLGTEMP:
-	input @input_arena;
-	if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP;	//CHECK
-	if (@input_arena == 0)
-	{
+// GM Control Panel
+//============================================================
+sec_in02,79,180,3	script	#arenacontrol	81,{
+	input .@input;
+	if (.@input == 0) {
 		mes "Error!";
 		close;
-	}
-	else if (@input_arena == 1357)
-	{
+	} else if (.@input == 1357) {
 		mes "Opening Control Panel";
 		mes "' A - R - E - N - A '";
 		next;
 		mes "Please select a";
 		mes "state for the arena.";
 		next;
-		switch( select( "Open.","Closed.") )
-		{
-			case 1:
-				mes "Currently";
-				mes "opening arena.";
-				misceffect EF_ENHANCE;	//CHECK
-				enablenpc "welcome_arena";
-				next;
-				break;
-			case 2:
-				mes "Currently";
-				mes "closing arena.";
-				misceffect EF_EXIT;	//CHECK
-				disablenpc "welcome_arena";
-				next;
-				break;
+		switch(select("Open.:Closed.")) {
+		case 1:
+			mes "Currently";
+			mes "opening arena.";
+			specialeffect EF_ENHANCE;
+			enablenpc "welcome_arena";
+			close;
+		case 2:
+			mes "Currently";
+			mes "closing arena.";
+			specialeffect EF_EXIT;
+			disablenpc "welcome_arena";
+			close;
 		}
-	}
-	else
-	{
+	} else {
 		mes "Closing control panel.";
 		close;
 	}

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików