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, 225 insertions, 283 deletions

diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 60077b88e..315d61165 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -1,20 +1,23 @@
 //===== Hercules Script ======================================
-//= Izlude Arena script
+//= Izlude Arena Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.5
 //===== Description: =========================================
 //= Izlude Acolyte Battle Arena
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 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]
+//= 1.5 Added GM management function. [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;
 	}
@@ -24,13 +27,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;
 
@@ -40,7 +41,7 @@ OnStartArena:
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
@@ -48,63 +49,63 @@ Onstart:
 force_5-1,100,12,0	script	arena#aco	-1,5,5,{
 OnTouch:
 	donpcevent "allkill#aco::OnEnable";
-	if (basejob == job_acolyte) {
-		donpcevent "arena_aco1::Onstart";
+	if (BaseJob == Job_Acolyte) {
+		donpcevent "arena_aco1::OnStart";
 	}
 	else {
-		donpcevent "arena_aco2::Onstart";
+		donpcevent "arena_aco2::OnStart";
 	}
 	disablenpc "arena#aco";
 	end;
 }
 
 -	script	arena_aco1	-1,{
-Onstart:
+OnStart:
 	donpcevent "Trocco#aco1::OnEnable";
 	end;
 
-Onreset_01:
+OnReset_01:
 	enablenpc "force_01_02#aco";
 	enablenpc "force_02start#aco";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#aco::Onreset";
+OnReset_02:
+	donpcevent "force_02mob#aco::OnReset";
 	enablenpc "force_02_03#aco";
 	enablenpc "force_03start#aco";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#aco";
 	enablenpc "force_04start#aco";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#aco";
 	enablenpc "force_05start#aco";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#aco";
 	enablenpc "force_06start#aco";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#aco";
 	enablenpc "force_07start#aco";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#aco";
 	enablenpc "force_08start#aco";
 	end;
 
-Onreset_08:
+OnReset_08:
 	enablenpc "force_08_09#aco";
 	enablenpc "force_09start#aco";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#aco";
 	end;
 }
@@ -129,49 +130,49 @@ OnTimer4000:
 
 OnTimer60000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer120000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer180000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer240000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer300000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer360000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer420000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco1::Onfailclearstage";
+		donpcevent "Trocco#aco1::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc;
 	end;
@@ -195,77 +196,77 @@ OnTimer494000:
 
 OnTimer495000:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco1::Onfailclearstage";
+	donpcevent "Trocco#aco1::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
+OnFailClearStage:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco1::Ontimeroff";
-	donpcevent "arena_aco1::Onreset";
+	donpcevent "Trocco#aco1::OnTimerOff";
+	//donpcevent "arena_aco1::OnReset";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_5-1","Objective: Destroy all Red Plants!",bc_map|bc_npc;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_5-1","Objective: Kill at least 10 Drops!",bc_map|bc_npc;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_5-1","Objective: Terminate all Zombies!",bc_map|bc_npc;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_5-1","The East Exit has opened!",bc_map|bc_npc;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_5-1","As a courtesy, we'll restore some of your HP and SP. Now, head to the next room! Go go go!!",bc_map|bc_npc;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_5-1","Objective: Obliterate all Orc Zombies!",bc_map|bc_npc;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_5-1","The South Exit has opened!",bc_map|bc_npc;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_5-1","Objective: Reach the South Exit while dodging Hydras!",bc_map|bc_npc;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_5-1","Objective: Kill all Archer Skeletons and Firelock Soldiers!",bc_map|bc_npc;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_5-1","The West Exit has opened!",bc_map|bc_npc;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_5-1","Objective: Boss Battle. Please proceed to the room to the north!",bc_map|bc_npc;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_5-1","Objective: Kill Zombie Prisoners, Skel Prisoners and Zombie Troops!",bc_map|bc_npc;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_5-1","Boss Defeated! The North Exit has opened. Thank you.",bc_map|bc_npc;
 	end;
 }
@@ -279,7 +280,7 @@ OnTouch:
 
 -	script	force_01mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On01_start";
+	donpcevent "Trocco#aco1::On01_Start";
 	monster "force_5-1",22,29,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
 	monster "force_5-1",29,29,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
 	monster "force_5-1",29,22,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
@@ -287,14 +288,14 @@ OnEnable:
 	monster "force_5-1",25,25,"Red Plant",1078,1,"force_01mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_01mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_01mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On01_end";
