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]

22 files changed, 1120 insertions, 340 deletions

diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index 96c24bdfa..684649917 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -15,7 +15,7 @@
 // Lauds
 //============================================================
 prontera,182,214,4	script	Lauds#Memorial	58,{
-	if(Memorial08 < 1) {
+	if (Memorial08 < 1) {
 		mes "[Mad Sago Lauds]";
 		mes "Hey, yo!";
 		mes "What are you doing there!?";
@@ -27,7 +27,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		next;
 		mes "[Mad Sago Lauds]";
 		mes "What is this!?";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Mad Sago Lauds]";
 		mes "Where is your towel!?";
@@ -67,14 +67,14 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		close;
 	}
 
-	else if(Memorial08 == 1) {
+	else if (Memorial08 == 1) {
 		if (countitem(1059) < 30 || countitem(914) < 20) {
 			mes "[Mad Sago Lauds]";
 			mes "What are these? They aren't enough?!";
 			mes "*Sigh* Do I really have to tell you again?!";
 			mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000.";
 			close;
-		}else{
+		} else {
 			mes "***Mad Sago Lauds appears to be muttering to himself***";
 			next;
 			mes "[Mad Sago Lauds]";
@@ -96,7 +96,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		}
 	}
 	
-	else if(Memorial08 == 2) {
+	else if (Memorial08 == 2) {
 		mes "[Mad Sago Lauds]";
 		mes "Ah, you have fluffy new towel now I even put your name on it";
 		next;
@@ -118,20 +118,20 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		close;
 	}
 
-	else if(Memorial08 == 3) {
+	else if (Memorial08 == 3) {
 		mes "[Mad Sago Lauds]";
 		mes "What are you still doing here?";
 		mes "I told you to go speak to Grast in Prontera!";
 		close;
 	}
 
-	else if(Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
+	else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
 		mes "[Mad Sago Lauds]";
 		mes "Go help Grast, and then come back.";
 		close;
 	}
 
-	else if(Memorial08 == 7) {
+	else if (Memorial08 == 7) {
 		mes "[Mad Sago Lauds]";
 		mes "Oh, you've brought them all.";
 		mes "Hahaha!";
@@ -153,38 +153,38 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		close;
 	}
 
-	else if(Memorial08 == 8) {
+	else if (Memorial08 == 8) {
 		mes "[Mad Sago Lauds]";
 		mes "Stop trying to give me your garbage!";
 		mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!";
 		close;
 	}
 	
-	else if(Memorial08 >= 9) {
+	else if (Memorial08 >= 9) {
 		set .@RandomMsg, rand(1,5);
-		if(.@RandomMsg == 1) {
+		if (.@RandomMsg == 1) {
 			mes "[Mad Sago Lauds]";
 			mes "Don't panic!";
-			emotion 0;
+			emotion e_gasp;
 			close;
 		}
-		else if(.@RandomMsg == 2) {
+		else if (.@RandomMsg == 2) {
 			mes "[Mad Sago Lauds]";
 			mes "Life... is like a grapefruit.";
 			mes "It's orange and squishy, and has a few pips in it, and some folks have half a one for breakfast.";
 			close;
 		}
-		else if(.@RandomMsg == 3) {
+		else if (.@RandomMsg == 3) {
 			mes "[Mad Sago Lauds]";
 			mes "There was a point to this story, but it has temporarily escaped the chronicler's mind.";
 			close;
 		}
-		else if(.@RandomMsg == 4) {
+		else if (.@RandomMsg == 4) {
 			mes "[Mad Sago Lauds]";
 			mes "42!";
 			close;
 		}
-		else if(.@RandomMsg == 5) {
+		else if (.@RandomMsg == 5) {
 			mes "[Mad Sago Lauds]";
 			mes "It is a mistake to think you can solve any major problems just with potatoes.";
 			close;
@@ -195,13 +195,13 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 // Memorial Plaque
 //============================================================
 prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
-	if(Memorial08 < 8) {
+	if (Memorial08 < 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "- It's a dusty old plaque.-";
 		close;
 	}
 	
-	else if(Memorial08 == 8) {
+	else if (Memorial08 == 8) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "- It's a dusty old plaque.-";
 		mes "'This must be what Lauds was talking about.'";
@@ -212,7 +212,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		goto L_CleanPlaque;
 	}
 	
-	else if(Memorial08 >= 9) {
+	else if (Memorial08 >= 9) {
 		goto L_CleanPlaque;
 	}
 	
@@ -223,7 +223,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		mes "-nor engraved stone bear record of their deeds,-";
 		mes "-yet will their remembrance be as lasting as the land they honored.-";
 		mes "-Daniel Webster-";
-		if(Memorial08 == 9) {
+		if (Memorial08 == 9) {
 			getexp 93750,43750;
 		}
 		next;
@@ -232,7 +232,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		mes "-I may not have gone where I intended to go,-";
 		mes "-but I think I have ended up where I needed to be.-";
 		mes "- Douglas Adams.-";
-		if(Memorial08 == 9) { 
+		if (Memorial08 == 9) { 
 			getexp 93750,43750;
 		}
 		next;
@@ -242,7 +242,7 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 		mes "-It is not the urge to surpass all others at whatever cost,-";
 		mes "- but the urge to serve others at whatever cost. -";
 		mes "- Arthur Ashe -";
-		if(Memorial08 == 9) { 
+		if (Memorial08 == 9) { 
 			getexp 93750,43750;
 			set Memorial08,10;
 		}
@@ -252,14 +252,14 @@ prontera,153,286,4	script	Memorial Plaque#Memorial	857,{
 // Grast
 //============================================================
 prontera,150,270,4	script	Grast#Memorial	900,{
-	if(Memorial08 < 3) {
+	if (Memorial08 < 3) {
 		mes "[Grast]";
 		mes "Memorial Day is a sad and yet glorious day.";
 		mes "I wonder how many people remember them...";
 		close;
 	}
 	
-	else if(Memorial08 == 3) {
+	else if (Memorial08 == 3) {
 		mes "[Grast]";
 		mes "Oh, isn't that a Towel of Memory?";
 		mes "I'm so glad to meet someone who understands the meaning of Memorial Day.";
@@ -277,7 +277,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		close;
 	}
 
-	else if(Memorial08 == 4) {
+	else if (Memorial08 == 4) {
 		if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -293,7 +293,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				goto L_GiveUp;
 			}
 			goto L_Continue;
-		}else{
+		} else {
 			mes "[Grast]";
 			mes "Oh, you've brought the materials I asked.";
 			next;
@@ -308,7 +308,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}
 	}
 	
-	else if(Memorial08 == 5) {
+	else if (Memorial08 == 5) {
 		if (countitem(1065) < 1 || countitem(610) < 1 || countitem(717) < 1 || countitem(747) < 1 || countitem(517) < 1 || countitem(515) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -323,7 +323,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				goto L_GiveUp;
 			}
 			goto L_Continue;
-		}else{
+		} else {
 			mes "[Grast]";
 			mes "Oh, you've brought everything I asked.";
 			mes "Hmm, I think you need just a little bit more.";
@@ -335,7 +335,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}
 	}
 	
-	else if(Memorial08 == 6) {
+	else if (Memorial08 == 6) {
 		if (countitem(643) < 1 || countitem(12018) < 1 || countitem(741) < 1 || countitem(745) < 1) {
 			mes "[Grast]";
 			mes "Oops, you haven't brought all materials.";
@@ -354,7 +354,7 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 				goto L_GiveUp;
 			}
 			goto L_Continue;
-		}else{
+		} else {
 			mes "[Grast]";
 			mes "Have you brought the materials I asked?";
 			mes "Ah, thank you for your hard work you've brought all of them.";
@@ -390,14 +390,14 @@ prontera,150,270,4	script	Grast#Memorial	900,{
 		}
 	}
 	
-	else if(Memorial08 == 7) {
+	else if (Memorial08 == 7) {
 		mes "[Grast]";
 		mes "Have you met Lauds?";
 		mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war.";
 		close;
 	}
 
-	else if(Memorial08 >= 8) {
+	else if (Memorial08 >= 8) {
 		mes "[Grast]";
 		mes "A towel is about the most massively useful thing an adventurer can have.";
 		close;
diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt
index 560b11f3d..4f46020a8 100644
--- a/npc/events/RWC_2011.txt
+++ b/npc/events/RWC_2011.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= RWC 2011 Golden Poring
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Collect blue cards dropped by Golden Porings to spell out
 //= 'RWC2011' and win a prize!
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Euphy]
-//============================================================ 
+//============================================================
 
 prontera,114,81,5	script	RWC2011 Agent#2	407,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
index cfa3a2b9b..3c2fdfe8f 100644
--- a/npc/events/RWC_2012.txt
+++ b/npc/events/RWC_2012.txt
@@ -1,17 +1,15 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= RWC 2012 Enchants
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Adds slots and enchantments to 2012 RWC Memory accessories.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Euphy]
-//============================================================ 
+//============================================================
 
 prontera,147,61,3	script	Driller#pron	87,{
 	disable_items;
diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt
index bb736955f..02e583ee6 100644
--- a/npc/events/StPatrick_2008.txt
+++ b/npc/events/StPatrick_2008.txt
@@ -24,7 +24,7 @@
 //= 1.0 First version. [Kisuka]
 //= 1.1 Fixed checkitems for ale, fixed ale prize(gives the correct one now). [Kisuka]
 //= 1.2 Optimized. Uses only one variable now. [L0ne_W0lf]
-//=	Corrected EXP rewards, and some typos.
+//=     Corrected EXP rewards, and some typos.
 //= 1.3 Corrected random in item function. [L0ne_W0lf]
 //= 1.4 Replaced effect numerics with constants. [Samuray22]
 //= 1.5 Revamped the script. [Kisuka]
diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt
index ee71a940b..7211ebaa1 100644
--- a/npc/events/bossnia.txt
+++ b/npc/events/bossnia.txt
@@ -1,18 +1,20 @@
 //===== Hercules Script ======================================
 //= Bossnia Warp NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Masao
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Description: ========================================= 
-//= Bossnia Warp NPC's.
-//===== Additional Comments: ================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= Bossnia MVP event.
+//===== Additional Comments: =================================
 //= 1.0 Converted from the official script.
 //= 1.1 Optimized. [Euphy]
-//============================================================ 
-
-prontera,132,125,4	script	Bossnia Staff::bsw	908,{
+//= 1.2 Moved spawns and warps (by Masao) to this file. [Euphy]
+//============================================================
 
+// Entrance NPCs
+//============================================================
+prontera,132,125,4	script	Bossnia Staff#1	908,{
 	mes "[Riss]";
 	mes "Hello?";
 	mes "I found some beautiful places";
@@ -62,7 +64,7 @@ prontera,132,125,4	script	Bossnia Staff::bsw	908,{
 	next;
 	if (Zeny > 4999) {
 		mes "[Riss]";
-		mes "Would you really like to take the challenge??";
+		mes "Would you really like to take the challenge?";
 		mes "Ok, just choose the course.";
 		next;
 		set .@i, select("First","Second","Third","Fourth");
@@ -79,9 +81,194 @@ prontera,132,125,4	script	Bossnia Staff::bsw	908,{
 	mes "Come back when you have at least 5,000 zeny.";
 	close;
 }
+geffen,124,169,4	duplicate(Bossnia Staff#1)	Bossnia Staff#2	908
+payon,165,150,4	duplicate(Bossnia Staff#1)	Bossnia Staff#3	908
+morocc,142,100,4	duplicate(Bossnia Staff#1)	Bossnia Staff#4	908
+lighthalzen,203,140,4	duplicate(Bossnia Staff#1)	Bossnia Staff#5	908
+rachel,132,144,4	duplicate(Bossnia Staff#1)	Bossnia Staff#6	908
+
+// Warp Portals
+//============================================================
+bossnia_01,204,204,0	warp	bossnia01	1,1,prontera,155,180
+bossnia_02,204,204,0	warp	bossnia02	1,1,prontera,155,180
+bossnia_03,204,204,0	warp	bossnia03	1,1,prontera,155,180
+bossnia_04,204,204,0	warp	bossnia04	1,1,prontera,155,180
+
+// Monster Spawns
+//============================================================
+
+//----------------------------------------------------------------------------
+// bossnia_01 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_01,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_01,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_01,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_01,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_01,0,0,0,0	monster	Baphomet	1039,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_01,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_01,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_01,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_01,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_01,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_01,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_01,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_01,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_01,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_01,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_01,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_01,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_01,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_01,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_01,45,118,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_01,196,122,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_01,142,61,1,1	monster	Ifrit	1832,1,0,0,1
+
+//----------------------------------------------------------------------------
+// bossnia_02 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_02,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_02,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_02,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_02,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_02,0,0,0,0	monster	Baphomet	1039,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_02,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_02,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_02,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_02,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_02,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_02,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_02,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_02,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_02,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_02,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_02,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_02,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_02,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_02,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_02,45,118,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_02,196,122,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_02,142,61,1,1	monster	Ifrit	1832,1,0,0,1
+
+//----------------------------------------------------------------------------
+// bossnia_03 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_03,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_03,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_03,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_03,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_03,0,0,0,0	monster	Baphomet	1039,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_03,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_03,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_03,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_03,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_03,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_03,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_03,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_03,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_03,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_03,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_03,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_03,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_03,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_03,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_03,45,118,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_03,196,122,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_03,142,61,1,1	monster	Ifrit	1832,1,0,0,1
 
-geffen,124,169,4	duplicate(bsw)	Bossnia Staff#2	908
-payon,165,150,4	duplicate(bsw)	Bossnia Staff#3	908
-morocc,142,100,4	duplicate(bsw)	Bossnia Staff#4	908
-lighthalzen,203,140,4	duplicate(bsw)	Bossnia Staff#5	908
-rachel,132,144,4	duplicate(bsw)	Bossnia Staff#6	908
+//----------------------------------------------------------------------------
+// bossnia_04 - Bossnia
+//----------------------------------------------------------------------------
+bossnia_04,0,0,0,0	monster	Garm	1252,5,7200000,0,1
+bossnia_04,0,0,0,0	monster	Gloom Under Night	1768,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Dark Lord	1272,3,7200000,0,1
+bossnia_04,0,0,0,0	monster	Doppelganger	1046,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Dracula	1389,5,1800000,0,1
+bossnia_04,0,0,0,0	monster	Drake	1112,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Detale	1719,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Maya	1147,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Mistress	1059,1,1800000,0,1
+bossnia_04,0,0,0,0	monster	Baphomet	1039,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Egnigem Cenia	1658,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Amon Ra	1511,1,1800000,0,1
+bossnia_04,0,0,0,0	monster	Atroce	1785,10,1800000,0,1
+bossnia_04,0,0,0,0	monster	Vesper	1685,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Eddga	1115,1,1800000,0,1
+bossnia_04,0,0,0,0	monster	Osiris	1038,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Orc Lord	1190,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Orc Hero	1087,2,1800000,0,1
+bossnia_04,0,0,0,0	monster	Samurai Specter	1492,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Moonlight Flower	1150,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Lord of the Dead	1373,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Ktullanux	1779,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Kiel D-01	1734,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Thanatos Phantom	1708,2,7200000,0,1
+bossnia_04,0,0,0,0	monster	Lady Tanee	1688,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Tao Gunka	1583,1,3600000,0,1
+bossnia_04,0,0,0,0	monster	Turtle General	1312,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Pharaoh	1157,2,3600000,0,1
+bossnia_04,0,0,0,0	monster	Stormy Knight	1251,2,3600000,0,1
+bossnia_04,0,0,0,0	monster	Falling Bishop	1871,5,7200000,0,1
+bossnia_04,0,0,0,0	monster	Phreeoni	1159,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	Golden Thief Bug	1086,10,3600000,0,1
+bossnia_04,0,0,0,0	monster	Evil Snake Lord	1418,10,7200000,0,1
+bossnia_04,0,0,0,0	monster	RSX-0806	1623,5,7200000,0,1
+bossnia_04,0,0,0,0	monster	Assassin Cross Eremes	1647,1,0,0,1
+bossnia_04,137,118,1,1	monster	Whitesmith Howard	1648,1,0,0,1
+bossnia_04,122,195,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_04,45,118,1,1	monster	Beelzebub	1873,1,0,0,1
+bossnia_04,196,122,1,1	monster	Valkyrie Randgris	1751,1,0,0,1
+bossnia_04,142,61,1,1	monster	Ifrit	1832,1,0,0,1
diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt
index cc4fb543c..ab834da51 100644
--- a/npc/events/children_week.txt
+++ b/npc/events/children_week.txt
@@ -5,27 +5,27 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Indian Ro: Children Week Event
 //===== Additional Comments: =================================
 //= 1.1 First Beta. [Samuray22]
 //============================================================
 
 prontera,146,91,5	script	Pandit chacha#child07	61,{
-	if(BaseLevel > 50) {
+	if (BaseLevel > 50) {
 		mes "[Pandit chacha]";
 		mes "Hahaha~";
 		mes "It is special day, comes only one time in a year.";
 		mes "If you see little adventurers around you send to me~";
 		mes "I will give the special gift.";
 		close;
-	} else if(BaseLevel < 20) {
+	} else if (BaseLevel < 20) {
 		mes "[Pandit chacha]";
 		mes "Hahaha~";
 		mes "You are a baby adventurer not little adventurer.";
 		mes "When you more grow up, come back again. hahaha.";
 		close;
-	} else if(oversea_event9 < 1) {
+	} else if (oversea_event9 < 1) {
 		mes "[Pandit chacha]";
 		mes "Hahaha~";
 		mes "Welcome, little adventurers!";
@@ -33,7 +33,7 @@ prontera,146,91,5	script	Pandit chacha#child07	61,{
 		mes "I would like to give the small gift to little adventurer...";
 		mes "What about you? Do you want to take it?";
 		next;
-		if(select("No. I will take it later.","Sure, i want.") == 1) {
+		if(select("No. I will take it later.:Sure, I want.") == 1) {
 			mes "[Pandit chacha]";
 			mes "That's too bad.... hum...";
 			mes "I gathered some stuffs from far a way world to make it....";
@@ -41,21 +41,21 @@ prontera,146,91,5	script	Pandit chacha#child07	61,{
 			close;
 		}
 		set oversea_event9,1;
-		getitem 11705,10; //Children's Potion
+		getitem 11705,10; //Special_White_Potion
 		mes "[Pandit chacha]";
 		mes "Look. This is a child Potion.";
 		mes "The weight is just 1 but recover much HP.";
 		mes "If you want to get more, bring the 1 Wedding Bouquet and 1 Witherless Rose.";
 		close;
-	} else if(oversea_event9 == 1) {
-		if(countitem(745) > 0 && countitem(748) > 0) {
+	} else if (oversea_event9 == 1) {
+		if (countitem(745) > 0 && countitem(748) > 0) {
 			mes "[Pandit chacha]";
 			mes "Ahha!!";
 			mes "You have remembered my beautiful composition.";
 			mes "You did good work.";
 			mes "Could you give me 1 Wedding Bouquet and 1 Witherless Rose? ";
 			next;
-			if(select("Not yet.","Sure, take it.") == 1) {
+			if(select("Not yet.:Sure, take it.") == 1) {
 				mes "[Pandit chacha]";
 				mes "If you are not prepared yet, call me when you ready.";
 				close;
@@ -66,10 +66,10 @@ prontera,146,91,5	script	Pandit chacha#child07	61,{
 			mes "Here, I will exchange to the 50 child potion.";
 			mes "Once you get this 50 child potion, I won't give any more.";
 			close2;
-			delitem 745,1; //Wedding Bouquet
-			delitem 748,1; //Witherless Rose
+			delitem 745,1; //Wedding_Bouquet
+			delitem 748,1; //Witherless_Rose
 			set oversea_event9,2;
-			getitem 11705,50; //Children's Potion
+			getitem 11705,50; //Special_White_Potion
 			end;
 		}
 		mes "[Pandit chacha]";
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index a5af84273..5b8af009b 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Event 1: Louise's Kim creates Louise's Santa Hat.
 //= Event 2: Enjoy Happymerry Chistmas Event summons monsters.
 //= Event 3: Oholy requires you to hunt Deviruchi NPCs.
@@ -51,7 +51,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 	mes "";
 	emotion e_lv;
 	next;
-	if(countitem(2236) > 0) {
+	if (countitem(2236) > 0) {
 		if (select("Here.:It's ok.") == 1) {
 			mes "[Designer Louise Kim]";
 			mes "Nice choice!!";
@@ -294,7 +294,7 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 			end;
 		}
 	}
-	else if((christ_solo05 > 0) && (christ_solo05 < 5)){
+	else if ((christ_solo05 > 0) && (christ_solo05 < 5)){
 		mes "[Enjoy]";
 		mes "Each should have one person's phone number.";
 		mes "We must keep it secret before we put in action.";
@@ -395,7 +395,7 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 			donpcevent "Christ#christ02::OnCommandEmotion";
 			donpcevent "Mas#mas02::OnCommandEmotion";
 			donpcevent "Event#event02::OnCommandEmotion";
-			misceffect 376; //_HITLINE2
+			misceffect EF_HITLINE2;
 			delitem 604,5; //Branch_of_Dead_Tree
 			set christ_solo05,6;
 			donpcevent "Happymerry#happymerry02::OnCommandOff";
@@ -719,7 +719,7 @@ prontera,62,339,3	script	Christ#christ	875,{
 		set christ_solo05,3;
 		close;
 	}
-	else if(christ_solo05 > 2) {
+	else if (christ_solo05 > 2) {
 		mes "[Christ]";
 		mes "Than,see you there!!";
 		mes "I'll go meet Enjoy!";
@@ -755,7 +755,7 @@ prontera,62,339,3	script	Christ#christ	875,{
 }
 
 prontera,163,66,7	script	Mas#mas	748,{
-	if(christ_solo05 == 3) {
+	if (christ_solo05 == 3) {
 		mes "[Mas]";
 		mes "Herds!!!!!How long does it take!";
 		mes "Somebody know the regenerating time of Herb?!!";
@@ -810,7 +810,7 @@ prontera,163,66,7	script	Mas#mas	748,{
 		set christ_solo05,4;
 		close;
 	}
-	else if(christ_solo05 > 3) {
+	else if (christ_solo05 > 3) {
 		mes "[Mas]";
 		mes "If you excuse me, I'll go ahead and meat Enjoy.";
 		mes "And don't forget to tell ^0000FFEvent^000000 about this.";
@@ -837,7 +837,7 @@ prontera,163,66,7	script	Mas#mas	748,{
 }
 
 prontera,35,209,5	script	Event#event	881,{
-	if(christ_solo05 == 4) {
+	if (christ_solo05 == 4) {
 		mes "[Event]";
 		mes "........................";
 		next;
@@ -891,7 +891,7 @@ prontera,35,209,5	script	Event#event	881,{
 		set christ_solo05,5;
 		close;
 	}
-	else if(christ_solo05 > 4) {
+	else if (christ_solo05 > 4) {
 		mes "[Event]";
 		mes "Wait for me miss Kafra~~~";
 		mes "Don't be so lonely~.";
@@ -1104,7 +1104,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			close;
 		}
 	}
-	else if(christ_carol05 == 1) {
+	else if (christ_carol05 == 1) {
 		mes "[Oholy]";
 		mes "He should not be able to escape";
 		mes "from the town. Please find the";
@@ -1113,8 +1113,8 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 		mes "Punish the wicked devil who is ruining Christmas!!!";
 		close;
 	}
-	else if(christ_carol05 == 2) {
-		if(!checkweight(1201,1)) {
+	else if (christ_carol05 == 2) {
+		if (!checkweight(1201,1)) {
 			mes "^3355FFWait a second!";
 			mes "Right now, you're carrying";
 			mes "too many things with you.";
@@ -1123,8 +1123,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "to store some of your items.^000000";
 			close;
 		}
-		set .@now_weight,MaxWeight-Weight;
-		if(.@now_weight < 2000) {
+		if (MaxWeight - Weight < 2000) {
 			mes "^3355FFWait a second!";
 			mes "Right now, you're carrying";
 			mes "too many things with you.";
@@ -1441,7 +1440,7 @@ function	script	F_carol_devi	{
 			disablenpc getarg(0);
 			next;
 			mes "-You are now cursed!!!-";
-			sc_start SC_Curse,5000,0;
+			sc_start SC_CURSE,5000,0;
 			emotion e_omg,1;
 			close;
 		case 3:
@@ -1458,7 +1457,7 @@ function	script	F_carol_devi	{
 			disablenpc getarg(0);
 			next;
 			mes "-You are blinded!!!-";
-			sc_start SC_Blind,5000,0;
+			sc_start SC_BLIND,5000,0;
 			emotion e_omg,1;
 			close;
 		case 4:
@@ -1475,7 +1474,7 @@ function	script	F_carol_devi	{
 			disablenpc getarg(0);
 			next;
 			mes "-You are poisoned!!!-";
-			sc_start SC_Poison,5000,0;
+			sc_start SC_POISON,5000,0;
 			emotion e_omg,1;
 			close;
 		}
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 91555424a..5e9b26e86 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -29,7 +29,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Merry Christmas!";
 			mes "Hey! You! What comes to mind when you think about Christmas?";
 			next;
-		}else{
+		} else {
 			mes "[Caroller]";
 			mes "Jingle Bells! Jingle Bells! Jingle all the way!";
 			next;
@@ -41,7 +41,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Merry Christmas!";
 			if (Sex) {
 				mes "Hey, boy! What comes to mind when";
-			}else{
+			} else {
 				mes "Hey, girl! What comes to mind when";
 			}
 			mes "you think about Christmas?";
@@ -67,7 +67,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "If you win over Santa, you can get a gift. Would you go for it?";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't that big news?";
@@ -85,7 +85,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "Furthermore, he has put bad magic on the gifts so that they become monsters!";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't it amazing?";
@@ -113,7 +113,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 						mes "[Caroller]";
 						mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 						close;
-					}else{
+					} else {
 						mes "[Caroller]";
 						mes "Wow, you have them.";
 						next;
@@ -131,13 +131,13 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion 18;
+							emotion e_heh;
 							delitem 6092,6;
 							getnameditem 12354,"+strcharinfo(0)+";
 							mes "[Caroller]";
 							mes "Let's care about others around you on this Christmas season!";
 							close;
-						}else{
+						} else {
 							mes "[Caroller]";
 							mes "Oh!";
 							mes "Shyness!";
@@ -152,7 +152,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion 18;
+							emotion e_heh;
 							delitem 6092,6;
 							getitem 12354,1;
 							mes "[Caroller]";
@@ -230,7 +230,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 					mes "Please, for our children's hope!!!?";
 					mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
 					next;
-					emotion 33;
+					emotion e_ok;
 					mes "[Caroller]";
 					mes "They're definitely as harsh as their name.";
 					mes "Go on please!";
@@ -252,7 +252,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "Are there some spcial abilities within them?";
 				mes "There's still the designer in the Christmas village... How about asking her to make that costume?";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "It's hot, huh?";
@@ -270,7 +270,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "And he isn't alone anymore... is what I heard...";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Hotness, right?";
@@ -293,13 +293,13 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "For all of the children of this world!!!";
 			mes "Please bring me ^0000FFSinging Crystal Pieces^000000 from ^0000FFViolent Gift Boxes^000000!";
 			next;
-			emotion 33;
+			emotion e_ok;
 			mes "[Caroller]";
 			mes "Be careful!";
 			mes "They're definitely as harsh as their name.";
 			mes "Take care!!!";
 			close;
-		}else{
+		} else {
 			specialeffect EF_GLORIA;
 			mes "[Caroller]";
 			mes "Don't cry, don't cry!";
@@ -335,7 +335,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
 			delitem 6092,6;
-			emotion 33;
+			emotion e_ok;
 			set iROxmas08carol,2;
 			mes "[Caroller]";
 			mes "Those are all needed.";
@@ -354,12 +354,12 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "So, we need more of some materials.";
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
-			emotion 33;
+			emotion e_ok;
 			mes "[Caroller]";
 			mes "That's all we need.";
 			mes "Isn't that easy?";
 			close;
-		}else{
+		} else {
 			specialeffect EF_GLORIA;
 			mes "[Caroller]";
 			mes "Jingle bells, jingle bells,";
@@ -414,7 +414,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Caroller]";
 			mes "Don't worry, it tastes good.";
 			next;
-			emotion 33;
+			emotion e_ok;
 			getitem 2784,1;
 			getnameditem 12354,"+strcharinfo(0)+";
 			delitem 1019,10;
@@ -454,7 +454,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "[Santa Claus]";
 		if (Sex) {
 			mes "Ho ho ho! What a good boy!";
-		}else{
+		} else {
 			mes "Ho ho ho! What a good girl!";
 		}
 		next;
@@ -526,7 +526,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "Let's get started!";
 		next;
 		while(.@SantaCardTurn != 5) {
-			emotion 56;
+			emotion e_loud;
 			mes "[Santa Claus]";
 			mes "First let me shuffle up these cards... Ok!!!";
 			next;
@@ -581,28 +581,28 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Let's see!!";
 			mes "One! Two! Three!";
 			if (.@SantaCardNpc == 1) {
-				cutin "Æ÷¸µÄ«µå",4;
+				cutin "����ī��",4; // Poring Card
 			}
 			else if (.@SantaCardNpc == 2) {
-				cutin "¿£Á©¸µÄ«µå",4;
+				cutin "������ī��",4; // Angeling Card
 			}
 			else if (.@SantaCardNpc == 3) {
-				cutin "°í½ºÆ®¸µÄ«µå",4;
+				cutin "����Ʈ��ī��",4; // Ghostring Card
 			}
 			next;
 			set .@SantaCardTurn,.@SantaCardTurn+1;
 			if (.@SantaCardP == .@SantaCardNpc) {
 				set .@SantaCardWins,.@SantaCardWins+1;
-				emotion 0;
-				emotion 5,1;
+				emotion e_gasp;
+				emotion e_ic,1;
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "You're lucky.";
 				mes "Can you guess the right card the next time around?";
 				next;
-			}else{
-				emotion 0;
-				emotion 23,1;
+			} else {
+				emotion e_gasp;
+				emotion e_omg,1;
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "Aww maybe next time...";
@@ -617,7 +617,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Santa Claus]";
 			mes "Whenever you want.";
 			close;
-		}else{
+		} else {
 			mes "[Santa Claus]";
 			mes "You're so good!";
 			next;
@@ -687,7 +687,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "........................";
 		if (Sex) {
 			mes "Oh! Poor boy...";
-		}else{
+		} else {
 			mes "Oh! Poor girl...";
 		}
 		next;
@@ -695,7 +695,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "........................";
 		if (Sex) {
 			mes "Oh! Poor boy...";
-		}else{
+		} else {
 			mes "Oh! Poor girl...";
 		}
 		mes "...";
@@ -728,7 +728,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "The reason catching up to him is so hard, is that his clothes have been given strong power!";
 	mes "I blessed them with good luck!";
 	next;
-	emotion 3;
+	emotion e_lv;
 	mes "[Louise Kim]";
 	mes "Preta Porter!!";
 	mes "Which is quite luxurious but sold at good price ~";
@@ -745,7 +745,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "Ah!";
 		mes "You're silly! You lost your big chance!";
 		next;
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "Come to me later if you want to get the mission.";
 		mes "I, Louise Kim, am generous enough to accept you next time.";
@@ -763,7 +763,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "Anyway, can you bring me some stuff?";
 	next;
 	if (select("Why not? What do you need?:Sorry, no time.") == 2) {
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "What?";
 		mes "You will definitely regret it.";
@@ -781,13 +781,13 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 			mes "[Louise Kim]";
 			mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free...";
 			next;
-			emotion 3;
+			emotion e_lv;
 			mes "[Louise Kim]";
 			mes "Please see me again if you are interested.";
 			close;
-	}else{
+	} else {
 		select("Here you are.");
-		emotion 33;
+		emotion e_ok;
 		mes "[Louise Kim]";
 		mes "Oh! Good!";
 		mes "Let's not delay.";
@@ -799,7 +799,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-and many blessings she sings.-";
 		next;
 		specialeffect EF_BLESSING;
-		emotion 2;
+		emotion e_ho;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -813,7 +813,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-Count your blessings and sing!-";
 		next;
 		specialeffect EF_GLORIA;
-		emotion 2;
+		emotion e_ho;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -825,7 +825,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-cheer and goodwill!-";
 		next;
 		specialeffect EF_BENEDICTIO;
-		emotion 3;
+		emotion e_lv;
 		mes "[Louise Kim]";
 		mes "This is miraculous!";
 		mes "I am a genius of the world.";
@@ -837,7 +837,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "My fashion is radiant.";
 		mes "I ain't envious of Designer Pierre.";
 		next;
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "I am supposed to get paid well, however I will just let it be free, since this is Christmas!";
 		next;
diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt
index fe6e02c85..92033782d 100644
--- a/npc/events/easter_2008.txt
+++ b/npc/events/easter_2008.txt
@@ -91,7 +91,7 @@ prontera,111,99,5	script	Egg Salesman#prt::EggVendor	98,{
 				}
 				else {
 					set .@egg_zeny,.@input*500;
-					if (zeny < .@egg_zeny) {
+					if (Zeny < .@egg_zeny) {
 						mes "[Egg Salesman]";
 						mes "You don't have enough Zeny.";
 						next;
@@ -118,7 +118,7 @@ prontera,111,99,5	script	Egg Salesman#prt::EggVendor	98,{
 							mes "them, but I don't know anything";
 							mes "about that. Well, have a good";
 							mes "time, and I'll see you again!";
-							set zeny,zeny-.@egg_zeny;
+							set Zeny, Zeny-.@egg_zeny;
 							getitem 7605,.@input; //Chicken_Egg
 							close;
 						}
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
new file mode 100644
index 000000000..b57963ad6
--- /dev/null
+++ b/npc/events/easter_2010.txt
@@ -0,0 +1,618 @@
+//===== Hercules Script ======================================
+//= Easter Event (2010)
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Lift Lina's curse for an Easter Egg Shell.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+prontera,202,297,3	script	Rina#Easter	727,{
+	disable_items;
+	if (BaseLevel < 40) {
+		mes "[Rina]";
+		mes "Hi~!";
+		mes "You are an adventurer like me.";
+		next;
+		mes "[Rina]";
+		mes "I am put under a curse.";
+		mes "I know you want to help me,";
+		mes "but your experience is not enough.";
+		next;
+		consumeitem 607; //Yggdrasilberry
+		consumeitem 12068; //Luk_Dish03
+		consumeitem 12063; //Dex_Dish03
+		consumeitem 12053; //Vit_Dish03
+		npcskill "AL_INCAGI",1,0,0;
+		npcskill "AL_BLESSING",1,0,0;
+		mes "[Rina]";
+		mes "I am not in the good condition,";
+		mes "so what I can do for you";
+		mes "is just like this.";
+		mes "Then, good bye.";
+		mes "Take care~!";
+		close;
+	}
+	set .@quest1, checkquest(9117);
+	if (.@quest1 == -1) {
+		playbgm "30.mp3"; // One Step Closer
+		mes "[Rina]";
+		mes "Hi~!";
+		mes "You are an adventurer like me.";
+		mes "Well... In fact, I am";
+		mes "put under a strange curse.";
+		next;
+		mes "[Rina]";
+		mes "To release this curse,";
+		mes "somebody needs to do ^800080Oath-taking ceremony^000000";
+		mes "with me,";
+		mes "and then needs to solve";
+		mes "several problems instead of me.";
+		next;
+		if (select("Let's help ^800080Rina^000000.:Just skip it.") == 2) {
+			emotion e_sigh;
+			mes "[Rina]";
+			mes "To help me,";
+			mes "I need a competent adventurer.";
+			mes "If you know those people,";
+			mes "I hope you to introduce them to me later.";
+			close;
+		}
+		emotion e_awsm;
+		mes "[Rina]";
+		mes "Are you really going to help me?";
+		mes "Thank you.";
+		mes "You are so brave.";
+		next;
+		playbgm "01.mp3"; // Title
+		mes "[Rina]";
+		mes "Then I'll start ^800080Oath-taking ceremony^000000.";
+		mes " ";
+		mes "^787878( A mysterious atmosphere hangs in the air. )^000000";
+		next;
+		specialeffect2 EF_COUPLECASTING;
+		next;
+		mes "[Rina]";
+		mes "Blah blah blah...";
+		mes " ";
+		mes "Blah blah blah...";
+		mes " ";
+		mes "^787878( ... This is a strange spell. )^000000";
+		next;
+		specialeffect2 EF_SIGNUM;
+		mes "[Rina]";
+		mes "Haaaaah~";
+		mes "^800080Oath-taking ceremony^000000 is done enough now.";
+		mes "Isn't that so simple?";
+		next;
+		emotion e_dum;
+		mes "[Rina]";
+		mes "Okay, from no on,";
+		mes "you need to go on ^006400a real adventure";
+		mes "to release my curse^000000.";
+		mes "Let me know when you are ready.";
+		setquest 9117;
+		close;
+	} else if (.@quest1 == 0 || .@quest1 == 1) {
+	L_HuntingInfo:
+		mes "[Rina]";
+		mes "What you need to do is";
+		mes "to choose one monster among";
+		mes "^FF0000DEVIRUCHI,^000000 ^FF0000WRAITH DEAD,^000000";
+		mes "^FF0000DULLAHAN,^000000 ^FF0000NIGHTMARE TERROR^000000";
+		mes "and then kill ^0000FF50^000000 monsters";
+		mes "and come back to me.";
+		next;
+		mes "[Rina]";
+		mes "It must be a tough task,";
+		mes "but you are the right person";
+		mes "who did the oath-taking ceremony.";
+		mes "I hope you succeed.";
+		if (.@quest1 < 2) {
+			completequest 9117;
+			setquest 9118;
+			setquest 9119;
+			setquest 9120;
+			setquest 9121;
+		}
+		close2;
+		npcskill "AL_INCAGI",1,0,0;
+		npcskill "AL_BLESSING",1,0,0;
+		end;
+	} else if (.@quest1 == 2) {
+		if (checkquest(9118) < 2 || checkquest(9119) < 2 || checkquest(9120) < 2 || checkquest(9121) < 2) {
+			if (checkquest(9118,HUNTING) == 2 || checkquest(9119,HUNTING) == 2 || checkquest(9120,HUNTING) == 2 || checkquest(9121,HUNTING) == 2) {
+				mes "[Rina]";
+				mes "You did it.";
+				mes "I can feel that my body is recovering.";
+				mes "But it is not enough.";
+				next;
+				mes "[Rina]";
+				mes "^006400You have one more thing to do.^000000";
+				mes "Let me know when you're ready.";
+				close2;
+				completequest 9118;
+				completequest 9119;
+				completequest 9120;
+				completequest 9121;
+				setquest 9122;
+			} else
+				goto L_HuntingInfo;
+			end;
+		}
+	}
+	set .@quest2, checkquest(9122);
+	if (.@quest2 == 0 || .@quest2 == 1) {
+		mes "[Rina]";
+		mes "I will check one thing.";
+		mes "For this task,";
+		mes "You need to feel the music.";
+		next;
+		mes "[Rina]";
+		mes "You cannot complete the task";
+		mes "without the music.";
+		mes "do you have any problem?";
+		next;
+		mes "- Check! -";
+		mes "^787878- BGM option should be turned on -^000000";
+		mes "^787878- in the game option menu. -^000000";
+		mes "^787878- Please check -^000000";
+		mes "^787878- whether you can listen -^000000";
+		mes "^787878- to the music sound. -^000000";
+		next;
+		if(select("[I'm ready to listen to the BGM.]:[I can't listen to the BGM.]") == 2) {
+			mes "[Rina]";
+			mes "I am so shocked that";
+			mes "you cannot feel the music.";
+			mes "What should we do now...";
+			close2;
+			emotion e_sob;
+			end;
+		}
+		mes "[Rina]";
+		mes "Listen carefully";
+		mes "the feelings of it...";
+		mes "I can't hear it,";
+		mes "but you can hear the sound.";
+		next;
+		if (oversea_event2 < 520 || oversea_event3 < 270 || oversea_event6 < 245 || oversea_event9 < 197) {
+			     if (oversea_event2 == 520) playbgm "13.mp3"; // Theme of Geffen
+			else if (oversea_event3 == 270) playbgm "59.mp3"; // Theme of Lutie
+			else if (oversea_event6 == 245) playbgm "70.mp3"; // Theme of Juno
+			else if (oversea_event9 == 197) playbgm "94.mp3"; // Theme of Rachel
+			else {
+				switch(rand(1,4)) {
+					case 1: playbgm "13.mp3"; set oversea_event2,520; break;
+					case 2: playbgm "59.mp3"; set oversea_event3,270; break;
+					case 3: playbgm "70.mp3"; set oversea_event6,245; break;
+					case 4: playbgm "94.mp3"; set oversea_event9,197; break;
+				}
+			}
+		}
+		mes "[Rina]";
+		mes "^006400The music you're hearing now^000000";
+		mes "has something to do with the one specific city.";
+		mes "Think carefully ^006400what kind of city^000000";
+		mes "has similar feeling with this music.";
+		next;
+		mes "[Rina]";
+		mes "And...";
+		mes "Go to ^006400the city";
+		mes "where you can remind by this music^000000.";
+		next;
+		mes "[Rina]";
+		mes "After that,";
+		mes "find ^FF0000the strange mark^000000";
+		mes "around the entrances of the city.";
+		mes "Then you can release the curse on me.";
+		next;
+		mes "[Rina]";
+		mes "It must be tough";
+		mes "but I hope you good luck.";
+		close2;
+		emotion e_sigh;
+		end;
+	} else {
+		set .@quest3, checkquest(9123);
+		if (.@quest3 == 0 || .@quest3 == 1) {
+			emotion e_kis;
+			mes "[Rina]";
+			mes "You're back~!";
+			mes "My curse has been released.";
+			mes "Thank you so much.";
+			next;
+			if (checkweight(5852,1) == 0) {
+				mes "[Rina]";
+				mes "Your bag is too full.";
+				mes "I have a present for you";
+				mes "so make your bag lighter.";
+				mes "I'll wait for you.";
+				close;
+			}
+			completequest 9123;
+			getitem 5852,1; //Easter_Egg_Shell
+			set .@BaseExp, (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2);
+			if (ADVJOB == 0) {
+				     if (BaseLevel < 40) set .@nBaseExp, .@BaseExp;
+				else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel);
+				else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20));
+				else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+				else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+				else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+				else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+				else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2);
+
+				set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2;
+			} else {
+				     if (BaseLevel < 30) set .@nBaseExp, .@BaseExp;
+				else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10);
+				else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2);
+				else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+				else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+				else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+				else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+				else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel);
+				else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2);
+
+				set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3;
+			}
+			getexp .@nBaseExp,.@nJobExp;
+			mes "[Rina]";
+			mes "This is the present for you.";
+			mes "It's not a big one";
+			mes "but please take it";
+			mes "as a token of my gratitude.";
+			next;
+			mes "[Rina]";
+			mes "I'll take a rest for a few days";
+			mes "and then I'll go on an adventure.";
+			mes "See you again.";
+			close2;
+			consumeitem 607; //Yggdrasilberry
+			consumeitem 12068; //Luk_Dish03
+			consumeitem 12063; //Dex_Dish03
+			consumeitem 12053; //Vit_Dish03
+			npcskill "AL_INCAGI",1,0,0;
+			npcskill "AL_BLESSING",1,0,0;
+			end;
+		} else {
+			mes "[Rina]";
+			mes "Thank you for releasing my curse.";
+			mes "I'll take a rest for a few days";
+			mes "and then go on an adventure again.";
+			mes "Have a happy day~!";
+			close2;
+			consumeitem 607; //Yggdrasilberry
+			npcskill "AL_INCAGI",1,0,0;
+			npcskill "AL_BLESSING",1,0,0;
+			end;
+		}
+	}
+}
+
+geffen,207,114,4	script	#Hiddne01Easter	844,{
+	if (oversea_event2 > 519) {
+	OnRelease:
+		specialeffect EF_PATTACK;
+		mes "- I found ^0000FFthe strange mark^000000. -";
+		next;
+		specialeffect2 EF_HOLYHIT;
+		mes "- I can definitely feel that";
+		mes "- ^0000FFRina^000000 has been released";
+		mes "- from the curse.";
+		mes "- ^006400Let's go back to Rina!^000000";
+		if (checkquest(9122) < 2) {
+			completequest 9122;
+			setquest 9123;
+		}
+		close;
+	}
+	end;
+}
+
+xmas,144,52,4	script	#Hiddne02Easter	844,{
+	if (oversea_event3 > 269)
+		doevent "#Hiddne01Easter::OnRelease";
+	end;
+}
+
+yuno,164,46,4	script	#Hiddne03Easter	844,{
+	if (oversea_event6 > 244)
+		doevent "#Hiddne01Easter::OnRelease";
+	end;
+}
+
+rachel,36,132,4	script	#Hiddne04Easter	844,{
+	if (oversea_event9 > 196)
+		doevent "#Hiddne01Easter::OnRelease";
+	end;
+}
+
+prontera,204,297,3	script	Rina's Little Friend	463,{
+	disable_items;
+	if (checkquest(9117) == -1) {
+		emotion e_swt2;
+		mes "[Rina's Little Friend]";
+		mes ".......";
+		mes " ";
+		mes "^787878( No response. )^000000";
+		close;
+	}
+	if (checkquest(9123) == 2) {
+		emotion e_meh;
+		mes "[Rina's Little Friend]";
+		mes "Hi.";
+		mes "I guess you're the trustworthy friend.";
+		mes "Are you here to make a deal with me?";
+		next;
+		switch(select("Yes.:No.:What do you mean?")) {
+		case 1:
+			if (ADVJOB == 0) {
+				if (BaseLevel < 70)
+					set .@nCharge,400000;
+				else if (BaseLevel < 90)
+					set .@nCharge,450000;
+				else
+					set .@nCharge,480000;
+			} else
+				set .@nCharge,500000;
+			if (countitem(574) < 1 || countitem(1001) < 20 || Zeny < .@nCharge) {
+				mes "[Rina's Little Friend]";
+				mes "Hmm.";
+				mes "The material is not enough.";
+				mes "Please check the things you need.";
+				close;
+			}
+			mes "[Rina's Little Friend]";
+			mes "Cool... if you give me the materials";
+			mes "I will start it right now.";
+			mes "Are you ready for it?";
+			next;
+			if(select("Yes, let's start it.:No, stop it.") == 2) {
+				mes "[Rina's Little Friend]";
+				mes "Heh. It's boring.";
+				close;
+			}
+			mes "[Rina's Little Friend]";
+			mes "Okay, I will start it now.";
+			mes " ";
+			mes "^787878( A mysterious atmosphere hangs in the air. )^000000";
+			next;
+			specialeffect EF_ASPERSIO;
+			delitem 574,1; //Egg
+			delitem 1001,20; //Sparkling_Dust
+			set Zeny, Zeny - .@nCharge;
+			set .@nPercentage, rand(1,100);
+			if (.@nPercentage <= 41) {
+				mes "[Rina's Little Friend]";
+				mes "Life is given to the egg.";
+				mes "Aaaaah~ I got to take some rest.";
+				mes "Good bye~!";
+				if (.@nPercentage <= 12)
+					getitem 9003,1; //Poporing_Egg
+				else if (.@nPercentage <= 24)
+					getitem 9005,1; //Picky_Egg
+				else if (.@nPercentage <= 36)
+					getitem 9009,1; //Savage_Bebe_Egg
+				else
+					getitem 9023,1; //Deviruchi_Egg
+				close2;
+				emotion e_yawn;
+				end;
+			} else if (.@nPercentage <= 60) {
+				if (.@nPercentage >= 42 && .@nPercentage <= 45)
+					getitem 5852,1; //Easter_Egg_Shell
+				else
+					getitem 12019,5; //Holy_Egg
+				mes "[Rina's Little Friend]";
+				mes "It seems that you have quite interesting things.";
+				mes "I need to take some rest.";
+				mes "Good bye~!";
+				close2;
+				emotion e_yawn;
+				end;
+			} else if (.@nPercentage <= 85) {
+				if (.@nPercentage >= 61 && .@nPercentage <= 75) {
+					getitem 1001,20; //Sparkling_Dust
+					getitem 607,1; //Yggdrasilberry
+				} else {
+					getitem 574,1; //Egg
+					getitem 608,2; //Seed_Of_Yggdrasil
+				}
+				mes "[Rina's Little Friend]";
+				mes "There was no change.";
+				mes "I didn't mean to do it,";
+				mes "but I'm sorry...";
+				mes "I hope to see you again, my friend.";
+				emotion e_dum;
+				close;
+			} else {
+				getitem 12093,2; //Dex_Dish08
+				mes "[Rina's Little Friend]";
+				mes "Hmm.";
+				mes "It became a dish.";
+				mes "Looks delicious.";
+				mes "Then, good bye~!";
+				close2;
+				emotion e_rice;
+				end;
+			}
+		case 2:
+			mes "[Rina's Little Friend]";
+			mes "You are here just to see my cute looks?";
+			mes "Aren't you peeking at Rina";
+			mes "pretending to see me?";
+			mes "It's funny... haha~";
+			close2;
+			emotion e_gg;
+			end;
+		case 3:
+			playbgm "23.mp3"; // Travel
+			mes "[Rina's Little Friend]";
+			mes "Huh?!";
+			mes "I never told you before?";
+			mes "Then listen carefully.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "I have a";
+			mes "special ability.";
+			mes "It's to give a special strength";
+			mes "to ^0000FFthe egg^000000.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "Well, I cannot do that unlimitedly.";
+			mes "There is no magic that is done forever.";
+			mes "So I need some additional cost.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "And I cannot sure";
+			mes "to what the egg will be changed.";
+			mes "It may be end in failure";
+			mes "and it can be something like Pet Egg.";
+			next;
+			if(select("Ask the cost.:Stop listening because it feels like a trick.") == 2) {
+				mes "[Rina's Little Friend]";
+				mes "Well... I don't really care.";
+				mes "Good bye.";
+				close2;
+				playbgm "08.mp3"; // Theme of Prontera
+				end;
+			}
+			mes "[Rina's Little Friend]";
+			mes "Do you want to make a deal?";
+			mes "You need";
+			mes "^0000FF1 Egg^000000, ^0000FF20 Light Granule^000000 and";
+			if (ADVJOB == 0) {
+				if (BaseLevel < 70)
+					mes "^B8860B400,000 Zeny.";
+				else if (BaseLevel < 90)
+					mes "^B8860B450,000 Zeny^000000.";
+				else
+					mes "^B8860B480,000 Zeny^000000.";
+			} else
+				mes "^B8860B500,000 Zeny^000000.";
+			next;
+			mes "[Rina's Little Friend]";
+			mes "If you are interested";
+			mes "make that zeny and come again.";
+			mes "Haha...";
+			mes "I'll be waiting for you.";
+			close2;
+			playbgm "08.mp3"; // Theme of Prontera
+			emotion e_gg;
+			end;
+		}
+	}
+	emotion e_meh;
+	mes "[Rina's Little Friend]";
+	mes "Ahem!";
+	mes "Why? Are you surprised to see me speaking?";
+	mes "Well, I understand you.";
+	mes "Only the person who did";
+	mes "the oath-taking ceremony can talk with me.";
+	next;
+	mes "[Rina's Little Friend]";
+	mes "If Rina's curse is released,";
+	mes "I can also";
+	mes "suggest you";
+	mes "an interesting thing.";
+	next;
+	mes "[Rina's Little Friend]";
+	mes "I will let you know";
+	mes "the detailed explanation later.";
+	mes "Then see you later, my friend.";
+	close;
+}
+
+prontera,116,82,5	script	Traveler#01Easter	85,{
+	mes "[Traveler]";
+	mes "I'm a traveler";
+	mes "and I often visit ^8B4513Prontera^000000.";
+	mes "Hmm, I think I might";
+	mes "see you around here before.";
+	next;
+	if(select("Listen some more.:Just ignore it.") == 2) {
+		mes "[Traveler]";
+		mes "As I expected,";
+		mes "you are a silent person. Ha ha.";
+		mes "Good bye.";
+		close;
+	}
+	mes "[Traveler]";
+	mes "A few days ago,";
+	mes "I saw a new adventurer";
+	mes "who were standing";
+	mes "near the ^8B4513Cathedral^000000.";
+	next;
+	emotion e_lv;
+	mes "[Traveler]";
+	mes "That adventurer seemed pretty.";
+	mes "But...";
+	mes "I feel some strange energy";
+	mes "so I don't come close to that person.";
+	next;
+	mes "[Traveler]";
+	mes "Look like";
+	mes "you're interested in";
+	mes "that new adventurer?";
+	mes "Or that is just your face look. Ha ha.";
+	next;
+	if(select("I'm interested in it.:I don't care at all.") == 2) {
+		mes "[Traveler]";
+		mes "Ah~ I see~!";
+		mes "Then, Good bye.";
+		close;
+	}
+	mes "[Traveler]";
+	mes "Just as I expected!";
+	mes "You can find";
+	mes "that new adventurer";
+	mes "on the way to the ^8B4513Cathedral^000000";
+	mes "at the direction of 1o'clock in ^8B4513Prontera^000000.";
+	next;
+	mes "[Traveler]";
+	mes "She was carrying";
+	mes "^800080a big egg thing^000000.";
+	mes "That's what I know.";
+	close;
+OnInit:
+	initnpctimer;
+	end;
+OnTimer5000:
+	emotion e_gasp;
+	stopnpctimer;
+	initnpctimer;
+	end;
+}
+
+prontera,163,194,5	script	Traveler#02Easter	92,{
+	mes "[Traveler]";
+	mes "A while ago,";
+	mes "I met a lady";
+	mes "and she said she has been";
+	mes "under a strange curse.";
+	next;
+	mes "[Traveler]";
+	mes "I wanted to help her";
+	mes "but my experience is not enough.";
+	mes "So I couldn't help her.";
+	next;
+	mes "[Traveler]";
+	mes "If you are more than";
+	mes "level ^0000FF40^000000,";
+	mes "go to the ^8B4513Cathedral^000000";
+	mes "at the direction of 1'o clock.";
+	mes "I hope you can help her...";
+	close;
+OnInit:
+	initnpctimer;
+	end;
+OnTimer5000:
+	emotion e_gasp;
+	stopnpctimer;
+	initnpctimer;
+	end;
+}
diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index 893e0c92b..0e2e5da12 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Official Skill Resetter Event in Yuno (kRO & idRO)
-//===== By: ================================================== 
+//===== By: ==================================================
 //= $ephiroth
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.02
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= 2006 - Edition Skill Reset NPC
 //= 2006/11/16: 1.0 Release and fully working. [$ephiroth]
 //= 1.01 Checked, fixed typos, now uses MISC_QUEST var [Lupus]
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index cafb8f01e..f1de9e6d9 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1,15 +1,16 @@
 //===== Hercules Script ======================================
 //= Guild dungeon event, Arunafeltz.
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= Guild dungeon event, Arunafeltz. Retrieve Morestone's
 //= pickaxe from Kublin.
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//= 1.2 Added GM management function. [Euphy]
 //============================================================
 
 arug_dun01,1,1,1	script	Monster Controler#aru_gd	81,{
@@ -43,7 +44,7 @@ OnEnable:
 	}
 	end;
 
-Onkill:
+OnKill:
 	killmonster "arug_dun01","Monster Controler1#aru::OnMyMObDead";
 	end;
 
@@ -674,7 +675,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -816,7 +817,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see.";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -902,7 +903,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				mes "When is that person coming? I am very bored~!";
 				close;
 			}
-			emotion 18;
+			emotion e_heh;
 			mes "[Pierrot Pier]";
 			mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
 			next;
@@ -926,7 +927,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -983,14 +984,14 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 		}
 		else {
 			mes "[Pierrot Pier]";
-			mes "Voc� encontrou o tesouro?";
-			mes "Mostre-me o que voc� tem nas m�os agora.";
+			mes "Did you find the treasure?";
+			mes "Show me that thing you are holding, now!";
 			next;
 			mes "[Pierrot Pier]";
-			mes "Deixe-me ver...";
+			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -1040,35 +1041,35 @@ Ongame_start:
 	donpcevent "paper_sp_9_a::OnEnable";
 	set .@roulette_where,rand(1,9);
 	if (.@roulette_where == 1) {
-		donpcevent "paper_sp_1_a::Onbingo";
+		donpcevent "paper_sp_1_a::OnBingo";
 	}
 	else if (.@roulette_where == 2) {
-		donpcevent "paper_sp_2_a::Onbingo";
+		donpcevent "paper_sp_2_a::OnBingo";
 	}
 	else if (.@roulette_where == 3) {
-		donpcevent "paper_sp_3_a::Onbingo";
+		donpcevent "paper_sp_3_a::OnBingo";
 	}
 	else if (.@roulette_where == 4) {
-		donpcevent "paper_sp_4_a::Onbingo";
+		donpcevent "paper_sp_4_a::OnBingo";
 	}
 	else if (.@roulette_where == 5) {
-		donpcevent "paper_sp_5_a::Onbingo";
+		donpcevent "paper_sp_5_a::OnBingo";
 	}
 	else if (.@roulette_where == 6) {
-		donpcevent "paper_sp_6_a::Onbingo";
+		donpcevent "paper_sp_6_a::OnBingo";
 	}
 	else if (.@roulette_where == 7) {
-		donpcevent "paper_sp_7_a::Onbingo";
+		donpcevent "paper_sp_7_a::OnBingo";
 	}
 	else if (.@roulette_where == 8) {
-		donpcevent "paper_sp_8_a::Onbingo";
+		donpcevent "paper_sp_8_a::OnBingo";
 	}
 	else {
-		donpcevent "paper_sp_9_a::Onbingo";
+		donpcevent "paper_sp_9_a::OnBingo";
 	}
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -1106,7 +1107,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB
@@ -1131,7 +1132,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB
@@ -1156,7 +1157,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB
@@ -1181,7 +1182,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB
@@ -1206,7 +1207,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB
@@ -1231,7 +1232,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB
@@ -1256,7 +1257,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB
@@ -1281,7 +1282,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB
@@ -1306,7 +1307,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB
@@ -1511,10 +1512,11 @@ arug_que01,114,105,3	duplicate(GD_Ev_Flower)	#aru_flower_53	978
 arug_que01,109,105,3	duplicate(GD_Ev_Flower)	#aru_flower_54	977
 arug_que01,104,105,3	duplicate(GD_Ev_Flower)	#aru_flower_55	976
 
-/*
 arug_dun01,5,5,1	script	Event controller#aru_gd	81,{
-	input .@input; //,0,9999;
-	if (input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Incorrect password.";
+		close;
+	} else {
 		mes "How can I help you?";
 		next;
 		switch(select("Reset.:No, thanks.")) {
@@ -1532,9 +1534,4 @@ arug_dun01,5,5,1	script	Event controller#aru_gd	81,{
 			close;
 		}
 	}
-	else {
-		mes "Incorrect password.";
-		close;
-	}
 }
-*/
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 786164320..5ff30aa67 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1,15 +1,16 @@
 //===== Hercules Script ======================================
 //= Guild dungeon event, Schwaltzvalt.
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's
 //= pickaxe from Kublin.
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//= 1.2 Added GM management function. [Euphy]
 //============================================================
 
 schg_dun01,1,1,1	script	Monster Controler#sch_gd	81,{
@@ -43,7 +44,7 @@ OnEnable:
 	}
 	end;
 
-Onkill:
+OnKill:
 	killmonster "schg_dun01","Monster Controler1#sch::OnMyMObDead";
 	end;
 
@@ -673,7 +674,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -815,7 +816,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see.";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -901,7 +902,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				mes "When is that person coming? I am very bored~!";
 				close;
 			}
-			emotion 18;
+			emotion e_heh;
 			mes "[Pierrot Pier]";
 			mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
 			next;
@@ -925,7 +926,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -982,14 +983,14 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 		}
 		else {
 			mes "[Pierrot Pier]";
-			mes "Voc� encontrou o tesouro?";
-			mes "Mostre-me o que voc� tem nas m�os agora.";
+			mes "Did you find the treasure?";
+			mes "Show me that thing you are holding, now!";
 			next;
 			mes "[Pierrot Pier]";
-			mes "Deixe-me ver...";
+			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -1039,35 +1040,35 @@ Ongame_start:
 	donpcevent "paper_sp_9_s::OnEnable";
 	set .@roulette_where,rand(1,9);
 	if (.@roulette_where == 1) {
-		donpcevent "paper_sp_1_s::Onbingo";
+		donpcevent "paper_sp_1_s::OnBingo";
 	}
 	else if (.@roulette_where == 2) {
-		donpcevent "paper_sp_2_s::Onbingo";
+		donpcevent "paper_sp_2_s::OnBingo";
 	}
 	else if (.@roulette_where == 3) {
-		donpcevent "paper_sp_3_s::Onbingo";
+		donpcevent "paper_sp_3_s::OnBingo";
 	}
 	else if (.@roulette_where == 4) {
-		donpcevent "paper_sp_4_s::Onbingo";
+		donpcevent "paper_sp_4_s::OnBingo";
 	}
 	else if (.@roulette_where == 5) {
-		donpcevent "paper_sp_5_s::Onbingo";
+		donpcevent "paper_sp_5_s::OnBingo";
 	}
 	else if (.@roulette_where == 6) {
-		donpcevent "paper_sp_6_s::Onbingo";
+		donpcevent "paper_sp_6_s::OnBingo";
 	}
 	else if (.@roulette_where == 7) {
-		donpcevent "paper_sp_7_s::Onbingo";
+		donpcevent "paper_sp_7_s::OnBingo";
 	}
 	else if (.@roulette_where == 8) {
-		donpcevent "paper_sp_8_s::Onbingo";
+		donpcevent "paper_sp_8_s::OnBingo";
 	}
 	else {
-		donpcevent "paper_sp_9_s::Onbingo";
+		donpcevent "paper_sp_9_s::OnBingo";
 	}
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -1105,7 +1106,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB
@@ -1130,7 +1131,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB
@@ -1155,7 +1156,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB
@@ -1180,7 +1181,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB
@@ -1205,7 +1206,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB
@@ -1230,7 +1231,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB
@@ -1255,7 +1256,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB
@@ -1280,7 +1281,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB
@@ -1305,7 +1306,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB
@@ -1510,10 +1511,11 @@ schg_que01,114,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_53	978
 schg_que01,109,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_54	977
 schg_que01,104,105,3	duplicate(GD_Ev_Flower2)	#sch_flower_55	976
 
-/*
 schg_dun01,5,5,1	script	Event controller#sch_gd	81,{
-	input .@input; //,0,9999;
-	if (input == 1854) {
+	if (callfunc("F_GM_NPC",1854,0) < 1) {
+		mes "Incorrect password.";
+		close;
+	} else {
 		mes "How can I help you?";
 		next;
 		switch(select("Reset.:No, thanks.")) {
@@ -1531,9 +1533,4 @@ schg_dun01,5,5,1	script	Event controller#sch_gd	81,{
 			close;
 		}
 	}
-	else {
-		mes "Incorrect password.";
-		close;
-	}
 }
-*/
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt
index 5ceeebd44..3b8e12bf7 100644
--- a/npc/events/god_se_festival.txt
+++ b/npc/events/god_se_festival.txt
@@ -1,25 +1,26 @@
 //===== Hercules Script ======================================
 //= Valkyrie's Gift NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
 //= Post-God Item SE Creation Summoning Event 
-//= Second Sister is a cusotm translation.
-//===== Additional Comments: ================================= 
+//= Second Sister is a custom translation.
+//===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
-//============================================================ 
+//= 1.1 Added GM management function. [Euphy]
+//============================================================
 
-/*
-yuno,1,1,0	script	Festival Manager#gq_fes00	891,{
+// Original name: "Festival Manager#god_se_fes00"
+yuno,1,1,0	script	Festival Manager#gq_fes0	891,{
+	callfunc "F_GM_NPC";
 	mes "[Festival Manager]";
 	mes "I am the festival NPC manager for the God SE quest.";
 	mes "Please enter your password.";
 	next;
-	input .@input$;
-	if (.@input$ != "07godsefes") {
+	if (callfunc("F_GM_NPC","07godsefes",1) == 0) {
 		mes "[Festival Manager]";
 		mes "Password is incorrect.";
 		close;
@@ -42,7 +43,6 @@ yuno,1,1,0	script	Festival Manager#gq_fes00	891,{
 		close;
 	}
 }
-*/
 
 yuno,118,192,5	script	Rmimi Ravies#gq_fes01	891,{
 	set .@GID, getcharid(2);
@@ -119,7 +119,7 @@ yuno,118,192,5	script	Rmimi Ravies#gq_fes01	891,{
 				next;
 				mes "[Rmimi Ravies]";
 				mes "Have a good time.";
-				donpcevent "Rmimi Ravies#gq_fes01::Onstart";
+				donpcevent "Rmimi Ravies#gq_fes01::OnStart";
 				
 				announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
 				close;
@@ -164,7 +164,7 @@ OnDisable:
 	disablenpc "Rmimi Ravies#gq_fes01";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $@gqse_festival,1;
 	end;
@@ -390,19 +390,15 @@ OnTimer3900000:
 	end;
 }
 
-//===============================================================================================
-//                                             Rachel                                              
-//===============================================================================================
 
-//-------------------------------------Rachel Festival Manager-----------------------------------
-/*
-rachel,1,1,0	script	Festival Manager#god_se_fes02	891,{
+// Original name: "Festival Manager#god_se_fes02"
+rachel,1,1,0	script	Festival Manager#gq_fes2	891,{
+	callfunc "F_GM_NPC";
 	mes "[Festival Manager]";
 	mes "I am the festival NPC manager for the God SE quest.";
 	mes "Please enter your password.";
 	next;
-	input .@input$;
-	if (.@input$ != "07godsefes") {
+	if (callfunc("F_GM_NPC","07godsefes",1) == 0) {
 		mes "[Festival Manager]";
 		mes "Password is incorrect.";
 		close;
@@ -425,8 +421,6 @@ rachel,1,1,0	script	Festival Manager#god_se_fes02	891,{
 		close;
 	}
 }
-*/
-//----------------------------------------Rhehe Ravies----------------------------------------
 
 rachel,132,117,3	script	Rhehe Ravies#gq_fes03	891,{
 	set .@GID, getcharid(2);
@@ -507,7 +501,7 @@ rachel,132,117,3	script	Rhehe Ravies#gq_fes03	891,{
 				next;
 				mes "[Rhehe Ravies]";
 				mes "I hope you enjoy yourself!";
-				donpcevent "Rhehe Ravies#gq_fes03::Onstart";
+				donpcevent "Rhehe Ravies#gq_fes03::OnStart";
 				announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb";
 				close;
 			}
@@ -552,7 +546,7 @@ OnDisable:
 	disablenpc "Rhehe Ravies#gq_fes03";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $@gqse_festival,1;
 	end;
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index b8664de2e..0ffaf959a 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.4
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Event 1: Redeem "Pumpkin Mojo" for pumpkin headgear.
 //= Event 2: Create "Pumpkin Pie" item.
 //===== Additional Comments: =================================
@@ -40,8 +40,7 @@ OnEffect2:
 }
 
 prontera,164,69,3	script	Cool Devi#06_hw	738,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -237,8 +236,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 
 
 geffen,145,132,3	script	Hoirin#06_hw	729,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -393,8 +391,7 @@ OnTouch:
 }
 
 nif_in,19,32,3	script	Deviruchi#06_hw	738,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
@@ -486,8 +483,7 @@ nif_in,19,32,3	script	Deviruchi#06_hw	738,{
 // Creation of Pumpkin Pie (Event 2)
 //============================================================
 nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
 		mes "too many things with you.";
diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt
index 78407465f..8bb8df1fd 100644
--- a/npc/events/halloween_2008.txt
+++ b/npc/events/halloween_2008.txt
@@ -16,8 +16,7 @@
 //============================================================
 
 payon,162,176,4	script	Halloween Magician#iRO08	704,{
-	
-	if(Hallow08 < 1) {
+	if (Hallow08 < 1) {
 		mes "[Halloween Magician]";
 		mes "Kkkkkkkkk!";
 		mes "I have a special event this Halloween that tests your luck and agility.";
@@ -30,7 +29,6 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		next;
 		goto MainMenu;
 	}
-
 	if (Hallow08Kill == 1) {
 		mes "[Halloween Magician]";
 		mes "You a 'fraidy cat or something?!";
@@ -43,7 +41,6 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		}
 		goto Participate;
 	}
-
 	if (Hallow08Kill == 2) {
 		mes "[Halloween Magician]";
 		mes "Oh, well done! You are alright!";
@@ -59,14 +56,13 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		mes "You can get Halloween tickets for cool items.";
 		close;
 	}
-
-	if(Hallow08 > 0) {
+	if (Hallow08 > 0) {
 		mes "[Halloween Magician]";
 		mes "Well, do you want to hear the rules again or, just get back to it...";
 		next;
 		goto MainMenu2;
 	}
-	
+
 		Rules:
 			mes "[Halloween Magician]";
 			mes "This village is like a virtual Payon.";
@@ -96,10 +92,10 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 				mes "Hey...";
 				mes "Come back once you're ready.";
 				close;
-			}else{
+			} else {
 				goto MainMenu;
 			}
-			
+
 		Participate:
 			mes "[Halloween Magician]";
 			mes "Ok, you are ready.";
@@ -114,7 +110,7 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 				mes "You think I wouldn't notice that your weight is above '0'?";
 				mes "You're overweight...";
 				close;
-			}else{
+			} else {
 				mes "[Halloween Magician]";
 				mes "You seem good to go, and your weight is just right.";
 				next;
@@ -138,7 +134,7 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 				warp "evt_zombie",155,246;
 				end;
 			}
-			
+
 		TicketExchange:
 			mes "[Halloween Magician]";
 			mes "You want to exchange tickets for prizes?";
@@ -158,52 +154,52 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 			mes "What would you like to exchange for?";
 			next;
 			switch(select("Pumpkin Pie:Pumpkin-Head:Old Blue Box:Old Purple Box:Old Card Album")) {
-				case 1:
-					if(countitem(7941) < 5) {
-						goto NotEnough;
-					}else{
-						delitem 7941,5;
-						getitem 12192,1;
-						goto Enough;
-					}
-					break;
-				case 2:
-					if(countitem(7941) < 20) {
-						goto NotEnough;
-					}else{
-						delitem 7941,20;
-						getitem 5134,1;
-						goto Enough;
-					}
-					break;
-				case 3:
-					if(countitem(7941) < 50) {
-						goto NotEnough;
-					}else{
-						delitem 7941,50;
-						getitem 603,1;
-						goto Enough;
-					}
-					break;
-				case 4:
-					if(countitem(7941) < 70) {
-						goto NotEnough;
-					}else{
-						delitem 7941,70;
-						getitem 617,1;
-						goto Enough;
-					}
-					break;
-				case 5:
-					if(countitem(7941) < 200) {
-						goto NotEnough;
-					}else{
-						delitem 7941,200;
-						getitem 616,1;
-						goto Enough;
-					}
+			case 1:
+				if (countitem(7941) < 5) {
+					goto NotEnough;
+				} else {
+					delitem 7941,5;
+					getitem 12192,1;
+					goto Enough;
+				}
+				break;
+			case 2:
+				if (countitem(7941) < 20) {
+					goto NotEnough;
+				} else {
+					delitem 7941,20;
+					getitem 5134,1;
+					goto Enough;
+				}
+				break;
+			case 3:
+				if (countitem(7941) < 50) {
+					goto NotEnough;
+				} else {
+					delitem 7941,50;
+					getitem 603,1;
+					goto Enough;
+				}
+				break;
+			case 4:
+				if (countitem(7941) < 70) {
+					goto NotEnough;
+				} else {
+					delitem 7941,70;
+					getitem 617,1;
+					goto Enough;
+				}
+				break;
+			case 5:
+				if (countitem(7941) < 200) {
+					goto NotEnough;
+				} else {
+					delitem 7941,200;
+					getitem 616,1;
+					goto Enough;
+				}
 			}
-					
+
 		NextTime:
 			mes "[Halloween Magician]";
 			mes "Ok, see you then.";
@@ -231,7 +227,7 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 		next;
 		if (Hallow08 == 1) {
 			goto MainMenu2;
-		}else{
+		} else {
 			goto MainMenu;
 		}
 }
@@ -240,7 +236,7 @@ evt_zombie,16,142,1	script	zombiewarp001	45,2,2,{
 OnTouch:
 	if (@Hallow08Warp == 1) {
 		set Hallow08Kill,2;
-		specialeffect 16;
+		specialeffect EF_BASH;
 		warp "payon",28,142;
 	}
 	end;
@@ -250,7 +246,7 @@ evt_zombie,122,27,1	script	zombiewarp002	45,2,2,{
 OnTouch:
 	if (@Hallow08Warp == 2) {
 		set Hallow08Kill,2;
-		specialeffect 16;
+		specialeffect EF_BASH;
 		warp "payon",121,40;
 	}
 	end;
@@ -260,7 +256,7 @@ evt_zombie,267,89,1	script	zombiewarp003	45,2,2,{
 OnTouch:
 	if (@Hallow08Warp == 3) {
 		set Hallow08Kill,2;
-		specialeffect 16;
+		specialeffect EF_BASH;
 		warp "payon",253,95;
 	}
 	end;
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index a5faf713e..c349dec28 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -106,7 +106,7 @@ OnTouch:
 		mes "[Trick or Treater]";
 		mes "!!!!";
 		mes "Fine. I have no choice but to trick you back!";
-		sc_start SC_Stun,5000,0;
+		sc_start SC_STUN,5000,0;
 		close;
 	}
 	mes "[Trick or Treater]";
@@ -131,7 +131,7 @@ OnTouch:
 				mes "[Trick or Treater]";
 				mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 				mes "Fine. I have no choice but to trick you!";
-				sc_start SC_Stun,5000,0;
+				sc_start SC_STUN,5000,0;
 				close;
 			}
 		case 2:
@@ -152,7 +152,7 @@ OnTouch:
 				mes "[Trick or Treater]";
 				mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 				mes "Fine. I have no choice but to trick you!";
-				sc_start SC_Stun,5000,0;
+				sc_start SC_STUN,5000,0;
 				close;
 			}
 		case 3:
@@ -173,14 +173,14 @@ OnTouch:
 				mes "[Trick or Treater]";
 				mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 				mes "Fine. I have no choice but to trick you!";
-				sc_start SC_Stun,5000,0;
+				sc_start SC_STUN,5000,0;
 				close;
 			}
 		case 4:
 			mes "[Trick or Treater]";
 			mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat.";
 			mes "Fine. I have no choice but to trick you!";
-			sc_start SC_Stun,5000,0;
+			sc_start SC_STUN,5000,0;
 			close;
 	}
 OnInit:
diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt
index 557ce62c9..eb41fc9d0 100644
--- a/npc/events/idul_fitri.txt
+++ b/npc/events/idul_fitri.txt
@@ -1,10 +1,10 @@
 //===== Hercules Script ======================================
 //= Feast Day Of Ramadan Idul Fitri Event
-//===== By: ================================================== 
+//===== By: ==================================================
 //= $ephiroth
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.1
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= Info : Official idRO
 //= 2006/10/16: 1.0 Release and fully working. [$ephiroth]
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
@@ -68,4 +68,4 @@ prontera,146,92,3	script	Cellerb	58,{
 		emotion e_hmm;
 		close;
 	}
-}
+}
\ No newline at end of file
diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt
index 485a58e70..1c9443225 100644
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -62,7 +62,7 @@ function	script	F_GldTreasSw	{
 	close;
 }
 
-//<=============================== Castle 1 =================================>\\
+//<===============================Castle 1 =================================>\\
 
 // Treasure Spawn -----------------------
 nguild_alde,1,1,1	script	Treasure_N01	-1,{
@@ -88,7 +88,7 @@ nguild_alde,123,223,0	script	Switch#TresN01	111,{
 	end;
 }
 
-//<================================ Castle 2 ================================>\\
+//<================================Castle 2 ================================>\\
 
 // Treasure Spawn ----------------------------
 nguild_gef,1,1,1	script	Treasure_N02	-1,{
@@ -114,7 +114,7 @@ nguild_gef,152,117,0	script	Switch#TresN02	111,{
 	end;
 }
 
-//<================================ Castle 3 ================================>\\
+//<================================Castle 3 ================================>\\
 
 // Treasure Spawn ---------------------------
 nguild_pay,1,1,0	script	Treasure_N03	-1,{
@@ -139,7 +139,7 @@ nguild_pay,295,8,0	script	Switch#TresN03	111,{
 	end;
 }
 
-//<================================ Castle 4 ================================>\\
+//<================================Castle 4 ================================>\\
 
 // Treasure Spawn -------------------------------
 nguild_prt,1,1,0	script	Treasure_N04	-1,{
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt
index a08a1a701..8f2bd85d5 100644
--- a/npc/events/valentinesday.txt
+++ b/npc/events/valentinesday.txt
@@ -126,4 +126,4 @@ prt_castle,54,34,4	script	Carl Orleans	47,{
 	mes "[Carl Orleans]";
 	mes "Enjoy.";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt
index dd09f4470..8c5dd4432 100644
--- a/npc/events/valentinesday_2009.txt
+++ b/npc/events/valentinesday_2009.txt
@@ -82,7 +82,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 				mes "Maybe you should borrow some zeny from a friend.";
 				mes "Cuz, I'm not gonna be here everyday.";
 				close;
-			}else{
+			} else {
 				mes "[Marco Bassinio]";
 				mes "Good for you!";
 				mes "It's also perfect as a gift!";
@@ -103,7 +103,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 			mes "You also need to pay 500 zeny to carve your name on the box.";
 			mes "Are you all prepared...?";
 			next;
-			if(countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 500) {
+			if (countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 500) {
 				mes "[Marco Bassinio]";
 				mes "Hmm.. Looks like you don't have enough materials to decorate the gift box..";
 				mes "You can't just put your gift into some plain looking box..";
@@ -114,7 +114,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 				mes "Oh, also bring 500 zeny, and don't forget to bring your true loving heart with you!!";
 				close;
 			}
-			if(countitem(558) < 1) {
+			if (countitem(558) < 1) {
 				mes "[Marco Bassinio]";
 				mes "Hey, look, adventurer!";
 				mes "I can't create something right away!";
@@ -202,7 +202,7 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 					mes "Please check your wallet.";
 					next;
 					break;
-				}else{
+				} else {
 					mes "[Packs Trader]";
 					mes "Here they are.";
 					mes "Hope it makes your Valentine's Day more pleasing!";
@@ -243,7 +243,7 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 					mes "Please check your wallet.";
 					next;
 					break;
-				}else{
+				} else {
 					mes "[Packs Trader]";
 					mes "Here they are.";
 					mes "Hope it makes your Valentine's Day more pleasing!";
@@ -284,7 +284,7 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 					mes "Please check your wallet.";
 					next;
 					break;
-				}else{
+				} else {
 					mes "[Packs Trader]";
 					mes "Here they are.";
 					mes "Hope it makes your Valentine's Day more pleasing!";
@@ -363,7 +363,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 		mes "Just follow your heart!";
 		close;
 	}
-	if(countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 1000) {
+	if (countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 1000) {
 		mes "[Event Ring Maker]";
 		mes "Well, you don't have enough materials to make a gift box.";
 		mes "Check what you have, and come back later with all the materials.";
@@ -380,7 +380,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 	set iROval09ring,1;
 	if (Sex) {
 		getnameditem 12742,strcharinfo(0);
-	}else{
+	} else {
 		getnameditem 12743,strcharinfo(0);
 	}
 	mes "[Event Ring Maker]";
@@ -464,7 +464,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 					}
 					next;
 					break;
-				}else{
+				} else {
 					if (countitem(7946) > .@input) {
 						mes "[Valentine Vote Manager]";
 						mes "Seems like the value you entered is too small.";
@@ -552,7 +552,7 @@ prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
 		mes "Please.. I feel like my soul is lost..";
 		close;
 	}
-	if(countitem(558) < 3) {
+	if (countitem(558) < 3) {
 		mes "[Charles Orleans]";
 		mes "Ahhh, Mademoiselle.";
 		mes "I'm not an alchemist, or a magician.";
@@ -590,7 +590,7 @@ prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
 		mes "Adios, Mademoiselle.....";
 		mes "I'll be waiting for you.";
 		close;
-	}else{
+	} else {
 		if (!checkweight(559,1)) {
 			mes "[Charles Orleans]";
 			mes "You're carrying too many items.";
diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt
index 6ae844305..a8597cd22 100644
--- a/npc/events/valentinesday_2012.txt
+++ b/npc/events/valentinesday_2012.txt
@@ -153,4 +153,4 @@ mosk_in,21,244,3	script	Baker Extraordinaire	410,{
 		mes "Hello, "+strcharinfo(0)+"!";
 		close;
 	}
-}
+}
\ No newline at end of file