Merge pull request #201 from Michieru/master

Super-Mega Thanks to Michieru!
NPC Changelog (might be incomplete, did my best)
- npc/battleground/bg_common.txt 
-- 1.4 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius02.txt 
-- 1.5 Label standardization. [Euphy] 
-- 1.6 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra02.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/cities/ayothaya.txt 
-- 1.9 Updated Renewal warp coordinates. 
- npc/cities/izlude.txt 
-- 1.9a A part of Kylick's dialogue is Pre-Renewal only. [Euphy] 
- npc/cities/yuno.txt 
-- 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy] 
- npc/events/bossnia.txt 
-- 1.2 Moved spawns and warps (by Masao) to this file. [Euphy] 
- npc/events/easter_2010.txt 
-- 1.0 First version. [Euphy] 
- npc/events/gdevent_aru.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/gdevent_sch.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/god_se_festival.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/jobs/2-2/rogue.txt 
-- impossible get a Gladius [3]. (bugreport:481) [Samuray22] 
- npc/jobs/2-2e/SoulLinker.txt 
-- 1.6 Updated to match the latest official script. [Euphy] 
- npc/kafras/kafras.txt 
-- 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass] 
-- 1.1b Enabled saving in Izlude duplicates (RE). [Euphy] 
- npc/merchants/alchemist.txt 
-- 1.8 Moved Craft Book Merchant to Renewal path. [Euphy] 
- npc/mobs/citycleaners.txt 
-- 1.2 Split spawns into Pre-RE/RE and Town files. [Euphy] 
- npc/mobs/towns.txt 
-- 1.0 First version. 
- npc/other/Global_Functions.txt 
-- 2.17 Renamed 'F_RandMes' to 'F_Rand'. [Euphy]
-- 2.18 Removed useless 'getJobName' function. [Euphy]
- npc/other/acolyte_warp.txt 
-- 1.0 First version. [Euphy] 
- npc/other/arena/arena_aco.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates, and removed two level restrictions. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/other/arena/arena_lvl50.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl60.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates. [Euphy] 
- npc/other/arena/arena_lvl70.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl80.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_party.txt 
-- 1.4 Label standardization and bug fixes. [Euphy] 
-- 1.5 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_room.txt 
-- 1.2 Label standardization, disabled GM NPCs. [Euphy] 
-- 1.2a Added Renewal level checksk. [Euphy] 
-- 1.3 Script updates. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/hugel_bingo.txt 
-- 1.9 Some optimization/standardization. [Euphy] 
- npc/other/marriage.txt 
-- 1.3 Changed permanent global variables to temporary ones. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/pvp.txt 
-- 2.4 Fixed incorrect use of 'close' and some cleaning. [Joseph] 
-- 2.5 Renewal/Pre-Renewal split. [Euphy] 
- npc/other/turbo_track.txt 
-- 1.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.2 Added Renewal features. [Euphy] 
- npc/pre-re/cities/yuno.txt 
-- 1.0 First version. 
- npc/pre-re/kafras/kafras.txt 
-- 1.0 First version. 
- npc/pre-re/merchants/ammo_boxes.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/ammo_dealer.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/shops.txt 
-- 1.1 Moved Izlude shops to pre-re/re paths. [Streusel] 
- npc/pre-re/mobs/citycleaners.txt 
-- 1.0 First version, Pre-Renewal spawns. 
- npc/pre-re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/pre-re/other/msg_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE path. 
- npc/pre-re/other/pvp.txt 
-- 1.0 First version, Pre-Renewal. 
- npc/pre-re/other/resetskill.txt 
-- 1.0 First version. [L0ne_W0lf] 
- npc/pre-re/other/turbo_track.txt 
-- 1.0 Split Peco Peco Manager NPC. 
- npc/pre-re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/pre-re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/pre-re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
- npc/pre-re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/pre-re/quests/quests_veins.txt 
-- 1.0 First version. 
- npc/pre-re/warps/other/arena.txt 
-- 1.0 First version, Pre-Renewal warps. 
- npc/quests/dandelion_request.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/quests/eye_of_hellion.txt 
-- 2.0 Updated EXP rewards. 
-- 2.1 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/first_class/tu_archer.txt 
-- 1.1 optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_magician01.txt 
-- 1.4 Updated to match the official script. [Euphy] 
- npc/quests/first_class/tu_merchant.txt 
-- 1.1 Fixed bugs, optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_sword.txt 
-- 1.5 Added Renewal Izlude coordinates. 
-- 1.6 Added Pre-Renewal support. [Euphy] 
- npc/quests/first_class/tu_thief01.txt 
-- 1.5 Added Pre-Renewal support. [Euphy] 
- npc/quests/mage_solution.txt 
-- 1.0 Split from Pre-Renewal Mage job quest. [Zopokx] 
- npc/quests/okolnir.txt 
-- 1.1 Some bug fixes. [Toshiro90/Euphy] 
- npc/quests/partyrelay.txt 
-- 1.2 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_13_1.txt 
-- 3.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 3.2 Updated ep13_start and dialog to match official script. [Joseph] 
-- 3.3 Updated to match the latest official script. [Euphy] 
-- 3.3a Added Izlude RE coordinates. [Euphy] 
-- 3.4 Added GM management function and NPC. [Euphy] 
- npc/quests/quests_alberta.txt 
-- 2.6 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_amatsu.txt 
-- 1.5 Added questlog support. [Euphy] 
- npc/quests/quests_geffen.txt 
-- 1.5 Added Number Match Game. [Euphy] 
- npc/quests/quests_juperos.txt 
-- 1.8 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.9 Added GM management NPC. [Euphy] 
- npc/quests/quests_niflheim.txt 
-- Updated to Aegis 10.3 Standed, added Message Delivery Quest. 
-- 1.6 Added questlog support. [Euphy] 
- npc/quests/quests_veins.txt 
-- Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf] 
- npc/quests/seals/god_global.txt 
-- 1.2 Renewal script update. [Euphy] 
- npc/quests/seals/god_weapon_creation.txt 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/seal_status.txt 
-- 1.0 Translated from the official. [L0ne_W0lf] 
-- 1.1 Now checks proper char vars. [L0ne_W0lf] 
-- 1.2 Cleaning. [Euphy] 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/sleipnir_seal.txt 
-- 1.4 Renewal script update. [Euphy] 
- npc/quests/skills/novice_skills.txt 
-- 1.8 Added Baby support. [Zopokx] 
- npc/quests/skills/rogue_skills.txt 
-- 1.8 Some cleaning. [Euphy] 
- npc/quests/skills/sage_skills.txt 
-- 1.5 Optimized. [Euphy] 
- npc/re/airports/izlude.txt 
-- 1.0 Updated to match the new Izlude Map. [Masao] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/cities/dicastes.txt 
-- 1.3 Updated to match official script. [SkittleNugget] 
- npc/re/cities/izlude.txt 
-- 1.1 Updated to match the official script. [Euphy] 
-- 1.2 Added Channel Warper and Izlude duplicates. [Euphy] 
- npc/re/cities/jawaii.txt 
-- 1.1 Moved "Honeymoon Helper" NPC. 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/cities/malangdo.txt 
-- 1.2 Moved "Odgnalam" coordinates. 
-- 1.3 Fixed dialogues. 
-- 1.4 Dialogue edits, source iRO. 
-- 1.5 Added Izlude duplicates. 
- npc/re/cities/malaya.txt 
-- 0.1 Alberta sailors only. [Euphy] 
-- 0.2 Adapted from Masao's conversion. 
-- 1.0 Added remaining NPCs. 
- npc/re/cities/yuno.txt 
-- 1.0 First version. 
- npc/re/guides/guides_alberta.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_aldebaran.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_amatsu.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_ayothaya.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_brasilis.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_comodo.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_dewata.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_dicastes.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_einbroch.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_geffen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_gonryun.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_hugel.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_izlude.txt 
-- 1.2 Added Renewal Izlude viewpoint coordinates. 
-- 1.3 Navigation system update. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/guides/guides_juno.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_lighthalzen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_louyang.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_lutie.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_malaya.txt 
-- 1.0 First version. [Euphy] 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_mora.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_morroc.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_moscovia.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_niflheim.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_payon.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_prontera.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_rachel.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_umbala.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_veins.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/navigation.txt 
-- 1.0 First version. 
- npc/re/guild/invest_main.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/jobs/3-1/guillotine_cross.txt 
-- 1.4 Added missing labels. [Joseph] 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/royal_guard.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/sura.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/re/jobs/novice/novice.txt 
-- 1.0 First version, hand scripted from iRO. [Kisuka] 
-- 1.5 Replaced with the official kRO scripts. [Euphy] 
- npc/re/jobs/repair.txt 
-- 1.0 First version. 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/kafras/kafras.txt 
-- 1.2 Added Port Malaya Kafras. [Euphy] 
-- 1.3 Added Eden Group Kafra. [Euphy] 
-- 1.3a Moved Rune Knight Kafra from job file. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/3rd_trader.txt 
-- 1.3 Added Malangdo/Mora Points NPC. [Euphy] 
-- 1.4 Updated to match the official scripts. [Euphy] 
-- 1.5 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/advanced_refiner.txt 
-- 1.0 Added Malangdo Refiner "Holink". [Euphy] 
- npc/re/merchants/alchemist.txt 
-- 1.0 Split Geneticist shop from main file. [Euphy] 
- npc/re/merchants/ammo_boxes.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/ammo_dealer.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/card_separation.txt 
-- 1.1 Added "Richard" NPC. [Euphy] 
- npc/re/merchants/enchan_mora.txt 
-- 1.2 Bug fixes (bugreport:7930) [DeadlySilence] 
- npc/re/merchants/enchan_upg.txt 
-- 1.0 First version. 
-- 1.1 Standardizing, grammar and bug fixes. [Euphy] 
- npc/re/merchants/flute.txt 
-- 1.2a Fixed some conditions. [Euphy] 
- npc/re/merchants/renters.txt 
-- 2.2 Updated to match the official scripts. [Euphy] 
- npc/re/merchants/shops.txt 
-- 1.7 Added Izlude duplicates. [Euphy] 
- npc/re/mobs/citycleaners.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/mobs/dungeons/ecl_tdun.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/dungeons/mal_dun.txt 
-- 1.2 Added Pouring spawn, source iRO. [Euphy] 
- npc/re/mobs/fields/eclage.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/towns.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/re/other/item_merge.txt 
-- 1.0 First version, currently useless/disabled. 
- npc/re/other/mail.txt 
-- 1.0 First version, Renewal duplicates. 
- npc/re/other/mercenary_rent.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/pvp.txt 
-- 1.0 First version, Renewal. 
- npc/re/other/resetskill.txt 
-- 1.0 First version, Renewal script. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/stone_change.txt 
-- 1.0 First version. 
- npc/re/other/turbo_track.txt 
-- 1.0 Split Mount Manager NPC. 
- npc/re/quests/eden/71-85.txt 
-- 1.3 Updated to match the official scripts. [Euphy] 
- npc/re/quests/eden/eden_iro.txt 
-- 1.0 First version. 
-- 1.1 Edited and added more NPCs, lots of placeholders. [Euphy] 
- npc/re/quests/eden/eden_quests.txt 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/re/quests/homun_s.txt 
-- Genetic quest to mutate a level 99 evolved Homunculus 
-- 1.0 First Version, entirely custom. [Masao] 
- npc/re/quests/magic_books.txt 
-- 1.1 Optimized. [Euphy] 
-- 1.1a Updated NPC name to "Master Velofos". [Euphy] 
- npc/re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/re/quests/mrsmile.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_izlude.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_lighthalzen.txt 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_malangdo.txt 
-- 1.4a Dialogue edits, source iRO. 
-- 1.5 Added Cat Gamers. 
-- 1.6 Added GM management function. 
- npc/re/quests/quests_malaya.txt 
-- 0.4 Added "Cautious Village" and subsequent quests [DeadlySilence] 
-- 0.5 Added "Bakonawa Extermination" quest. [Euphy] 
-- 1.0 Added "Nurse in Port Malaya" and "Pintados Festival" quests. [Euphy] 
-- 1.1 Added GM management function and NPC. [Euphy] 
- npc/re/quests/quests_mora.txt 
-- 1.1 Added GM management function and NPCs. [Euphy] 
- npc/re/quests/quests_morocc.txt 
-- 1.1 Added new warpers for Satan Morroc maps. [Euphy] 
- npc/re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/re/warps/cities/eclage.txt 
-- 1.0a Disabled quest warp. [Euphy] 
- npc/re/warps/cities/izlude.txt 
-- 1.7 Updated to match the official scripts. [Euphy] 
-- 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/cities/malaya.txt 
-- 1.1 Updated to match official scripts. [Masao] 
-- 1.2 Added official Jeepney warp scripts. [Euphy] 
- npc/re/warps/fields/prontera_fild.txt 
-- 1.3a Moved Izlude warp to other file. [Euphy] 
-- 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy] 
-- 1.5 Added Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/other/arena.txt 
-- 1.0 First version, Renewal warps. 
- npc/re/warps/other/jobquests.txt 
-- 2.3 Added exit warps (job_exit) for 2nd class quests. [Euphy] 
- npc/warps/fields/glastheim.txt 
-- 1.5 Fixed random warp coordinates. [Euphy] 
- npc/warps/other/arena.txt 
-- 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy] 
-- 1.4 Added GM management function. [Euphy]