-		donpcevent "arena_aco1::Onreset_01";
+		donpcevent "Trocco#aco1::On01_End";
+		donpcevent "arena_aco1::OnReset_01";
 	}
 	end;
 }
@@ -309,19 +310,19 @@ OnTouch:
 
 -	script	force_02mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On02_start";
+	donpcevent "Trocco#aco1::On02_Start";
 	areamonster "force_5-1",22,69,29,130,"Drops",1572,20,"force_02mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_02mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if ((mobcount("force_5-1","force_02mob#aco::OnMyMobDead") < 11) && ($@drop_gate == 0)) {
 		set $@drop_gate,1;
-		donpcevent "Trocco#aco1::On02_end";
-		donpcevent "arena_aco1::Onreset_02";
+		donpcevent "Trocco#aco1::On02_End";
+		donpcevent "arena_aco1::OnReset_02";
 	}
 	end;
 }
@@ -334,26 +335,26 @@ OnTouch:
 
 -	script	force_03mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On03_start";
+	donpcevent "Trocco#aco1::On03_Start";
 	areamonster "force_5-1",9,157,41,190,"Zombie",1394,10,"force_03mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_03mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_03mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On03_end";
-		donpcevent "arena_aco1::Onreset_03";
+		donpcevent "Trocco#aco1::On03_End";
+		donpcevent "arena_aco1::OnReset_03";
 	}
 	end;
 }
 
 force_5-1,69,174,0	script	force_04start#aco	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco1::On04_start";
-	donpcevent "arena_aco1::Onreset_04";
+	donpcevent "Trocco#aco1::On04_Start";
+	donpcevent "arena_aco1::OnReset_04";
 	percentheal 50,50;
 	disablenpc "force_04start#aco";
 	end;
@@ -368,18 +369,18 @@ OnTouch:
 
 -	script	force_05mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On05_start";
+	donpcevent "Trocco#aco1::On05_Start";
 	areamonster "force_5-1",159,157,187,190,"Orc Zombie",1463,8,"force_05mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_05mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_05mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On05_end";
-		donpcevent "arena_aco1::Onreset_05";
+		donpcevent "Trocco#aco1::On05_End";
+		donpcevent "arena_aco1::OnReset_05";
 	}
 	end;
 }
@@ -387,14 +388,14 @@ OnMyMobDead:
 force_5-1,174,130,0	script	force_06start#aco	-1,1,1,{
 OnTouch:
 	donpcevent "force_06mob#aco::OnEnable";
-	donpcevent "arena_aco1::Onreset_06";
+	donpcevent "arena_aco1::OnReset_06";
 	disablenpc "force_06start#aco";
 	end;
 }
 
 -	script	force_06mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On06_start";
+	donpcevent "Trocco#aco1::On06_Start";
 	monster "force_5-1",170,124,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
 	monster "force_5-1",170,121,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
 	monster "force_5-1",173,116,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
@@ -414,7 +415,7 @@ OnEnable:
 	monster "force_5-1",179,80,"Hydra",1579,1,"force_06mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_06mob#aco::OnMyMobDead";
 	end;
 
@@ -430,7 +431,7 @@ OnTouch:
 
 -	script	force_07mob#aco	-1,{
 OnEnable:
-	donpcevent "Trocco#aco1::On07_start";
+	donpcevent "Trocco#aco1::On07_Start";
 	monster "force_5-1",170,32,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
 	monster "force_5-1",184,23,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
 	monster "force_5-1",165,9,"Archer Skeleton",1420,1,"force_07mob#aco::OnMyMobDead";
@@ -438,14 +439,14 @@ OnEnable:
 	monster "force_5-1",189,23,"Firelock Soldier",1523,1,"force_07mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_07mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_07mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On07_end";
-		donpcevent "arena_aco1::Onreset_07";
+		donpcevent "Trocco#aco1::On07_End";
+		donpcevent "arena_aco1::OnReset_07";
 	}
 	end;
 }
@@ -453,15 +454,15 @@ OnMyMobDead:
 force_5-1,132,26,0	script	force_08start#aco	-1,1,1,{
 OnTouch:
 	percentheal 50,50;
-	donpcevent "Trocco#aco1::On08_start";
-	donpcevent "arena_aco1::Onreset_08";
+	donpcevent "Trocco#aco1::On08_Start";
+	donpcevent "arena_aco1::OnReset_08";
 	disablenpc "force_08start#aco";
 	end;
 }
 
 force_5-1,99,82,0	script	force_09start#aco	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco1::On09_start";
