Merge pull request #201 from Michieru/master

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

1 files changed, 262 insertions, 449 deletions

diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 37d8d774b..af7df5f6c 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Quest NPCs related to Ayothaya
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.3
-//===== Compatible With ======================================
-//= rAthena SVN
+//= 2.5
 //===== Description ==========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Ayothaya Ring Quest
 //= Ayothaya Dungeon Quest
 //= Tom Yum Goong Quest
@@ -16,27 +14,27 @@
 //= 1.1 Added anti-novice protection [Lupus]
 //= 1.3 Fixed exploit [Lupus]
 //= 1.4 Updated, more close to the official. Thanks to birkiczd
-//=	Also optimized it again, remove unused global variable [Lupus]
+//=     Also optimized it again, remove unused global variable [Lupus]
 //= 1.5 Removed Duplicates [Silent]
 //= 1.6 Moved quests from cities/ to here:
-//= Shrimp, Dungeon, Tom Yum Goong [Evera]
+//=     Shrimp, Dungeon, Tom Yum Goong [Evera]
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.0 Rescripted Tom Yum Goong and Dungeon quest to Aegis [L0ne_W0lf]
-//=	10.3 standards.
+//=     10.3 standards.
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
 //= 2.1 Added missing checkweights. [L0ne_W0lf]
 //= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
+//= 2.4 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.5 Added questlog support. [Euphy]
 //============================================================
 
-// Ayothaya Ring Quest
+// Ayothaya Ring Quest :: ayo_ring
 //============================================================
 ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