1 files changed, 436 insertions, 519 deletions

diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index b83dc8eea..e100b76f6 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -1,32 +1,34 @@
 //===== Hercules Script ======================================
-//= Izlude Arena lvl 60
+//= Izlude Arena Level 60
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.4
 //===== Description: =========================================
 //= Izlude Battle Arena Level 60
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 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	lvl 60s Waiting Room	124,{
+arena_room,38,88,5	script	Lv60 Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 60 to 79",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60,79;
+	waitingroom "Individual; Level 60 to 79",50,"Lv60 Waiting Room::OnStartArena",1,1000,60,79;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
 	warpwaitingpc "force_2-1",99,12;
-	donpcevent "arena#60::Onstart";
+	donpcevent "arena#60::OnStart";
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
@@ -34,11 +36,7 @@ Onstart:
 force_2-1,99,20,4	script	Minilover#arena	124,{
 	end;
 
-OnInit:
-	set $@mapcount60, 0;
-	end;
-
-Onstart:
+OnStart:
 	initnpctimer;
 	set $arena_min60st,gettime(2);
 	set $arena_sec60st,gettime(1);
@@ -57,41 +55,36 @@ OnTimer5000:
 	end;
 
 OnTimer60000:
-	set $@mapcount60, getmapusers ("force_2-1");
-	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	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) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	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) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	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) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	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) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+	if (getmapusers("force_2-1") == 0) {
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 1 minute ",0;
 	end;
@@ -115,148 +108,146 @@ OnTimer374000:
 
 OnTimer375000:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "Minilover#arena::Onfailclearstage";
+	donpcevent "Minilover#arena::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
- 	donpcevent "cast#60::Ontimeover1";
+OnFailClearStage:
+ 	donpcevent "cast#60::OnTimeOver1";
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "arena#60::Onreset_all";
-	donpcevent "alloff#60::Onon";
-	donpcevent "lvl 60s Waiting Room::Onstart";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "arena#60::OnReset_All";
+	donpcevent "alloff#60::OnEnable";
+	donpcevent "Lv60 Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill at least 5 Goblins while dodging Rotar Zairos!",0;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_2-1","Escape to the north exit from the monsters!",0;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Mantises!",0;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_2-1","Clear! A door to the east room has opened!",0;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all non-aggressive monsters while dodging aggressive monsters!",0;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_2-1","A door to the east room has opened!",0;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters except Hydras and Kaphas!",0;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_2-1","Clear! A door to the south room has opened!",0;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Miyabi Dolls and escape to the south exit!",0;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_2-1","A door to the south room has opened!",0;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters!",0;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_2-1","Clear! A door to the west room has opened!",0;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_2-1","Please escape to the north exit!",0;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must defeat a Goblin Leader!",0;
 	end;
 
-On09_end:
+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";
-	donpcevent "force_02start#60::Onon";
+OnReset_01:
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02start#60::OnEnable";
 	enablenpc "force_01_02#60";
 	enablenpc "force_02_03#60";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03start#60::Onon";
+OnReset_02:
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03start#60::OnEnable";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#60";
-	donpcevent "force_04start#60::Onon";
-	donpcevent "force_03ex#60::Onreset";
+	donpcevent "force_04start#60::OnEnable";
+	donpcevent "force_03ex#60::OnReset";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#60";
-	donpcevent "force_05start#60::Onon";
-	donpcevent "force_04ex#60::Onreset";
+	donpcevent "force_05start#60::OnEnable";
+	donpcevent "force_04ex#60::OnReset";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#60";
-	donpcevent "force_06start#60::Onon";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
+	donpcevent "force_06start#60::OnEnable";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#60";
-	donpcevent "force_07start#60::Onon";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
+	donpcevent "force_07start#60::OnEnable";
+	donpcevent "force_06ex#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#60";
-	donpcevent "force_08start#60::Onon";
+	donpcevent "force_08start#60::OnEnable";
 	end;
 
-Onreset_08:
-	donpcevent "force_09start#60::Onon";
+OnReset_08:
+	donpcevent "force_09start#60::OnEnable";
 	enablenpc "force_08_09#60";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#60";
 	end;
 
-Onstart:
+OnStart:
 	disablenpc "force_01_02#60";
 	disablenpc "force_02_03#60";
 	disablenpc "force_03_04#60";
@@ -266,584 +257,533 @@ Onstart:
 	disablenpc "force_07_08#60";
 	disablenpc "force_08_09#60";
 	disablenpc "force_exit#60";
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#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_09ex#60::Onreset";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#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_09ex#60::OnReset";
 	enablenpc "force_08_01#60";
-	donpcevent "force_01start#60::Onon";
-	donpcevent "Minilover#arena::Onstart";
-	end;
-
-Onreset_all:
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#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_09ex#60::Onreset";
+	donpcevent "force_01start#60::OnEnable";
+	donpcevent "Minilover#arena::OnStart";
+	end;
+
+OnReset_All:
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#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_09ex#60::OnReset";
 	end;
-
 }
 
 force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On01_start";