+	donpcevent "Trocco#aco1::On09_Start";
 	donpcevent "force_09mob#aco::OnEnable";
 	disablenpc "force_09start#aco";
 	end;
@@ -474,66 +475,66 @@ OnEnable:
 	areamonster "force_5-1",88,89,111,110,"Zombie",1394,4,"force_09mob#aco::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_09mob#aco::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_09mob#aco::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco1::On09_end";
+		donpcevent "Trocco#aco1::On09_End";
 		set $@arn_2,gettimetick(2);
-		donpcevent "arena_aco1::Onreset_09";
+		donpcevent "arena_aco1::OnReset_09";
 	}
 	end;
 }
 
 -	script	arena_aco2	-1,{
-Onstart:
+OnStart:
 	donpcevent "Trocco#aco2::OnEnable";
 	end;
 
-Onreset_01:
+OnReset_01:
 	enablenpc "force_01_02#aco";
 	enablenpc "force_02start#pri";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#pri::Onreset";
+OnReset_02:
+	donpcevent "force_02mob#pri::OnReset";
 	enablenpc "force_02_03#aco";
 	enablenpc "force_03start#pri";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#aco";
 	enablenpc "force_04start#pri";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#aco";
 	enablenpc "force_05start#pri";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#aco";
 	enablenpc "force_06start#pri";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#aco";
 	enablenpc "force_07start#pri";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#aco";
 	enablenpc "force_08start#pri";
 	end;
 
-Onreset_08:
+OnReset_08:
 	enablenpc "force_08_09#aco";
 	enablenpc "force_09start#pri";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#aco";
 }
 
@@ -557,49 +558,49 @@ OnTimer4000:
 
 OnTimer60000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer120000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer180000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer240000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer300000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer360000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc;
 	end;
 
 OnTimer420000:
 	if (getmapusers("force_5-1") == 0) {
-		donpcevent "Trocco#aco2::Onfailclearstage";
+		donpcevent "Trocco#aco2::OnFailClearStage";
 	}
 	mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc;
 	end;
@@ -623,85 +624,85 @@ OnTimer494000:
 
 OnTimer495000:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco2::Onfailclearstage";
+	donpcevent "Trocco#aco2::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
+OnFailClearStage:
 	mapwarp "force_5-1","prt_are_in",177,86;
-	donpcevent "Trocco#aco2::Ontimeroff";
-	donpcevent "arena_aco2::Onreset";
+	donpcevent "Trocco#aco2::OnTimerOff";
+	//donpcevent "arena_aco2::OnReset";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_5-1","Objective: Kill all Zombies!",bc_map|bc_npc;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_5-1","Objective: Defeat all monsters!",bc_map|bc_npc;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_5-1","The North Exit has opened!",bc_map|bc_npc;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_5-1","Objective: Destroy all Red Plants!",bc_map|bc_npc;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_5-1","The East Exit has opened!",bc_map|bc_npc;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_5-1","Objective: Obliterate every monster!",bc_map|bc_npc;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_5-1","The East Exit has opened!",bc_map|bc_npc;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_5-1","Objective: Defeat Gargoyle!",bc_map|bc_npc;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_5-1","The South Exit has opened!",bc_map|bc_npc;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_5-1","Objective: Kill all Khalitzburgs!",bc_map|bc_npc;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_5-1","The South Exit has opened!",bc_map|bc_npc;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_5-1","Objective: Kill 1 Ancient Mummy!",bc_map|bc_npc;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_5-1","The West Exit has opened!",bc_map|bc_npc;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_5-1","The time has come for the Boss Battle. Please move north into the next room...",bc_map|bc_npc;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_5-1","Objective: Defeat the Boss Monster!",bc_map|bc_npc;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_5-1","Boss Cleared! The North Exit has opened! Thank you.",bc_map|bc_npc;
 	end;
 }
@@ -715,18 +716,18 @@ OnTouch:
 
 -	script	force_01mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On01_start";
+	donpcevent "Trocco#aco2::On01_Start";
 	areamonster "force_5-1",13,9,38,41,"Zombie",1394,10,"force_01mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_01mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_01mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On01_end";