-
-	if(thai_find == 14)
-	{
+	if (thai_find == 14) {
 		mes "[Shuda]";
 		mes "Have you";
 		mes "found Annon?";
@@ -60,9 +58,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "He will be ^660000punished^000000...";
 		mes "^666666*grinds teeth*^000000";
 		close;
-	}
-	else if(thai_find > 2 && thai_find < 14)
-	{
+	} else if (thai_find > 2 && thai_find < 14) {
 		mes "[Shuda]";
 		mes "^666666*Sigh...*^000000";
 		mes "You haven't";
@@ -74,11 +70,8 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "And by 'us,' I mean '^660000you^000000.' I don't care about your plans or whatever else you may have scheduled, because you're going to make";
 		mes "time for me! Oho ho ho ho ho!";
 		close;
-	}
-	else if(thai_find == 2)
-	{
-		if(countitem(7288)) //Engagement Ring
-		{
+	} else if (thai_find == 2) {
+		if (countitem(7288)) {
 			mes "[Shuda]";
 			mes "Ah... Is it...?!!";
 			mes "Yes, that's it!";
@@ -110,8 +103,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "^3355FFShuda gazes directly";
 			mes "at you with a puppy eyed look.^000000";
 			next;
-			switch( select( "D-Don't look at me that way!:Alright, alright." ) )
-			{
+			switch(select("D-Don't look at me that way!:Alright, alright.")) {
 			case 1:
 				mes "[Shuda]";
 				mes "Oh come on, you know everything that happened, and I know you're gonna continue adventuring";
@@ -134,10 +126,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "(Why am I always";
 				mes "doing things for other";
 				mes "people anyway?!)";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
-			break;
+				break;
 			case 2:
 				mes "[Shuda]";
 				mes "Yes, I knew I could count on you! So find Annon! It's my destiny to make him ^660000mine^000000. Hoo ho ho ho ho!";
@@ -148,14 +137,13 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "[Shuda]";
 				mes "Will you please tell Annon that";
 				mes "I got my ring back so he can come back to me now? I hope you'll remember that for me, adventurer.";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
-			break;
+				break;
 			}
-		}
-		else
-		{
+			delitem 7288,1; //Thai_Ring
+			changequest 12030,12031;
+			set thai_find,3;
+			close;
+		} else {
 			mes "[Shuda]";
 			mes "Huh...?";
 			mes "Did you find my ring?";
@@ -172,11 +160,11 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my ring. I'll be waiting";
 			mes "here for the good news.";
 			mes "Oho ho ho ho ho~!";
+			if (checkquest(12029) == -1)
+				setquest 12029;
 			close;
 		}
-	}
-	else if(thai_find == 1)
-	{
+	} else if (thai_find == 1) {
 		mes "[Shuda]";
 		mes "I feel a little bad asking you this, especially since you're";
 		mes "an outsider.";
@@ -189,15 +177,12 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		mes "Please bring my ring back to me.";
 		mes "I want to live with Annon as a happy couple forever. Can't you understand that?!";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Powerful-Looking Woman]";
 		mes "Umm...?";
 		mes "Ah, you must be one of the tourists. I'd guide you around and listen to your stories about the outside world, but...";
 		next;
-		if(rand(0,1))
-		{
+		if (rand(0,1)) {
 			mes "[Powerful-Looking Woman]";
 			mes "I'm reeeally";
 			mes "busy right now.";
@@ -213,8 +198,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my fiancee hadn't";
 			mes "thrown it...";
 			next;
-			switch( select( "What...?:Lies~!" ) )
-			{
+			switch(select("What...?:Lies~!")) {
 			case 1:
 				mes "[Powerful-Looking Woman]";
 				mes "What 'what?'";
@@ -234,7 +218,6 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "Wh-who are you to say";
 				mes "something so rude to such a nice lady like myself. Go away, I don't wanna talk to you!";
 				close;
-			break;
 			case 2:
 				mes "[Powerful-Looking Woman]";
 				mes "What lies?";
@@ -272,18 +255,15 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "Why are you staring at me?";
 				mes "Don't you have anything to do?";
 				next;
-				switch( select( "No.:No~ and you are an interesting girl." ) )
-				{
+				switch(select("No.:No~ and you are an interesting girl.")) {
 				case 1:
 					mes "[Powerful-Looking Woman]";
 					mes "I see. Hmmm...";
 					mes "You're kind of my type.";
-					if(sex)
-					{
+					if (Sex) {
 						mes "No no, that doesn't mean I'm interested in you. Plus I'm";
 						mes "already engaged.";
-					}
-					else
+					} else
 						mes "Before you think of anything weird, I meant that I think you and me are a lot alike.";
 					next;
 					mes "[Powerful-Looking Woman]";
@@ -343,7 +323,6 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					emotion e_heh;
 					set thai_find,1;
 					close;
-				break;
 				case 2:
 					mes "[Powerful-Looking Woman]";
 					mes "^666666*Sigh...*^000000";
@@ -407,15 +386,14 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					next;
 					mes "[Shuda]";
 					mes "So go and look under the water! There's no water current, so I'm sure it's still there! What are you waiting for, it's should be an easy swim for you! Oho ho ho ho ho!";
+					if (checkquest(12029) == -1)
+						setquest 12029;
 					set thai_find,1;
 					close;
-				break;
 				}
 			break;
 			}
-		}
-		else
-		{
+		} else {
 			mes "[Powerful-Looking Woman]";
 			mes "^666666*Sigh...*^000000";
 			mes "Why isn't it coming up from the water? Maybe if I stirred around with a wooden stick...?";
@@ -438,8 +416,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 	}
 
 OnTouch:
-	if(thai_find == 0)
-	{
+	if (thai_find == 0) {
 		mes "[Powerful-Looking Woman]";
 		mes "^666666*Sigh...*^000000";
 		mes "Where the";
@@ -451,15 +428,11 @@ OnTouch:
 		mes "Haven't you ever seen a delicate damsel sigh before? Leave me the hell alone!";
 		close;
 	}
-	
 }
-	
-ayo_dun02,91,263,0	script	#Annonblood	111,2,3,{
 
-if(!$annonactive)
-{
-	if(thai_find == 13)
-	{
+ayo_dun02,91,263,0	script	#Annonblood	111,2,3,{
+if (!$@annonactive) {
+	if (thai_find == 13) {
 		mes "["+strcharinfo(0)+"]";
 		mes "A blood stain?";
 		mes "What's going on?";
@@ -477,11 +450,9 @@ if(!$annonactive)
 		mes "[" +strcharinfo(0)+ "]";
 		mes "Hmmm....";
 		next;
-		switch( select( "Scatter the bushes.:Dig up the bushes." ) )
-		{
+		switch(select("Scatter the bushes.:Dig up the bushes.")) {
 		case 1:
-			if(!rand(0,2))
-			{
+			if (!rand(0,2)) {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "^666666*Cough cough*^000000";
 				mes "It's so dusty!";
@@ -502,7 +473,7 @@ if(!$annonactive)
 				mes "^3355FFshrubbery, you find";
 				mes "a small burrow.^000000";
 				next;
-				set $annonactive,1;
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[Haggard Man]";
 				mes "^666666*Cough cough!*^000000";
@@ -511,18 +482,16 @@ if(!$annonactive)
 				mes "stay back, or I'll kill myself!";
 				emotion e_omg,1;
 				next;
-				switch( select( "What are you doing here?:I'm not Shuda!" ) )
-				{
+				switch(select("What are you doing here?:I'm not Shuda!")) {
 				case 1:
 					mes "["+strcharinfo(0)+"]";
 					mes "Hey...";
 					mes "What are you doi--";
 					next;
-					set $annonactive,0;
+					set $@annonactive,0;
 					disablenpc "Haggard Man";
 					mes "^3355FFHe vanished!^000000";
 					close;
-				break;
 				case 2:
 					mes "[Haggard Man]";
 					mes "Hmmm...?";
@@ -531,11 +500,8 @@ if(!$annonactive)
 					mes "[Haggard Man]";
 					mes "You are unfamiliar to me, outsider. I'm unsure of how you found my hiding place, but if you have something to say, make it short!";
 					close;
-				break;
 				}
-			}
-			else
-			{
+			} else {
 				mes "^3355FFYou dig up the bushes, stirring";
 				mes "up a large, choking cloud of dust.^000000";
 				next;
@@ -546,22 +512,18 @@ if(!$annonactive)
 				mes "of dust!";
 				close;
 			}
-		break;
 		case 2:
 			mes "^3355FFAs you dig up the bushes, the ground beneath one of the bushes crumbles and you hear a scream";
 			mes "from beneath.^000000";
 			next;
-			if(!rand(0,2))
-			{
-				set $annonactive,1;
+			if (!rand(0,2)) {
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[?]";
 				mes "^666666*Cough cough*^000000";
 				mes "...M-my legs!";
 				close;
-			}
-			else
-			{
+			} else {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Hmmm...?";
 				mes "What was that noise?";
@@ -570,25 +532,18 @@ if(!$annonactive)
 				mes "^666666*cough cough cough*^000000";
 				close;
 			}
-		break;
 		}
-	}
-	else if(thai_find == 14)
-	{
+	} else if (thai_find == 14) {
 		mes "^3355FFYou find that the burrow is empty. It seems Annon has found a new hiding place.^000000";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "^3355FFYou find a pile of dead bushes under a large tree. The area around the bushes seems awfully dusty.^000000";
 		close;
 	}
 
-	OnTouch:
-	if(thai_find == 12)
-	{
-		if(!rand(0,2))
-		{
+OnTouch:
+	if (thai_find == 12) {
+		if (!rand(0,2)) {
 			emotion e_gasp,1;
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Huh...?";
@@ -607,18 +562,17 @@ if(!$annonactive)
 			mes "a blood stain in";
 			mes "this kind of place...";
 			set thai_find,13;
+			changequest 12033,12034;
 			close;
 		}
 	}
-
 }
-	
+
 }
-	
-ayo_dun02,91,264,3	script	Haggard Man	841,{
 
-	if(thai_find == 13)
-	{
+ayo_dun02,91,264,3	script	Haggard Man	841,{
+	//completequest 12034;
+	if (thai_find == 13) {
 		mes "[Haggard Man]";
 		mes "^666666*...Cough cough*^000000";
 		mes "No...! My hiding place!";
@@ -629,19 +583,17 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 		mes "Oh, how did this happen?";
 		mes "My spiritual training wasn't supposed to go like this...!";
 		next;
-		switch( select( "Treat his wound first.:Is that you, Annon?" ) )
-		{
+		switch(select("Treat his wound first.:Is that you, Annon?")) {
 		case 1:
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Anyway, I think you need to be treated. Let me check if I have some potions.";
 			next;
-			if(countitem(504)) //White potion
-			{
+			if (countitem(504)) {
 				mes "["+strcharinfo(0)+"]";
 				mes "Ah...";
 				mes "Here we are,";
 				mes "a White Potion.";
-				delitem 504,1; //White potion
+				delitem 504,1; //White_Potion
 				next;
 				mes "[Haggard Man]";
 				mes "You mean the White Potion,";
@@ -689,8 +641,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "It looks like you wish to know more. If you promise me that you will not mention my whereabouts";
 				mes "to Shuda, then I'll explain.";
 				next;
-				switch( select( "You think the world revolves around you?:What do you want me to do?" ) )
-				{
+				switch(select("You think the world revolves around you?:What do you want me to do?")) {
 				case 1:
 					mes "[" +strcharinfo(0)+ "]";
 					mes "You think the world";
@@ -717,74 +668,11 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "[Annon]";
 					mes "Of course, if you reveal to her that you've found me, I'll repay your favor. I implore you, just pretend you haven't found me, please?";
 					next;
-					menu "...Alright, alright.",-;
+					select("...Alright, alright.");
 					mes "[Annon]";
 					mes "Thank you so much!";
 					mes "Now, to pay you back, let me use one of the skills I've learned in my spiritual training.";
-					next;
-					mes "[Annon]";
-					mes "Let's see...";
-					mes "Let me twist your";
-					mes "arm this way, and";
-					mes "apply pressure here...";
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Wahhh~!";
-					mes "What the hell";
-					mes "are you doing!";
-					mes "You're hurting me, man!";
-					next;
-					mes "[Annon]";
-					mes "Oh, this is a special kind of massage. Don't worry, it'll relieve you of fatigue. It's quite heavenly, actually. You'll see~";
-					next;
-					mes "^3355FF*Snap snap snap*";
-					mes "*Snap snap snap*";
-					mes "*Crack crack crack*";
-					mes "*Crack crack crack*^000000";
-					next;
-					mes "^3355FFYou feel as though Annon";
-					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
-					set thai_find,14;
-					if(BaseLevel < 56)
-						getexp 900,0;
-					else if(BaseLevel > 55 && BaseLevel < 61)
-						getexp 1050,0;
-					else if(BaseLevel > 60 && BaseLevel < 66)
-						getexp 1868,0;
-					else if(BaseLevel > 65 && BaseLevel < 71)
-						getexp 2741,0;
-					else if(BaseLevel > 70 && BaseLevel < 76)
-						getexp 7076,0;
-					else if(BaseLevel > 75 && BaseLevel < 81)
-						getexp 13025,0;
-					else if(BaseLevel > 80 && BaseLevel < 86)
-						getexp 15034,0;
-					else if(BaseLevel > 85 && BaseLevel < 91)
-						getexp 18205,0;
-					else if(BaseLevel > 90)
-						getexp 40679,0;
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Whoa...?";
-					mes "That felt was so great~";
-					mes "It even feels like my mind";
-					mes "has been cleansed too!";
-					mes "You've got a deal!";
-					next;
-					mes "[Annon]";
-					mes "Thank you, thank you so much.";
-					mes "Now I can avoid being tied to Shuda, at least for a little longer.";
-					next;
-					mes "[Annon]";
-					mes "Now, if you'll excuse me,";
-					mes "I must make good my escape";
-					mes "before others find me.";
-					mes "Good day~!";
-					close2;
-					set $annonactive,0;
-					disablenpc "Haggard Man";
-					end;
-				break;
+					break;
 				case 2:
 					mes "[Annon]";
 					mes "Of course, what I want you to do is to keep me a secret from Shuda. Just forget that you've ever met me, and let Shuda know it was impossible to find me.";
@@ -795,76 +683,78 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "[Annon]";
 					mes "Now, you must be wondering";
 					mes "how I would repay you for your silence. Well, let me show you one of the skills I've learned in my spiritual training.";
-					next;
-					mes "[Annon]";
-					mes "Let's see...";
-					mes "Let me twist your";
-					mes "arm this way, and";
-					mes "apply pressure here...";
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Wahhh~!";
-					mes "What the hell";
-					mes "are you doing!";
-					mes "You're hurting me, man!";
-					next;
-					mes "[Annon]";
-					mes "Oh, this is a special kind";
-					mes "of massage. Don't worry, it'll";
-					mes "relieve you of fatigue. It's quite heavenly, actually. You'll see~";
-					next;
-					mes "^3355FF*Snap snap snap*";
-					mes "*Snap snap snap*";
-					mes "*Crack crack crack*";
-					mes "*Crack crack crack*^000000";
-					next;
-					mes "^3355FFYou feel as though Annon";
-					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
-					set thai_find,14;
-					if(BaseLevel < 56)
-						getexp 900,0;
-					else if(BaseLevel > 55 && BaseLevel < 61)
-						getexp 1050,0;
-					else if(BaseLevel > 60 && BaseLevel < 66)
-						getexp 1868,0;
-					else if(BaseLevel > 65 && BaseLevel < 71)
-						getexp 2741,0;
-					else if(BaseLevel > 70 && BaseLevel < 76)
-						getexp 7076,0;
-					else if(BaseLevel > 75 && BaseLevel < 81)
-						getexp 13025,0;
-					else if(BaseLevel > 80 && BaseLevel < 86)
-						getexp 15034,0;
-					else if(BaseLevel > 85 && BaseLevel < 91)
-						getexp 18205,0;
-					else if(BaseLevel > 90)
-						getexp 40679,0;
-					next;
-					mes "[" +strcharinfo(0)+ "]";
-					mes "Whoa...?";
-					mes "That felt was so great~";
-					mes "It even feels like my mind";
-					mes "has been cleansed too!";
-					mes "You've got a deal!";
-					next;
-					mes "[Annon]";
-					mes "Thank you, thank you so much.";
-					mes "Now I can avoid being tied to Shuda, at least for a little longer.";
-					next;
-					mes "[Annon]";
-					mes "Now, if you'll excuse me,";
-					mes "I must make good my escape";
-					mes "before others find me.";
-					mes "Good day~!";
-					close2;
-					set $annonactive,0;
-					disablenpc "Haggard Man";
-					end;
-				break;
+					break;
 				}
-			}
-			else
-			{
+				next;
+				mes "[Annon]";
+				mes "Let's see...";
+				mes "Let me twist your";
+				mes "arm this way, and";
+				mes "apply pressure here...";
+				next;
+				mes "[" +strcharinfo(0)+ "]";
+				mes "Wahhh~!";
+				mes "What the hell";
+				mes "are you doing!";
+				mes "You're hurting me, man!";
+				next;
+				mes "[Annon]";
+				mes "Oh, this is a special kind";
+				mes "of massage. Don't worry, it'll";
+				mes "relieve you of fatigue. It's quite heavenly, actually. You'll see~";
+				next;
+				mes "^3355FF*Snap snap snap*";
+				mes "*Snap snap snap*";
+				mes "*Crack crack crack*";
+				mes "*Crack crack crack*^000000";
+				next;
+				mes "^3355FFYou feel as though Annon";
+				mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
+				set thai_find,14;
+				completequest 12034;
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 900,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 1050,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 1868,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 2741,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 7075,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 13024,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 15034,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 18205,0;
+					else getexp 40678,0;
+				} else {
+					if (BaseLevel < 56) getexp 9000,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 10500,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 18684,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 27411,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 70757,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 130246,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 150340,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 182052,0;
+					else getexp 406786,0;
+				}
+				next;
+				mes "[" +strcharinfo(0)+ "]";
+				mes "Whoa...?";
+				mes "That felt was so great~";
+				mes "It even feels like my mind";
+				mes "has been cleansed too!";
+				mes "You've got a deal!";
+				next;
+				mes "[Annon]";
+				mes "Thank you, thank you so much.";
+				mes "Now I can avoid being tied to Shuda, at least for a little longer.";
+				next;
+				mes "[Annon]";
+				mes "Now, if you'll excuse me,";
+				mes "I must make good my escape";
+				mes "before others find me.";
+				mes "Good day~!";
+				close2;
+				set $@annonactive,0;
+				disablenpc "Haggard Man";
+				end;
+			} else {
 				mes "[" +strcharinfo(0)+ "]";
 				mes "No way, no way.";
 				mes "He's too seriously";
@@ -887,7 +777,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "me back inside!";
 				mes "Wahhhhhh~!";
 				next;
-				set $annonactive,0;
+				set $@annonactive,0;
 				disablenpc "Haggard Man";
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Okay, it's time";
@@ -899,7 +789,6 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				emotion e_no1,1;
 				close;
 			}
-		break;
 		case 2:
 			mes "[Haggard Man]";
 			mes "Annon...?";
@@ -923,34 +812,28 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 			mes "hide from Shuda.";
 			mes "^666666*Cries*^000000";
 			close2;
-			set $annonactive,0;
+			set $@annonactive,0;
 			disablenpc "Haggard Man";
 			end;
-		break;
 		}
-	}
-	else
-	{
+	} else {
 		mes "[Haggard Man]";
 		mes "Huh? Who are you?";
 		mes "This isn't a safe place for a tourists! You should leave right away!";
 		close2;
-		set $annonactive,0;
+		set $@annonactive,0;
 		disablenpc "Haggard Man";
 		end;
 	}
-	
+
 OnInit:
-	set $annonactive,0;
+	set $@annonactive,0;
 	disablenpc "Haggard Man";
 	end;
-	
 }
 		
 ayothaya,253,99,3	script	Fisherman	843,{
-
-	if(thai_find == 1)
-	{
+	if (thai_find == 1) {
 		mes "[Dannai]";
 		mes "This place is known to be";
 		mes "teeming with fish. The fish here tend to eat anything they find,";
@@ -964,11 +847,9 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "Would you";
 		mes "like to try?";
 		next;
-		switch( select( "Yes.:No, thanks." ) )
-		{
+		switch(select("Yes.:No, thanks.")) {
 		case 1:
-			if(countitem(528) && Zeny > 49) //Monster food
-			{
+			if (countitem(528) && Zeny > 49) {
 				mes "^3355FFYou cast your";
 				mes "fishing line";
 				mes "into the water.^000000";
@@ -980,61 +861,48 @@ ayothaya,253,99,3	script	Fisherman	843,{
 				next;
 				mes "^3355FFYou've hooked a Phen!^000000";
 				next;
-				delitem 528,1; //Monster food
-				set Zeny,Zeny-50;
-				set @randfish,rand(1,100);
-				if(@randfish > 0 && @randfish < 40)
-				{
+				delitem 528,1; //Monster's_Feed
+				set Zeny, Zeny-50;
+				set .@randfish,rand(1,100);
+				if (.@randfish > 0 && .@randfish < 40) {
 					mes "^3355FFWhile cooking the Phen, you";
 					mes "find that it's swallowed a Stone.^000000";
 					close2;
 					getitem 7049,1; //Stone
 					end;
-				}
-				else if(@randfish > 39 && @randfish < 60)
-				{
+				} else if (.@randfish > 39 && .@randfish < 60) {
 					mes "^3355FFInside of the Phen,";
 					mes "you find a Red Potion.^000000";
 					close2;
-					getitem 501,1; //Red potion
+					getitem 501,1; //Red_Potion
 					end;
-				}
-				else if(@randfish > 59 && @randfish < 70)
-				{
+				} else if (.@randfish > 59 && .@randfish < 70) {
 					mes "^3355FFInside of the Phen,";
 					mes "you find a Yellow Potion.^000000";
 					close2;
-					getitem 503,1; //Yellow potion
+					getitem 503,1; //Yellow_Potion
 					end;
-				}
-				else if(@randfish > 69 && @randfish < 80)
-				{
+				} else if (.@randfish > 69 && .@randfish < 80) {
 					mes "^3355FFThere's nothing inside...";
 					mes "But now you can eat Sushi!^000000";
 					close2;
-					getitem 551,1; //Sushi
+					getitem 551,1; //Shusi
 					end;
-				}
-				else if(@randfish > 79 && @randfish < 90)
-				{
+				} else if (.@randfish > 79 && .@randfish < 90) {
 					mes "^3355FFYou find";
 					mes "a Flower Ring";
 					mes "inside the Phen.^000000";
 					close2;
-					getitem 2612,1; //Flower ring
+					getitem 2612,1; //Flower_Ring
 					end;
-				}
-				else if(@randfish == 90)
-				{
+				} else if (.@randfish == 90) {
 					mes "^3355FFYou find";
 					mes "a Diamond Ring";
 					mes "inside the Phen.^000000";
 					close2;
-					getitem 2613,1; //Diamond ring
+					getitem 2613,1; //Diamond_Ring
 					end;
-				}
-				else if(@randfish > 90 && @randfish < 101)
-				{
+				} else if (.@randfish > 90 && .@randfish < 101) {
 					mes "^3355FFYou find a ring";
 					mes "with a name engraved";
 					mes "inside the band.^000000";
@@ -1043,17 +911,15 @@ ayothaya,253,99,3	script	Fisherman	843,{
 					mes "engagement ring.^000000";
 					close2;
 					set thai_find,2;
-					getitem 7288,1; //Engagement ring
+					changequest 12029,12030;
+					getitem 7288,1; //Thai_Ring
 					end;
 				}
-			}
-			else
-			{
+			} else {
 				mes "[Dannai]";
 				mes "Remember, you need ^3355FF1 Monster's Feed^000000 to use as bait and ^3355FF50 zeny^000000 to rend a rod.";
 				close;
 			}
-		break;
 		case 2:
 			mes "[Dannai]";
 			mes "No problem,";
@@ -1062,12 +928,9 @@ ayothaya,253,99,3	script	Fisherman	843,{
 			mes "the mind and makes you";
 			mes "feel at peace...";
 			close;
-		break;
 		}
 		close;
-	}
-	else if(thai_find < 1)
-	{
+	} else if (thai_find < 1) {
 		mes "[Dannai]";
 		mes "The fish here tend";
 		mes "to eat anything they find.";
@@ -1079,9 +942,7 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "why don't you sit down, relax";
 		mes "and enjoy some quiet fishing?";
 		close;
-	}
-	else
-	{
+	} else {
 		mes "[Dannai]";
 		mes "Welcome, long time no see!";
 		mes "It seems people learned that you found some kind of fortune from fishing here. After word got around, I've been getting lots";
@@ -1100,30 +961,26 @@ ayothaya,253,99,3	script	Fisherman	843,{
 		mes "own fortunes.";
 		close;
 	}
-	
 }
-	
+
 ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
 OnTouch:
-	if(thai_find == 4)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 4) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFYou find footprints heading to the ^5C3317North^3355FF. It looks like somebody was in quite a hurry, just like the villager said!^000000";
 			set thai_find,5;
+			changequest 12032,12033;
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
 OnTouch:
-	if(thai_find == 5)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 5) {
+		if (rand(1,3) < 2) {
 			emotion e_dots,1;
 			mes "^3355FFYou find another set of footprints. It seems that somebody was running away from something. These prints are heading to the ^5C3317East^3355FF. You'd better follow them to see what";
 			mes "you can find.^000000";
@@ -1131,15 +988,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun01,244,256,2	script	AyoFootprint3	139,2,0,{
 OnTouch:
-	if(thai_find == 6)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 6) {
+		if (rand(1,3) < 2) {
 			emotion e_no,1;
 			mes "^3355FFThe footprints end around this area. Whoever was running must";
 			mes "have been exhausted and stumbled on something. Perhaps the owner of the footprints is nearby...^000000";
@@ -1147,15 +1002,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun01,17,257,0	script	AyoFootprint4	139,2,0,{
 OnTouch:
-	if(thai_find == 7)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 7) {
+		if (rand(1,3) < 2) {
 			emotion e_ic,1;
 			mes "^3355FFAs you follow the footprints,";
 			mes "you arrive at the '^5C3317Entrance of the Shrine^3355FF.' Whoever this person was, he just ran into the second level.^000000";
@@ -1163,15 +1016,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun02,145,120,0	script	AyoFootprint5	139,2,0,{
 OnTouch:
-	if(thai_find == 8)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 8) {
+		if (rand(1,3) < 2) {
 			mes "^3355FFYou find the same footprints";
 			mes "in this place. It seems pretty";
 			mes "dangerous, and you wonder why";
@@ -1182,16 +1033,13 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
-	
+
 ayo_dun02,135,168,0	script	AyoFootprint6	139,0,2,{
 OnTouch:
-	if(thai_find == 9)
-	{
-		if (rand(1,3) == 1)
-		{
+	if (thai_find == 9) {
+		if (rand(1,3) == 1) {
 			emotion e_gasp,1;
 			mes "^3355FFThe trail of footprints";
 			mes "continue here, and seem";
@@ -1200,18 +1048,15 @@ OnTouch:
 			mes "^3355FFHmm...?";
 			mes "There's something here...^000000";
 			next;
-			switch( select( "Ignore.:^5C3317Investigate.^000000" ) )
-			{
+			switch(select("Ignore.:^5C3317Investigate.^000000")) {
 			case 1:
 				mes "["+strcharinfo(0)+"]";
 				mes "Well, it's probably nothing. But which way should I go now?";
 				set thai_find,10;
 				close;
-			break;
 			case 2:
-				set @randayo,rand(1,10);
-				if(@randayo < 2)
-				{
+				set .@randayo,rand(1,10);
+				if (.@randayo < 2) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Why, this is a pack of White Potions. Whoever owned these must have dropped these by accident. Hmm, I could use these for later...";
 					next;
@@ -1223,11 +1068,9 @@ OnTouch:
 					mes "I better look";
 					mes "into this.";
 					set thai_find,10;
-					getitem 504,10; //White potion
+					getitem 504,10; //White_Potion
 					close;
-				}
-				else if(@randayo > 2 && @randayo < 5)
-				{
+				} else if (.@randayo > 2 && .@randayo < 5) {
 					mes "["+strcharinfo(0)+"]";
 					mes "Why, this is a pack of Yellow Potions. Whoever owned these must have dropped these by accident. Hmm, I could use these for later...";
 					next;
@@ -1241,9 +1084,7 @@ OnTouch:
 					set thai_find,10;
 					getitem 503,10; //Yellow potion
 					close;
-				}
-				else
-				{
+				} else {
 					mes "[Rat]";
 					mes "^FF0000Squeak!";
 					mes "^FF0000Squeak Squeak!^000000";
@@ -1262,20 +1103,17 @@ OnTouch:
 					set thai_find,10;
 					close;
 				}
-			break;
 			}
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun02,77,213,0	script	AyoFootprint7	139,1,1,{
 OnTouch:
-	if(thai_find == 10)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 10) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFWhere is he...?";
 			mes "He seems to have gone";
@@ -1286,28 +1124,25 @@ OnTouch:
 			close;
 		}
 	}
-	
+	end;
 }
-	
+
 ayo_dun02,86,254,0	script	AyoFootprint8	139,1,1,{
 OnTouch:
-	if(thai_find == 11)
-	{
-		if(rand(1,3) < 2)
-		{
+	if (thai_find == 11) {
+		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
 			mes "^3355FFYou find traces of blood. Whoever was running in this direction may have been wounded. The trail of blood leads to the ^5C3317North^3355FF.^000000";
+			changequest 12032,12033;
 			set thai_find,12;
 			close;
 		}
 	}
-	
+	end;
 }
-	
-ayothaya,193,171,3	script	Old Man#02	842,{
 
-	if(thai_find == 3)
-	{
+ayothaya,193,171,3	script	Old Man#02	842,{
+	if (thai_find == 3) {
 		mes "[Tham]";
 		mes "Weird...";
 		mes "Why was that guy";
@@ -1336,13 +1171,11 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 		mes "[Tham]";
 		mes "Oh well, don't worry. All of our villagers aren't like that. Anyway, I hope you enjoy your travels in Ayotaya.";
 		set thai_find,4;
+		changequest 12031,12032;
 		close;
-	}
-	else
-	{
-		set @randayo,rand(1,7);
-		if(@randayo < 5)
-		{
+	} else {
+		set .@randayo,rand(1,7);
+		if (.@randayo < 5) {
 			mes "[Tham]";
 			mes "Oh hello~";
 			mes "I can tell from your clothes that you must be from Rune-Midgard.";
@@ -1370,9 +1203,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			mes "[Tham]";
 			mes "Anyway, I'm sure that you'll like it. I hope that you come visit Ayotaya as often as you can~";
 			close;
-		}
-		else if(@randayo > 4 && @randayo < 7)
-		{
+		} else if (.@randayo > 4 && .@randayo < 7) {
 			mes "[Tham]";
 			mes "Ah~";
 			mes "I've got this craving for Ms. Mali the Spicy's food, especially her 'Tom Yum Goong.'";
@@ -1382,9 +1213,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			mes "most delicious dish";
 			mes "in the entire world!";
 			close;
-		}
-		else
-		{
+		} else {
 			mes "[Tham]";
 			mes "Oh hello~";
 			mes "I can tell from your clothes that you must be from Rune-Midgard.";
@@ -1394,10 +1223,9 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 			close;
 		}
 	}
-	
 }
 
-// Ayothaya Dungeon Quest
+// Ayothaya Dungeon Quest :: ayo_tiger
 //============================================================
 ayothaya,83,132,0	script	Dusit#thai	843,{
 	if (ayodunquest == 0) {
@@ -1475,6 +1303,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 			mes "[Dusit]";
 			mes "Ah well, you'll see what I'm talking about. I hope he'll help you learn more about that evil creature.";
 			set ayodunquest,1;
+			setquest 12035;
 			close;
 		}
 		mes "[Dusit]";
@@ -1482,8 +1311,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 		mes "Then be careful!";
 		mes "It'll eat you alive!";
 		close;
-	}
-	else if (ayodunquest > 0) {
+	} else if (ayodunquest > 0) {
 		mes "[Dusit]";
 		mes "How are you?";
 		mes "If you're interested";
@@ -1602,8 +1430,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 				mes "Even if you can";
 				mes "wield the power of";
 				mes "holiness, you will still need the spiritual security of our land.";
-			}
-			else {
+			} else {
 				mes "[Boonthom]";
 				mes "There are many ghosts and";
 				mes "demons within the cave, and they will attack people who do not possess holy power... Like you.";
@@ -1625,6 +1452,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "when you prepare all";
 			mes "the materials.";
 			set ayodunquest,2;
+			changequest 12035,12036;
 			close;
 		}
 		mes "[Boonthom]";
@@ -1636,8 +1464,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "............";
 		mes "............";
 		close;
-	}
-	else if (ayodunquest == 2) {
+	} else if (ayodunquest == 2) {
 		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent!";
@@ -1664,6 +1491,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 7190,1; //Solid_Peeling
 			delitem 523,1; //Holy_Water
 			set ayodunquest,3;
+			changequest 12036,12037;
 			getitem 7285,1; //Thread_Skein
 			next;
 			mes "[Boonthom]";
@@ -1688,8 +1516,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "See you later.";
 		close;
-	}
-	else if (ayodunquest == 3) {
+	} else if (ayodunquest == 3) {
 		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent! Now you have brought everything I need, let me make the thing for you as I promised...";
@@ -1730,8 +1557,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "See you later.";
 		close;
-	}
-	else if (ayodunquest > 3 && ayodunquest < 9) {
+	} else if (ayodunquest > 3 && ayodunquest < 9) {
 		mes "[Boonthom]";
 		mes "You finally started seeking the tiger. I hope that you will be safe from harm.";
 		next;
@@ -1739,8 +1565,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "Feel free to ask";
 		mes "me for help at anytime.";
 		close;
-	}
-	else if (ayodunquest == 9) {
+	} else if (ayodunquest == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I copied down this";
 		mes "message while exploring";
@@ -1777,14 +1602,14 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		set ayodunquest,10;
+		changequest 12037,12038;
 		next;
 		mes "[Boonthom]";
 		mes "Return to me";
 		mes "once you have";
 		mes "gathered everything.";
 		close;
-	}
-	else if (ayodunquest == 10) {
+	} else if (ayodunquest == 10) {
 		if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1) {
 			mes "[Boonthom]";
 			mes "Hmm~";
@@ -1813,6 +1638,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 523,2; //Holy_Water
 			set ayodunquest,11;
 			getitem 7287,1; //Thread_Skein_
+			changequest 12038,12039;
 			next;
 			mes "[Boonthom]";
 			mes "Even if you lose this, don't worry. Just bring me the materials, and";
@@ -1839,8 +1665,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "more powerful holy";
 		mes "threads for you.";
 		close;
-	}
-	else if (ayodunquest == 11) {
+	} else if (ayodunquest == 11) {
 		if (countitem(7287) > 0) {
 			mes "[Boonthom]";
 			mes "Those threads";
@@ -1850,8 +1675,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "to you to defend yourself";
 			mes "from monster attacks, okay?";
 			close;
-		}
-		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Ooooohmmmmm...";
 			next;
@@ -1886,8 +1710,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		close;
-	}
-	else if (ayodunquest == 12) {
+	} else if (ayodunquest == 12) {
 		mes "[Boonthom]";
 		mes "Huh...!";
 		mes "You must have seen something.";
@@ -1914,17 +1737,16 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "If you wish to explore the building again, but you don't have any holy thread, feel free to ask me at anytime.";
 		set ayodunquest,13;
+		completequest 12039;
 		close;
-	}
-	else if (ayodunquest > 12) {
+	} else if (ayodunquest > 12) {
 		if (countitem(7287) > 0) {
 			mes "[Boonthom]";
 			mes "Best of luck on your";
 			mes "expeditions, brave";
 			mes "adventurer~";
 			close;
-		}
-		else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
 			mes "[Boonthom]";
 			mes "Lost the";
 			mes "holy threads";
@@ -2210,6 +2032,7 @@ ayo_dun01,99,118,0	script	 #hun_thai_5	111,{
 ayo_dun01,16,188,0	script	 #hun_thai_6	111,{
 	if (ayodunquest == 8) {
 		set ayodunquest,9;
+		setquest 12036;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.^000000";
 		next;
 		mes "^3355FFIt reads '^0000FFOtherwise, it's impossible...^3355FF' You are unable to read the rest of the message.^000000";
@@ -2231,8 +2054,7 @@ ayo_dun01,24,283,0	script	 #2_dun_in	111,{
 			close2;
 			if (rand(1,10) > 5) {
 				warp "ayo_dun02",23,26;
-			}
-			else {
+			} else {
 				warp "ayo_dun02",275,26;
 			}
 			end;
@@ -2259,12 +2081,13 @@ ayo_dun02,268,108,0	script	 #reward_tiger	111,{
 		mes "^3355FFYou pick";
 		mes "up the box.^000000";
 		set ayodunquest,12;
+		completequest 12039;
 		getitem 603,1; //Old_Blue_Box
 		close;
 	}
 }
 
-// Tom Tung Goong Quest
+// Tom Tung Goong Quest :: ayo_tom
 //============================================================
 ayothaya,196,265,3	script	Einon#ayo	842,{
 	if (tomyumgoong == 0) {
@@ -2305,6 +2128,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 			next;
 			emotion e_no1;
 			set tomyumgoong,1;
+			setquest 8123;
 			mes "[Einon]";
 			mes "She is the best cook when it";
 			mes "comes to Tom Yum Goong!";
@@ -2318,8 +2142,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 		mes "change your mind,";
 		mes "please come back.";
 		close;
-	}
-	else if (tomyumgoong == 1) {
+	} else if (tomyumgoong == 1) {
 		mes "[Einon]";
 		mes "Ah, you wanna know";
 		mes "where ^3131FFMali the Spicy^000000 is?";
@@ -2340,7 +2163,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 	mes "Wouldn't you agree with me?";
 	close;
 }
-	
+
 ayo_in01,145,163,3	script	Cook#ayo	839,{
 	if (tomyumgoong < 2) {
 		mes "[Mali the Spicy]";
@@ -2356,8 +2179,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "it's my fate to cook the greatest Tom Yum Goong ever.";
 		if (tomyumgoong == 0) {
 			close;
-		}
-		else {
+		} else {
 			next;
 			mes "[Mali the Spicy]";
 			mes "Oh I see...";
@@ -2397,6 +2219,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes "my name, that guy";
 				mes "might give you a discount.";
 				set tomyumgoong,2;
+				changequest 8123,8124;
 				next;
 				mes "[Mali the Spicy]";
 				mes "His name is ^3131FFThongpool^000000.";
@@ -2408,8 +2231,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "a try if you really want to taste the best Tom Yum Goong.";
 			close;
 		}
-	}
-	else if (tomyumgoong > 1 && tomyumgoong < 4) {
+	} else if (tomyumgoong > 1 && tomyumgoong < 4) {
 		if (tomyumgoong == 2 && countitem(567) > 19) {
 			mes "[Mali the Spicy]";
 			mes "Errr...";
@@ -2428,8 +2250,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "and ask him to give you the freshest Shrimp to cook the best";
 			mes "Tom Yum Goong?";
 			close;
-		}
-		else if (tomyumgoong == 3) {
+		} else if (tomyumgoong == 3) {
 			if (countitem(567) > 19) {
 				mes "[Mali the Spicy]";
 				mes "Ah, you came back!";
@@ -2456,6 +2277,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				next;
 				if (select("Where can I find Lemons?:I hate sour food. I'd better quit!") == 1) {
 					set tomyumgoong,4;
+					changequest 8124,8125;
 					mes "[Mali the Spicy]";
 					mes "A few days ago, I saw a good";
 					mes "Lemon tree while taking a walk.";
@@ -2493,8 +2315,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "you 20 Shrimps.";
 		mes "Now hurry~";
 		close;
-	}
-	else if (tomyumgoong > 3 && tomyumgoong < 6) {
+	} else if (tomyumgoong > 3 && tomyumgoong < 6) {
 		if (tomyumgoong == 4 && countitem(568) > 9) {
 			mes "[Mali the Spicy]";
 			mes "You think these are";
@@ -2508,8 +2329,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			mes "fresh! They're just";
 			mes "common Lemons!";
 			close;
-		}
-		else if (tomyumgoong == 5) {
+		} else if (tomyumgoong == 5) {
 			if (countitem(568) > 9) {
 				emotion e_gasp;
 				mes "[Mali the Spicy]";
@@ -2538,6 +2358,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				if (select("Okay, I'll be right back.:Ah, I'm tired now. Let me take a rest first...") == 1) {
 					delitem 568,10; //Lemon
 					set tomyumgoong,6;
+					changequest 8125,8126;
 					mes "[Mali the Spicy]";
 					mes "See you in a bit~";
 					close;
@@ -2569,8 +2390,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "Lemons so that I can make";
 		mes "some Tom Yum Goong!";
 		close;
-	}
-	else if (tomyumgoong == 6) {
+	} else if (tomyumgoong == 6) {
 		if (countitem(7286) > 29) {
 			mes "[Mali the Spicy]";
 			mes "I don't understand...";
@@ -2587,10 +2407,8 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "[Malli the Spicy]";
 		mes "Please go take a look in the Market. I don't doubt that it will be a good experience. After all, my fantastic Tom Yum Goong is waiting for you!";
 		close;
-	}
-	else if (tomyumgoong == 7) {
-		set .@now_weight,MaxWeight-Weight;
-		if (.@now_weight > 1499) {
+	} else if (tomyumgoong == 7) {
+		if (MaxWeight - Weight > 1499) {
 			if (countitem(7286) > 29) {
 				delitem 7286,30; //Chilli
 				emotion e_gasp;
@@ -2638,6 +2456,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes " .........";
 				next;
 				set tomyumgoong,8;
+				completequest 8126;
 				getitem 566,10; //Tomyumkung
 				emotion e_no1;
 				mes "[Mali the Spicy]";
@@ -2686,7 +2505,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 	mes "Heh heh heh~!";
 	close;
 }
-	
+
 ayothaya,153,86,5	script	Thongpool#ayo	843,{
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
@@ -2726,9 +2545,8 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 			next;
 			if (select("I will take them.:I could get 100 Jellopies for that much!") == 1) {
 				if (Zeny > 10999) {
-					set .@now_weight,MaxWeight-Weight;
-					if (.@now_weight > 3999) {
-						set zeny,zeny-11000;
+					if (MaxWeight - Weight > 3999) {
+						set Zeny, Zeny-11000;
 						set tomyumgoong,3;
 						getitem 567,20; //Prawn
 						emotion e_no1;
@@ -2761,8 +2579,7 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 		mes "of Tom Yum Goong";
 		mes "is priceless!";
 		close;
-	}
-	else if (tomyumgoong == 3) {
+	} else if (tomyumgoong == 3) {
 		mes "[Thongpool]";
 		mes "Mmm...?";
 		mes "Did you need";
@@ -2772,9 +2589,8 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 		next;
 		if (select("Yes!:No, thanks.") == 1) {
 			if (Zeny > 10999) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight > 3999) {
-					set zeny,zeny-11000;
+				if (MaxWeight - Weight > 3999) {
+					set Zeny, Zeny-11000;
 					getitem 567,20; //Prawn
 					mes "[Thongpool]";
 					mes "There you go~";
@@ -2802,9 +2618,9 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 	mes "I've got the best Shrimp caught in the cleanest waters in the world~!";
 	close;
 }
-	
+
 ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
-	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -2852,7 +2668,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 	close;
 
 OnTouch:
-	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
+	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -3124,9 +2940,8 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		if (select("Thanks, I'll take it.:It's a rip-off, man!") == 1) {
 			emotion e_thx;
 			if (Zeny > 1999) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight > 1199) {
-					set zeny,zeny-2000;
+				if (MaxWeight - Weight > 1199) {
+					set Zeny, Zeny-2000;
 					set tomyumgoong,7;
 					getitem 7286,30; //Chilli
 					mes "[Merchant Thongdum]";
@@ -3163,8 +2978,7 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		mes "reasonable. I want you to know";
 		mes "that I'm a respectable Merchant.";
 		close;
-	}
-	else if (tomyumgoong == 7) {
+	} else if (tomyumgoong == 7) {
 		mes "[Merchant Thongdum]";
 		mes "I thought I provided you";
 		mes "with enough ingredients, but";
@@ -3182,9 +2996,8 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 			close;
 		}
 		if (Zeny > 1999) {
-			set .@now_weight,MaxWeight-Weight;
-			if (.@now_weight > 1199) {
-				set zeny,zeny-2000;
+			if (MaxWeight - Weight > 1199) {
+				set Zeny, Zeny-2000;
 				getitem 7286,30; //Chilli
 				mes "[Merchant Thongdum]";
 				mes "Thank you,";