+	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
 	end;
 }
 
 force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On02_start";
+	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
 	end;
 }
 
 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";
+	donpcevent "arena#60::OnReset_02";
+	donpcevent "Minilover#arena::On03_Start";
 	warp "force_2-1",25,159;
 	end;
 }
 
 force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On04_start";
+	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
 	end;
 }
 
 force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On05_start";
+	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
 	end;
 }
 
 force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On06_start";
+	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
 	end;
 }
 
 force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On07_start";
+	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
 	end;
 }
 
 force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On08_start";
+	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
 	enablenpc "force_08_09#60";
 	end;
 }
 
 force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::On09_start";
+	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
 	end;
 }
 
 force_2-1,99,124,1	script	force_exit#60	45,1,1,{
-
 OnTouch:
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "#arn_timer_60::Onon";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "#arn_timer_60::OnEnable";
 	mapwarp "force_2-1","prt_are_in",22,139,0,0;
 	end;
 }
 
 -	script	force_01start#60	-1,{
-
-Onon:
-	donpcevent "force_01mob#60::Onon";
-end;
+OnEnable:
+	donpcevent "force_01mob#60::OnEnable";
+	end;
 }
 
 -	script	force_01ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_01ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_01ex#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMobEx";
+OnEnable:
+	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";
-	end;
-
-Onon:
-	donpcevent "force_01ex#60::Onon";
-	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) {
-		donpcevent "Minilover#arena::On01_end";
-		donpcevent "arena#60::Onreset_01";
+OnReset:
+	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::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";
 	}
 	end;
 }
 
 -	script	force_02start#60	-1,{