-		donpcevent "arena_aco2::Onreset_01";
+		donpcevent "Trocco#aco2::On01_End";
+		donpcevent "arena_aco2::OnReset_01";
 	}
 	end;
 }
@@ -745,23 +746,23 @@ OnTouch:
 
 -	script	force_02mob#pri	-1,{
 OnOn1:
-	donpcevent "Trocco#aco2::On02_start";
+	donpcevent "Trocco#aco2::On02_Start";
 	areamonster "force_5-1",22,69,29,130,"Orc Skeleton",1462,5,"force_02mob#pri::OnMyMobDead";
 	end;
 
 OnOn2:
-	donpcevent "Trocco#aco2::On02_start";
+	donpcevent "Trocco#aco2::On02_Start";
 	areamonster "force_5-1",22,69,29,130,"Ghoul",1423,5,"force_02mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_02mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_02mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On02_end";
-		donpcevent "arena_aco2::Onreset_02";
+		donpcevent "Trocco#aco2::On02_End";
+		donpcevent "arena_aco2::OnReset_02";
 	}
 	end;
 }
@@ -775,18 +776,18 @@ OnTouch:
 
 -	script	force_03mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On03_start";
+	donpcevent "Trocco#aco2::On03_Start";
 	areamonster "force_5-1",14,163,37,185,"Red Plant",1078,5,"force_03mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_03mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_03mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On03_end";
-		donpcevent "arena_aco2::Onreset_03";
+		donpcevent "Trocco#aco2::On03_End";
+		donpcevent "arena_aco2::OnReset_03";
 	}
 	end;
 }
@@ -805,7 +806,7 @@ OnTouch:
 
 -	script	force_04mob#pri	-1,{
 OnOn1:
-	donpcevent "Trocco#aco2::On04_start";
+	donpcevent "Trocco#aco2::On04_Start";
 	monster "force_5-1",rand(71,130),rand(170,178),"Evil Druid",1435,1,"force_04mob#pri::OnMyMobDead";
 	monster "force_5-1",rand(71,130),rand(170,178),"Wrath",1475,1,"force_04mob#pri::OnMyMobDead";
 	monster "force_5-1",rand(71,130),rand(170,178),"Zombie Prisoner",1480,1,"force_04mob#pri::OnMyMobDead";
@@ -813,21 +814,21 @@ OnOn1:
 	end;
 
 OnOn2:
-	donpcevent "Trocco#aco2::On04_start";
+	donpcevent "Trocco#aco2::On04_Start";
 	areamonster "force_5-1",71,170,130,178,"Evil Druid",1435,2,"force_04mob#pri::OnMyMobDead";
 	areamonster "force_5-1",71,170,130,178,"Wrath",1475,2,"force_04mob#pri::OnMyMobDead";
 	areamonster "force_5-1",71,170,130,178,"Zombie Prisoner",1480,2,"force_04mob#pri::OnMyMobDead";
 	monster "force_5-1",rand(71,130),rand(170,178),"Skel Prisoner",1479,1,"force_04mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_04mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_04mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On04_end";
-		donpcevent "arena_aco2::Onreset_04";
+		donpcevent "Trocco#aco2::On04_End";
+		donpcevent "arena_aco2::OnReset_04";
 	}
 	end;
 }
@@ -854,7 +855,7 @@ OnOn2:
 	areamonster "force_5-1",161,159,187,190,"Penomena",1441,10,"force_05ex#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_05ex#pri::OnMyMobDead";
 	end;
 
@@ -864,19 +865,19 @@ OnMyMobDead:
 
 -	script	force_05mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On05_start";
+	donpcevent "Trocco#aco2::On05_Start";
 	areamonster "force_5-1",161,159,187,190,"Gargoyle",1597,4,"force_05mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_05mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_05mob#pri::OnMyMobDead") < 1) {
-		donpcevent "force_05ex#pri::Onreset";
-		donpcevent "Trocco#aco2::On05_end";
-		donpcevent "arena_aco2::Onreset_05";
+		donpcevent "force_05ex#pri::OnReset";
+		donpcevent "Trocco#aco2::On05_End";
+		donpcevent "arena_aco2::OnReset_05";
 	}
 	end;
 }
@@ -902,7 +903,7 @@ OnEnable:
 	areamonster "force_5-1",170,67,178,131,"Permeter",1314,5,"force_06ex#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_06ex#pri::OnMyMobDead";
 	end;
 
