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, 52 insertions, 194 deletions

diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 8b804e0cd..6d9034627 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -1,21 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Rogue Skills Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Lupus, Reddozen
-//===== Current Version: ===================================== 
-//= 1.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.8
+//===== Description: =========================================
+//= [Official Conversion]
 //= Quests for skills: CLose Confine
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Bug fixes as pointed out by Brainstorm in bugreport:351 [L0ne_W0lf]
 //= 1.6a Fixed(?) antoher problem (NPCs not disabling) hopefully. [L0ne_W0lf]
 //= 1.6b Corrected a Typo error with "rouge". (bugreport:909) [Samuray22]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.8 Some cleaning. [Euphy]
 //============================================================
 
 in_rogue,359,177,0	script	#killershow01	-1,{
@@ -85,80 +84,28 @@ OnTouch:
 		mes "yellow. If he intends to go";
 		mes "backward, it will be pale red.";
 		next;
-		while(1) {
-			if (.@lim_1 == 10) {
-				break;
+		setarray .@Effects[1],EF_CHANGECOLD,EF_CHANGEWIND,EF_CHANGEEARTH;
+		for(set .@lim_1,0; .@lim_1<10; set .@lim_1,.@lim_1+1) {
+			set .@move_1,rand(1,3);
+			specialeffect .@Effects[.@move_1];
+			if (select("Block him to the Left:Block him to the Right:Block his Retreat") == .@move_1) {
+				mes "^3355FFThe killer remains";
+				mes "unable to move and looks";
+				mes "incredibly confused! Right";
+				mes "now, you're using the Close";
+				mes "Confine skill perfectly!^000000";
+				specialeffect EF_POTION1;
+				specialeffect2 EF_POTION7;
 			}
 			else {
-				set .@lim_1,.@lim_1 + 1;
-				set .@move_1,rand(1,3);
-				if (.@move_1 == 1) {
-					specialeffect EF_CHANGECOLD;
-					if (select("Block him to the Left:Block him to the Right:Block his Retreat") == 1) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
-				else if (.@move_1 == 2) {
-					specialeffect EF_CHANGEWIND;
-					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 2) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
-				else if (.@move_1 == 3) {
-					specialeffect EF_CHANGEEARTH;
-					if (select("Block him at the Left:Block him at the Right:Block him at the back") == 3) {
-						mes "^3355FFThe killer remains";
-						mes "unable to move and looks";
-						mes "incredibly confused! Right";
-						mes "now, you're using the Close";
-						mes "Confine skill perfectly!^000000";
-						specialeffect EF_POTION1;
-						specialeffect2 EF_POTION7;
-						next;
-					}
-					else {
-						mes "^3355FFWait--!";
-						mes "For some reason,";
-						mes "you sense that's not";
-						mes "the direction the killer";
-						mes "is moving at this moment.";
-						mes "You naturally correct yourself.^000000";
-						next;
-					}
-				}
+				mes "^3355FFWait--!";
+				mes "For some reason,";
+				mes "you sense that's not";
+				mes "the direction the killer";
+				mes "is moving at this moment.";
+				mes "You naturally correct yourself.^000000";
 			}
+			next;
 		}
 		mes "^3355FFYou successfully";
 		mes "retrieved the priceless";
@@ -1207,58 +1154,16 @@ OnDisable:
 prt_are01,149,162,0	script	Kienna#1st	700,1,1,{
 	end;
 OnTouch:
-	callfunc "F_Kienna","1st";
-	end;
-}
-
-prt_are01,136,150,0	script	Kienna#2nd	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","2nd";
-	end;
-}
-
-prt_are01,150,138,0	script	Kienna#3rd	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","3rd";
-	end;
-}
-
-prt_are01,163,147,0	script	Kienna#4th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","4th";
-	end;
-}
-
-prt_are01,134,140,0	script	Kienna#5th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","5th";
-	end;
-}
-
-prt_are01,161,140,0	script	Kienna#6th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","6th";
-	end;
-}
-
-prt_are01,161,160,0	script	Kienna#7th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","7th";
-	end;
-}
-
-prt_are01,138,159,0	script	Kienna#8th	700,1,1,{
-	end;
-OnTouch:
-	callfunc "F_Kienna","8th";
+	callfunc "F_Kienna",strnpcinfo(2);
 	end;
 }
+prt_are01,136,150,0	duplicate(Kienna#1st)	Kienna#2nd	700,1,1
+prt_are01,150,138,0	duplicate(Kienna#1st)	Kienna#3rd	700,1,1
+prt_are01,163,147,0	duplicate(Kienna#1st)	Kienna#4th	700,1,1
+prt_are01,134,140,0	duplicate(Kienna#1st)	Kienna#5th	700,1,1
+prt_are01,161,140,0	duplicate(Kienna#1st)	Kienna#6th	700,1,1
+prt_are01,161,160,0	duplicate(Kienna#1st)	Kienna#7th	700,1,1
+prt_are01,138,159,0	duplicate(Kienna#1st)	Kienna#8th	700,1,1
 
 function	script	F_Kienna	{
 	if (ROG_SK == 6) {
@@ -1272,71 +1177,24 @@ function	script	F_Kienna	{
 		mes "immobilizing me. Get ready~";
 		set ROG_SK,7;
 		next;
-		while(1) {
-			if (.@lim_1 == 10) {
-				break;
+		for(set .@lim_1,0; .@lim_1<10; set .@lim_1,.@lim_1+1) {
+			set .@move_1,rand(1,3);
+			if (select("Block her to the Left:Block her to the Right:Block her retreat") == .@move_1) {
+				mes "[Kienna]";
+				mes "Huh...?";
+				mes "You blocked me!";
+				mes "Very nice work~";
+				specialeffect EF_POTION1;
+				specialeffect2 EF_POTION7;
+				set .@suc_1,.@suc_1 + 1;
 			}
 			else {
-				set .@lim_1,.@lim_1 + 1;
-				set .@move_1,rand(1,3);
-				if (.@move_1 == 1) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 1) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
-				else if (.@move_1 == 2) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 2) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
-				else if (.@move_1 == 3) {
-					if (select("Block her to the Left:Block her to the Right:Block her retreat") == 3) {
-						mes "[Kienna]";
-						mes "Huh...?";
-						mes "You blocked me!";
-						mes "Very nice work~";
-						specialeffect 204; //EF_POTION1
-						specialeffect2 210; // EF_POTION7
-						set .@suc_1,.@suc_1 + 1;
-						next;
-					}
-					else {
-						mes "[Kienna]";
-						mes "Sorry, but I wasn't";
-						mes "moving in that direction.";
-						mes "Your block attempt failed...";
-						next;
-					}
-				}
+				mes "[Kienna]";
+				mes "Sorry, but I wasn't";
+				mes "moving in that direction.";
+				mes "Your block attempt failed...";
 			}
+			next;
 		}
 		mes "[Kienna]";
 		mes "Alright, we're done";
@@ -1495,9 +1353,9 @@ OnStartArena:
 	end;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'