-
-Onon:
-	donpcevent "force_02mob#60::Onon";
+OnEnable:
+	donpcevent "force_02mob#60::OnEnable";
 	end;
 }
 
 -	script	force_02mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_02mob#60::OnMobEx";
-	end;
-Onon:
-	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:
+OnReset:
+	killmonster "force_2-1","force_02mob#60::OnMyMobDead";
+	end;
+OnEnable:
+	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,{
-
-Onon:
-	donpcevent "force_03mob#60::Onon";
+OnEnable:
+	donpcevent "force_03mob#60::OnEnable";
 	end;
 }
 
 -	script	force_03ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_03ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_03ex#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",26,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	monster "force_2-1",21,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
-	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";
+OnEnable:
+	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,{
-
-Onon:
-	donpcevent "force_03ex#60::Onon";
-	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;
+OnEnable:
+	donpcevent "force_03ex#60::OnEnable";
+	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";
+OnReset:
+	killmonster "force_2-1","force_mob01#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_03_60,$force_03_60 -1;
-	if ($force_03_60 < 1) {
-		donpcevent "Minilover#arena::On03_end";
-		donpcevent "arena#60::Onreset_03";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_03mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On03_End";
+		donpcevent "arena#60::OnReset_03";
 	}
 	end;
 }
 
 -	script	force_04start#60	-1,{