@@ -912,29 +913,29 @@ OnMyMobDead:
 
 -	script	force_06mob#pri	-1,{
 OnOn1:
-	donpcevent "Trocco#aco2::On06_start";
+	donpcevent "Trocco#aco2::On06_Start";
 	monster "force_5-1",rand(170,178),rand(67,131),"Khalitzburg",1438,1,"force_06mob#pri::OnMyMobDead";
 	end;
 
 OnOn2:
-	donpcevent "Trocco#aco2::On06_start";
+	donpcevent "Trocco#aco2::On06_Start";
 	areamonster "force_5-1",170,67,178,131,"Khalitzburg",1438,2,"force_06mob#pri::OnMyMobDead";
 	end;
 
 OnOn3:
-	donpcevent "Trocco#aco2::On06_start";
+	donpcevent "Trocco#aco2::On06_Start";
 	areamonster "force_5-1",170,67,178,131,"Khalitzburg",1438,4,"force_06mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_06mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_06mob#pri::OnMyMobDead") < 1) {
-		donpcevent "force_06ex#pri::Onreset";
-		donpcevent "Trocco#aco2::On06_end";
-		donpcevent "arena_aco2::Onreset_06";
+		donpcevent "force_06ex#pri::OnReset";
+		donpcevent "Trocco#aco2::On06_End";
+		donpcevent "arena_aco2::OnReset_06";
 	}
 	end;
 }
@@ -948,33 +949,33 @@ OnTouch:
 
 -	script	force_07mob#pri	-1,{
 OnEnable:
-	donpcevent "Trocco#aco2::On07_start";
+	donpcevent "Trocco#aco2::On07_Start";
 	monster "force_5-1",rand(160,188),rand(9,42),"Ancient Mummy",1522,1,"force_07mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_07mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_07mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On07_end";
-		donpcevent "arena_aco2::Onreset_07";
+		donpcevent "Trocco#aco2::On07_End";
+		donpcevent "arena_aco2::OnReset_07";
 	}
 	end;
 }
 
 force_5-1,132,26,0	script	force_08start#pri	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco2::On08_start";
-	donpcevent "arena_aco2::Onreset_08";
+	donpcevent "Trocco#aco2::On08_Start";
+	donpcevent "arena_aco2::OnReset_08";
 	disablenpc "force_08start#pri";
 	end;
 }
 
 force_5-1,99,82,0	script	force_09start#pri	-1,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco2::On09_start";
+	donpcevent "Trocco#aco2::On09_Start";
 	if (BaseLevel < 70) {
 		donpcevent "force_09mob#pri::OnOn4";
 	}
@@ -1010,15 +1011,15 @@ OnOn4:
 	areamonster "force_5-1",88,89,111,110,"Zombie",1394,4,"force_09mob#pri::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_5-1","force_09mob#pri::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("force_5-1","force_09mob#pri::OnMyMobDead") < 1) {
-		donpcevent "Trocco#aco2::On09_end";
+		donpcevent "Trocco#aco2::On09_End";
 		set $@arn_2,gettimetick(2);
-		donpcevent "arena_aco2::Onreset_09";
+		donpcevent "arena_aco2::OnReset_09";
 	}
 	end;
 }
@@ -1026,7 +1027,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 {
@@ -1035,68 +1036,9 @@ 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,25,44,0	script	force_01_02#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",25,69;
-	end;
-}
-
-force_5-1,25,134,0	script	force_02_03#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",25,159;
-	end;
-}
-
-force_5-1,44,174,0	script	force_03_04#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",69,174;
-	end;
-}
-
-force_5-1,134,174,0	script	force_04_05#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",159,174;
-	end;
-}
-
-force_5-1,174,155,0	script	force_05_06#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",174,130;
-	end;
-}
-
-force_5-1,174,65,0	script	force_06_07#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",174,40;
-	end;
-}
-
-force_5-1,155,26,0	script	force_07_08#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",132,26;
-	end;
-}
-
-force_5-1,99,54,0	script	force_08_09#aco	45,1,1,{
-OnTouch:
-	warp "force_5-1",99,82;
-	end;
-}
-
 force_5-1,99,124,0	script	force_exit#aco	45,1,1,{
 OnTouch:
-	donpcevent "Trocco#aco1::Ontimeroff";
+	donpcevent "Trocco#aco1::OnTimerOff";
 	donpcevent "#arn_timer_aco::OnEnable";
 	mapwarp "force_5-1","prt_are_in",21,35;
 	end;
@@ -1186,18 +1128,18 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 		if (arena_point < 29981) {
 			set arena_point,arena_point+20;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
 		else {
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
 		end;
 	}
 	else {
-		if (basejob == job_acolyte) {
+		if (BaseJob == Job_Acolyte) {
 			set .@acotop_t,$arn_acotop;
 			set .@acotop_n$,$arn_acotopn$;
 		}
@@ -1253,10 +1195,10 @@ 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";
+				donpcevent "Vendigos::OnLineRec_aco";
 			}
 			else {
 				if (BaseLevel < 70) {
@@ -1275,7 +1217,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 					set $arn_pritop90,.@record_timeaco;
 					set $arn_pritopn90$, strcharinfo(0);
 				}
-				donpcevent "Vendigos::Onlinerec_pri";
+				donpcevent "Vendigos::OnLineRec_pri";
 			}
 			next;
 			if (arena_point == 30000) {
@@ -1330,7 +1272,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 			end;
@@ -1394,7 +1336,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 			end;
@@ -1412,31 +1354,31 @@ 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";
+				donpcevent "#Vendigos::OnLineRec_aco";
 			}
 			else {
 				if (BaseLevel < 70) {
 					set $arn_pritop60,.@record_timeaco;
 					set $arn_pritopn60$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri60";
+					donpcevent "#Vendigos::OnLineRec_pri60";
 				}
 				else if (BaseLevel < 80) {
 					set $arn_pritop70,.@record_timeaco;
 					set $arn_pritopn70$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri70";
+					donpcevent "#Vendigos::OnLineRec_pri70";
 				}
 				else if (BaseLevel < 90) {
 					set $arn_pritop80,.@record_timeaco;
 					set $arn_pritopn80$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri80";
+					donpcevent "#Vendigos::OnLineRec_pri80";
 				}
 				else {
 					set $arn_pritop90,.@record_timeaco;
 					set $arn_pritopn90$, strcharinfo(0);
-					donpcevent "#Vendigos::Onlinerec_pri90";
+					donpcevent "#Vendigos::OnLineRec_pri90";
 				}
 			}
 			next;
@@ -1492,11 +1434,11 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			}
 			specialeffect2 EF_EXIT;
 			warp "arena_room",100,75;
-			donpcevent "#arn_timer_aco::Onstop";
+			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
 			donpcevent "Acolyte Waiting Room::OnStart";
 		}
-		close;
+		end;
 	}
 }
 
@@ -1518,13 +1460,13 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
-	donpcevent "arn_warp_aco::Onout";
-	donpcevent "#arn_timer_aco::Onstop";
+	donpcevent "arn_warp_aco::OnOut";
+	donpcevent "#arn_timer_aco::OnStop";
 	//donpcevent "alloff#aco::OnEnable";
 	donpcevent "Acolyte Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 }
@@ -1534,17 +1476,17 @@ OnInit:
 	disablenpc "arn_warp_aco";
 	end;
 
-Onout:
+OnOut:
 	enablenpc "arn_warp_aco";
 	end;
 
-Onhide:
+OnHide:
 	disablenpc "arn_warp_aco";
 	end;
 
 OnTouch:
 	warp "arena_room",100,75;
-	donpcevent "arn_warp_aco::Onhide";
+	donpcevent "arn_warp_aco::OnHide";
 	end;
 }
 
@@ -1553,29 +1495,29 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 }
 
 -	script	allkill#aco	-1,{
 OnEnable:
-	donpcevent "force_01mob#aco::Onreset";
-	donpcevent "force_02mob#aco::Onreset";
-	donpcevent "force_03mob#aco::Onreset";
-	donpcevent "force_05mob#aco::Onreset";
-	donpcevent "force_06mob#aco::Onreset";
-	donpcevent "force_07mob#aco::Onreset";
-	donpcevent "force_09mob#aco::Onreset";
-	donpcevent "force_01mob#pri::Onreset";
-	donpcevent "force_02mob#pri::Onreset";
-	donpcevent "force_03mob#pri::Onreset";
-	donpcevent "force_04mob#pri::Onreset";
-	donpcevent "force_05mob#pri::Onreset";
-	donpcevent "force_06mob#pri::Onreset";
-	donpcevent "force_07mob#pri::Onreset";
-	donpcevent "force_09mob#pri::Onreset";
-	donpcevent "force_05ex#pri::Onreset";
+	donpcevent "force_01mob#aco::OnReset";
+	donpcevent "force_02mob#aco::OnReset";
+	donpcevent "force_03mob#aco::OnReset";
+	donpcevent "force_05mob#aco::OnReset";
+	donpcevent "force_06mob#aco::OnReset";
+	donpcevent "force_07mob#aco::OnReset";
+	donpcevent "force_09mob#aco::OnReset";
+	donpcevent "force_01mob#pri::OnReset";
+	donpcevent "force_02mob#pri::OnReset";
+	donpcevent "force_03mob#pri::OnReset";
+	donpcevent "force_04mob#pri::OnReset";
+	donpcevent "force_05mob#pri::OnReset";
+	donpcevent "force_06mob#pri::OnReset";
+	donpcevent "force_07mob#pri::OnReset";
+	donpcevent "force_09mob#pri::OnReset";
+	donpcevent "force_05ex#pri::OnReset";
 	disablenpc "force_01start#aco";
 	disablenpc "force_02start#aco";
 	disablenpc "force_03start#aco";
@@ -1604,9 +1546,9 @@ OnEnable:
 	disablenpc "force_08_09#aco";
 	disablenpc "force_exit#aco";
 	disablenpc "arn_warp_aco"; //050630
-	donpcevent "Trocco#aco1::Onstop";
-	donpcevent "Trocco#aco2::Onstop";
-	donpcevent "#arn_timer_aco::Onstop";
+	donpcevent "Trocco#aco1::OnTimerOff";
+	donpcevent "Trocco#aco2::OnTimerOff";
+	donpcevent "#arn_timer_aco::OnStop";
 	end;
 }
 
@@ -1626,7 +1568,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$;
@@ -1685,24 +1627,24 @@ OnInit:
 }
 
 -	script	#Vendigos	-1,{
-Onlinerec_aco:
+OnLineRec_aco:
 	mapannounce "arena_room","Vendigos: "+$arn_acotopn$+" has made a new record in the Arena Time Force Battle - Acolyte Mode. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri60:
+OnLineRec_pri60:
 	mapannounce "arena_room","Vendigos: "+$arn_pritopn60$+" has made a new record in the Arena Time Force Battle - Priest: Level 70 or lower. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri70:
+OnLineRec_pri70:
 	mapannounce "arena_room","Vendigos: "+$arn_pritopn70$+" has made a new record in the Arena Time Force Battle - Priest: Level 80 or lower. Congratulations!",bc_map,"0xFFFF00";
 	end;
 
-Onlinerec_pri80:
+OnLineRec_pri80:
 	mapannounce "arena_room","Vendigos: "+$arn_pritopn80$+" has made a new record in the Arena Time Force Battle - Priest: Level 90 or lower. Congratulations!",bc_map,"0xFFFF00";
 	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";
+OnLineRec_pri90:
+	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;
 }
 
@@ -1749,7 +1691,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";
@@ -1766,21 +1708,21 @@ arena_room,140,136,3	script	Guide Alias	729,{
 	close;
 }
 
-/*
 arena_room,195,5,3	script	log-on-aco#arena	802,{
-	input .@input; //,0,2000;
-	if (.@input == 0) {
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "^3355FFIncorrect Password.^000000";
 		close;
-	}
-	else if (.@input == 1357) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "[!!CAUTION!!]";
 		mes "^3355FFThe following menu";
 		mes "the record for that";
 		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";
@@ -1811,13 +1753,14 @@ arena_room,195,5,3	script	log-on-aco#arena	802,{
 }
 
 arena_room,195,10,3	script	acolink#arena	802,{
-	input .@input; //,0,2000;
-	if (.@input == 0) {
+	set .@i, callfunc("F_GM_NPC",1357,0);
+	if (.@i == -1) {
 		mes "Command has";
 		mes "been canceled.";
 		close;
-	}
-	else if (.@input == 1357) {
+	} else if (.@i == 0) {
+		end;
+	} else {
 		mes "This NPC opens and";
 		mes "closes the Warp Portal";
 		mes "to the Arena's Acolyte";
@@ -1842,4 +1785,3 @@ arena_room,195,10,3	script	acolink#arena	802,{
 		}
 	}
 }
-*/