-
-Onon:
-	donpcevent "force_04mob#60::Onon";
+OnEnable:
+	donpcevent "force_04mob#60::OnEnable";
 	end;
 }
 
 -	script	force_04ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_04ex#60::OnMobEx";
+OnReset:
+	killmonster "force_2-1","force_04ex#60::OnMyMobDead";
 	end;
 
-Onon:
-	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";
+OnEnable:
+	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";
+OnReset:
+	killmonster "force_2-1","force_04mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	donpcevent "force_04ex#60::Onon";
-	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;
+OnEnable:
+	donpcevent "force_04ex#60::OnEnable";
+	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) {
-		donpcevent "force_04ex#60::Onreset";
-		donpcevent "Minilover#arena::On04_end";
-		donpcevent "arena#60::Onreset_04";
+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";
 	}
 	end;
 }
 
 -	script	force_05start#60	-1,{
-
-Onon:
-	donpcevent "force_05mob#60::Onon";
+OnEnable:
+	donpcevent "force_05mob#60::OnEnable";
 	end;
 }
 
 -	script	force_05ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_05ex#60::OnMobEx";
+OnReset:
+	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";
+OnSummonMob_05:
+	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;
 
-OnMobEx:
+OnMyMobDead:
 	end;
 }
 
 -	script	force_05mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_05mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_05mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	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;
+OnEnable:
+	donpcevent "force_05ex#60::OnSummonMob_05";
+	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) {
-		donpcevent "Minilover#arena::On05_end";
-		donpcevent "arena#60::Onreset_05";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_05mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On05_End";
+		donpcevent "arena#60::OnReset_05";
 	}
 	end;
 }
 
 -	script	force_06start#60	-1,{
-
-Onon:
-	donpcevent "force_06mob#60::Onon";
+OnEnable:
+	donpcevent "force_06mob#60::OnEnable";
 	end;
 }
 
 -	script	force_06ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_06ex#60::OnMobEx";
-	end;
-
-Onon:
-	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) {
+OnReset:
+	killmonster "force_2-1","force_06ex#60::OnMyMobDead";
+	end;
+
+OnEnable:
+	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";
+OnReset:
+	killmonster "force_2-1","force_06mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	donpcevent "force_06ex#60::Onon";
-	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;
+OnEnable:
+	donpcevent "force_06ex#60::OnEnable";
+	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;
-		donpcevent "Minilover#arena::On06_end";
-		donpcevent "arena#60::Onreset_06";
+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,{
-
-Onon:
-	donpcevent "force_07mob#60::Onon";
+OnEnable:
+	donpcevent "force_07mob#60::OnEnable";
 	end;
 }
 
 -	script	force_07mob#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_07mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_07mob#60::OnMyMobDead";
 	end;
 
-Onon:
-	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
-	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
-	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;
+OnEnable:
+	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) {
-		donpcevent "Minilover#arena::On07_end";
-		donpcevent "arena#60::Onreset_07";
+OnMyMobDead:
+	if (mobcount("force_2-1","force_07mob#60::OnMyMobDead") < 1) {
+		donpcevent "Minilover#arena::On07_End";
+		donpcevent "arena#60::OnReset_07";
 	}
 	end;
 }
 
 -	script	force_08start#60	-1,{
-
-Onon:
-	donpcevent "force_08ex#60::Onon";
+OnEnable:
+	donpcevent "force_08ex#60::OnEnable";
 	end;
 }
 
 -	script	force_08ex#60	-1,{
-
-Onon:
-	donpcevent "arena#60::Onreset_08";
+OnEnable:
+	donpcevent "arena#60::OnReset_08";
 	end;
 }
 
 -	script	force_09start#60	-1,{
-
-Onon:
-	donpcevent "force_09mob#60::Onon";
+OnEnable:
+	donpcevent "force_09mob#60::OnEnable";
 	end;
 }
 
 -	script	force_09ex#60	-1,{
-
-Onreset:
-	killmonster "force_2-1","force_09ex#60::OnMobEx";
-	end;
-
-Onsummonmob_09:
-	monster "force_2-1",90,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	monster "force_2-1",92,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
-	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:
+OnReset:
+	killmonster "force_2-1","force_09ex#60::OnMyMobDead";
+	end;
+
+OnSummonMob_09:
+	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,{
-
-Onon:
-	donpcevent "force_09ex#60::Onsummonmob_09";
-	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMobDeath";
-	set $force_09_60,1;
+OnEnable:
+	donpcevent "force_09ex#60::OnSummonMob_09";
+	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMyMobDead";
 	end;
 
-Onreset:
-	killmonster "force_2-1","force_09mob#60::OnMobDeath";
+OnReset:
+	killmonster "force_2-1","force_09mob#60::OnMyMobDead";
 	end;
 
-OnMobDeath:
-	set $force_09_60,$force_09_60 -1;
-	if ($force_09_60 < 1) {
-		donpcevent "Minilover#arena::On09_end";
-		donpcevent "arena#60::Onreset_09";
-		donpcevent "arena#60::Onreset_all";
+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";
 		set $arena_min60end,gettime(2);
 		set $arena_sec60end,gettime(1);
 	}
@@ -851,7 +791,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.";
@@ -873,29 +812,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;
 		}
@@ -911,7 +840,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 	mes "Congratulations!";
 	next;
 	mes "[Staff]";
-	mes "The fastest player among people who cleared lvl 60s arena time force battle is ^3131FF"+$arena_60topn$+"^000000.";
+	mes "The fastest player among people who cleared Lv60 arena time force battle is ^3131FF"+$arena_60topn$+"^000000.";
 	next;
 	mes "[Staff]";
 	mes "^3131FF"+$arena_60topn$+"^000000's running time was ^3131FF"+$top_60min+"^000000minutes ^3131FF"+$top_60sec+"^000000seconds.";
@@ -932,9 +861,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.";
@@ -946,15 +873,13 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			close2;
 		}
 		specialeffect2 EF_EXIT;
- 		donpcevent "cast#60::Onnomal1";
+ 		donpcevent "cast#60::OnNomal1";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_60::Onstop";
-		donpcevent "alloff#60::Onon";
-		donpcevent "lvl 60s Waiting Room::Onstart";
+		donpcevent "#arn_timer_60::OnStop";
+		donpcevent "alloff#60::OnEnable";
+		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
-	}
-	else
-	{
+	} else {
 		emotion e_omg;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
@@ -965,7 +890,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 		set $top_60min, @record_min60;
 		set $top_60sec, @record_sec60;
 		set $arena_60topn$,strcharinfo(0);
-		donpcevent "Vendigos::Onlinerec_60";
+		donpcevent "Vendigos::OnLineRec_60";
 		next;
 		if (arena_point > 29950) {
 			mes "[Staff]";
@@ -979,9 +904,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.";
@@ -997,19 +920,17 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			close2;
 		}
 		specialeffect2 EF_HIT5;
- 		donpcevent "cast#60::Onnomal2";
+ 		donpcevent "cast#60::OnNomal2";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_60::Onstop";
-		donpcevent "alloff#60::Onon";
-		donpcevent "lvl 60s Waiting Room::Onstart";
+		donpcevent "#arn_timer_60::OnStop";
+		donpcevent "alloff#60::OnEnable";
+		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
 	}
-
 }
 
 -	script	#arn_timer_60	-1,{
-
-Onon:
+OnEnable:
 	initnpctimer;
 	end;
 
@@ -1026,65 +947,62 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#60::Ontimeover2";
-	donpcevent "arn_warp_60::Onout";
-	donpcevent "#arn_timer_60::Onstop";
-	donpcevent "alloff#60::Onon";
-	donpcevent "lvl 60s Waiting Room::Onstart";
+ 	donpcevent "cast#60::OnTimeOver2";
+	donpcevent "arn_warp_60::OnOut";
+	donpcevent "#arn_timer_60::OnStop";
+	donpcevent "alloff#60::OnEnable";
+	donpcevent "Lv60 Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end; 
 }
 
 -	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:
+OnTimeOver1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
 
-Onnomal1:
+OnNomal1:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Onnomal2:
+OnNomal2:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#60	-1,{
-
-Onon:
+OnEnable:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#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_09ex#60::Onreset";
-	donpcevent "Minilover#arena::Ontimeroff";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#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_09ex#60::OnReset";
+	donpcevent "Minilover#arena::OnTimerOff";
 	disablenpc "Minilover#arena";
 	disablenpc "force_01_02#60";
 	disablenpc "force_02_03#60";
@@ -1096,7 +1014,7 @@ Onon:
 	disablenpc "force_08_09#60";
 	disablenpc "force_exit#60";
 	disablenpc "arena#60";
-	donpcevent "#arn_timer_60::Onstop";
+	donpcevent "#arn_timer_60::OnStop";
 	enablenpc "Minilover#arena";
 	enablenpc "arena#60";
 	end;
@@ -1104,5 +1022,4 @@ Onon:
 OnInit:
 	if(!$top_60min && !$top_60sec) set $top_60min,6;
 	end;
-
 }