* Updated Kunlun NPCs and warps.

- Didn't update the Kunlun 'Power' npcs
- Updated Lutie and Comodo warps.
* Fixed some slight inconsistencies with the some script headers.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12014 54d463be-8e91-2dee-dedb-b68131a5f0ec

14 files changed, 2411 insertions, 2252 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 4b41193d6..5b600c94a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,10 @@
 Date		Added
 ======
+2008/01/05
+	* Rev. 12014 Updated Kunlun NPCs and warps. [L0ne_W0lf]
+	- Didn't update the Kunlun 'Power' npcs
+	- Updated Lutie and Comodo warps.
+	* Fixed some slight inconsistencies with the some script headers.
 2008/01/01
 	* Corrected some delitems in Kyel Hyre Quest. (bugreport:690) [Samuray22]
 	* Corrected a Typo error in Yuno NPCs. (bugreport:716)
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index b6fd867fb..d33c751b3 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -5,8 +5,11 @@
 //===== Current Version: ===================================== 
 //= 1.3
 //===== Compatible With: ===================================== 
-//= Any eAthena Version; Niflheim Required
+//= eAthena SVN
 //===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Amatsu Town Script
+//===== Additional Comments: ================================= 
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //=	Moved elemental stone trader to 'elemental_trader.txt'
 //============================================================
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 3b2ae908e..d22e39fa6 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -1,5 +1,5 @@
 //===== eAthena Script ======================================= 
-//= Ayothaya Town
+//= Ayotaya Town
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: =====================================
@@ -8,9 +8,9 @@
 //= eAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Ayothaya Town Scripts
+//= Ayotaya Town Script
 //===== Additional Comments: ================================= 
-//= 1.6 Rescripted to AEgis 10.3 standards. [L0ne_W0lf]
+//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
 // Ayothaya Transportation NPC
@@ -26,7 +26,7 @@ alberta,247,42,3	script	Aibakthing#ayo	843,{
 	switch(select("About Ayotaya.:Go to Ayotaya.:Cancel.")) {
 	case 1:
 		mes "[Aibakthing]";
-		mes "We Ayothayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature.";
+		mes "We Ayotayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature.";
 		next;
 		mes "[Aibakthing]";
 		mes "Our traditional cuisine is world famous. It's no surprise when we serve dishes like Tom Yum Goong, made of Shrimp, Lemon and Chillis, which has a tantalizing aroma and flavor beyond imagining.";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index fffdb4403..b5452ee02 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -1,572 +1,420 @@
 //===== eAthena Script ======================================= 
-//= Gonryun Town
+//= Kunlun Town
 //===== By: ================================================== 
 //= x[tsk], KarLaeda
 //===== Current Version: ===================================== 
 //= 1.4
 //===== Compatible With: ===================================== 
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: ========================================= 
-//
+//= [Aegis Conversion]
+//= Kunlun Town Script
 //===== Additional Comments: ================================= 
-// May be missing npc's and dialogue.
-//= 1.1 Fixed Typo’s [Nexon]
-//= 1.2 Removed Duplicates [Silent]
-//= 1.3 Max NPC Name is 23 [Toms]
-//= 1.3a Removed temp NPC plugs due Broken Sword quest [Lupus]
-//= 1.4 Added missing NPC [KarLaeda]
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//=	Moved Lost Knife mini-quest to quest file.
 //============================================================
 
-
-alberta,245,69,4	script	Public Relations#01	776,{
-	mes "[Waba]";
-	mes "Hello there! I have traveled far from the Kingdom of Gonryun, my hometown.";
-	mes "I invite all to visit and celebrate the diversity of Gonryun! We welcome all sorts of visitors.";
-	M_Menu:
+// Kunlun Transportation
+//============================================================ 
+alberta,245,69,3	script	Kunlun Envoy#gon	776,{
+	mes "[Wa Bai Hu]";
+	mes "Good day~";
+	mes "Let me invite you all";
+	mes "to my homeland, Kunlun.";
+	mes "It is my honor to guide";
+	mes "such distinguished quests from";
+	mes "the Rune-Midgard kingdom.";
 	next;
-	menu "Gonryun? What is that?",M_1, "Travel to Gonryun.",M_2, "Nevermind.",M_End;
-
-	M_1:
-		mes "[Waba]";
-		mes "The Kingdom of Gonryun is a sight to behold! It floats high above the sky, beyond the pillar of light!";
+	switch(select("About Kunlun:Visit Kunlun:Cancel")) {
+	case 1:
+		mes "[Wa Bai Hu]";
+		mes "Kunlun is a beautiful place,";
+		mes "rich with history, and its";
+		mes "own traditions. I also think";
+		mes "Kunlun is the best place for";
+		mes "sightseeing.";
 		next;
-		mes "[Waba]";
-		mes "You can certainly appreciate the sights of the floating mainland! If you go, be sure to try.";
-		mes "The steamed dumplings and peaches, they're a Gonryun specialty not to be missed!";
-		goto M_Menu;
-	M_2:
-		mes "[Waba]";
-		mes "The traveling expenses are ^0000ff10,000 zeny^000000.  The fee is a bit pricy but this is because of the dangerous nature of the trip.";
-		mes "The return trip is free, however. Are you prepared to go?";
+		mes "[Wa Bai Hu]";
+		mes "When you arrive at the harbor of";
+		mes "Kunlun, you'll be able to see";
+		mes "miniature replicas of";
+		mes "buildings found in Alberta";
+		mes "and Prontera.";
 		next;
-		menu "Let's Go!",-, "Actually... I changed my mind, sorry.",M_End;
-		
-			if (Zeny < 10000){
-				mes "[Waba]";
-				mes "I am sorry if it seems like a lot, but the ^0000ff10,000 zeny^000000 we request is necessary in order to make the trip.";
-				close;
-			}
-			set Zeny,Zeny-10000;
-			warp "gon_fild01",258,82;
-			end;
-	M_End:
-		mes "[Waba]";	
-		mes "Please see me again if you want to visit! I am pleased just to meet an honored guest from the Continent.";
-		close;
-
-}
-
-//===============================================================================
-
-gon_fild01,255,79,6	script	Public Relations#02	776,{
-	mes "[Waba]";
-	mes "We are ready to head back as soon as the conditions are favorable.";
-	next;
-	menu "ALBERTA.",-,"I'll stay a bit longer.",M_End;
-
-		warp "alberta",243,68;
-		end;
-	M_End:
-		mes "[Waba]";
-		mes "Oh there's no rush! Enjoy yourself and take in all the sights!";
-		close;
-}
-
-//===============================================================================
-
-gon_fild01,187,239,4	script	Public Relations#03	776,{
-	mes "[Choseryu]";
-	mes "The sacred pillar of light connects this island to Gonryun Kingdom. There's no time to idly chit chat now, be on your way.";
-	mes "I hope you will have many fond memories of Gonryun before you leave.";
-	close;
-}
-
-//===============================================================================
-
-gonryun,153,64,0	script	Public Relations#04	776,{
-	mes "[Choseryu]";
-	mes "If you're ready to set sail I can send you back to the harbor.";
-	next;
-	menu "Send me to the harbor.",-,"I'd like to stay a bit longer.",M_End;
-
-		mes "[Choseryu]";
-		mes "Please come back to visit soon!";
+		mes "[Wa Bai Hu]";
+		mes "After enjoying a nice, leisurely";
+		mes "stroll, step into the beautiful";
+		mes "column of light that will take";
+		mes "you up into the clouds to";
+		mes "Kunlun Village.";
 		next;
-		warp "gon_fild01",258,82;
-		close;
-	M_End:
-		mes "[Choseryu]";
-		mes "Be sure to see all that Gonryun has to offer!";
-		close;
-}
-
-//===============================================================================
-//Inn
-//===============================================================================
-
-gon_in,153,35,4	script	Hotel Manager	702,{
-	mes "[Mayouban]";
-	mes "Welcome! Your face is new around here. We've had many strangers from the outside coming into the village recently.";
-	mes "We've been quite short-handed here at the hotel.";
-	next;
-	mes "[Mayouban]";
-	mes "It always seems to be 'get me this' or 'get me that' with the customers! Never a tip or a compliment. I suppose I should really welcome all the extra business.";
-	next;
-	menu "I'd like something to drink.",-,"I'll be on my way.",M_End;
-
-		mes "[Mayouban]";
-		mes "Here you go.  There have been so many rowdy customers lately sometimes I'd just like to sit down and have a drink myself.";
-		close;
-	M_End:
-		mes "[Mayouban]";
-		mes "May you have a safe journey! Come back any time.";
+		mes "[Wa Bai Hu]";
+		mes "I've heard that on the";
+		mes "Rune-Midgarts continent,";
+		mes "there is another city that is";
+		mes "is kept aloft in the sky by";
+		mes "an ancient, mysterious power...";
+		next;
+		mes "[Wa Bai Hu]";
+		mes "Well, my Kunlun also floats";
+		mes "in the air, but without any";
+		mes "so called technology or";
+		mes "power supply. We consider";
+		mes "our land especially blessed...";
+		next;
+		mes "[Wa Bai Hu]";
+		mes "When you're in Kunlun, don't";
+		mes "forget to try our specialties";
+		mes "such as the giant dumpling or the heaven peach.";
+		next;
+		mes "[Wa Bai Hu]";
+		mes "You'd better prepare yourself";
+		mes "if you are planning to visit";
+		mes "the Kunlun dungeon. I must";
+		mes "say, that is not a safe place to go for fun.";
+		next;
+		mes "[Wa Bai Hu]";
+		mes "If you are interested in visiting";
+		mes "Kunlun, do not hesitate to let";
+		mes "me know. It's my great pleasure";
+		mes "to serve you, honorable guest.";
 		close;
-}
-
-//===============================================================================
-
-gonryun,139,142,6	script	Girl#08	772,{
-	mes "[Sanfayon]";
-	mes "................";
-	mes "It's been great having new visitors come to the village, but........ ever since I was robbed by that Thief.......";
-	next;
-	mes "[Sanfayon]";
-	mes "I have been so afraid of the foreigners.....";
-	emotion e_wah;
-	close;
-}
-
-//===============================================================================
-
-gon_in,18,27,4	script	Elder's Wife	771,{
-	mes "[Sangufayon]";
-	mes "Oh my! You look like an important visitor from the outside. Aren't you?";
-	next;
-	menu "Yes, I am.",-,"Where is the village Elder?",M_End;
-
-		mes "[Sangufayon]";
-		mes "We do not get many visitors from the outside to see my husband so it's so easy to spot them. Hohohohoho!";
+	case 2:
+		mes "[Wa Bai Hu]";
+		mes "Excellent choice, I am glad";
+		mes "to have you as our guest~";
+		mes "However, a small fee is required";
+		mes "to board the ship to Kunlun.";
+		next;
+		mes "[Wa Bai Hu]";
+		mes "We ask that you pay 10,000 zeny";
+		mes "prior to departure. That fee also";
+		mes "covers the cost of returning";
+		mes "to Alberta. I am ready to guide";
+		mes "you to Kunlun at any time.";
+		next;
+		mes "[Wa Bai Hu]";
+		mes "Would you like to board?";
+		next;
+		if (select("To Kunlun~!:No.") == 1) {
+			if (Zeny > 9999) {
+				mes "[Wa Bai Hu]";
+				mes "Thank you, let me guide you there immediately.";
+				close2;
+				set zeny,zeny-10000;
+				warp "gon_fild01",258,82;
+				end;
+			}
+			mes "[Wa Bai Hu]";
+			mes "I am sorry, but you must have";
+			mes "10,000 zeny to travel to Kunlun.";
+			mes "Please make sure you have enough";
+			mes "zeny with you. Thank you, and";
+			mes "please come again.";
+			close;
+		}
+		mes "[Wa Bai Hu]";
+		mes "I see. However, whenever you";
+		mes "change your mind, please let";
+		mes "me know. It would be a great";
+		mes "please to serve you, most";
+		mes "honorable guest.";
 		close;
-	M_End:
-		mes "[Sangufayon]";
-		mes "The master of the house, hohohohoho? Why... he is upstairs on the second floor if you need to talk to him, hohohoho.";
+	case 3:
+		mes "[Wa Bai Hu]";
+		mes "I see. However, whenever you";
+		mes "change your mind, please let me";
+		mes "know. It would be a great pleasure to serve you, most honorable guest.";
 		close;
+	}
 }
 
-//===============================================================================
-
-gonryun,119,111,4	script	Chen Wan Sok	89,{
-	mes "[Chen Wan Sok]";
-	mes "The village Elder here is truly a sociable fellow. Just because he is friendly does not mean he is lax on the rules! He can get riled up sometimes.";
+gon_fild01,255,79,7	script	Kunlun Envoy#gon2	776,{
+	mes "[Wa Bai Hu]";
+	mes "So, did you enjoy your trip?";
+	mes "I guess it's the time for you to";
+	mes "go home. The ship to Rune-Midgard is ready to depart at any time.";
 	next;
-	mes "[Chen Wan Sok]";
-	mes "When the Elder's blessing, you can get away with a lot of things in this town. Sometimes there are those that cause mischief, but they are always dealt with.";
+	if (select("Go back to Alberta:Cancel") == 1) {
+		mes "[Wa Bai Hu]";
+		mes "Please come again.";
+		mes "I hope you will let your friends";
+		mes "know about Kunlun when you get";
+		mes "back. Now, let me guide you";
+		mes "back to Alberta.";
+		close2;
+		warp "alberta",243,67;
+		end;
+	}
+	mes "[Wa Bai Hu]";
+	mes "Take your time, my guest.";
+	mes "There should be many places";
+	mes "you may have missed.";
 	close;
 }
 
-//===============================================================================
-
-gonryun,237,225,4	script	Hanyon Kyou	776,{
-	mes "[Hanyon Kyou]";
-	mes "How could I have done something like this?";
-	mes "..............";
-	next;
-	mes "[Hanyon Kyou]";
-	mes "I've dropped my lucky knife! Now it's probably gone forever."; 
+gon_fild01,187,239,7	script	Kunlun Envoy#gon3	776,{
+	mes "[Zhang Quing Long]";
+	mes "Please head north to enter Kunlun.";
+	mes "I hope you will have a great time";
+	mes "while staying in Kunlun.";
 	close;
 }
 
-//===============================================================================
-
-gonryun,51,101,4	script	Gaiysonchoru	778,{
-	mes "[Gaiysonchoru]";
-	emotion e_swt;
-	mes "..............";
-	next;
-	mes "[Gaiysonchoru]";
-	mes "Well......... I'm worried.";
+gonryun,153,64,7	script	Kunlun Envoy#gon4	776,{
+	mes "[Zhang Quing Long]";
+	mes "Please make yourself comfortable.";
+	mes "If you want to go back, I will";
+	mes "be more than happy to guide you";
+	mes "to the ship to Alberta.";
 	next;
-	mes "[Gaiysonchoru]";
-	mes "So very worried.";
-	close;
-}
-
-//===============================================================================
-
-gonryun,237,226,3	script	YunKyoHam#gn	776,{
-	mes "[YunKyoHam]";
-	if (nakha < 2) {
-		mes "Oh no~ Holy cow!";
-		mes "Can't believe I dropped";
-		mes "my valuable knife! ahhhhhh.";
-		if (baselevel >= 20) {
-			next;
-			if (nakha == 0) set nakha,1;
-			mes "[YunKyoHam]";
-			mes "I need to go down to get it";
-			mes "but...the monsters..";
-			mes "I am so scared..  What should I do!";
-		}
-	} else if (nakha == 2) {
-		mes "ehhhh.. what should I do..";
-		mes "got any business to";
-		mes "take care of?";
-		mes "hmm?";
-		if (countitem(1201) < 1) close;
-		next;
-		mes "[YunKyoHam]";
-		mes "uk! that...that knife";
-		mes "is my ancestor's knife that";
-		mes "I dropped from here.";
-		mes "Where did you get it?";
-		next;
-		mes "[YunKyoHam]";
-		mes "I dropped that knife from";
-		mes "here and it belongs to my";
-		mes "ancestor's property. It sure is";
-		mes "a cheap knife,";
-		mes "but really valuable to me";
-		mes "and my family.";
-		next; 
-		mes "[YunKyoHam]";
-		mes "Would you hand that";
-		mes "knife to me?";
-		next;
-		if (select("give.:ignore.") == 2 || countitem(1201) < 1) {
-			mes "[YunKyoHam]";
-			mes "Huk! my family heiloom!!";
-			mes "You Evil! Satan! Animal! Hode";
-			mes "My curse shall be on his head!!!";
-			close;
-		}
-		mes "[YunKyoHam]";
-		mes "ohoh! Thank you!";
-		mes "Take these potions.";
-		mes "They are not expensive";
-		mes "but my favorites.";
-		set nakha,3;
-		delitem 1201, 1; // Knife
-		getitem 505,2; // Blue_Potion
-		next;
-		mes "[YunKyoHam]";
-		mes "You kept my family";
-		mes "treasure safe. Thank you!!";
-		mes "hahaha";
-	} else {
-		mes "next.. I heard my neighbor";
-		mes "is worrying about something";
-		mes "these days.. well, I got my";
-		mes "own business to take care of.";
-	}
-	close;
-}
-
-gon_fild01,245,257,0	script	lost knife#gn	139,1,1,{
-	if (nakha == 1) {
-		set nakha, 2;
-		mes "-something is hidden underneath the sand dunes-";
-		mes " ";
-		mes "-You have found an -";
-		mes "-undefined knife.-";
+	if (select("Go back to the harbor:Cancel") == 1) {
+		mes "[Zhang Quing Long]";
+		mes "I hope you enjoyed your trip.";
+		mes "Now, let me guide you back";
+		mes "to the harbor.";
 		close2;
-		getitem 1201, 1; // Knife
+		warp "gon_fild01",258,82;
 		end;
 	}
+	mes "[Zhang Quing Long]";
+	mes "Take your time, my guest.";
+	mes "There should be many places";
+	mes "you may have missed.";
+	close;
 }
 
-gonryun,200,82,3	script	Sungson Gam#gn	774,{
-	mes "[Sungson Gam]";
-	mes "Festival is always wonderful.";
+// Generic Kunlun NPCs
+//============================================================ 
+gonryun,200,82,3	script	Jian Chung Xun#gon	774,{
+	mes "[Jian Chung Xun]";
+	mes "I simply adore festivals.";
 	mes "That's why I love this town.";
-	mes "This town make me feel that I am";
-	mes "in the middle of festival all the time. hehe.";
+	mes "This town makes me feel like I am";
+	mes "in the middle of a festival all year round.";
 	close;
 }
 
-gonryun,268,88,3	script	Joonpo Lyang#gn	776,{
-	mes "[Joonpo Lyang]";
-	mes "We are proud in name of independent nation";
-	mes "We've been fighting againt the evil envaders";
-	mes "who wanted to take this blessed land.";
-	mes "And we did win the battles and kept our land until now.";
+gonryun,268,88,3	script	Liang Zhun Bu#gon	776,{
+	mes "[Liang Zhun Bu]";
+	mes "We are proud to be an independent";
+	mes "nation, and have been fighting";
+	mes "against the evil invaders who've";
+	mes "wanted to conquer this blessed land for many years...";
 	next;
-	mes "[Joonpo Lyang]";
-	mes "We believe in Victory of Triumphal song!";
-	mes "That represents our sunrise!";
+	mes "[Liang Zhun Bu]";
+	mes "But we have victoriously fended";
+	mes "off every invasion! As long";
+	mes "as we believe in ourselves,";
+	mes "we shall never forget the";
+	mes "Trumphal Song that has helped us in our struggles.";
 	close;
 }
 
-gonryun,118,111,5	script	Wonsuk Chen#gn	89,{
-	mes "[Wonsuk Chen]";
-	mes "A chieft of this town is";
-	mes "an open-hearted man.";
-	mes "But I heard that there are some";
-	mes "people who don't like his character. hmm..";
+gonryun,118,111,5	script	Qian Yuen Shuang#gon	89,{
+	mes "[Qian Yuen Shuang]";
+	mes "The chief of this town is a man";
+	mes "who opens his heart to others.";
+	mes "However, I have heard that there";
+	mes "are some people who don't like his personality...";
 	next;
-	mes "[Wonsuk Chen]";
-	mes "Well, I like my town. Chief's efforts";
-	mes "make our town way better. I just hope";
-	mes "I don't get to see some dummies";
-	mes "around the town anymore.";
+	mes "[Qian Yuen Shuang]";
+	mes "Well, I like my town. The Chief's";
+	mes "efforts have made our town safer.";
+	mes "I just hope other people feel the";
+	mes "same way about what he has done.";
 	close;
 }
 
-gonryun,181,161,3	script	Moonjin Chung#gn	773,{
-	mes "[Moonjin Chung]";
-	mes "The men in our town, Gonryun are";
-	mes "all brave and energetic.";
-	mes "But, they are unable to get married";
-	mes "these days..";
+gonryun,181,161,3	script	Jing Wen Zhen#gon	773,{
+	mes "[Jing Wen Zhen]";
+	mes "The men in our town, Kunlun, are";
+	mes "all brave and courageous.";
+	mes "But, they are unable to get";
+	mes "married. It's quite a shame really...";
 	next;
-	mes "[Moonjin Chung]";
+	mes "[Jing Wen Zhen]";
 	mes "It's all because there are";
-	mes "way more men than women.";
+	mes "more men than women.";
 	mes "I am not even sure whether";
-	mes "my son could get married";
-	mes "or not. hmm..";
+	mes "or not my son will be able to";
+	mes "find me a daughter in law.";
 	close;
 }
 
-gonryun,113,135,6	script	Gatekeeper#gn1	780,{
-	mes "[Gatekeeper]";
-	mes "Welcome. This is a resident";
-	mes "of SaYumMoon, a chief";
-	mes "of this town.";
+gonryun,113,135,6	script	Gatekeeper#gon	780,{
+	mes "[Kunlun Guard]";
+	mes "Welcome.";
+	mes "This is the residence of Shi Yan Wen, the chief of Kunlun.";
 	next;
-	mes "[Gatekeeper]";
-	mes "It won't likely to happen";
-	mes "but, if we see anything suspicious,";
-	mes "we'll arrest you right away.";
+	mes "[Kunlun Guard]";
+	mes "You better behave yourself while";
+	mes "you are here. If we see anything";
+	mes "suspicious, we'll arrest you in a heartbeat.";
 	next;
-	mes "[Gatekeeper]";
-	mes "But do not worry that much.";
-	mes "Nothing will happen I believe.";
-	mes "Enjoy your visit.";
+	mes "[Kunlun Guard]";
+	mes "However, rest assured, you seem";
+	mes "like a trustworthy person.";
+	mes "I'm sure nothing will happen. Enjoy your visit.";
 	close;
 }
 
-gonryun,113,127,6	script	Gatekeeper#gn2	780,{
-	mes "[Gatekeeper]";
-	mes "Welcome. This is a resident";
-	mes "of SaYumMoon, a chief";
-	mes "of this town.";
+gonryun,113,127,6	script	Gatekeeper#gon2	780,{
+	mes "[Kunlun Guard]";
+	mes "Welcome.";
+	mes "This is the residence of Shi Yan Wen, the chief of Kunlun.";
 	next;
-	mes "[Gatekeeper]";
-	mes "It won't likely to happen";
-	mes "but, if we see anything suspicious,";
-	mes "we'll arrest you right away.";
+	mes "[Kunlun Guard]";
+	mes "You better behave yourself while";
+	mes "you are here. If we see anything";
+	mes "suspicious, we'll arrest you in a heartbeat.";
 	next;
-	mes "[Gatekeeper]";
-	mes "But do not worry that much.";
-	mes "Nothing will happen I believe.";
-	mes "Enjoy your visit.";
+	mes "[Kunlun Guard]";
+	mes "However, rest assured, you seem";
+	mes "like a trustworthy person.";
+	mes "I'm sure nothing will happen. Enjoy your visit.";
 	close;
 }
 
-gon_in,73,82,5	script	SungChul Ki#gn	778,{
-	mes "[SungChul Ki]";
-	if (nakha != 3) {
+gon_in,73,82,5	script	Ji Chung Zhe#gon	778,{
+	if (nakha >= 0 && nakha <= 2) {
+		mes "[Ji Chung Zhe]";
 		mes "............";
 		next;
-		mes "[SungChul Ki]";
+		mes "[Ji Chung Zhe]";
 		mes "puuuuu....This sure is";
 		mes "something to worry about.";
 		close;
 	}
-	set cha, 1;
-	mes "SungChul Ki is my name.";
-	mes "I am a great tea maker.";
-	mes "I give all my efforts";
-	mes "in making tasty tea";
-	mes "night and day.";
-	next;
-	mes "[SungChul Ki]";
-	mes "hu...but I haven't make any";
-	mes "great tea lately.";
-	mes "I need some special";
-	mes "ingredients...";
-	next;
-	mes "[SungChul Ki]";
-	mes "There's a rumor says with snake,";
-	mes "it's possible to make great tea.";
-	mes "But where can I find and how can";
-	mes "I catch one? that's not possible.";
-	mes "hmm...";
-	close;
-
-//	no idea what should happen after you started the quest...
-//	if ((v[cha] == 1) & (v[°Ç°-ȯ] > 0))
-//		mes "[SungChul Ki]"
-//		mes "...À_? ¹ìÀ> Àâ_Æ_- _ª¿Â"
-//		mes "¹°°ÇÀ̶ó°í? ÈåÀ_..."
-//		mes "¿ØÁö ¸ð¸_°Ô ÁÁ_ƺ¸ÀÌ_°É."
-//		mes "À̸R Áຸ°Ô. Çѹø Â÷¸¦"
-//		mes "¸¸÷é_°Ú_×!"
-//		next;
-//		mes "................................"
-//		next;
-//		mes "................................"
-//		next;
-//		mes "................................"
-//		next;
-//	endif
-//
-//
-//
+	if (nakha == 3) {
+		set cha,1;
+		mes "[Ji Chung Zhe]";
+		mes "I am Ji Chung Zhe, a renown brewer";
+		mes "of teas. Everyday, I put all my";
+		mes "efforts in making scrumptious, delicious tea.";
+		next;
+		mes "[Ji Chung Zhe]";
+		mes "*Sigh* But lately, the tea I've";
+		mes "been making hasn't been that";
+		mes "great... If I only had some special ingredients...";
+		next;
+		mes "[Ji Chung Zhe]";
+		mes "I've been told that if you use";
+		mes "a snake, you can concoct a truly";
+		mes "extraordinary beverage~";
+		mes "But...where can I find one";
+		mes "and how can I catch one?";
+		mes "Hmm...";
+		close;
+	}
 }
 
-//==============ÃàÁ¦ °ü¸RÀÎ================
-//npc "gon_in" "È_ÀÌ _º" 4_M_TWMIDMAN 101 21 3 5 5
-//OnClick:
-//	mes "[È_ÀÌ _º]"
-//	mes "ÈÞ¿ì... °ÆÁ¤ÀÌ+º."
-//	mes "____ À̹ø¿¡÷÷ ÃàÁ¦¸¦ ¹úÀÏ"
-//	mes "ŸÀ̹ÖÀÌ ¿Ô_Â÷_ _îÂî÷È"
-//	mes "ÀÏÀÎÁö ÀüÇô ÃàÁ¦Áغñ°¡"
-//	mes "÷ÇÁö_Ê_Ò_î..."
-//	next;
-//	mes "[È_ÀÌ _º]"
-
-gon_in,173,27,3	script	Kuha Woo#gn	774,{
-	mes "[Kuha Woo]";
-	mes "Like I expected, with my age,";
-	mes "they don't sell alcohol to me.";
-	mes "Adults seems enjoying drinks.";
-	mes "I wonder how it taste.";
+gon_in,173,27,3	script	Yu Jiu Xia#gon	774,{
+	mes "[Yu Jiu Xia]";
+	mes "Geez, just as I thought.";
+	mes "They won't sell alcohol to me.";
+	mes "Maybe its cuz I'm too young...";
+	mes "Hmmm...I wonder how it tastes...";
 	next;
-	mes "[Kuha Woo]";
-	mes "However, they're making";
-	mes "some tasty tea that even kid";
+	mes "[Yu Jiu Xia]";
+	mes "However, I know they're making";
+	mes "some tasty tea that even kids";
 	mes "like me can enjoy.";
-	mes "It's such a heart beating";
-	mes "just even thinking about this new tea.";
-	close;
-}
-
-gonryun,163,60,4	script	Gonryun Guide	780,{
-	mes "[Wonchi Ha]";
-	mes "Come to Gonryun where passion";
-	mes "and energy overflows. You can feel liveliness";
-	mes "just by walking around!";
-	next;
-	mes "[Wonchi Ha]";
-	mes "I am responsible to help you";
-	mes "with any questions you may have.";
-	mes "so please feel free to ask any";
-	next;
-	switch(select("resident of Chief:Tool Dealer:Weapon Dealer:Armor Dealer:wine shop")){
-	case 1:
-		viewpoint 1,109,131,1,0xFF3355;
-		mes "[Wonchi Ha]";
-		mes "In your minimap";
-		mes "Head to ^FF3355+^000000";
-		mes "You'll get to a resident of chief.";
-		mes "Enjoy your trip in";
-		mes "lovely Gonryun!";
-		break;
-	case 2:
-		viewpoint 1,147,82,2,0xCE6300;
-		mes "[Wonchi Ha]";
-		mes "In your minimap";
-		mes "Head to ^CE6300+^000000";
-		mes "You'll get to a Tool Dealer.";
-		mes "Enjoy your trip in";
-		mes "lovely Gonryun!";
-		break;
-	case 3:
-		viewpoint 1,174,104,3,0x55FF33;
-		mes "[Wonchi Ha]";
-		mes "In your minimap";
-		mes "Head to ^55FF33+^000000";
-		mes "You'll get to a Weapon Dealer.";
-		mes "Enjoy your trip in";
-		mes "lovely Gonryun!";
-		break;
-	case 4:
-		viewpoint 1,173,84,4,0x3355FF;
-		mes "[Wonchi Ha]";
-		mes "In your minimap";
-		mes "Head to ^3355FF+^000000";
-		mes "You'll get to an Armor Dealer.";
-		mes "Enjoy your trip in";
-		mes "lovely Gonryun!";
-		break;
-	case 5:
-		viewpoint 1,215,114,5,0xFFFFFF;
-		mes "[Wonchi Ha]";
-		mes "In your minimap";
-		mes "Head to ^FFFFFF+^000000";
-		mes "You'll get to a wine shop.";
-		mes "Enjoy your trip in";
-		mes "lovely Gonryun!";
-		break;
-	}
+	mes "It makes my mouth water just";
+	mes "thinking about this new tea.";
 	close;
 }
 
-gonryun,166,196,3	script	Soldier#gn	780,{
-	mes "[Waguo]";
+gonryun,166,196,3	script	Soldier#gon	780,{
 	if (b_sword < 7) {
-		mes "You know what?";
-		mes "This place used to be a shrine.";
-		mes "From the certain period time,";
-		mes "the Taoist hermits who failed to";
-		mes "get to the kingdom in the sky began";
-		mes "to gather, it became a den of monsters.";
-	} else if (b_sword > 6 && b_sword < 10){
-		mes "It was pretty noisy last night huh?";
-		mes "Because of that theif, it was a mess.";
-		mes "Noisier than the festivals.";
+		mes "[Wa Qiu Wu]";
+		mes "Let me tell you something";
+		mes "interesting about this place~";
+		mes "Long ago, this entire area used to be a shrine.";
+		next;
+		mes "[Wa Qiu Wu]";
+		mes "In those days, Taoist hermits";
+		mes "used to gather here in order to";
+		mes "reach the Sky Kingdom. However,";
+		mes "they failed miserably...slowly the monsters began to come...";
+		close;
+	}
+	else if ((b_sword > 6) && (b_sword < 10)) {
+		mes "[Wa Qiu Wu]";
+		mes "Don't you think it was quite noisy";
+		mes "last night? It was all because";
+		mes "of that thief. He made quite";
+		mes "a scene...It was so loud that";
 		mes "I couldn't sleep at all...";
 		next;
-		mes "[Waguo]";
+		mes "[Wa Qiu Wu]";
 		mes "Ahh~~~~!";
-		mes "I was night working last night";
-		mes "and all of a sudden, I saw";
+		mes "In the middle of all that";
+		mes "commotion, I saw";
 		mes "something running straight";
-		mes "into a shrine.";
+		mes "into the shrine.";
 		next;
-		mes "[Waguo]";
+		mes "[Wa Qiu Wu]";
 		mes "It was moving so fast that";
-		mes "I couldn't even decide to chase it";
-		mes "at all.  It was a ponderous creature";
-		mes "looked like human.  I wonder";
+		mes "I couldn't even tell what it was.";
+		mes "From what I could recognize, it";
+		mes "looked human. I wonder";
 		mes "what it was...";
-	} else {
-		mes "You know what??";
-		mes "This place used to be a shrine.";
-		mes "From the certain period time,";
-		mes "the Taoist hermits who failed to";
-		mes "get to the kingdom in the sky began";
-		mes "to gather, it became a den of monsters.";
 		next;
-		mes "[Waguo]";
-		mes "Town is getting ready for the";
-		mes "Festival, But it's taking long time.";
-		mes "It never happended in the past.";
+		mes "[Wa Qiu Wi]";
+		mes "It might have been the";
+		mes "thief, but it moved";
+		mes "so fast, it seemed like";
+		mes "just a blur.";
+		close;
 	}
+	mes "[Wa Qiu Wu]";
+	mes "Let me tell you something";
+	mes "interesting~ This entire area";
+	mes "used to be a shrine.";
+	next;
+	mes "[Wa Qiu Wu]";
+	mes "A long time ago, Taoist hermits";
+	mes "used to gather here in order to";
+	mes "reach the Sky Kingdom. However,";
+	mes "they failed miserably...slowly the monsters began to come.";
+	next;
+	mes "[Wa Qiu Wu]";
+	mes "The town is getting ready for the";
+	mes "Festival, but something is delaying";
+	mes "it. This has never happened before...";
 	close;
 }
 
-gonryun,169,71,3	script	Guide#gn	770,{
-	mes "[Leeheemin]";
-	mes "Welcome~";
-	mes "Did you enjoy sightseeing";
-	mes "on the way?";
-	mes "Small buildings you saw are a structures";
-	mes "we made with hard working efforts.";
+gonryun,169,71,3	script	Guidev#gon	770,{
+	mes "[Li Xi Jiao]";
+	mes "Welcome to Kunlun!";
+	mes "Did you enjoy all the incredible";
+	mes "scenery on your way here?";
+	mes "The buildings may be small, but we";
+	mes "all worked hard to build this city.";
 	next;
-	mes "[Leeheemin]";
-	mes "They are a miniatures of";
-	mes "Rune-Midgarts Kingdom.";
-	mes "You can have a view of";
-	mes "cities at a glance.";
-	mes "It was not easy to work on it.";
-	mes "Don't you think they're masterpiece?";
+	mes "[Li Xi Jiao]";
+	mes "I have some miniatures of";
+	mes "the Rune-Midgarts Kingdom.";
+	mes "You can view all of Prontera in a";
+	mes "single glance. The craftsmanship";
+	mes "on these masterpieces is quite stunning!";
 	next;
-	mes "[Leeheemin]";
+	mes "[Li Xi Jiao]";
 	mes "If you look around carefully,";
-	mes "You'll find a lots of beautiful";
-	mes "sights all over the town.";
+	mes "You'll find all sorts of beautiful";
+	mes "sights throughout the town.";
 	close;
 }
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+// May be missing npc's and dialogue.
+//= 1.1 Fixed Typo’s [Nexon]
+//= 1.2 Removed Duplicates [Silent]
+//= 1.3 Max NPC Name is 23 [Toms]
+//= 1.3a Removed temp NPC plugs due Broken Sword quest [Lupus]
+//= 1.4 Added missing NPC [KarLaeda]
+//============================================================
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index c741d596e..516676aa9 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -13,7 +13,7 @@
 //= eAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Official NPC's for Louyang city.
+//= Louyang Town Script
 //===== Additional Comments: ================================= 
 //= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //============================================================
diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index c7ea2bc7e..8862e8763 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -3,745 +3,785 @@
 //===== By: ==================================================
 //= KarLaeda
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 1
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Gonryun Broken Sword Quest
+//= [Aegis Conversion]
+//= Broken Sword Quest (Kept old mechanics)
+//= Lost Knife Quest
 //===== Additional Comments: ================================= 
 //= 1.1 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//=	Added Lost Knife, updated dialog for Broken Sword
+//=	dungeon quest mechanics aportion is still the same.
 //============================================================ 
 
-
-gon_in,17,93,5	script	Chief#gnbs	775,{
-	mes "[SaYumMoon]";
-	if (BaseLevel <= 50) {
-		mes "hmm...";
-		mes "Oh, Hi there~";
-		mes "I am SaYumMoon, a chief of";
-		mes "this village.";
-		mes "Welcome to Kunlun.";
-		next;
-		mes "[SaYumMoon]";
-		mes "Well, to tell you about this village..";
-		mes "We weren't that much associated with ";
-		mes "other villages.";
-		mes "Nevertheless, through the village named";
-		mes "Alberta, we allowed people to visit";
-		mes "here. It all happened lately.";
-		next;
-		mes "[SaYumMoon]";
-		mes "I feel that this town has been";
-		mes "isolated for too long.";
-		mes "Therefore, people in this town";
-		mes "are not yet so friendly with";
-		mes "visitors yet.";
-		next;
-		mes "[SaYumMoon]";
-		mes "Moreover, thieves are having";
-		mes "fun in this town lately.";
-		mes "Well, you've come to visit this";
-		mes "town.. Enjoy your stay.";
-		close;
-	}
-	if (b_sword == 0) {
-		set b_sword,1;
-		mes "hmm...";
-		mes "Oh, Hi there~";
-		mes "I am SaYumMoon, a chief of";
-		mes "this village.";
-		mes "Welcome to Kunlun.";
-		next;
-		mes "[SaYumMoon]";
-		mes "Well, to tell you about this village..";
-		mes "We weren't that much associated with ";
-		mes "other villages.";
-		mes "Nevertheless, through the village named";
-		mes "Alberta, we allowed people to visit";
-		mes "here. It all happened lately.";
-		next;
-		mes "[SaYumMoon]";
-		mes "I feel that this town has been";
-		mes "isolated for too long.";
-		mes "Therefore, people in this town";
-		mes "are not yet so friendly with";
-		mes "visitors yet.";
-		next;
-		mes "[SaYumMoon]";
-		mes "Moreover, thieves are having";
-		mes "fun in this town lately.";
-		mes "Well, you've come to visit this";
-		mes "town.. Enjoy your stay.";
-		close;
-	}
-	if (b_sword < 18) {
-		switch (b_sword) {
-		case 1:
-			mes "Umm....";
-			mes "Oh, Hi there~";
-			mes "I am SaYumMoon, a chief of";
-			mes "this village.";
-			next;
-			mes "[SaYumMoon]";
-			mes "Welcome to Kunlun.";
-			mes "I feel that this village has been";
-			mes "isolated for too long";
-			mes "unlike other villages.";
-			next;
-			mes "[SaYumMoon]";
-			mes "Nevertheless, through the village named";
-			mes "Alberta, we allowed people to visit";
-			mes "here. It all happened lately.";
-			mes "Since our village has been";
+// Broken Sword
+//============================================================ 
+gon_in,17,93,5	script	Chief#gon	775,{
+	if (BaseLevel > 50) {
+		if (b_sword == 0) {
+			set b_sword,1;
+			mes "[Shi Yan Wen]";
+			mes "Hmm...?";
+			mes "Oh, hello there~";
+			mes "I am Shi Yan Wen, the chief of";
+			mes "this village. Allow me to personally welcome you to Kunlun.";
 			next;
-			mes "[SaYumMoon]";
-			mes "isolated for long time,";
-			mes "people in this town";
-			mes "are not yet so friendly with";
-			mes "visitors yet.";
-			mes "Moreover, thieves are having";
+			mes "[Shi Yan Wen]";
+			mes "Although our village hasn't";
+			mes "associated with other towns very";
+			mes "much, we have recently begun";
+			mes "to allow visitors coming from Alberta.";
 			next;
-			mes "[SaYumMoon]";
-			mes "fun in this town lately.";
-			mes "Well, you've come to visit this";
-			mes "town.. Enjoy your stay.";
-			break;
-		case 2:
-			mes "Oh, it's you~";
-			mes "How do you like it here so far?";
-			mes "Like you've noticed,";
-			mes "village is not so peaceful huh?";
+			mes "[Shi Yan Wen]";
+			mes "I feel that this town has been";
+			mes "isolated for too long. Because";
+			mes "of that, people in this town aren't too friendly with visitors yet.";
 			next;
-			if(select("It's alright.:I heard that something was stolen..") == 1){
-				mes "[SaYumMoon]";
-				mes "Good...";
-				mes "Well, watch out for robbery.";
-				mes "And..don't act suspicious";
-				mes "in the village.";
-				close;
-			}
-			mes "[SaYumMoon]";
-			mes "hmm..you heard of it?";
-			mes "It was just last night when robbery";
-			mes "occurred. The rumor was true..";
-			mes "Lots of thieves are out there in the village.";
-			next;
-			switch(select("......:What was stolen?:Anyone with injuries?")){
+			mes "[Shi Yan Wen]";
+			mes "Moreover, we've been having a recent problem with thieves";
+			mes "that have been enjoying themselves far too much in Kunlun...";
+			mes "Well, you've come to visit here";
+			mes "so I hope you enjoy your stay.";
+			close;
+		}
+		else if (b_sword < 18) {
+			switch (b_sword) {
 			case 1:
-				mes "[SaYumMoon]";
-				mes "Can't believe it really happened.";
-				mes "If you see anyone suspicious,";
-				mes "please let me know.";
-				set b_sword,3;
-				break;
-			case 2:
-				mes "[SaYumMoon]";
-				mes "um.....";
-				mes "that is....";
-				mes "just an ordinary sword.";
-				mes "But to us, it's a family treasure";
-				mes "from generation to generation.";
+				mes "[Shi Yan Wen]";
+				mes "Oh, hello there~";
+				mes "I am Shi Yan Wen, the chief of";
+				mes "this village. Allow me to personally welcome you to Kunlun.";
 				next;
-				mes "[SaYumMoon]";
-				mes "I must find this sword";
-				mes "no mattter what!";
-				mes "...but I can't go find it just";
-				mes "by myself. I am too busy.";
+				mes "[Shi Yan Wen]";
+				mes "Although our village hasn't";
+				mes "associated with other towns very";
+				mes "much, we have recently begun";
+				mes "to allow visitors coming from Alberta.";
 				next;
-				mes "[SaYumMoon]";
-				mes "You know how busy it is to be a";
-				mes "chief of village.";
-				mes "This is a big trouble...hmm...";
+				mes "[Shi Yan Wen]";
+				mes "I feel that this town has been";
+				mes "isolated for too long. Because";
+				mes "of that, people in this town aren't too friendly with visitors yet.";
 				next;
-				if (select("Hope you find it soon.:Can I find it for you?") == 1){
-					mes "[SaYumMoon]";
-					mes "um..thank you.";
-					mes "Perhaps you find a sword, ";
-					mes "please let me know.";
-					set b_sword,11;
-				} else {
-					mes "[SaYumMoon]";
-					mes "Oh~ Are you serious??";
-					mes "People in the village are";
-					mes "now very sensitive cause of";
-					mes "thieves. It is so difficult to ask";
-					mes "them for a help. If you would help";
-					mes "me to find a sword. I'll pay for that for sure.";
+				mes "[Shi Yan Wen]";
+				mes "Moreover, we've been having a recent problem with thieves";
+				mes "that have been enjoying themselves far too much in Kunlun...";
+				mes "Well, you've come to visit here";
+				mes "so I hope you enjoy your stay.";
+				close;
+			case 2:
+				mes "[Shi Yan Wen]";
+				mes "Oh, it's you~";
+				mes "How do you like it here so far?";
+				mes "As you've probably noticed,";
+				mes "the village isn't that peaceful, huh?";
+				next;
+				if (select("It's alright.:I heard that something was stolen...") == 1) {
+					mes "[Shi Yan Wen]";
+					mes "Well, I'm glad you don't mind.";
+					mes "Just watch out for robbers,";
+					mes "and try not to act suspicious";
+					mes "in the village.";
+					close;
+				}
+				mes "[Shi Yan Wen]";
+				mes "Hmm...you've heard of it?";
+				mes "It was just last night when the";
+				mes "robbery occurred. The rumors";
+				mes "are true. Sadly, there are lots of thieves out there in the village...";
+				next;
+				switch(select("......:What was stolen?:Was anyone hurt?")) {
+				case 1:
+					mes "[Shi Yan Wen]";
+					mes "I can't believe it really";
+					mes "happened... Well, if you see";
+					mes "any suspicious characters around,";
+					mes "or find what was stolen, please let me know.";
+					set b_sword,3;
+					close;
+				case 2:
+					mes "[Shi Yan Wen]";
+					mes "Well...";
+					mes "Erm...it was...";
+					mes "...just an ordinary sword.";
+					mes "But to us, it's been a family treasure for many generations.";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "I must find this sword";
+					mes "no matter what!";
+					mes "...but I can't go find it just";
+					mes "by myself. I'm just too busy.";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "You know how busy it is to be the";
+					mes "chief of a village. This is very troubling...*Sigh*";
+					next;
+					if (select("Hope you find it soon.:Can I find it for you?") == 1) {
+						mes "[Shi Yan Wen]";
+						mes "um..Thank you.";
+						mes "If you somehow come across it,";
+						mes "please let me know.";
+						set b_sword,11;
+						close;
+					}
+					mes "[Shi Yan Wen]";
+					mes "Oh!~ Are you serious??";
+					mes "...The people in the village are";
+					mes "very fearful these days because";
+					mes "of the thieves. It is so difficult";
+					mes "to ask them for help...";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "If you would help me find the sword, I will surely repay you for your efforts.";
+					set b_sword,3;
+					close;
+				case 3:
+					mes "[Shi Yan Wen]";
+					mes "Fortunately, no one was hurt.";
+					mes "However, the thieves took a";
+					mes "valuable family treasure";
+					mes "which has been passed down from";
+					mes "generation to generation.";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "I must find this sword";
+					mes "no matter what!";
+					mes "...But I can't go find it just";
+					mes "by myself. I'm just too busy.";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "You know how busy it is to be the";
+					mes "chief of a village. This is very troubling...*Sigh*";
+					next;
+					if (select("Hope you find it soon.:Can I find it for you?") == 1) {
+						mes "[Shi Yan Wen]";
+						mes "Um..Thank you.";
+						mes "If you somehow come across it,";
+						mes "please let me know.";
+						set b_sword,11;
+						close;
+					}
+					mes "[Shi Yan Wen]";
+					mes "Oh!~ Are you serious??";
+					mes "...The people in the village are";
+					mes "very fearful these days because";
+					mes "of the thieves. It is so difficult";
+					mes "to ask them for help...";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "If you would help me find the sword, I will surely repay you for your efforts.";
 					set b_sword,3;
+					close;
 				}
-				break;
 			case 3:
-				mes "[SaYumMoon]";
-				mes "Fortunately, no one's hurt.";
-				mes "But we lost something valuable.";
-				mes "It's a family treasure";
-				mes "which came from generation";
-				mes "to generation.";
+			case 4:
+			case 5:
+				mes "[Shi Yan Wen]";
+				mes "Haven't found it yet?";
+				mes "There's no rush, take it easy.";
+				mes "You have to take care of";
+				mes "youself first before";
+				mes "doing favors for others.";
+				close;
+			case 6:
+				mes "[Shi Yan Wen]";
+				mes "Oh, you found a clue?";
+				mes "So far, it looks like";
+				mes "you're doing good work.";
+				mes "Take this old family medicine, it might be of use sometime soon.";
+				set b_sword,7;
+				getitem 504,3; //White_Potion
+				close;
+			case 7:
+				mes "[Shi Yan Wen]";
+				mes "It might be helpful for you to";
+				mes "know that the thief sustained";
+				mes "an injury, so he is probably not very far from here.";
+				close;
+			case 8:
+				mes "[Shi Yan Wen]";
+				mes "What...?";
+				mes "My sword has been broken!?";
+				mes "Unbelievable~!!";
+				mes "How could this happen??";
 				next;
-				mes "[SaYumMoon]";
-				mes "I must find this sword";
-				mes "no mattter what!";
-				mes "...but I can't go find it just";
-				mes "by myself. I am too busy.";
+				mes "[Shi Yan Wen]";
+				mes "First it's stolen, and now";
+				mes "it's in pieces... *Sob*";
+				mes "Would you please search";
+				mes "for the rest of my sword?";
+				mes "It means so much to my family...";
+				close;
+			case 9:
+				mes "[Shi Yan Wen]";
+				mes "*Sob*...";
+				mes "...my sword... in pieces...";
+				mes "I beg of you, please find them";
+				mes "for me. I will give you something in return.";
+				close;
+			case 10:
+				mes "[Shi Yan Wen]";
+				mes "Oh!~";
+				mes "You've found the pieces for me~";
+				mes "I knew you could do it.";
+				mes "But the sword is still shattered.";
+				mes "What shall I do...?";
 				next;
-				mes "[SaYumMoon]";
-				mes "You know how busy it is to be a";
-				mes "chief of village.";
-				mes "This is a big trouble...hmm...";
+				mes "[Shi Yan Wen]";
+				mes "If it's okay with you,";
+				mes "would you repair my sword for me?";
+				mes "I'll repay you for your help.";
 				next;
-				if (select("Hope you find it soon.:Can I find it for you?") == 1){
-					mes "[SaYumMoon]";
-					mes "um..thank you.";
-					mes "Perhaps you find a sword, ";
-					mes "please let me know.";
-					set b_sword,11;
-				} else {
-					mes "[SaYumMoon]";
-					mes "Oh~ Are you serious??";
-					mes "People in the village are";
-					mes "now very sensitive cause of";
-					mes "thieves. It is so difficult to ask";
-					mes "them for a help. If you would help";
-					mes "me to find a sword. I'll pay for that for sure.";
-					set b_sword,3;
+				if (select("No way.:Alright.") == 1) {
+					mes "[Shi Yan Wen]";
+					mes "Well, I see...you've been such a";
+					mes "nice person. I truly appreciate";
+					mes "your hard work. It would be";
+					mes "wonderful if you could help";
+					mes "me repair the sword, but I";
+					mes "will not force you.";
+					next;
+					mes "[Shi Yan Wen]";
+					mes "I'll find some way to repair";
+					mes "it. Without your help, I ";
+					mes "would have never found it.";
+					mes "Please accept this as a";
+					mes "token of my gratitude...";
+					set b_sword,15;
+					getitem 603,1; //Old_Blue_Box
+					next;
+					mes "[Shi Yan Wen]";
+					mes "If you find any information";
+					mes "or clues about that cursed";
+					mes "thief, please let me know.";
+					mes "I have my sword back but";
+					mes "there's no way I can forgive";
+					mes "this affront to my ancestors...";
+					close;
 				}
-				break;
-			}
-			break;
-		case 3:
-			mes "Haven't found it yet?";
-			mes "No rush. Take it easy.";
-			mes "You have to take care of";
-			mes "youself first before";
-			mes "doing other's favors.";
-			break;
-		case 4:
-			mes "Haven't found it yet?";
-			mes "No rush. Take it easy.";
-			mes "You have to take care of";
-			mes "youself first before";
-			mes "doing other's favors.";
-			break;
-		case 5:
-			mes "Haven't found it yet?";
-			mes "No rush. Take it easy.";
-			mes "You have to take care of";
-			mes "youself first before";
-			mes "doing other's favors.";
-			break;
-		case 6:
-			mes "Oh, you found a traces?";
-			mes "You're doing a good work.";
-			mes "This is my family remedies.";
-			mes "It might help you.";
-			set b_sword,7;
-			getitem 504,3; // White_Potion
-			break;
-		case 7:
-			mes "Thief is in an injury.";
-			mes "He probably is not";
-			mes "far away from here.";
-			break;
-		case 8:
-			mes "Oh, my sword...";
-			mes "..it's broken?";
-			mes "Unbelievable~";
-			mes "How could this happen..";
-			mes "Would you also look for";
-			mes "the other parts please?";
-			break;
-		case 9:
-			mes "hmm...";
-			mes "..my sword... in pieces..";
-			mes "I beg you please. Find it for me.";
-			mes "You'll get something in return.";
-			break;
-		case 10:
-			mes "Oh~~";
-			mes "You've found the pieces for me~";
-			mes "I knew you would've make it.";
-			mes "But they are broken into pieces.";
-			mes "What should I do...";
-			next;
-			mes "[SaYumMoon]";
-			mes "If it's ok with you,";
-			mes "Would you repair my sword for me?";
-			mes "I'm sure I'll pay for that.";
-			next;
-			if (select("No way.:Alright.") == 1) {
-				mes "[SaYumMoon]";
-				mes "Well, yes.. you've been such a";
-				mes "nice person. I appreciate for";
-				mes "your hard work.";
-				mes "It would be better if you help me";
-				mes "to repair the sword for me though..";
-				mes "nono.. I am not enforcing you..";
-				next;
-				mes "[SaYumMoon]";
-				mes "I'll find someway to repair it.";
-				mes "Without your help, I could've done";
-				mes "nothing. This is not a big present";
-				mes "but please take it.";
-				set b_sword,15;
-				getitem 603,1; // Old_Blue_Box
-				next;
-				mes "[SaYumMoon]";
-				mes "If you get any informations or";
-				mes "traces about that damn thief,";
-				mes "please let me know.";
-				mes "I got my sword back but there's";
-				mes "no way I can forgive that thief.";
-				mes "Have a nice travel.";
-			} else {
-				mes "[SaYumMoon]";
-				mes "Wow..you are so nice.";
-				mes "I am owing you a big favor.";
+				mes "[Shi Yan Wen]";
+				mes "Such generosity...";
+				mes "I'm truly indebted to you...";
 				mes "I have no idea how this sword";
-				mes "broke into pieces.";
-				mes "I believe you have to find famous";
-				mes "blacksmith to repair it.";
+				mes "broke into pieces, though.";
+				mes "You will probably need to find a";
+				mes "famous blacksmith to repair it.";
 				next;
-				mes "[SaYumMoon]";
-				mes "Like you know already, this is";
-				mes "a family treasure for me.";
-				mes "oh.. one more thing..";
+				mes "[Shi Yan Wen]";
+				mes "As I already mentioned, this is";
+				mes "an important family treasure...";
+				mes "Oh! I just remembered--";
 				next;
-				mes "[SaYumMoon]";
-				mes "There's a guy named ^555555Choahk^000000";
-				mes "in the village. He has been to many";
-				mes "places all around the world.";
-				mes "He probably has the informations";
-				mes "you need. Go find him first.";
+				mes "[Shi Yan Wen]";
+				mes "There's a guy named ^555555Zuo Hei^000000";
+				mes "in the village. He has been to";
+				mes "many places around the world.";
+				mes "He may know of such a weaponsmith. Please seek this man out.";
 				next;
-				mes "[SaYumMoon]";
-				mes "and.. this is not a big gift";
-				mes "but please take it..";
-				mes "here...";
+				mes "[Shi Yan Wen]";
+				mes "Oh, one last thing. This is";
+				mes "but a trinket, but please";
+				mes "accept this gift from me.";
 				set b_sword,14;
-				getitem 603,1; // Old_Blue_Box
+				getitem 603,1; //Old_Blue_Box
+				close;
+			case 11:
+				mes "[Shi Yan Wen]";
+				mes "The village is not in a good";
+				mes "mood these days, but there are";
+				mes "still lots of things to see in Kunlun.";
+				close;
+			case 12:
+				mes "[Shi Yan Wen]";
+				mes "Hmm.. no traces? No clues?";
+				mes "... Nothing? Well, that's";
+				mes "alright. Thank you for";
+				mes "trying to help.";
+				mes "Hmm....";
+				next;
+				mes "[Shi Yan Wen]";
+				mes "Here...take this.";
+				mes "Have a good time in Kunlun~";
+				set b_sword,13;
+				getitem 504,1; //White_Potion
+				close;
+			case 13:
+				mes "[Shi Yan Wen]";
+				mes "Is everything going well?";
+				mes "The village has not been";
+				mes "in a good mood, lately.";
+				mes "Still, please try to";
+				mes "enjoy yourself.";
+				close;
+			case 14:
+			case 15:
+			case 16:
+			case 17:
+				mes "[Shi Yan Wen]";
+				mes "I really appreciate what you are";
+				mes "doing. It's a big relief that";
+				mes "something is finally being done";
+				mes "about these thefts.";
+				next;
+				mes "[Shi Yan Wen]";
+				mes "Perhaps now, peace will finally";
+				mes "come to the village, just like in the old days...";
+				close;
 			}
-			break;
-		case 11:
-			mes "The village is not in a good";
-			mes "mood at this moment, but still";
-			mes "lots of things to look around.";
-			break;
-		case 12:
-			mes "hmm.. no traces? no marks?... nothing?";
-			mes "ok.. well, thanks for help anyways.";
-			mes "umm....";
+		}
+		else if (b_sword < 32) {
+			mes "[Shi Yan Wen]";
+			mes "I appreciate what you are doing,";
+			mes "and your help has been";
+			mes "a relief to me. The Village";
+			mes "seems less tense, much like";
+			mes "it was in the old days.";
 			next;
-			mes "[SaYumMoon]";
-			mes "Here..take this.";
-			mes "Have a good time.";
-			set b_sword,13;
-			getitem 504,1; // White_Potion
-			break;
-		case 13:
-			mes "Everything going well?";
-			mes "The village is not in a good mood.";
-			mes "Take care of yourself.";
-			break;
-		case 14:
-			mes "I appreciate what you are doing.";
-			mes "You make me feel comfortable.";
-			mes "Village seems it's turning back";
-			mes "to old times too. huhu";
-			break;
-		case 15:
-			mes "I appreciate what you are doing.";
-			mes "You make me feel comfortable.";
-			mes "Village seems it's turning back";
-			mes "to old times too. huhu";
-			break;
-		case 16:
-			mes "I appreciate what you are doing.";
-			mes "You make me feel comfortable.";
-			mes "Village seems it's turning back";
-			mes "to old times too. huhu";
-			break;
-		case 17:
-			mes "I appreciate what you are doing.";
-			mes "You make me feel comfortable.";
-			mes "Village seems it's turning back";
-			mes "to old times too. huhu";
-			break;
+			mes "[Shi Yan Wen]";
+			mes "Although I hope you'll be";
+			mes "be able to repair my";
+			mes "sword soon, you've";
+			mes "already done so much for";
+			mes "me. I feel sorry for";
+			mes "asking you to do more.";
+			close;
 		}
-	} else if (b_sword < 32) {
-		mes "I appreciate what you are doing.";
-		mes "You make me feel comfortable.";
-		mes "Village seems it's turning back";
-		mes "to old times too. huhu";
-		mes "and please repair my";
-		mes "sword for me.";
-		next;
-		mes "[SaYumMoon]";
-		mes "You've done so many things for me.";
-		mes "I feel sorry about asking you";
-		mes "more to do.";
-	} else if (b_sword == 32) {
-		if (countitem(1123) < 1) { // Haedonggum
-			mes "um.....";
-			mes "Not yet huh?";
-			mes "You'll repair it for me right?";
-			mes "I'll be waiting.";
-		} else {
-			mes "oh.. it's you.";
+		else if (b_sword == 32) {
+			if (countitem(1123) < 1) {
+				mes "[Shi Yan Wen]";
+				mes "Hm.....";
+				mes "Not finished yet, huh?";
+				mes "Still, it's good to know";
+				mes "it's being repaired...";
+				mes "I'll be waiting, then.";
+				close;
+			}
+			mes "[Shi Yan Wen]";
+			mes "Oh, it's you~ Hello.";
 			mes "............";
 			mes "Is that my sword?";
-			mes "Wow you have done it.";
+			mes "Wow, you've done it!";
 			mes "Good work!";
 			next;
-			mes "[SaYumMoon]";
-			mes "Hmm..If you have a similar sword I have,";
-			mes "please leave it somewhere else and come back.";
-			mes "Just in case that you give me a wrong one...";
-			next;
-			if(select("Wait for sec:Here it is.") == 1 || countitem(1123) < 1){
-				mes "[SaYumMoon]";
-				mes "Ok, go ahead.";
-				mes "Don't leave mine!!";
-				mes "haha..";
-				close;
-			}
-			mes "[SaYumMoon]";
+			mes "[Shi Yan Wen]";
 			mes "This is a small gift for you.";
-			mes "Please take it.";
-			mes "Thanks for a job well done!";
-			delitem 1123,1; // Haedonggum
+			mes "Please take it as thanks for a job well done!";
+			delitem 1123,1; //Haedonggum
 			set b_sword,33;
-			getitem 2404,1; // Shoes_
+			getitem 2404,1; //Shoes_
 			next;
-			mes "[SaYumMoon]";
-			mes "Many thanks for your trouble.";
-			mes "Now I don't feel shame to";
-			mes "ancestors anymore.";
-			mes "huhuh...";
-			mes "Have a good time.";
+			mes "[Shi Yan Wen]";
+			mes "Thank you for all of your efforts.";
+			mes "With this sword repaired, I no";
+			mes "longer feel that I am shaming";
+			mes "my ancestors...";
+			mes "Heh heh...";
+			mes "Have a good time in Kunlun.";
+			close;
 		}
-	} else {
-		mes "Oh, it's you.";
-		mes "Once again, thank you.";
-		mes "Enjoy your stay in";
-		mes "our village.";
-		mes "huhuh..";
+		mes "[Shi Yan Wen]";
+		mes "Oh, it's you~";
+		mes "Once again, I'd like to thank";
+		mes "you for all of your help.";
+		mes "Enjoy your stay in our village.";
+		mes "Heh heh~";
+		close;
 	}
+	mes "[Shi Yan Wen]";
+	mes "Hmm...?";
+	mes "Oh, hello there~";
+	mes "I am Shi Yan Wen, the chief of";
+	mes "this village. Allow me to personally welcome you to Kunlun.";
+	next;
+	mes "[Shi Yan Wen]";
+	mes "Although our village hasn't";
+	mes "associated with other towns very";
+	mes "much, we have recently begun";
+	mes "to allow visitors coming from Alberta.";
+	next;
+	mes "[Shi Yan Wen]";
+	mes "I feel that this town has been";
+	mes "isolated for too long. Because";
+	mes "of that, people in this town aren't too friendly with visitors yet.";
+	next;
+	mes "[Shi Yan Wen]";
+	mes "Moreover, we've been having a recent problem with thieves";
+	mes "that have been enjoying themselves far too much in Kunlun...";
+	mes "Well, you've come to visit here";
+	mes "so I hope you enjoy your stay.";
 	close;
 }
 
-gon_in,152,35,4	script	Hostess#gnbs	702,{
-	mes "[MaYumBang]";
+gon_in,152,35,4	script	Hostess#gon	702,{
 	if (b_sword < 1) {
-		mes "Oh.. you're new here right?";
+		mes "[Mei Yen Fang]";
+		mes "Oh...you're new here, right?";
 		mes "Came from out of town?";
-		mes "It's easy to see many people from";
-		mes "out of town these days.";
+		mes "It's common to see lots of";
+		mes "foreigners these days.";
 		mes "It made people in the village busy.";
 		next;
-		mes "[MaYumBang]";
-		mes "Oops, what am I saying..";
-		mes "Wants some wine?";
+		mes "[Mei Yen Fang]";
+		mes "Oh, what am I saying...";
+		mes "Want some wine?";
 		next;
-		if (select("Yes, please:No, it's ok.") == 1) {
-			mes "[MaYumBang]";
-			mes "Oooops.. oh no...";
-			mes "Many customers came by earlier and";
-			mes "we are out of wine..";
-			mes "Customers are growing larger.";
-			mes "It is also a trouble..";
-		} else {
-			mes "[MaYumBang]";
-			mes "Well, have fun in the village.";
-			mes "Stop by sometimes.";
+		if (select("Yes, please:No, it's okay.") == 1) {
+			mes "[Mei Yen Fang]";
+			mes "Oooops~! Oh no...";
+			mes "A lot of customers came by earlier,";
+			mes "so now we're out of wine...";
+			mes "It's getting difficult to keep up with the increasing number of customers...";
+			close;
 		}
-	} else if (b_sword < 3) {
-		mes "You know what?";
-		mes "Chief's house was robbed last night.";
-		mes "I can't believe this happened.";
-		mes "Thieves are hanging around the";
-		mes "village these days.";
+		mes "[Mei Yen Fang]";
+		mes "Well, have fun in the village.";
+		mes "Stop by again sometime.";
+		close;
+	}
+	switch(b_sword) {
+	case 1:
+	case 2:
+		mes "[Mei Yen Fang]";
+		mes "Hey, you know what?";
+		mes "The chief's house was robbed";
+		mes "last night. I can't believe";
+		mes "this happened...I guess this is the work of those thieves...";
 		next;
-		mes "[MaYumBang]";
-		mes "How anxious it is..";
-		mes "It could also happen to my shop.";
-		mes "I should watch out.";
-		mes "oh..what am I saying to you..";
-		mes "Enjoy your time in my shop..hoho.";
-		if (b_sword == 1) set b_sword,2;
-	} else if (b_sword == 3) {
-		mes "Oh, it's you again.";
-		mes "I heard that you decided to";
-		mes "help our chief.";
-		mes "Please get him for us.";
-		mes "How anxious it is..";
+		mes "[Mei Yen Fang]";
+		mes "How worrisome it all is...";
+		mes "It could even happen to me!";
+		mes "I better watch out...";
+		mes "Oh, what am I saying?";
+		mes "Enjoy your time in my shop...hehe~";
+		set b_sword,2;
+		close;
+	case 3:
+		mes "[Mei Yen Fang]";
+		mes "Oh, it's you again~";
+		mes "I heard that you've decided";
+		mes "to help our chief.";
+		mes "Please do your best for him!";
+		mes "Everyone in the village has";
+		mes "been on edge...";
 		next;
-		mes "[MaYumBang]";
+		mes "[Mei Yen Fang]";
 		mes "Do you see that guy over there";
 		mes "leaning on the table?";
-		mes "He seems to know about last night's";
-		mes "happenings.";
-		mes "He has been drinking all night long.";
+		mes "He seems to know about what";
+		mes "happened last night, but...";
+		mes "He's been drinking all night long.";
 		set b_sword,4;
-	} else if (b_sword > 3 && b_sword < 11) {
-		mes "Hello there.";
-		mes "Feel something strange in the village huh?";
-		mes "It's all because of the thieves.";
-		mes "And it makes my business worse.";
-		mes "peeew...";
-	} else if (b_sword == 11 || b_sword == 12) {
-		mes "Feel something strange in the village huh?";
-		mes "Hope the thief to get caught in short time.";
-		mes "...";
-	} else {
-		mes "You caught him?";
-		mes "Wow, how brave you are.";
-		mes "I should get ready to run the";
-		mes "shop again. I need to order";
-		mes "some wine first.";
+		close;
+	}
+	if (b_sword > 3 && b_sword < 11) {
+		mes "[Mei Yen Fang]";
+		mes "Hello there~";
+		mes "Feeling tension in the village,";
+		mes "huh? It's all because of those";
+		mes "thieves... ";
 		next;
-		mes "[MaYumBang]";
-		mes "SulBoong drank all the wine in the shop.";
-		mes "I did not refill the wine since there";
-		mes "aren't any customers...hoho.";
-		mes "Stop by next time.";
-		mes "I'll have a wine ready.";
+		mes "[Mei Yen Fang]";
+		mes "They're also making things hard for my business...";
+		mes " ";
+		mes "*Sigh*";
+		close;
+	}
+	else if (b_sword == 11 || b_sword == 12) {
+		mes "[Mei Yen Fang]";
+		mes "Feeling tension in the village,";
+		mes "huh? I Hope the thief will get caught soon.";
+		mes "...";
+		close;
 	}
+	mes "[Mei Yen Fang]";
+	mes "You caught him?!";
+	mes "Wow, you're very brave.";
+	mes "I should get ready to run the";
+	mes "shop again. But I'll need to";
+	mes "order some wine first.";
+	next;
+	mes "[Mei Yen Fang]";
+	mes "Xue Bong drank all the wine in the";
+	mes "shop, and I didn't restock any";
+	mes "since everyone has been scared";
+	mes "off by the thefts...";
+	mes "But stop by next time.";
+	mes "I'll have some wine ready.";
 	close;
 }
 
-gon_in,165,16,4	script	Man in hangover#gnbs	748,{
-	mes "[SulBoong]";
+gon_in,165,16,4	script	Man in hangover#gon	748,{
 	if (b_sword < 4) {
+		mes "[Xue Bong]";
 		mes "Ahhh.. my stomach.. my head..";
-		mes "Shouldn't drink so much..";
+		mes "I shouldn't drink so much..";
 		mes "Ehhhh....";
 		emotion e_swt2;
-	} else if (b_sword == 4) {
-		if (countitem(506) < 1) { // Green_Potion
-			mes "Ehhh....";
-			mes "Can somebody bring me a potion?";
-			mes "Ehhh....";
-			close;
-		}
-		mes "Ehhh..my stomach..";
-		mes "I need something..";
-		mes "Ehhh..";
-		mes "uh..hey you.. could you give me one of";
-		mes "your ^00FF00Green_Potion^000000 to me?";
-		mes "I got a mad stomach.";
-		next;
-		if (select("No.:Ok, here.") == 1 || countitem(506) < 1) {
-			mes "[SulBoong]";
-			mes "Ehh...";
-			mes "Are you sure?";
-			next;
-			if (select("Sorry, I don't have one.:Ok, here it is.") == 1 || countitem(506) < 1) {
-				mes "[SulBoong]";
-				mes "Wooo..";
-				mes "Go away man..";
-				set b_sword,12;
+		close;
+	}
+	else if (b_sword < 6) {
+		switch(b_sword) {
+		case 4:
+			if (countitem(506) < 1) {
+				mes "[Xue Bong]";
+				mes "*Urk!* I feel sick...";
+				mes "Can somebody bring me a potion?";
+				mes "*Groan*....";
+				emotion e_swt2;
 				close;
 			}
-			delitem 506,1; // Green_Potion
-			set b_sword,5;
-			mes "[SulBoong]";
-			mes "Oh.. thanks.";
-			mes "I thought you're teasing me.";
-			mes "I feel much better now.";
-			mes "By the way.. You got any questions?";
-			next;
-			if (select("About thief.:Nothing.") == 1){
-				mes "[SulBoong]";
-				mes "Ah~ a thief..";
-				mes "hmm.. let me see..";
-				mes "I went out for walk in the middle";
-				mes "of night while I was drinking.";
-				mes "And I heard something noisy.";
-				next;
-				mes "[SulBoong]";
-				mes "I looked around and found that";
-				mes "area near chief's house was brighter";
-				mes "than any other area. It was strange.";
-				mes "So I kept watching at it and";
-				mes "all of a sudden, I saw something moving";
-				mes "on the roof of houses.";
-				next;
-				mes "[SulBoong]";
-				mes "It disappeared in a second.";
-				mes "I was drunk, and it was dark outside.";
-				mes "I have no idea whether it was a man or a cat or..";
-				mes "don't know what it was.. huhu..";
-				set b_sword,6;
-			} else {
-				mes "[SulBoong]";
-				mes "Ok, then, good bye..";
-				mes "Don't be a drinker like me.";
-				mes "Unless you want to suffer from a hangovers.";
-				mes "huhu..";
-			}
-		} else {
-			delitem 506,1; // Green_Potion
-			set b_sword,5;
-			emotion e_thx;
-			mes "[SulBoong]";
-			mes "Thank you.";
-			mes "heew.. feel much better now.";
-			mes "hmm.. you seem like you got";
-			mes "something to ask me.";
+			mes "[Xue Bong]";
+			mes "Ohhh...my stomach...";
+			mes "I need something...";
+			mes "Moan~ Uh, hey you!";
+			mes "Could you give me one";
+			mes "of your ^00FF00Green_Potion^000000s?";
+			mes "I think I'm going to barf...";
 			next;
-			switch(select("About thief..:How much have you been drinking?:Nothing..")){
+			switch(select("No.:Here, drink this!")) {
 			case 1:
-				mes "[SulBoong]";
-				mes "Ah~ a thief..hmm...";
-				mes "I went out for walk in the middle";
-				mes "of night while I was drinking.";
-				mes "And I heard something noisy.";
-				mes "I looked around and found that";
-				mes "area near chief's house was brighter";
-				next;
-				mes "[SulBoong]";
-				mes "than any other area. It was strange.";
-				mes "So I kept watching at it and";
-				mes "all of a sudden, I saw something moving";
-				mes "on the roof of houses.";
-				mes "It disappeared in a second.";
+				mes "[Xue Bong]";
+				mes "Uhh...";
+				mes "Are you sure?";
 				next;
-				if (select("Where to?:Probably a cat.") == 1) {
-					mes "[SulBoong]";
-					mes "Umm?";
-					mes "Well..let me see..";
-					mes "It came from... and head to...um...";
-					mes "bla bla..";
+				switch(select("Sorry, I don't have any.:Here, you can have it!")) {
+				case 1:
+					mes "[Xue Bong]";
+					mes "C'mon, man...";
+					mes "I...I'm in freakin' pain here...";
+					set b_sword,12;
+					close;
+				case 2:
+					delitem 506,1; //Green_Potion
+					set b_sword,5;
+					mes "[Xue Bong]";
+					mes "Oh man...thanks.";
+					mes "I thought you were teasing me.";
+					mes "I feel much better now.";
+					mes "So...uh, what brings you here?";
 					next;
-					mes "He was mumbling for awhile";
-					mes "......";
+					if (select("Heard about the thief?:Nothing.") == 1) {
+						mes "[Xue Bong]";
+						mes "Ah, a thief~";
+						mes "Hmm...let me see..";
+						mes "I went out for walk in the middle";
+						mes "of the night while I was drinking.";
+						mes "And I heard a noise.";
+						next;
+						mes "[Xue Bong]";
+						mes "I looked around and found that the";
+						mes "area near the chief's house was";
+						mes "brighter than any other area...";
+						mes "It was odd...";
+						mes "[Xue Bong]";
+						mes "So I kept watching it and";
+						mes "all of a sudden, I saw something";
+						mes "moving on the rooftops...";
+						next;
+						mes "[Xue Bong]";
+						mes "It disappeared in a second.";
+						mes "I was drunk, and it was dark";
+						mes "outside. I have no idea";
+						mes "whether it was a man,";
+						mes "a poring, or if I had just";
+						mes "drank too much..eheh.";
+						set b_sword,6;
+						close;
+					}
+					mes "[Xue Bong]";
+					mes "Okay then, thanks again.";
+					mes "Don't be a drinker like me,";
+					mes "unless you want to suffer from";
+					mes "serious hangovers. See you later~";
+					close;
+				}
+			case 2:
+				delitem 506,1; //Green_Potion
+				set b_sword,5;
+				emotion e_thx;
+				mes "[Xue Bong]";
+				mes "Whew, Thanks!";
+				mes "I feel much better now.";
+				mes "Hmm...you seem new around here.";
+				mes "Anything you wanna know?";
+				next;
+				switch(select("About a thief...:How much have you been drinking?:Nothing~")) {
+				case 1:
+					mes "[Xue Bong]";
+					mes "Ah, a thief, eh? Let's see...";
+					mes "I went out for walk in the middle";
+					mes "of the night while I was drinking.";
+					mes "All of a sudden, I heard a strange noise...";
 					next;
-					mes "[SulBoong]";
-					mes "Ah ha~ right...";
-					mes "A shrine.. yes..thief was heading to";
-					mes "a shrine and disappeared.";
-					mes "I'm not sure if it was a human or";
-					mes "an animal...but little big creature.";
-					mes "wonder what it was..";
-					set b_sword,6;
+					mes "[Xue Bong]";
+					mes "I looked around and found that the";
+					mes "area near the chief's house was";
+					mes "brighter than any other area. It was odd...";
 					next;
-					mes "[SulBoong]";
-					mes "Anything else I can help?";
-					mes "Thanks for the potion.";
+					mes "[Xue Bong]";
+					mes "So I kept watching it and,";
+					mes "all of a sudden, I saw something moving on the rooftops...";
 					next;
-					switch(select("Thanks for the information.:Stop drinking too much.:Ok, bye")){
-					case 1:
-						mes "[SulBoong]";
-						mes "I'll see you later then.";
-						mes "I am always here drinking..huhu";
-						break;
-					case 2:
-						mes "[SulBoong]";
-						mes "hmm..";
-						mes "Don't mind me.";
-						break;
-					case 3:
-						mes "[SulBoong]";
-						mes "Alrighty.";
-						mes "Come again whenever you find";
-						mes "any other questions.";
-						break;
+					if (select("Where to?:Probably a Wild Rose.") == 1) {
+						mes "[Xue Bong]";
+						mes "Umm?";
+						mes "Well..let me see..";
+						mes "It came from... and head to...um...";
+						mes "murmur..";
+						next;
+						mes "^3355FFHe started mumbling for a bit^000000";
+						mes "......";
+						next;
+						mes "[Xue Bong]";
+						mes "Ah ha!! Right...";
+						mes "A shrine, yeah, the thief was";
+						mes "heading to a shrine and";
+						mes "disappeared. I'm not";
+						mes "sure if it was a human or an";
+						mes "animal...";
+						set b_sword,6;
+						next;
+						mes "[Xue Bong]";
+						mes "Anything else I can help you with?";
+						mes "I appreciate the potion.";
+						next;
+						switch(select("Thanks for the information.:Stop drinking so much.:Okay, bye")) {
+						case 1:
+							mes "[Xue Bong]";
+							mes "I'll see you later then.";
+							mes "I'm always be here drinking..eheh.";
+							close;
+						case 2:
+							mes "[Xue Bong]";
+							mes "Ehh..Don't mind me.";
+							mes "I'm a social drinker...";
+							mes " ";
+							mes "It's just I don't got nobody to be social with.";
+							close;
+						case 3:
+							mes "[Xue Bong]";
+							mes "Alright.";
+							mes "Come again whenever you have";
+							mes "any other questions.";
+							close;
+						}
 					}
-				} else {
-					mes "[SulBoong]";
+					mes "[Xue Bong]";
 					mes "Yeah..maybe.";
-					mes "It was so dark outside and I was drunk.";
-					mes "I can't remember it clearly.";
-					mes "Anyways it was bigger than a cat for sure.";
+					mes "It was so dark outside and I was";
+					mes "drunk so I don't remember";
+					mes "clearly. I'm pretty sure it was bigger than that, though.";
+					close;
+				case 2:
+					mes "[Xue Bong]";
+					mes "Ah..um....I..I don't remember.";
+					mes "When I woke up, There were tons of";
+					mes "empty bottles around me.";
+					mes "...";
+					next;
+					mes "^3355FF.......";
+					mes "For some reason, you can't discern his testimony's reliability...^000000";
+					close;
+				case 3:
+					mes "[Xue Bong]";
+					mes "Alrighty then.";
+					mes "Hope you don't ever drink like me";
+					mes "in the future. You'll suffer";
+					mes "for a long time if you do.";
+					mes "You know what a hangover is, right?";
+					close;
 				}
-				break;
-			case 2:
-				mes "[SulBoong]";
-				mes "Ah..um....I..I am not sure.";
-				mes "When I woke up, There were so many";
-				mes "empty bottles around me.";
-				mes ".....";
-				next;
-				mes "^00FF00.......";
-				mes "Without a specific reason, he seemed to be very respectable.^000000";
-				break;
-			case 3:
-				mes "[SulBoong]";
-				mes "alright then.";
-				mes "Hope you don't ever drink like me";
-				mes "in the future.";
-				mes "You'll suffer for long time if you do.";
-				mes "You know what hangover is right?";
-				break;
 			}
-		}
-	} else if (b_sword == 5) {
-		mes "Oh, it's you.";
-		mes "Thanks for the portion last time.";
-		mes "What are you up to?";
-		mes "Got any question for me?";
-		next;
-		if (select("About a thief last night...:Nope, just passing by..") == 1){
-			mes "[SulBoong]";
-			mes "Ah~ a thief..";
-			mes "hmm.. let me see..";
-			mes "I went out for walk in the middle";
-			mes "of night while I was drinking.";
-			mes "And I heard something noisy.";
-			mes "I looked around and found that";
-			next;
-			mes "[SulBoong]";
-			mes "area near chief's house was brighter";
-			mes "than any other area. It was strange.";
-			mes "So I kept watching at it and";
-			mes "all of a sudden, I saw something moving";
-			mes "on the roof of houses.";
+		case 5:
+			mes "[Xue Bong]";
+			mes "Oh, it's you. Hey.";
+			mes "Thanks for the potion last time.";
+			mes "What are you up to?";
+			mes "Got any questions for me?";
 			next;
-			mes "[SulBoong]";
-			mes "It disappeared in a second.";
-			mes "I was drunk, and it was dark outside.";
-			mes "I have no idea whether it was a man or a cat or..";
-			mes "don't know what it was.. huhu..";
-			set b_sword,6;
-		} else {
-			mes "[SulBoong]";
-			mes "alright then.";
-			mes "Hope you don't ever drink like me";
-			mes "in the future.";
-			mes "bye.";
+			switch(select("About a thief last night...:Nope, just passing by..")) {
+			case 1:
+				mes "[Xue Bong]";
+				mes "Ah~ a thief...?";
+				mes "Hmm...let me see...";
+				mes "I went out for walk in the middle";
+				mes "of the night while I was drinking.";
+				mes "All of a sudden, I heard a strange noise...";
+				next;
+				mes "[Xue Bong]";
+				mes "I looked around and found that the";
+				mes "area near the chief's house was";
+				mes "brighter than any other area. It was odd...";
+				next;
+				mes "[Xue Bong]";
+				mes "So I kept watching it and,";
+				mes "all of a sudden, I saw something moving on the rooftops...";
+				next;
+				mes "[Xue Bong]";
+				mes "It disappeared in a second.";
+				mes "I was drunk, and it was dark";
+				mes "outside. I have no idea";
+				mes "whether it was a man, a poring,";
+				mes "or if I just had too much to drink...heheh~";
+				set b_sword,6;
+				close;
+			case 2:
+				mes "[Xue Bong]";
+				mes "Okay, then, thanks again.";
+				mes "Don't be a drinker like me,";
+				mes "unless you want to suffer from";
+				mes "serious hangovers. See you later~";
+				close;
+			}
 		}
-	} else if (b_sword < 11) {
-		mes "Well, do your job well.";
-		mes "To keep the peace in our village,";
-		mes "we need to take chief's worries out.";
-	} else if (b_sword <14) {
-		switch (b_sword) {
+	}
+	else if (b_sword < 11) {
+		mes "[Xue Bong]";
+		mes "Well, hopefully you can find";
+		mes "those thieves. To keep the";
+		mes "peace in our village, we need to help out our chief...";
+		close;
+	}
+	else if (b_sword <14) {
+		switch(b_sword) {
 		case 11:
+			mes "[Xue Bong]";
 			mes "Ahhh.. my stomach.. my head..";
-			mes "Shouldn't drink so much..";
-			mes "Ehhhh....";
+			mes "I shouldn't drink so much..";
+			mes "ughh....";
 			emotion e_swt2;
-			break;
+			close;
 		case 12:
-			mes "Ehhhh..go away.";
-			mes "You're a man with no mercy.";
-			mes "ehhh...";
-			emotion e_pif;
-			break;
+			mes "[Xue Bong]";
+			mes "Enhhhh..go away.";
+			mes "You're merciless...";
+			mes "How could you turn a";
+			mes "blind eye to a";
+			mes "boozer's suffering?";
+			mes "Urk...!";
+			emotion e_an;
+			close;
 		case 13:
-			mes "Ehhhh..go away.";
-			mes "You're such a coldhearted man.";
-			mes "ehhh...";
-			emotion e_pif;
-			break;
+			mes "[Xue Bong]";
+			mes "Enhhhh...go away.";
+			mes "You're so coldhearted...";
+			mes "How could you turn away";
+			mes "a drunk in need...?";
+			mes "*Groan*...";
+			emotion e_an;
+			close;
 		}
-	} else {
-		mes "Wahahaha.";
-		mes "So..you found a chief's belongging's?";
-		mes "I knew you could've done it.";
-		mes "You're brave enough to do anything.";
-		mes "Wahahaha.";
 	}
+	mes "[Xue Bong]";
+	mes "So you found the chief's";
+	mes "belongings?! I knew it!";
+	mes "I knew you could do it!";
+	mes "You're brave enough";
+	mes "to do anything!";
+	mes "Good job!";
 	close;
 }
 
@@ -802,7 +842,7 @@ gon_dun01,2,1,0	script	timer1-1	-1,{
 gon_dun01,202,25,0	script	#getitem1-1	111,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -869,7 +909,7 @@ gon_dun01,3,1,0	script	timer1-2	-1,{
 gon_dun01,190,159,0	script	#getitem1-2	111,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -936,7 +976,7 @@ gon_dun01,4,1,0	script	timer1-3	-1,{
 gon_dun01,164,53,0	script	#getitem1-3	111,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1003,7 +1043,7 @@ gon_dun01,5,1,0	script	timer1-4	-1,{
 gon_dun01,134,183,0	script	#getitem1-4	111,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1070,7 +1110,7 @@ gon_dun01,6,1,0	script	timer1-5	-1,{
 gon_dun01,140,257,0	script	#getitem1-5	111,2,1,{
 	if (b_sword != 7) end;
 	set b_sword,8;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1145,7 +1185,7 @@ gon_dun02,2,1,0	script	timer2-1	-1,{
 gon_dun02,202,25,0	script	#getitem2-1	111,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1212,7 +1252,7 @@ gon_dun02,3,1,0	script	timer2-2	-1,{
 gon_dun02,265,201,0	script	#getitem2-2	111,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1279,7 +1319,7 @@ gon_dun02,4,1,0	script	timer2-3	-1,{
 gon_dun02,247,128,0	script	#getitem2-3	111,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1346,7 +1386,7 @@ gon_dun02,5,1,0	script	timer2-4	-1,{
 gon_dun02,149,75,0	script	#getitem2-4	111,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1413,7 +1453,7 @@ gon_dun02,6,1,0	script	timer2-5	-1,{
 gon_dun02,23,106,0	script	#getitem2-5	111,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1480,7 +1520,7 @@ gon_dun02,7,1,0	script	timer2-6	-1,{
 gon_dun02,249,40,0	script	#getitem2-6	111,2,1,{
 	if (b_sword != 8) end;
 	set b_sword,9;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
 	close;
 
@@ -1555,11 +1595,12 @@ gon_dun03,2,1,0	script	timer3-1	-1,{
 gon_dun03,10,74,0	script	#getitem3-1	111,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1625,11 +1666,12 @@ gon_dun03,3,1,0	script	timer3-2	-1,{
 gon_dun03,199,102,0	script	#getitem3-2	111,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1695,11 +1737,12 @@ gon_dun03,4,1,0	script	timer3-3	-1,{
 gon_dun03,14,163,0	script	#getitem3-3	111,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1765,11 +1808,12 @@ gon_dun03,5,1,0	script	timer3-4	-1,{
 gon_dun03,156,263,0	script	#getitem3-4	111,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1835,11 +1879,12 @@ gon_dun03,6,1,0	script	timer3-5	-1,{
 gon_dun03,170,90,0	script	#getitem3-5	111,2,1,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1905,11 +1950,12 @@ gon_dun03,7,1,0	script	timer3-6	-1,{
 gon_dun03,68,39,0	script	#getitem3-6	111,1,2,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1975,11 +2021,12 @@ gon_dun03,6,1,0	script	timer3-7	-1,{
 gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
 	if (b_sword != 9) end;
 	set b_sword,10;
-	mes "You found ^FF0000piece of blade^000000.";
+	mes "You found a ^FF0000piece of blade^000000.";
 	mes "Seems like it's a part of the sword you've been looking for.";
-	mes "You put all the pieces on the ground";
-	mes "and assembled them. Seems like you've found ";
-	mes "all pieces of the blade.";
+	next;
+	mes "You put all the pieces on the";
+	mes "ground and assembled them.";
+	mes "It looks like you've found all of the pieces of the blade.";
 	close;
 
 	OnInit:
@@ -1997,362 +2044,415 @@ gon_dun03,68,213,0	script	#getitem3-7	111,1,2,{
 }
 
 gon_in,18,27,5	script	Madam#gnbs	771,{
-	mes "[SangHwaYeun]";
-	mes "hohohohoho~";
+	mes "[Shang Hua Yen]";
+	mes "Ho, ho, ho~";
 	mes "Who might this be?";
-	mes "A vistor from out of town~";
-	mes "hohoho.";
+	mes "A visitor from out of town~";
+	mes "Welcome!";
 	next;
-	if (select("Hi, Madam~:Where's chief?") == 1) {
-		mes "[SangHwaYeun]";
-		mes "Hi, there~";
+	if (select("Hello, Madam~:Where's the chief?") == 1) {
+		mes "[Shang Hua Yen]";
+		mes "Hello, darling~";
 		close;
 	}
-	mes "[SangHwaYeun]";
-	if (sex == 0) {
-		mes "Hoho, he's upstairs.";
-		mes "You're such a pretty lady.";
-		mes "Don't be too fascinated by";
-		mes "my husband. alright?";
-		mes "Hohoho~";
-	} else {
-		mes "He's upstairs.";
-		mes "You are such a handsome young man";
-		mes "But not better than my huhsband.";
-		mes "Hohoho..";
+	if (Sex == 0) {
+		mes "[Shang Hua Yen]";
+		mes "Hoho~ he's upstairs.";
+		mes "My, are you such a pretty lady~";
+		mes "Just don't be too enraptured by my husband, alright?";
+		mes "Tee hee~";
+		close;
 	}
+	mes "[Shang Hua Yen]";
+	mes "Oh, he's upstairs...";
+	mes "My~! Aren't you a darling young";
+	mes "man. But still, not nearly as handsome as my husband~";
+	mes "Tee hee~";
+	emotion e_lv;
 	close;
 }
 
 gon_dun03,62,222,0	script	Strange dead body#gnbs	111,{
 	if (b_sword < 7) {
-		mes "Here's a rotten dead body.";
-		mes "Seemed to be eaten by monsters.";
+		mes "Here's a decomposing corpse.";
+		mes "It seems like monsters devoured it.";
 		close;
 	}
-	if (b_sword > 6 && b_sword < 11) {
-		mes "There's a paper between the bones";
-		mes "of dead body.";
+	else if (b_sword > 6 && b_sword < 11) {
+		mes "There's a written message between the bones of the corpse.";
+		mes "of the corpse.";
 		mes "Take a look?";
 		next;
-		if (select("Yes.:Leave.") == 1) {
-			mes "Paper is so worned out,";
-			mes "but there's a words on it.";
-			mes "It's written by a blood.";
-			mes "So difficult to see the letter.";
-			mes "Almost impossible to find out what's written.";
+		if (select("Yes.:Eew, no!") == 1) {
+			mes "^3355FFThe paper is old and fading,";
+			mes "but there are words on it.";
+			mes "It's written in blood.";
+			mes "The letters are faded and it's almost impossible to read...^000000 ";
 			next;
-			mes "^FF0000Damn I can't...believe..  failed..";
+			mes "^FF0000Damn I can't.. believe.. failed..";
 			mes "Sayum... I should've..";
-			mes "watchout...ehhh...but..  break";
-			mes "..pieces...and seprate..";
-			mes "I..with";
+			mes "watchout.. ehhh.. but.. break";
+			mes "..pieces.. and seperate..";
+			mes "I.. with";
 			mes "this...^000000";
 			next;
-			mes "Paper was all blood-stained.";
-			mes "He probably couldn't make it any longer.";
-		} else {
-			mes "Felt something was missing.";
-			mes "Blood-stained dead body was";
-			mes "getting on my nerve";
-			mes "But I just decided to leave from here.";
+			mes "^3355FFThe rest was indecipherable...";
+			mes "He probably couldn't take it any longer...^000000";
+			close;
 		}
-	} else if (b_sword == 11 || b_sword == 12) {
-		mes "Here's a ungly looking dead body.";
-		mes "I should just pass by.";
-	} else {
-		mes "A skeleton eaten by many monsters.";
-		mes "Felt pitable for awhile, but felt";
-		mes "bad when looking at it for";
-		mes "long time.";
+		mes "[ ^6699FF" + name + "^000000 ]";
+		mes "Eew, no!";
+		mes " ";
+		mes "Yucky yucky YUCKY!";
+		next;
+		mes "^3355FFYou feel like there's something important here...";
+		mes "But the rotting carcass has a";
+		mes "foul odor that makes you feel nauseated.^000000";
+		close;
+	}
+	else if (b_sword == 11 || b_sword == 12) {
+		mes "^3355FFIt's a rotting human corpse...";
+		mes "I should just pass by.^000000";
+		close;
 	}
+	mes "^3355FFA skeleton chewed up by";
+	mes "monsters...I feel sorry for";
+	mes "him, but start getting this";
+	mes "really creepy feeling after staring at it for a while.^000000";
 	close;
 }
 
 gonryun,139,142,7	script	Girl##gnbs1	772,{
-	mes "[SaEunSo]";
 	if (b_sword < 12) {
+		mes "[Shi Ying Xiao]";
 		mes "..........";
-		mes "I was happy looking at the visitors";
-		mes "from other villages, but because of";
-		mes "the thief, I feel terrible now'";
+		mes "I was happy meeting visitors";
+		mes "from outside the village,";
+		mes "but because of the thief, I feel terrible now...";
 		emotion e_dots;
-	} else {
-		mes "Hehe...";
-		mes "I am so happy now.";
-		mes "Lots of visitors are coming to our village..";
-		mes "found the stuff my father lost..";
-		mes "Hehe...";
-		mes "The guy who found the stuff for my";
-		mes "father.. I am sure he is a great man.";
+		close;
 	}
+	mes "[Shi Ying Xiao]";
+	mes "Hehe...";
+	mes "I am so happy now~";
+	mes "Lots of visitors are coming to our";
+	mes "village now. But most of all,";
+	mes "Someone found my father's heirloom~";
+	next;
+	if (select("I'm glad you're relieved.:That would be me!") == 1) {
+		mes "[Shi Ying Xiao]";
+		mes "Yes, the mood of the entire";
+		mes "village seems to have calmed...";
+		mes "I'm sure whoever found my father's sword is a great person.";
+		close;
+	}
+	mes "[ ^6699FF" + strcharinfo(0) + "^000000 ]";
+	mes "That would be me!";
+	next;
+	mes "[ ^6699FF" + strcharinfo(0) + "^000000 ]";
+	mes "I AM YOUR HERO!";
+	next;
+	emotion e_heh;
+	mes "[Shi Ying Xiao]";
+	mes "Thank you so much for bringing hope to our village, hero~";
 	close;
 }
 
-gonryun,100,241,0	script	Stranger#gnbs"	733,{
-	mes "[Choahk]";
+gonryun,100,241,0	script	Stranger#gnbs	733,{
 	if (b_sword < 14) {
+		mes "[Zuo Hei]";
 		mes "Hmm...";
-		mes "I'm pretty busy right now, come later.";
+		mes "I'm pretty busy right now, come back later.";
 		emotion e_dots;
-	} else if (b_sword < 17) {
-		switch (b_sword) {
+		close;
+	}
+	else if (b_sword < 17) {
+		switch(b_sword) {
 		case 14:
 			switch(nakha) {
 			case 0:
+				mes "[Zuo Hei]";
 				mes "Hmm...";
 				mes "What is it?";
 				mes "What do you want?";
-				mes "I don't like to get bothered.";
+				mes "I don't like to be bothered.";
 				next;
-				if (select("Ask about blacksmith.:Are are you being so mean?") == 1){
-					mes "[Choahk]";
-					mes "Hum.....";
-					mes "so..you are the one who found";
-					mes "the sword huh?";
+				if (select("Ask about the blacksmith.:Why are you being so mean?") == 1) {
+					mes "[Zuo Hei]";
+					mes "Ahh..";
+					mes "So you're the one who found";
+					mes "the sword, eh?";
 					mes "Did you also get asked to repair it?";
 					next;
-					if (select("Exactly.:No..I'm just...") == 1){
-						mes "[Choahk]";
-						mes "well..";
-						mes "If you want some information";
-						mes "from me, come after helping one";
-						mes "person in the village who's in trouble right now.";
-						set b_sword,16;
-					} else {
-						mes "[Choahk]";
+					if (select("Exactly.:No..I'm just...") == 1) {
+						mes "[Zuo Hei]";
 						mes "Hmm...";
-						mes "I guess not...";
-						mes "Don't bother me anymore. I got bunch of things to do.";
+						mes "If you want some information from";
+						mes "me, come back after helping the";
+						mes "person in the village who's in";
+						mes "trouble right now.";
+						next;
+						mes "[Zuo Hei]";
+						mes "It's another heirloom";
+						mes "problem, but I want to";
+						mes "see for myself that";
+						mes "you're really interested";
+						mes "in helping others.";
+						set b_sword,16;
+						close;
 					}
-				} else {
-					mes "[Choahk]";
-					mes "Hmm...";
-					mes "Why do you care about other's";
-					mes "personality. It's none of your business.";
-					mes "Take a look at yourself first";
-					mes "before you say something like that.";
+					mes "[Zuo Hei]";
+					mes "Hmm, I didn't think so...";
+					mes "Now, don't bother me anymore.";
+					mes "I've got a bunch of things to do.";
+					close;
 				}
-				break;
+				mes "[Zuo Hei]";
+				mes "Grr...";
+				mes "Why should you care about the";
+				mes "someone else's personality?";
+				mes "That's none of your business.";
+				mes "Take a look in the mirror first";
+				mes "before you say things like that.";
+				emotion e_ag;
+				close;
 			case 1:
+				mes "[Zuo Hei]";
 				mes "Hmm...";
 				mes "You're in the middle of helping";
-				mes "someone now huh?";
-				mes "Why don't you go and take care of it first.";
+				mes "someone now, I hear.";
+				mes "Why don't you go and take care of them first.";
 				mes "Once you start to help someone,";
-				mes "you're responsible to finsh that job well.";
+				mes "you can't just quit halfway.";
 				set b_sword,16;
-				break;
+				close;
 			case 2:
+				mes "[Zuo Hei]";
 				mes "Hmm...";
 				mes "You're in the middle of helping";
-				mes "someone now huh?";
-				mes "Why don't you go and take care of it first.";
+				mes "someone now, I hear.";
+				mes "Why don't you go and take care of them first.";
 				mes "Once you start to help someone,";
-				mes "you're responsible to finsh that job well.";
+				mes "you can't just quit halfway.";
 				set b_sword,16;
-				break;
+				close;
 			case 3:
+				mes "[Zuo Hei]";
 				mes "Hmm...";
 				mes "What do you want??";
 				next;
-				if (select("Ask about blacksmith.:Are are you being so mean?") == 1) {
-					mes "[Choahk]";
-					mes "Hum.....";
-					mes "so..you are the one who found";
-					mes "the sword huh?";
-					mes "Did you also get asked to repair it?";
+				if (select("Ask about the blacksmith.:Why are you being so mean?") == 1) {
+					mes "[Zuo Hei]";
+					mes "Ahh...";
+					mes "So you are the one who found";
+					mes "the sword, eh? I assume you were also asked to repair it...";
 					next;
-					if (select("Exactly.:No..I'm just...") == 1){
-						mes "[Choahk]";
+					if (select("Exactly.:No...I'm just...") == 1) {
+						mes "[Zuo Hei]";
 						mes "Hmm...";
-						mes "Since it's broke into pieces,";
-						mes "you should find someone to repair it.";
+						mes "Since it's been shattered,";
+						mes "you'll need a very skilled smith.";
 						mes "Go to ^FF0000Geffen^000000, you'll find someone";
 						mes "who can help you.";
 						set b_sword,17;
-					} else {
-						mes "[Choahk]";
-						mes "Hmm...";
-						mes "I guess not...";
-						mes "Don't bother me anymore.";
-						mes "I got bunch of things to do.";
+						close;
 					}
-				} else {
-					mes "[Choahk]";
-					mes "Hmm...";
-					mes "Why do you care about other's";
-					mes "personality. It's none of your business.";
-					mes "Take a look at yourself first";
-					mes "before you say something like that.";
+					mes "[Zuo Hei]";
+					mes "Hmm, I didn't think so...";
+					mes "Now, don't bother me anymore.";
+					mes "I've got a bunch of things to do.";
+					close;
 				}
-				break;
+				mes "[Zuo Hei]";
+				mes "Grr...";
+				mes "Why should you care about the";
+				mes "someone else's personality?";
+				mes "That's none of your business.";
+				mes "Take a look in the mirror first";
+				mes "before you say things like that.";
+				emotion e_ag;
+				close;
 			case 4:
+				mes "[Zuo Hei]";
 				mes "Guess I was wasting my time.";
-				mes "If you make any promises,";
+				mes "If you make a promise to someone,";
 				mes "it's your responsibility to";
-				mes "take care of it until it's completely done.";
+				mes "follow through with it to completion.";
 				next;
-				mes "[Choahk]";
-				mes "I don't like people who do not";
-				mes "keep the promises.";
-				mes "You'll not get any informations from me.";
+				mes "[Zuo Hei]";
+				mes "I don't like people who fail to";
+				mes "keep the promises they make.";
+				mes "You'll not get any information from me.";
 				mes "Don't ever bother me again.";
 				set b_sword,15;
-				break;
+				close;
 			}
 			break;
 		case 15:
-			mes "Hmm...";
-			mes "I'm busy right now. Why don't come later.";
+			mes "[Zuo Hei]";
+			mes "Sorry, I'm busy right now.";
+			mes "Why don't you come back later.";
 			emotion e_dots;
-			break;
+			close;
 		case 16:
-			switch(nakha){
+			switch(nakha) {
 			case 0:
+				mes "[Zuo Hei]";
 				mes "Hmm......";
-				mes "You're not done with your";
-				mes "requirements yet.";
+				mes "You're not done with the";
+				mes "requirement I've given you...";
 				mes "I can't give you any information";
 				mes "until you finish your job.";
-				break;
+				close;
 			case 1:
+				mes "[Zuo Hei]";
 				mes "Hmm....";
 				mes "Once you start to help someone,";
-				mes "you're responsible to finsh that job well.";
-				mes "Why don't you go and take care of it first.";
-				break;
+				mes "you can't just quit halfway.";
+				mes "Why don't you go and take care of them first.";
+				close;
 			case 2:
+				mes "[Zuo Hei]";
 				mes "Hmm....";
 				mes "Once you start to help someone,";
-				mes "you're responsible to finsh that job well.";
-				mes "Why don't you go and take care of it first.";
-				break;
+				mes "you can't just quit halfway.";
+				mes "Why don't you go and take care of them first.";
+				close;
 			case 3:
+				mes "[Zuo Hei]";
 				mes "Hmm......";
 				mes "What do you want?";
 				next;
-				if (select("Ask about blacksmith.:Are are you being so mean?") == 1) {
-					mes "[Choahk]";
-					mes "Hum.....";
-					mes "so..you are the one who found";
-					mes "the sword huh?";
+				if (select("Ask about the blacksmith.:Why are you being so mean?") == 1) {
+					mes "[Zuo Hei]";
+					mes "Ahh...";
+					mes "So you are the one who found";
+					mes "the sword eh?";
 					mes "Did you also get asked to repair it?";
 					next;
-					if (select("Exactly:No.. I'm just...") == 1) {
-						mes "[Choahk]";
+					if (select("Exactly.:No, i'm just...") == 1) {
+						mes "[Zuo Hei]";
 						mes "Hmm...";
-						mes "Since it's broke into pieces,";
-						mes "you should find someone to repair it.";
+						mes "Since it's been shattered,";
+						mes "you'll need a very skilled smith.";
 						mes "Go to ^FF0000Geffen^000000, you'll find someone";
 						mes "who can help you.";
 						set b_sword,17;
-					} else {
-						mes "[Choahk]";
-						mes "Hmm...";
-						mes "I guess not...";
-						mes "Don't bother me anymore.";
-						mes "I got bunch of things to do.";
+						close;
 					}
-				} else {
-					mes "[Choahk]";
-					mes "Hmm...";
-					mes "Why do you care about other's";
-					mes "personality. It's none of your business.";
-					mes "Take a look at yourself first";
-					mes "before you say something like that.";
+					mes "[Zuo Hei]";
+					mes "Oh, I suppose not.";
+					mes "Why are you asking me, then?";
+					mes "Don't bother me anymore.";
+					mes "I've got a bunch of things to do.";
+					close;
 				}
-				break;
+				mes "[Zuo Hei]";
+				mes "Grr...";
+				mes "Why should you care about the";
+				mes "someone else's personality?";
+				mes "That's none of your business.";
+				mes "Take a look in the mirror first";
+				mes "before you say things like that.";
+				emotion e_ag;
+				close;
 			case 4:
+				mes "[Zuo Hei]";
 				mes "Guess I was wasting my time.";
-				mes "If you make any promises,";
-				mes "it's your responsibility to";
-				mes "take care of it until it's completely done.";
+				mes "If you make a promise to";
+				mes "someone, it's your";
+				mes "responsibility to";
+				mes "follow through with it to completion.";
 				next;
-				mes "[Choahk]";
-				mes "I don't like people who do not";
-				mes "keep the promises.";
-				mes "You'll not get any informations from me.";
-				mes "Don't ever bother me again.";
+				mes "[Zuo Hei]";
+				mes "I don't like people who fail";
+				mes "to keep their promises.";
+				mes "You'll not get any information from me. Don't ever bother me again.";
 				set b_sword,15;
-				break;
+				close;
 			}
-			break;
 		}
-	} else if (b_sword < 33) {
-		mes "Umm?";
+	}
+	else if (b_sword < 33) {
+		mes "[Zuo Hei]";
+		mes "Hey there...uhm..";
 		mes "Didn't I tell you to go to ^FF0000Geffen^000000?";
-		mes "You'll find famous blacksmith there.";
-		mes "He'll repair the sword for you.";
-		mes "I gave you all the informations";
-		mes "I have so far.";
+		mes "You'll find a famous blacksmith";
+		mes "that can repair the sword for you.";
+		mes "That's all the information I can";
+		mes "give you, really.";
 		next;
-		mes "[Choahk]";
-		mes "You are responsible to take care of the rest.";
-	} else {
-		mes "Hmm......";
-		mes "Helping people in trouble is";
-		mes "such a nice thing to do.";
-		mes "You are doing the right thing.";
+		mes "[Zuo Hei]";
+		mes "It's up to you to make good use of it.";
+		close;
 	}
+	mes "[Zuo Hei]";
+	mes "Hmm...";
+	mes "Helping people in trouble is";
+	mes "such a nice thing to do.";
+	mes "You are doing the right thing.";
 	close;
 }
 
 geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
-	mes "[Aumgarl]";
 	if (b_sword < 17) {
-		mes "Pew..hew....";
+		mes "[Aumgarl]";
+		mes "*Sob*..*sob*....";
 		mes "My poor baby Lyroo..";
-		mes "hew....";
-	} else if (b_sword < 32) {
-		switch (b_sword) {
+		mes "*Sniff*...";
+		close;
+	}
+	else if (b_sword < 32) {
+		switch(b_sword) {
 		case 17:
-			mes "Pew..hew....";
+			mes "[Aumgarl]";
+			mes "*Sob*...";
 			mes "My poor baby Lyroo..";
-			mes "hew....";
+			mes "*Sniff*...";
 			next;
-			if (select("Sir...:...........") == 1) {
+			if (select("Sir...?:...........") == 1) {
 				mes "[Aumgarl]";
-				mes "Umm? Who're you?";
-				mes "Need something?";
-				mes "If not, please leave..";
+				mes "Hmm...Who are you?";
+				mes "Do you need something?";
+				mes "If not, please leave...";
 				next;
-				if (select("I came to repair the sword.:I heard you are famous blacksmith...") == 1) {
+				if (select("I came to repair this sword.:I heard you are a famous blacksmith...") == 1) {
 					mes "[Aumgarl]";
-					mes "Umm........";
-					mes "Sorry but, we're closed.";
-					mes "Come again next time.";
-					mes "Bye";
+					mes "Umm...";
+					mes "I'm sorry, but we're closed.";
+					mes "Come again another time.";
+					mes "Goodbye.";
 					set b_sword,18;
-				} else {
-					mes "[Aumgarl]";
-					mes "Yes, I am a blacksmith,";
-					mes "but I don't think I am famous.";
-					mes "And unfortunately.. we are closed.";
+					close;
 				}
-			} else {
 				mes "[Aumgarl]";
-				mes "Done with your business?";
-				mes "Then please leave.";
+				mes "Yes, I am a blacksmith,";
+				mes "but I don't think I'm famous.";
+				mes "And unfortunately, we're closed right now.";
+				close;
 			}
-			break;
+			mes "[Aumgarl]";
+			mes "If you have nothing to say to me,";
+			mes "then please leave me alone.";
+			close;
 		case 18:
-			mes "Like I said...I am busy!";
-			mes "Come later.";
+			mes "[Aumgarl]";
+			mes "Like I said, we're closed!";
+			mes "Come back later.";
 			if (rand(1,8) == 7) {
 				set b_sword,19;
-				mes "What nerve you've got!";
+				mes "Didn't you hear me?! Sheesh!";
 			}
 			close2;
 			warp "geffen",173,169;
 			end;
 		case 19:
-			mes "Hmm....";
-			mes "Ahh....";
-			mes "What nerve you've got!";
-			mes "What do you want?";
+			mes "[Aumgarl]";
+			mes "Hmm...";
+			mes "You're a persistent one!!";
+			mes "What is it that you want?";
 			next;
-			switch(select("I want to marry your granddaughter.:Your graddaughter is such a pretty girl.:I came to repair the sword.")){
+			switch(select("I want to marry your granddaughter.:Your granddaughter is such a pretty girl.:I came to repair the sword.")) {
 			case 1:
 				mes "[Aumgarl]";
 				mes ".....";
@@ -2363,19 +2463,20 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 				next;
 				mes "[Aumgarl]";
 				mes "Who the heck are you?";
-				mes "Want my granddaughter all of a sudden?";
+				mes "What do you want with my";
+				mes "granddaughter all of a sudden!?";
 				mes "Get the hell out of here!";
-				mes "Don't ever come back here!";
+				mes "Don't ever come back here again!";
 				emotion e_pif;
-				break;
+				close;
 			case 2:
 				mes "[Aumgarl]";
-				mes "You're damn right~";
-				mes "My granddaughter is so~ pretty.";
-				mes "Hahaha....";
-				mes ".....peew heew....";
+				mes "You're darn right~";
+				mes "My granddaughter is soo~ pretty.";
+				mes "Hahaha...ah....hah...";
+				mes ".....*Sob, sob*....";
 				next;
-				switch(select("I want to marry her...:I came to repair the sword.:Anything wrong?")){
+				switch(select("I want to marry her...:I came to repair the sword.:Anything wrong?")) {
 				case 1:
 					mes "[Aumgarl]";
 					mes ".....";
@@ -2386,98 +2487,99 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 					next;
 					mes "[Aumgarl]";
 					mes "Who the heck are you?";
-					mes "Want my granddaughter all of a sudden?";
-					mes "Get the hell out of here!";
-					mes "Don't ever come back here!";
+					mes "What do you want with my";
+					mes "granddaughter all of a sudden!?";
+					mes "Get out of here you pervert!";
+					mes "Don't ever come back here again!";
 					emotion e_pif;
-					break;
+					close;
 				case 2:
 					mes "[Aumgarl]";
 					mes "...............";
-					mes "the sword?";
-					mes "I don't remember when was the";
-					mes "last time I touched a steel.";
-					mes "hmm...";
-					mes "let me see the sword.?";
+					mes "A sword?";
+					mes "I don't remember when the last";
+					mes "time I worked with steel was.";
+					mes "Hmm...";
+					mes "May I see the sword?";
 					next;
 					mes "[Aumgarl]";
 					mes "Hmm......";
-					mes "Umm.........";
+					mes "Hmmmm......";
 					mes "............";
 					next;
-					mes "^0000FFHe took a careful look at the pieces of sword for awhile.^000000";
+					mes "^0000FFHe intently studied the pieces of the sword for a while.^000000";
 					next;
 					mes "[Aumgarl]";
-					mes "Hmm.......";
-					mes "So this is the one huh?";
-					mes "Well.....";
-					mes "I am sorry, but this sword is not";
-					mes "something I can repair";
+					mes "Hmm...";
+					mes "So this is the one, huh?";
+					mes "Well...I am sorry, but this sword";
+					mes "is not something I can repair";
 					mes "at the moment.";
 					next;
 					mes "[Aumgarl]";
 					mes "Why don't you go find";
-					mes "some other blacksmith.";
-					mes "I am sorry........";
-					break;
+					mes "another blacksmith?";
+					mes "I am truly sorry.";
+					close;
 				case 3:
 					mes "[Aumgarl]";
-					mes "Ah...............";
-					mes "this is not something I shall tell";
-					mes "others....but....";
-					mes "my granddaughter lyroo has";
+					mes "Um..well...";
+					mes "This is not something I normally";
+					mes "tell strangers, but....";
+					mes "My granddaughter Lyroo has";
 					mes "an incurable disease...";
 					next;
 					mes "[Aumgarl]";
 					mes "Not long after she was born,";
-					mes "her parents died by an accident.";
-					mes "Since from that day of an accident,";
-					mes "I took care of her.";
-					mes "hmm......";
+					mes "her parents died from an accident.";
+					mes "Since that day, I have been taking care of her...";
+					next;
+					mes "[Aumgarl]";
+					mes "But that wasn't the end of it...";
+					mes "Soon after, she started to suffer";
+					mes "from a serious illness. I've met";
+					mes "doctors from all around";
+					mes "Rune-Midgard...";
 					next;
 					mes "[Aumgarl]";
-					mes "Ahh...........";
-					mes "and...moreover, she started to suffer";
-					mes "from an illness. I've met many famous";
-					mes "doctors all around the place but....";
-					mes "no one even found out the name of";
-					mes "a disease.";
+					mes "But not one of them could";
+					mes "diagnose her sickness...";
 					next;
-					switch(select("I am sorry to hear that.:I'll make her happy.:I want to cure her.")){
+					switch(select("I am sorry to hear that.:I'll make her happy.:I want to cure her.")) {
 					case 1:
 						mes "[Aumgarl]";
-						mes "Ahh.......";
-						mes "I'll just have to take it";
-						mes "as our fate.";
-						mes "I just feel sorry for lyroo.";
-						mes ".............";
+						mes "*Sigh*...";
+						mes "I'll just have to accept it";
+						mes "as her fate. I just feel";
+						mes "so sorry for Lyroo.";
+						mes "...";
 						emotion e_dots;
-						break;
+						close;
 					case 2:
 						mes "[Aumgarl]";
-						mes "Umm.....";
-						mes "What do you mean?";
-						mes "How're you going to make her happy?";
-						mes "I don't think it makes sense at all.";
-						mes "Umm......";
+						mes "Umm...";
+						mes "What do you mean...?";
+						mes "'Make her happy?'";
+						mes "You're not making any sense...";
+						mes "I'm confused...";
 						next;
-						switch(select( "I'll make her happy all the time.:I want to take her with me.:I will cure her.")){
+						switch(select("I'll make her happy all the time.:I want to take her with me.:I will cure her.")) {
 						case 1:
 							mes "[Aumgarl]";
-							mes "................";
+							mes "...";
 							mes "What are you talking about?";
 							mes "Make her happy all the time?";
 							mes "She is dying even at";
 							mes "this moment.";
 							next;
 							mes "[Aumgarl]";
-							mes "I think you are out of";
-							mes "your mind!";
-							mes "Get out of here.";
-							break;
+							mes "I think you're out of";
+							mes "your mind, sicko!";
+							mes "Get out of here!";
+							close;
 						case 2:
 							mes "[Aumgarl]";
-							mes "................";
+							mes "...What do you mean?";
 							mes "You want to take her to where?";
 							mes "What are you gonna do?";
 							next;
@@ -2487,62 +2589,59 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 								mes "it any longer. I don't think";
 								mes "there is anyone who can";
 								mes "cure my granddaughter.";
-							} else {
+								close;
+							}
+							mes "[Aumgarl]";
+							mes "Ahh...";
+							mes "I'm not blaming you.";
+							mes "It's not your fault anyway.";
+							mes "...*Sigh*...";
+							next;
+							if (select("Well...:I'll pray for her recovery.") == 1) {
 								mes "[Aumgarl]";
-								mes "Ahh.......";
-								mes "I am not blaming you.";
-								mes "It's not your fault anyway.";
-								mes "........";
+								mes "Err..";
+								mes "I am sorry to ask you this...";
+								mes "But would you do me a favor?";
+								mes "Umm...";
 								next;
-								if (select("...........:I'll wish for her recover.") == 1){
-									mes "[Aumgarl]";
-									mes "Ahh......";
-									mes "....I am sorry to ask you this but..";
-									mes "can you do me a favor?";
-									mes "Umm......";
-									next;
-									if (select("No.:Sure.") == 1) {
-										mes "[Aumgarl]";
-										mes "Umm....";
-										mes "Alright, I won't bother you..";
-										mes "bye...";
-										break;
-									}
-									mes "[Aumgarl]";
-									mes "It won't be easy but,";
-									mes "would you help me to find";
-									mes "any doctors... nono..anybody";
-									mes "who can cure Lyroo or";
-									next;
-									mes "[Aumgarl]";
-									mes "has any informations";
-									mes "about her unidentified illness?";
-									mes "please?";
-									mes "...peeew..";
-									next;
-									menu "Yes, Sir.",-;
-									mes "[Aumgarl]";
-									mes "Oh....";
-									mes "Thank you so much.";
-									mes "If Lyroo can get her health back,";
-									mes "I'll never forget";
-									mes "your help forever.";
-									next;
-									mes "[Aumgarl]";
-									mes "Thank you..";
-									mes "Thank you...";
-									set b_sword,20;
-								} else {
+								if (select("No.:Sure.") == 1) {
 									mes "[Aumgarl]";
-									mes "Well...thanks.";
-									mes "I'm going to try my best to";
-									mes "make her happy till the";
-									mes "last second.";
-									mes "Come by sometimes to say hi";
-									mes "to Lyroo.";
+									mes "Err...";
+									mes "Alright, I won't bother you..";
+									mes "Goodbye...";
+									close;
 								}
+								mes "[Aumgarl]";
+								mes "It won't be easy, but";
+								mes "would you help me to find";
+								mes "a doctor...No, anybody";
+								mes "who can cure Lyroo...";
+								next;
+								mes "[Aumgarl]";
+								mes "Anyone who has any information about her illness?? Please...";
+								mes "...*Sob*...";
+								next;
+								select("Yes, Sir.");
+								mes "[Aumgarl]";
+								mes "Oh...";
+								mes "Thank you so much.";
+								mes "If Lyroo can get her health back,";
+								mes "I'll never forget your help.";
+								next;
+								mes "[Aumgarl]";
+								mes "Thank you...";
+								mes "Thank you...";
+								set b_sword,20;
+								close;
 							}
-							break;
+							mes "[Aumgarl]";
+							mes "Well...thank you.";
+							mes "I'm going to try my best to";
+							mes "make her happy until the";
+							mes "very end..";
+							mes "Please come by sometime";
+							mes "to say hi to Lyroo.";
+							close;
 						case 3:
 							mes "[Aumgarl]";
 							mes ".............";
@@ -2551,12 +2650,14 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 							mes "You don't look like";
 							mes "a doctor to me.";
 							next;
-							switch(select("I am a doctor.:I know a famous doctor.:I'll cure her no matter what.")){
+							switch(select("I am a doctor.:I know a famous doctor.:I'll cure her no matter what.")) {
 							case 1:
 								mes "[Aumgarl]";
-								mes "Hoo.......";
+								mes "Ehm...";
 								mes "Do I look like a fool to you?";
-								mes "I hate people who lie";
+								mes "I hate people who lie like that. Get out of my sight.";
+								mes "Get out of my sight.";
+								mes " ";
 								emotion e_pif;
 								close2;
 								warp "geffen",173,169;
@@ -2565,210 +2666,215 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 								mes "[Aumgarl]";
 								mes "A famous doctor?";
 								mes "I've met all kinds of";
-								mes "doctors around.";
-								mes "I probably have met that";
-								mes "doctor already.";
-								break;
+								mes "famous doctors. I've";
+								mes "probably met whoever";
+								mes "you may know already.";
+								close;
 							case 3:
 								mes "[Aumgarl]";
 								mes "................";
 								mes "You want to cure her";
 								mes "no matter what?";
 								mes "How're going to do that?";
-								mes "What if it turns worse?";
+								mes "What if it turns worse,";
 								mes "Huh?";
 								next;
 								mes "[Aumgarl]";
-								mes "No more of your bragging.";
-								mes "Please go away.";
-								break;
+								mes "I'm tired of your bragging.";
+								mes "Please just leave us alone.";
+								close;
 							}
-							break;
 						}
-						break;
 					case 3:
 						mes "[Aumgarl]";
 						mes ".................";
-						mes "Thanks for your concern..";
+						mes "Thanks for your concern...";
 						mes "but you're a stranger to us.";
 						mes "I can't let you do that.";
 						mes "Thanks anyways.";
-						break;
+						close;
 					}
-					break;
 				}
-				break;
 			case 3:
 				mes "[Aumgarl]";
 				mes ".........";
-				mes "Umm........";
-				mes "I'm sorry but";
-				mes "I am so exhausted.";
-				mes "Can't help you..";
-				break;
+				mes "Umm...";
+				mes "I'm sorry, but I am";
+				mes "very tired right now.";
+				mes "Can't help you...";
+				close;
 			}
-			break;
 		case 20:
 		case 21:
 		case 22:
 		case 23:
-			mes "Ahh........";
-			mes "Go to place where it's";
-			mes "crowd of people.";
-			mes "And you'll get some informations.";
-			mes "I'm counting on you.";
-			break;
+			mes "[Aumgarl]";
+			mes "Hmmm...";
+			mes "Why don't you try looking";
+			mes "someplace that's always";
+			mes "crowded with people. I'm";
+			mes "sure there must be someone";
+			mes "out there who knows...";
+			close;
 		case 24:
 		case 25:
 		case 26:
-			mes "Ahh....";
-			mes "Lyroo is upstairs.";
-			mes "She's in pain.";
-			mes "Don't talk to her too long.";
-			break;
+			mes "[Aumgarl]";
+			mes "Ahh...";
+			mes "Lyroo is upstairs...";
+			mes "Bue she's in pain.";
+			mes "Try not to talk to her";
+			mes "for too long.";
+			close;
 		case 27:
-			mes "Oh....";
+			mes "[Aumgarl]";
+			mes "Oh my...";
 			mes "Thank you...";
-			mes "I never thought you'll";
-			mes "help me.";
-			mes "Go ahead see Lyroo.";
-			break;
+			mes "I never thought you'd";
+			mes "really help me.";
+			mes "Go ahead and see Lyroo.";
+			close;
 		case 28:
+			mes "[Aumgarl]";
 			mes "Thank you so much...";
 			mes "Without your help...";
 			emotion e_sob;
-			mes "it was meaningless.";
+			mes "it would have been hopeless.";
 			next;
 			mes "[Aumgarl]";
 			mes "Alright....";
 			mes "Is there anything I can";
-			mes "do for you?";
-			mes "I want to return your favor somehow.";
+			mes "do for you? I want to";
+			mes "return your favor somehow.";
 			next;
-			if (select("No..I don't need anything.:Would you repair the sword for me?") == 1) {
+			switch(select("No...I don't need anything.:Would you repair the sword for me?")) {
+			case 1:
 				mes "[Aumgarl]";
-				mes "Hmm....";
-				mes "Well..";
+				mes "Hmm...";
 				mes "Whenever you have a favor to ask,";
-				mes "come and find me.";
-				mes "I'll try my best to help you.";
+				mes "come and find me. I'll do";
+				mes "my best to help you.";
 				set b_sword,29;
-			} else {
+				close;
+			case 2:
 				mes "[Aumgarl]";
 				mes "Hmm....";
-				mes "Show me the sword.";
+				mes "Show me this sword.";
 				mes "I need to take a look at it first";
 				mes "to find out whether I can repair it or not.";
 				next;
-				mes "^0000FF Showed the pieces of broken sword";
-				mes "to Aumgarl.";
+				mes "^0000FFYou Show the pieces of the";
+				mes "broken sword to Aumgarl.";
 				mes "....................";
 				mes "Aumgarl took a careful look";
-				mes "at the pieces for awhile..^000000";
+				mes "at the pieces for awhile...^000000";
 				next;
-				mes "................";
-				mes "............";
-				mes "........";
-				mes "......";
+				mes "...";
+				mes "...";
+				mes "...";
+				mes "...";
 				next;
 				mes "[Aumgarl]";
-				mes "Umm.....";
-				mes "Well.....";
-				mes "It's not possible to get into";
-				mes "work right away.";
-				mes "I need some materials.";
+				mes "Hmm...";
+				mes "It's not possible to start work";
+				mes "immediately. I'll need";
+				mes "some materials.";
 				next;
 				mes "[Aumgarl]";
-				mes "To repair this sword, we need";
-				mes "some materials.";
-				mes "Since Lyroo is upstairs in pain.";
+				mes "To repair this sword, I need";
+				mes "to restock my supplies.";
+				mes "Since Lyroo is upstairs in pain,";
 				mes "I don't think I can leave the house.";
 				next;
 				mes "[Aumgarl]";
-				mes "so....would you get the";
+				mes "So...could you get the";
 				mes "materials for me?";
 				mes "I am sorry I am asking";
-				mes "you too much to do.";
+				mes "you to do this, as well.";
 				next;
-				if (select("Umm..let's do it next time.:Alright, I'll go get them.") == 1){
+				if (select("Umm...let's do it next time.:Alright, I'll go get them.") == 1) {
 					mes "[Aumgarl]";
 					mes "Umm.....";
 					mes "I am sorry I can't";
 					mes "help you right away.";
 					mes "Come back here when";
 					mes "you need my help then.";
-				} else {
-					mes "[Aumgarl]";
-					mes "Oh~~ really?";
-					mes "Thank you.";
-					mes "I'm sure I'll repair it for you.";
-					mes "Now, listen carefully.";
-					next;
-					mes "[Aumgarl]";
-					mes "^FF00FF One Anvil";
-					mes "2 Oridecon Stones";
-					mes "5 Broken Swords";
-					mes "2 Steels";
-					mes "1 Hammer of Blacksmith";
-					mes "2 Star Crumbs";
-					mes "5 Live Coals^000000";
-					next;
-					mes "[Aumgarl]";
-					mes "Quite alot huh?";
-					mes "They are necessities";
-					mes "We need them to repair the sword.";
-					mes "I'll go find some other materials.";
-					set b_sword,30;
+					close;
 				}
+				mes "[Aumgarl]";
+				mes "Oh~~ really?";
+				mes "Thank you!";
+				mes "I'm sure I can repair it for you.";
+				mes "Now, listen carefully,";
+				mes "this is what I will need-";
+				next;
+				mes "[Aumgarl]";
+				mes "^FF00FF One Anvil";
+				mes "2 Rough Oridecons";
+				mes "5 Broken Swords";
+				mes "2 Steels";
+				mes "1 Hammer of Blacksmith";
+				mes "2 Star Crumbs";
+				mes "5 Live Coals^000000";
+				next;
+				mes "[Aumgarl]";
+				mes "It's quite a lot, huh?";
+				mes "But these are the necessary";
+				mes "supplies we need to repair the sword.";
+				mes "I'll go find some other materials.";
+				set b_sword,30;
+				close;
 			}
-			break;
 		case 29:
+			mes "[Aumgarl]";
 			mes "Oh~ It's you.";
-			mes "Got any favor to ask?";
+			mes "Got any favors to ask?";
 			mes "I'll do my best";
 			mes "to help you.";
 			next;
-			if (select("Maybe next time..:Please repair this sword for me.") == 1) {
+			switch(select("Maybe next time...:Please repair this sword for me.")) {
+			case 1:
 				mes "[Aumgarl]";
-				mes "Well..";
-				mes "Whenever you have a favor to ask,";
-				mes "come and find me.";
-			} else {
+				mes "Well...";
+				mes "If you ever have a favor to";
+				mes "ask, come and find me.";
+				close;
+			case 2:
 				mes "[Aumgarl]";
 				mes "Hmm....";
-				mes "Show me the sword.";
+				mes "Show me this sword.";
 				mes "I need to take a look at it first";
 				mes "to find out whether I can repair it or not.";
 				next;
-				mes "^0000FF Showed the pieces of broken sword";
-				mes "to Aumgarl.";
+				mes "^0000FFYou show the pieces of the";
+				mes "broken sword to Aumgarl.";
 				mes "....................";
 				mes "Aumgarl took a careful look";
-				mes "at the pieces for awhile..^000000";
+				mes "at the pieces for a while...^000000";
 				next;
-				mes "................";
-				mes "............";
-				mes "........";
-				mes "......";
+				mes "...";
+				mes "...";
+				mes "...";
+				mes "...";
 				next;
 				mes "[Aumgarl]";
-				mes "Umm.....";
-				mes "Well.....";
-				mes "It's not possible to get into";
-				mes "work right away.";
+				mes "Hmm...";
+				mes "Well,";
+				mes "It's not possible to start work";
+				mes "immediately.";
 				mes "I need some materials.";
 				next;
 				mes "[Aumgarl]";
-				mes "To repair this sword, we need";
-				mes "some materials.";
-				mes "Since Lyroo is upstairs in pain.";
+				mes "To repair this sword, I need";
+				mes "to restock my supplies.";
+				mes "Since Lyroo is upstairs in pain,";
 				mes "I don't think I can leave the house.";
 				next;
 				mes "[Aumgarl]";
-				mes "so....would you get the";
+				mes "So...could you get the";
 				mes "materials for me?";
 				mes "I am sorry I am asking";
-				mes "you too much to do.";
+				mes "you to do this, as well.";
 				next;
 				if (select("Umm..let's do it next time.:Alright, I'll go get them.") == 1) {
 					mes "[Aumgarl]";
@@ -2777,52 +2883,18 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 					mes "help you right away.";
 					mes "Come back here when";
 					mes "you need my help then.";
-				} else {
-					mes "[Aumgarl]";
-					mes "Oh~~ really?";
-					mes "Thank you.";
-					mes "I'm sure I'll repair it for you.";
-					mes "Now, listen carefully.";
-					next;
-					mes "[Aumgarl]";
-					mes "^FF00FF1 Anvil";
-					mes "2 Oridecon Stones";
-					mes "5 Broken Swords";
-					mes "2 Steels";
-					mes "1 Hammer of Blacksmith";
-					mes "2 Star Crumbs";
-					mes "5 Live Coals^000000";
-					next;
-					mes "[Aumgarl]";
-					mes "Quite alot huh?";
-					mes "They are necessities";
-					mes "We need them to repair the sword.";
-					mes "I'll go find some other materials.";
-					set b_sword,30;
+					close;
 				}
-			}
-			break;
-		case 30:
-			if (countitem(986) > 0 && countitem(756) > 1 && countitem(7110) > 4 && countitem(999) > 1 && countitem(1005) > 0 && countitem(1000) > 1 && countitem(7098) > 4) {
-				mes "Oh~~ good, you got them all.";
-				mes "Alright, come back later,";
-				mes "I'll have it repaired.";
-				delitem 986,1; // Anvil
-				delitem 756,2; // Oridecon_Stone
-				delitem 7110,5; // Vroken_Sword
-				delitem 999,2; // Steel
-				delitem 1005,1; // Hammer_Of_Blacksmith
-				delitem 1000,2; // Star_Crumb
-				delitem 7098,5; // Live_Coal
-				set b_sword,31;
-			} else {
-				mes "Hmm.....";
-				mes "Not ready yet?";
-				mes "Materials you need are...";
+				mes "[Aumgarl]";
+				mes "Oh~~ really?";
+				mes "Thank you!";
+				mes "I'm sure I can repair it for you.";
+				mes "Now, listen carefully,";
+				mes "this is what I will need-";
 				next;
 				mes "[Aumgarl]";
-				mes "^FF00FF1 Anvil";
-				mes "2 Oridecon Stones";
+				mes "^FF00FF One Anvil";
+				mes "2 Rough Oridecons";
 				mes "5 Broken Swords";
 				mes "2 Steels";
 				mes "1 Hammer of Blacksmith";
@@ -2830,57 +2902,97 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 				mes "5 Live Coals^000000";
 				next;
 				mes "[Aumgarl]";
-				mes "Wrote them down?";
-				mes "I'm almost ready for other materials.";
+				mes "It's quite alot, huh?";
+				mes "These are necessary supplies.";
+				mes "We need them to repair the sword.";
+				mes "I'll go find some other materials.";
+				set b_sword,30;
+				close;
 			}
-			break;
+		case 30:
+			if (countitem(986) > 0 && countitem(756) > 1 && countitem(7110) > 4 && countitem(999) > 1 && countitem(1005) > 0 && countitem(1000) > 1 && countitem(7098) > 4) {
+				mes "[Aumgarl]";
+				mes "Oh, good! You got them all.";
+				mes "Alright, come back later,";
+				mes "and I'll have it repaired.";
+				delitem 986,1; //Anvil
+				delitem 756,2; //Oridecon_Stone
+				delitem 7110,5; //Vroken_Sword
+				delitem 999,2; //Steel
+				delitem 1005,1; //Hammer_Of_Blacksmith
+				delitem 1000,2; //Star_Crumb
+				delitem 7098,5; //Live_Coal
+				set b_sword,31;
+				close;
+			}
+			mes "[Aumgarl]";
+			mes "Hmm.....";
+			mes "Haven't found everything yet?";
+			mes "Here's the list again-";
+			next;
+			mes "[Aumgarl]";
+			mes "^FF00FF 1 Anvil";
+			mes "2 Rough Oridecons";
+			mes "5 Broken Swords";
+			mes "2 Steels";
+			mes "1 Hammer of Blacksmith";
+			mes "2 Star Crumbs";
+			mes "5 Live Coals^000000";
+			next;
+			mes "[Aumgarl]";
+			mes "Wrote them down?";
+			mes "I've almost found the other materials.";
+			close;
 		case 31:
 			if (rand(1,5) == 2) {
+				mes "[Aumgarl]";
 				mes "Hey, you're back.";
-				mes "Here it is.";
-				mes "This sword is a great one";
-				mes "for sure. I've noticed at";
-				mes "the first sight.";
-				mes "huhu.....";
+				mes "Here it is! This sword";
+				mes "is a great one, for";
+				mes "sure. I noticed that at";
+				mes "first sight.";
+				mes "Indeed...";
 				next;
 				mes "[Aumgarl]";
-				mes "I haven't seen this kind of";
-				mes "great sword for a long";
-				mes "time in my life.";
+				mes "I haven't seen quality";
+				mes "of this magnitude in a";
+				mes "in a long time.";
 				mes "I envy you...";
-				mes "Huhuhu......";
+				mes "Hehehe......";
 				next;
 				mes "'You received repaired";
 				mes "'^FF0000SaYumMoon's sword^000000'.";
 				set b_sword,32;
-				getitem 1123,1; // Haedonggum
-			} else {
-				mes "Umm.. it's not done yet.";
-				mes "Would you give me little";
-				mes "more time? It takes longer";
-				mes "than I thought. sorry.";
+				getitem 1123,1; //Haedonggum
+				close;
 			}
-			break;
+			mes "[Aumgarl]";
+			mes "Umm... it's not done yet.";
+			mes "Would you give me a little";
+			mes "bit more time? It's taking";
+			mes "longer than I thought. Sorry.";
+			close;
 		}
-	} else {
-		mes "Thank you...";
-		mes "You've been a great help";
-		mes "to us.";
-		mes "Hope my work had";
-		mes "helped you.";
 	}
+	mes "[Aumgarl]";
+	mes "Thank you...";
+	mes "You've been a great help";
+	mes "to us. I hope my work";
+	mes "has been of some use to you.";
 	close;
 }
 
 geffen_in,106,106,7	script	Girl#gnbs2	716,{
-	mes "[Lyroo]";
 	if (b_sword < 20) {
+		mes "[Lyroo]";
 		mes "Ah...Ah....";
 		mes "Ah...Hi.......";
 		next;
-		mes "^0000FFThis girl seemed to be in serious pain.^000000";
+		mes "^0000FFThis girl seems to be in serious pain...^000000";
 		close;
-	} else if (b_sword < 24) {
+	}
+	else if (b_sword < 24) {
+		mes "[Lyroo]";
 		mes "Aaa....Aaa....";
 		mes "you...you....";
 		mes "you are the....one...";
@@ -2891,157 +3003,179 @@ geffen_in,106,106,7	script	Girl#gnbs2	716,{
 		mes "..tha... thank you....";
 		next;
 		mes "^0000FFBetter stop talking to her and";
-		mes "rush to find a way to cure her.^000000";
+		mes "hurry and find a cure.^000000";
 		close;
-	} else if (b_sword == 24 || b_sword == 25 || b_sword == 26) {
+	}
+	else if (b_sword == 24 || b_sword == 25 || b_sword == 26) {
+		mes "[Lyroo]";
 		mes "Ahh...ahh....";
-		if (sex == 0) {
+		if (Sex == 0)
 			mes "It's ..you.. pretty...sister..";
-		} else {
+		else
 			mes "It's ..you.. handsome...brother..";
-		}
-		mes "ah he he....";
+		mes "Ahh...heh heh...";
 		next;
-		if (select("Ask about her health condition.:Talk to her for a while.") == 1){
-			mes "[Lyroo]";
+		if (select("Ask about her health condition.:Talk to her for a while.") == 1) {
 			if (rand(1,4) == 3) {
-				mes "uh....umm...?";
-				mes "umm... I...";
+				mes "[Lyroo]";
+				mes "Uh....umm...?";
+				mes "Umm... I...";
 				mes "I can't talk...too long..";
-				mes "so.. listen....carefully..please...";
+				mes "So...listen....";
+				mes "carefully..please...";
 				next;
 				mes "[Lyroo]";
-				mes "^0030FFMy body..repeatedly turns cold and hot...";
-				mes "....no sweating on my body...";
-				mes "..and get paralyzed ...quite often..and..";
-				mes "my heart beats ...irregularly.^000000";
+				mes "^0030FFMy body...repeatedly turns cold and";
+				mes "hot... I'm not sweating at all...";
+				mes "....But I'm paralyzed...often";
+				mes "often..and...my heart beats...";
+				mes "...irregularly.^000000";
 				next;
 				mes "[Lyroo]";
-				mes "Ahh...Ahh.";
+				mes "Ahh...hah~";
 				mes "...........";
-			} else {
-				mes "I...am...so...";
-				mes "...tired.";
-				mes ".............";
+				next;
+				mes "^0000FFShe seems to have fallen asleep.^000000";
+				close;
 			}
-		} else {
 			mes "[Lyroo]";
-			mes "Ahh........";
-			mes "I..want to ...talk to...you..";
-			mes "but.... sorry....";
+			mes "I...am...so...";
+			mes "...tired.";
+			mes ".............";
+			next;
+			mes "^0000FFShe seems to have fallen asleep.^000000";
+			close;
 		}
+		mes "[Lyroo]";
+		mes "Ahh........";
+		mes "I..want to ...talk to...you..";
+		mes "but.... sorry....";
 		next;
-		mes "^0000FFshe seems to have fallen asleeep.^000000";
+		mes "^0000FFShe seems to have fallen asleep.^000000";
 		close;
-	} else if (b_sword == 27) {
+	}
+	else if (b_sword == 27) {
+		mes "[Lyroo]";
 		mes "uh...umm?";
-		if (sex == 0) {
-			mes "Ah....It's you pretty sister...";
-		} else {
-			mes "Ah....It's you handsome brother...";
-		}
-		if (countitem(606) > 0) {
-			mes "uh?..what is that you have?";
-			next;
-			if (select("It's nothing.:It's your medicine.") == 1 || countitem(606) < 1){
-				mes "[Lyroo]";
-				mes "umm......";
-				mes "ok....";
-				mes "...........";
-				close;
-			}
+		if (Sex == 0)
+			mes "Ah....It's you, pretty sister...";
+		else
+			mes "Ah....It's you, handsome brother...";
+		mes "Uhm? what is that you have?";
+		next;
+		if (select("It's nothing.:It's your medicine.") == 1) {
 			mes "[Lyroo]";
-			mes "Ah!";
-			mes "you found the medicine~";
-			mes "Ah..hehe...";
-			delitem 606,1; // Aloebera
+			mes "Oh...";
+			mes "Alright...";
+			mes "...";
 			next;
-			mes "^0000FFYou gave her a medicine you";
-			mes "received from Cylrnel.";
-			mes "After taking a medicine, Lyroo";
-			mes "fell in asleep.^000000";
-			set b_sword,28;
-		}
-		close;
-	} else {
-		mes "ehehe...";
-		if (sex == 0) {
-			mes "Thank you my pretty sister.";
-		} else {
-			mes "Thank you my handsome brother.";
+			mes "^0000FFYou really should be giving her the medicine.^000000";
+			close;
 		}
-		mes "I'll have my health back";
-		mes "and be a strong girl. hehe";
+		mes "[Lyroo]";
+		mes "Ah!";
+		mes "You found the medicine~!";
+		mes "I'm...so relieved...";
+		next;
+		mes "^0000FFYou gave her the medicine you";
+		mes "received from Cylrnel.";
+		mes "After taking the medicine, Lyroo";
+		mes "fell asleep.^000000";
+		delitem 606,1; //Aloebera
+		set b_sword,28;
 		close;
 	}
+	mes "[Lyroo]";
+	mes "Heehehe...";
+	if (Sex == 0)
+		mes "Thank you my pretty sister.";
+	else 
+		mes "Thank you handsome brother~";
+	mes "I'll get my health back";
+	mes "and be a strong girl!";
+	close;
 }
 
-prontera,275,86,2	script	Young man#SaYumMoon"	97,{
-	mes "[Neil]";
+prontera,275,86,2	script	Young man#SaYumMoon	97,{
 	if (b_sword < 20) {
-		mes "It's so good to be helathy.";
-		mes "If you stay in hospital laying";
-		mes "down on the bed all day long,";
-		mes "It'll make you feel depressed.";
-		next;
 		mes "[Neil]";
-		mes "Take care of your health";
-		mes "all the time.";
-		mes "Health is the best of all.";
-	} else {
-		mes "Not long ago, I was in hospital";
-		mes "laying down on the bed for";
-		mes "quite a long time.";
-		mes "And I met this ^FF5000doctor from Yuno^000000.";
-		mes "She helped me to recover in no time.";
-		mes "Yet, I can't run around though.";
+		mes "Oh man, it feels so good";
+		mes "to be out of the hospital...";
+		mes "I thought I was going to be";
+		mes "there forever~!";
 		next;
 		mes "[Neil]";
-		mes "However, I can't believe I got";
-		mes "my health back. It's like a";
-		mes "miracle. Hope I can be someone like";
-		mes "her who can cure others.";
-		if (b_sword == 20) set b_sword,21;
+		mes "Listen guy, appreciate";
+		mes "your health, 'cuz almost";
+		mes "nothing is worse than";
+		mes "being really really sick...";
+		close;
 	}
+	mes "[Neil]";
+	mes "Not long ago, I was in the";
+	mes "hospital, stuck lying in bed...";
+	mes "No one knew what was wrong";
+	mes "with me...but I grew weaker";
+	mes "everyday...";
+	next;
+	mes "[Neil]";
+	mes "But then, this ^FF5000doctor from Juno^000000";
+	mes "arrived, and she helped me";
+	mes "recover in no time!";
+	mes "Though...I still can't walk so well.";
+	next;
+	mes "[Neil]";
+	mes "All the other doctors had said";
+	mes "my case was hopeless, and that";
+	mes "I'd never recover. Luckily,";
+	mes "this Juno doctor was able to";
+	mes "find a cure...";
+	next;
+	mes "[Neil]";
+	mes "It was a miracle!";
+	mes "I'm so happy to be alive!";
+	if (b_sword == 20) set b_sword,21;
 	close;
 }
 
 yuno,208,164,4	script	Active little girl#gnbs	101,{
-	mes "[Hisa]";
 	if (b_sword < 21) {
-		mes "Ahhmm.....";
+		mes "[Hisa]";
+		mes ".....";
 		mes "This town is so boring.";
-		mes "No events, no festivals..";
-		mes "and all the people stay in";
-		mes "their home studying this and that.";
+		mes "No events, no festivals...";
+		mes "All people do all day is stay at";
+		mes "at home and study. How dull!";
 		close;
 	}
-	mes "But still, there's one person";
-	mes "I respect. Her name is ^FF5500Cylrnel^000000.";
-	mes "She is an expert in medical treatment.";
-	mes "Moreover, whenever someone becomes";
-	mes "sick in the town, she comes right";
-	mes "away to cure that person..";
+	mes "[Hisa]";
+	mes "There's one person in Juno that";
+	mes "I still respect. Her name is ^FF5500Cylrnel^000000.";
+	next;
+	mes "[Hisa]";
+	mes "She's an expert in medical";
+	mes "treatment. Whenever someone falls";
+	mes "ill in this town, she comes to";
+	mes "cure that person right away...";
 	next;
 	mes "[Hisa]";
-	mes "She tells me lots of stories";
-	mes "she experienced. It's so";
-	mes "interesting to hear them.";
-	mes "She also made jorney round the";
-	mes "world.... Ah ha.....";
+	mes "She also tells me lots of";
+	mes "interesting stories about";
+	mes "her experiences. She's even";
+	mes "made a journey around the";
+	mes "world... It's so interesting!";
 	next;
 	mes "[Hisa]";
-	mes "She's probably at her home.";
-	mes "She came back from a trip.";
-	mes "haha......";
+	mes "She's probably at home after";
+	mes "coming back from some trip.";
+	mes "Haha~";
 	if (b_sword == 21) set b_sword,22;
 	if (rand(1,2) == 2) {
 		next;
 		mes "[Hisa]";
-		mes "Ah~!";
-		mes "She's also known as an";
-		mes "fickle woman.";
-		mes "Better watch out. haha..";
+		mes "Oh right~!";
+		mes "She's also known to be a fickle";
+		mes "and forgetful woman. So you'd better watch out, hehe~";
 	}
 	close;
 }
@@ -3049,188 +3183,247 @@ yuno,208,164,4	script	Active little girl#gnbs	101,{
 yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 	if (b_sword < 23) {
 		mes "[??????]";
-		mes "I have no idea who you are";
-		mes "but would you mind to leave me alone?";
-		mes "I am really busy right now.";
-	} else if (b_sword < 27) {
-		mes "[Cylrnel]";
-		switch (b_sword) {
+		mes "I don't believe we've met";
+		mes "before, but would you mind";
+		mes "coming back later? I've got a lot of work to do at the moment.";
+		close;
+	}
+	else if (b_sword < 27) {
+		switch(b_sword) {
 		case 23:
-			mes "How can I help you?";
-			mes "If it's not urgent, please";
-			mes "come back next time.";
-			next;
 			mes "[Cylrnel]";
+			mes "Hello, can I help you?";
+			mes "If it's not urgent,";
+			mes "please come back later.";
+			next;
 			if (rand(1,4) == 2) {
-				mes "...............";
-				mes "Need to ask me something?";
+				mes "[Cylrnel]";
+				mes "Hmm...you look like you";
+				mes "want to ask me something?";
 				next;
 				if (select("You're so beautiful.:Do you like traveling?") == 1) {
-					mes "[Cylrnel]";
 					if (rand(1,4) == 4) {
-						mes "..excuse me?";
+						mes "[Cylrnel]";
+						mes "...excuse me?";
 						mes "Ah ha ha~";
 						mes "You're a funny guy.";
-						mes "Trying to work on me?";
+						mes "Trying to hit on me?";
 						mes "Ah ha ha ha.";
 						next;
-						if (select("Yes, I fell in love in first sight.:I have a favor to ask.") == 1) {
-							mes "[Cylrnel]";
+						if (select("Yes, I fell in love at first sight.:I have a favor to ask.") == 1) {
 							if (rand(1,3) == 3) {
-								mes "Ahhaha...Ahahaha...";
-								mes "Ah..I'm sorry..";
+								mes "[Cylrnel]";
+								mes "HAHAHAHHAHAHAHAH!";
+								mes "Ah...I'm sorry..";
 								mes "I haven't seen a guy like you";
 								mes "for a long time.";
+								emotion e_heh;
 								next;
 								mes "[Cylrnel]";
-								mes "It makes me laugh..haha.";
-								mes "Guess what?";
-								mes "I know you're not here";
-								mes "to work on me.";
-								mes "What business do you have?";
+								mes "You make me laugh...";
+								mes "But guess what?";
+								mes "I already know you're not";
+								mes "here to hit on me.";
+								mes "So what did you really want?";
 								next;
-								menu "Well, actually...",-;
-								mes "^FF0000Told Cylrnel about Lyroo.";
-								mes "And also about favor of blacksmith, Aumgarl.^000000";
+								select("Well, actually...");
+								mes "^FF0000You Tell Cylrnel about Lyroo,";
+								mes "and about the favor for Aumgarl the blacksmith.^000000";
 								next;
-								mes "[Cylrnel]";
 								if (rand(1,3) == 2) {
-									mes "Um.....";
-									mes "that's what happened..";
-									mes "Oh, well..";
-									mes "I need exact symptoms of a girl.";
-									mes "Go find exact symptoms first";
-									mes "and come back again.";
+									mes "[Cylrnel]";
+									mes "Hmm.....";
+									mes "So that's what happened...";
+									mes "Well, I need to know the";
+									mes "exact symptoms...go and";
+									mes "find out for me and then";
+									mes "come back afterwards.";
 									next;
 									mes "[Cylrnel]";
-									mes "Without exact symptoms,";
-									mes "I can't make any diagnose.";
+									mes "Without the exact symptoms, I can't make an accurate diagnosis.";
 									set b_sword,24;
-								} else {
-									mes "Umm.......";
-									mes "Quite a long story..";
-									mes "I have no idea why you're";
-									mes "trying to help these people,";
-									mes "but, it's hard to believe you.";
-									mes "Why don't you find some other doctor?";
+									close;
 								}
-							} else {
-								mes "Ah!";
-								mes "I never thought someone";
-								mes "like you still exist.";
-								mes "I am sorry but, I am";
-								mes "tired with this crap.";
+								mes "[Cylrnel]";
+								mes "Well now...";
+								mes "That's quite a long story.";
+								next;
+								mes "[Cylrnel]";
+								mes "I have no idea why you're";
+								mes "trying to help these people,";
+								mes "so it's a bit hard to believe";
+								mes "you...";
+								close;
 							}
-						} else {
 							mes "[Cylrnel]";
-							if (rand(1,3) == 3) {
-								mes "Huhu...";
-								mes "well...";
-								mes "Let me hear your story.";
-								next;
-								menu "Actually...",-;
-								mes "^FF0000Told Cylrnel about Lyroo.";
-								mes "And also about favor of blacksmith, Aumgarl.^000000";
+							mes "Oh brother!";
+							mes "I never thought someone";
+							mes "like you could still exist.";
+							mes "I'm sorry, but you're";
+							mes "really not my type.";
+							close;
+						}
+						if (rand(1,3) == 3) {
+							mes "[Cylrnel]";
+							mes "Is that so?";
+							mes "well then,";
+							mes "Let me hear your story.";
+							next;
+							select("Well, it's like this...");
+							mes "^FF0000You Tell Cylrnel about Lyroo,";
+							mes "and about the favor of Aumgarl the blacksmith.^000000";
+							next;
+							if (rand(1,3) == 2) {
+								mes "[Cylrnel]";
+								mes "Hmm.....";
+								mes "So that's what happened...";
+								mes "Well, I need to know the";
+								mes "exact symptoms...go and";
+								mes "find out for me and then";
+								mes "come back afterwards.";
 								next;
 								mes "[Cylrnel]";
-								if (rand(1,3) == 1) {
-									mes "Um.....";
-									mes "that's what happened..";
-									mes "Oh, well..";
-									mes "I need exact symptoms of a girl.";
-									mes "Go find exact symptoms first";
-									mes "and come back again.";
-									next;
-									mes "[Cylrnel]";
-									mes "Without exact symptoms,";
-									mes "I can't make any diagnose.";
-									set b_sword,24;
-								} else {
-									mes "Umm.......";
-									mes "Quite a long story..";
-									mes "I have no idea why you're";
-									mes "trying to help these people,";
-									mes "but, it's hard to believe you.";
-									mes "Why don't you find some other doctor?";
-								}
-							} else {
-								mes "Huhu..";
-								mes "Well...";
-								mes "You're no differ with";
-								mes "any other guys around.";
-								mes "I don't have any bussiness";
-								mes "with you. please leave.";
-								close2;
-								warp "yuno",246,143;
-								end;
+								mes "Without the exact symptoms, I can't make an accurate diagnosis.";
+								set b_sword,24;
+								close;
 							}
+							mes "[Cylrnel]";
+							mes "Well now...";
+							mes "That's quite a long story.";
+							next;
+							mes "[Cylrnel]";
+							mes "I have no idea why you're";
+							mes "trying to help these people,";
+							mes "so it's a bit hard to believe";
+							mes "you...";
+							close;
 						}
-					} else {
-						mes "Ahhaha..";
-						mes "You're a funny guy.";
-						mes "But, that doesn't";
-						mes "work on me.";
+						mes "[Cylrnel]";
+						mes "Well...";
+						mes "While I'd like to help,";
+						mes "You're a stranger, and the";
+						mes "residents need my help.";
+						mes "I don't have any extra time";
+						mes "to help you. Please leave.";
+						close2;
+						warp "yuno",246,143;
+						end;
 					}
-				} else {
 					mes "[Cylrnel]";
-					mes "Hmm.. Yes.. but,";
-					mes "if you don't have ";
-					mes "any business to take care,";
-					mes "please leave, I'm pretty busy right now.";
+					mes "Ahahaha..";
+					mes "You're a funny guy.";
+					mes "But, that won't";
+					mes "work on me!";
+					close;
 				}
-			} else {
-				mes "I am sorry, I don't have a time to waste.";
+				mes "[Cylrnel]";
+				mes "Err...well, I do, but...";
+				mes "If you don't have any";
+				mes "favors to ask, please leave.";
+				mes "I'm very busy right now.";
+				close;
 			}
-			break;
+			mes "[Cylrnel]";
+			mes "I'm sorry, but I don't have";
+			mes "any time for you right now.";
+			close;
 		case 24:
-			mes "Oh..";
-			mes "you're back..";
-			mes "Did you find the right symptoms?";
+			mes "[Cylrnel]";
+			mes "Oh, you're back...";
+			mes "Did you figure out the symptoms?";
 			mes "I wanted to go with you, but";
-			mes "I been really busy.";
+			mes "I've been really busy.";
 			next;
-			if(select("Not yet...:Yes, Here.") == 1){
+			if (select("Not yet...:Yes, Here.") == 1) {
 				mes "[Cylrnel]";
-				mes "You're still here?";
-				mes "Go right away!";
-				mes "She's in serious pain.";
+				mes "What! Why not!?";
+				mes "Hurry to her house!";
+				mes "She's in serious pain!";
 				mes "Her body could be paralyzed";
-				mes "in any minute!";
+				mes "at any moment!";
 				close;
 			}
 			mes "[Cylrnel]";
-			mes "What a relief..";
+			mes "What a relief...";
 			mes "You're earlier than I thought.";
 			mes "I'll ask you some questions about";
 			mes "her condition. Answer correctly.";
 			next;
 			mes "[Cylrnel]";
-			mes "First, How was her body temperature?";
-			set @sick,0;
+			mes "First, how was her body temperature?";
+			set sick,0;
 			next;
-			setarray .sick1$[1],"Very hot.","Very cold.","Normal.","Turns hot and cold repeatedly.";
-			set @sick1,select(.sick1$[1],.sick1$[2],.sick1$[3],.sick1$[4]);
-			if (@sick1 == 4) set @sick,@sick+1;
+			switch(select("Very hot.:Very cold.:Normal.:Turns hot and cold repeatedly.")) {
+			case 1:
+				set .@sick1$,"Very hot.";
+				break;
+			case 2:
+				set .@sick1$,"Very cold.";
+				break;
+			case 3:
+				set .@sick1$,"Normal.";
+				break;
+			case 4:
+				set .@sick1$,"Turns hot and cold repeatedly";
+				set .@sick,.@sick+1;
+				break;
+			}
 			mes "[Cylrnel]";
-			mes "Ok.";
+			mes "Okay...";
 			mes "Now, about physiological condition.";
 			next;
-			setarray .sick2$[1],"No sweating at all.","Sweating all over the body.","Runny nose.","No tears, sweats at all.";
-			set @sick2,select(.sick2$[1],.sick2$[2],.sick2$[3],.sick2$[4]);
-			if (@sick2 == 1) set @sick,@sick+1;
+			switch(select("No sweating at all.:Sweating all over the body.:Runny nose.:No tears, sweats at all.")) {
+			case 1:
+				set .@sick2$,"No sweating at all.";
+				set .@sick,.@sick+1;
+				break;
+			case 2:
+				set .@sick2$,"Sweating all over the body.";
+				break;
+			case 3:
+				set .@sick2$,"Runny nose.";
+				break;
+			case 4:
+				set .@sick2$,"No tears, sweats at all.";
+				break;
+			}
 			mes "[Cylrnel]";
 			mes "Next, tell me about";
-			mes "her body condition.";
+			mes "her physical condition.";
 			next;
-			setarray .sick3$[1],"Nothing particular.","Become paralyzed often.","Muscles became so soft.","Muscles became so hard.";
-			set @sick3,select(.sick3$[1],.sick3$[2],.sick3$[3],.sick3$[4]);
-			if (@sick3 == 2) set @sick,@sick+1;
+			switch(select("Nothing in particular.:Becomes paralyzed often.:Muscles became soft.:Muscles became hard.")) {
+			case 1:
+				set .@sick3$,"Nothing in particular.";
+				break;
+			case 2:
+				set .@sick3$,"Becomes paralyzed often.";
+				set .@sick,.@sick+1;
+				break;
+			case 3:
+				set .@sick3$,"Muscles became soft.";
+				break;
+			case 4:
+				set .@sick3$,"Muscles became hard.";
+				break;
+			}
 			mes "[Cylrnel]";
-			mes "How about an internal organs?";
+			mes "How about internal organs?";
 			next;
-			setarray .sick4$[1],"Stomach hurts like it's been stabbed by a knife.","Head hurts like it's been smashed by a hammer.","Heart beats irregularly.","Has difficulty in breathing.";
-			set @sick4,select(.sick4$[1],.sick4$[2],.sick4$[3],.sick4$[4]);
-			if (@sick4 == 3) set @sick,@sick+1;
+			switch(select("Stomach hurts like it's been stabbed by a knife.:Head hurts like it's been smashed by a hammer.:Heart beats irregularly.:Has difficulty in breathing.")) {
+			case 1:
+				set .@sick4$,"Stomach hurts like it's been stabbed by a knife.";
+				break;
+			case 2:
+				set .@sick4$,"Head hurts like it's been smashed by a hammer.";
+				break;
+			case 3:
+				set .@sick4$,"Heart beats irregularly.";
+				set .@sick,.@sick+1;
+				break;
+			case 4:
+				set .@sick4$,"Has difficulty in breathing.";
+				break;
+			}
 			mes "[Cylrnel]";
 			mes "Hmm.. alright.";
 			mes "Let me check this.";
@@ -3238,25 +3431,25 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 			mes "..............";
 			next;
 			mes "[Cylrnel]";
-			mes "^FF0000"+.sick1$[@sick1]+"";
-			mes ""+.sick2$[@sick2]+"";
-			mes ""+.sick3$[@sick3]+"";
-			mes ""+.sick4$[@sick4]+"^000000";
+			mes "^FF0000"+.@sick1$+"";
+			mes ""+.@sick2$+"";
+			mes ""+.@sick3$+"";
+			mes ""+.@sick4$+"^000000";
 			mes "right?";
 			next;
-			if(select("No..not exactly..:Yes, I am sure.") == 1){
+			if (select("No..not exactly..:Yes, I am sure.") == 1) {
 				mes "[Cylrnel]";
-				mes "Then, go back to her and";
+				mes "Then go back to her and";
 				mes "find the exact symptoms";
 				mes "right away~!!";
 				close;
 			}
 			mes "[Cylrnel]";
-			mes "You're sure about";
-			mes "this, right?";
-			mes "If they're wrong symptoms, I can't be responsible.";
+			mes "You're sure about this, right?";
+			mes "If they're the wrong symptoms,";
+			mes "I can't be responsible.";
 			next;
-			if(select("Well..let me go and recheck it.:I'm sure.") == 1){
+			if (select("Err..let me go and double check.:I'm sure.") == 1) {
 				mes "[Cylrnel]";
 				mes "Then, go back to her and";
 				mes "find the exact symptoms";
@@ -3270,14 +3463,14 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 			mes "Get them as fast as possible.";
 			mes "Alright?";
 			next;
-			if (@sick == 4) {
+			if (.@sick == 4) {
 				mes "[Cylrnel]";
-				mes "^FF00002 Seeds of Yggdrasil";
+				mes "^FF00002 Yggdrasil Seeds";
 				mes "3 Aloes";
 				mes "1 Witherless Rose";
-				mes "10 Starsands Of Witch";
+				mes "10 Witch Starsands";
 				mes "5 Burning Hearts";
-				mes "5 Ice pieces";
+				mes "5 Ice Cubics";
 				set b_sword,26;
 				next;
 				mes "[Cylrnel]";
@@ -3286,20 +3479,21 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 				mes "We need...";
 				next;
 				mes "[Cylrnel]";
-				mes "^FF00002 Seeds of Yggdrasil";
+				mes "^FF00002 Yggdrasil Seeds";
 				mes "3 Aloes";
 				mes "1 Witherless Rose";
-				mes "10 Starsands Of Witch";
+				mes "10 Witch Starsands";
 				mes "5 Burning Hearts";
-				mes "5 Ice pieces";
+				mes "5 Ice Cubics";
 				next;
-			} else {
+			}
+			else {
 				mes "[Cylrnel]";
-				mes "^FF00001 Seed of Yggdrasil";
+				mes "^FF00001 Yggdrasil Seed";
 				mes "1 Aloe";
-				mes "5 Starsands Of Witch";
+				mes "5 Witch Starsands";
 				mes "3 Burning Hearts";
-				mes "3 Ice pieces";
+				mes "3 Ice Cubics";
 				set b_sword,25;
 				next;
 				mes "[Cylrnel]";
@@ -3308,28 +3502,24 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 				mes "We need...";
 				next;
 				mes "[Cylrnel]";
-				mes "^FF00001 Seed of Yggdrasil";
+				mes "^FF00001 Yggdrasil Seed";
 				mes "1 Aloe";
-				mes "5 Starsands Of Witch";
+				mes "5 Witch Starsands";
 				mes "3 Burning Hearts";
-				mes "3 Ice pieces";
+				mes "3 Ice Cubics";
 				next;
 			}
 			mes "[Cylrnel]";
 			mes "Get them as fast as possible.";
 			mes "There isn't much time for Lyroo.";
-			break;
+			close;
 		case 25:
-			if (countitem(608) > 0 && countitem(704) > 0 && countitem(1061) > 4 && countitem(7097) > 2 && countitem(7066) > 2) {
-				mes "Hmm....";
-				mes "Good. you got them all.";
-				mes "Let me see..";
+			if (countitem(608) > 0 && countitem(704) > 0 && countitem(1061) > 2 && countitem(7066) > 2) {
+				mes "[Cylrnel]";
+				mes "Hmm...";
+				mes "Good, you got them all.";
+				mes "Let me see now...";
 				mes ".............";
-				delitem 608,1; // Seed_Of_Yggdrasil
-				delitem 704,1; // Aloe
-				delitem 1061,5; // Starsand_Of_Witch
-				delitem 7097,3; // Burning_Heart
-				delitem 7066,3; // Ice_Piece
 				next;
 				mes "^FF0000Cylrnel began to mix";
 				mes "the ingredients.";
@@ -3340,53 +3530,53 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 				next;
 				mes "[Cylrnel]";
 				mes "............";
-				mes "What!?!?";
-				mes ".....";
-				mes "Hey you....";
-				mes "You gave me a wrong information.";
+				mes "What the?!?!";
+				mes "...";
+				mes "Hey you...";
+				mes "You gave me the wrong information!";
+				delitem 608,1; //Seed_Of_Yggdrasil
+				delitem 704,1; //Aloe
+				delitem 1061,5; //Starsand_Of_Witch
+				delitem 7097,3; //Burning_Heart
+				delitem 7066,3; //Ice_Piece
 				set b_sword,24;
 				next;
 				mes "[Cylrnel]";
-				mes "I made the mecine according";
-				mes "to the symptoms you told me.";
-				mes "But, it became strange medicine!";
-				mes "Bring me the exact symptoms!";
-				close2;
-				warp "yuno",246,143;
-				end;
-			} else {
-				mes "...........";
-				mes "Hey~ you don't have all";
-				mes "the ingredients yet.";
-				mes "Go get them all right away.";
-				next;
-				mes "[Cylrnel]";
-				mes "^FF00001 Seed of Yggdrasil";
-				mes "1 Aloe";
-				mes "5 Starsands Of Witch";
-				mes "3 Burning Hearts";
-				mes "3 Ice pieces";
-				next;
-				mes "[Cylrnel]";
-				mes "Alright?";
-				mes "Now, hurry!.";
+				mes "I've chosen the ingredients";
+				mes "according to the symptoms";
+				mes "you've described...";
+				mes "But this isn't medicine!!";
+				mes "Now go and find out her exact symptoms!";
 				close2;
 				warp "yuno",246,143;
 				end;
 			}
-			break;
+			mes "[Cylrnel]";
+			mes "...";
+			mes "Hey~ you don't have all";
+			mes "the ingredients yet.";
+			mes "Go get them all right away.";
+			next;
+			mes "[Cylrnel]";
+			mes "^FF00001 Seed of Yggdrasil";
+			mes "1 Aloe";
+			mes "5 Witch Starsands";
+			mes "3 Burning Hearts";
+			mes "3 Ice Cubics";
+			next;
+			mes "[Cylrnel]";
+			mes "Alright?";
+			mes "Now, hurry up!";
+			close2;
+			warp "yuno",246,143;
+			end;
 		case 26:
 			if (countitem(608) > 1 && countitem(704) > 2 && countitem(748) > 0 && countitem(1061) > 9 && countitem(7097) > 4 && countitem(7066) > 4) {
-				mes "Hmm....";
-				mes "Good. you got them all.";
+				mes "[Cylrnel]";
+				mes "Hmm...";
+				mes "Good, you got them all.";
 				mes "Let me see..";
 				mes ".............";
-				delitem 608,2; // Seed_Of_Yggdrasil
-				delitem 704,3; // Aloe
-				delitem 748,1; // Witherless_Rose
-				delitem 1061,10; // Starsand_Of_Witch
-				delitem 7097,5; // Burning_Heart
-				delitem 7066,5; // Ice_Piece
 				next;
 				mes "^FF0000Cylrnel began to mix";
 				mes "the ingredients.";
@@ -3396,98 +3586,210 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 				mes "......^000000";
 				next;
 				mes "[Cylrnel]";
-				mes "Here~!";
-				mes "It's done.";
-				mes "I don't think this medicine would";
-				mes "cure her disease completely. However,";
-				mes "it will alleviate her from the pain.";
+				mes "Here~! It's done...";
+				mes "I don't think this medicine will";
+				mes "cure her disease completely.";
+				mes "However, it will greatly alleviate her pain.";
 				next;
 				mes "[Cylrnel]";
-				mes "It wasn't easy to make this medicine.";
-				mes "Here, take this with you.";
-				mes "Take care then..";
+				mes "It wasn't easy to make this";
+				mes "medicine. Take care, bring";
+				mes "this to Lyroo and give her my regards...";
+				delitem 608,2; //Seed_Of_Yggdrasil
+				delitem 704,3; //Aloe
+				delitem 748,1; //Witherless_Rose
+				delitem 1061,10; //Starsand_Of_Witch
+				delitem 7097,5; //Burning_Heart
+				delitem 7066,5; //Ice_Piece
 				set b_sword,27;
-				getitem 606,1; // Aloebera
-			} else {
-				mes "...........";
-				mes "Hey~ you don't have all";
-				mes "the ingredients yet.";
-				mes "Go get them all right away.";
-				next;
-				mes "[Cylrnel]";
-				mes "^FF00002 Seeds of Yggdrasil";
-				mes "3 Aloes";
-				mes "1 Witherless Rose";
-				mes "10 Starsands Of Witch";
-				mes "5 Burning Hearts";
-				mes "5 Ice pieces";
-				next;
-				mes "[Cylrnel]";
-				mes "Alright?";
-				mes "Go get them as fast as possible.";
+				getitem 606,1; //Aloebera
 				close;
-				warp "yuno",246,143;
-				end;
 			}
-			break;
+			mes "[Cylrnel]";
+			mes "...";
+			mes "Hey~ You don't have all";
+			mes "the ingredients yet.";
+			mes "Go get them all right away!";
+			next;
+			mes "[Cylrnel]";
+			mes "^FF00002 Yggdrasil Seeds";
+			mes "3 Aloes";
+			mes "1 Witherless Rose";
+			mes "10 Witch Starsands";
+			mes "5 Burning Hearts";
+			mes "5 Ice Cubics";
+			next;
+			mes "[Cylrnel]";
+			mes "Alright?";
+			mes "Go get them as fast as possible.";
+			close2;
+			warp "yuno",246,143;
+			end;
 		}
-	} else {
-		mes "[Cylrnel]";
-		mes "Huhu...";
-		mes "How is she doing?";
-		mes "Getting better?.";
-		mes "By taking that medicine, she'll";
-		mes "recover fast.";
-		next;
-		mes "[Cylrnel]";
-		mes "Tell her to come to me";
-		mes "sometimes to get a medical.";
-		mes "treatment. Walking from her";
-		mes "house to here would be a good";
-		mes "exercise too. Name of her disease";
-		mes "is called '^FF0000Amarhade^000000'.";
-		next;
-		mes "[Cylrnel]";
-		mes "It's a rare disease that";
-		mes "it's not even well known";
-		mes "to medical institution.";
-		mes "Likewise, exact treatment";
-		mes "has not maden yet.";
-		next;
-		mes "[Cylrnel]";
-		mes "..but I found the something..";
-		mes "and it's a.....secret. haha.";
-//      Emotion "Doctor" ET_DELIGHT
-		emotion e_ho;
 	}
+	mes "[Cylrnel]";
+	mes "Hey there...";
+	mes "How is she doing?";
+	mes "Getting better?";
+	mes "By taking that medicine,";
+	mes "she'll recover fast.";
+	next;
+	mes "[Cylrnel]";
+	mes "Tell her to come to me";
+	mes "sometime to get medical";
+	mes "treatment. Walking from her";
+	mes "house to here would be good";
+	mes "exercise too.";
+	next;
+	mes "[Cylrnel]";
+	mes "The name of her disease is";
+	mes "called '^FF0000Amarhade^000000'.";
+	mes "It's a rare, relatively";
+	mes "unknown illness, so an exact";
+	mes "treatment hasn't been found yet.";
+	next;
+	mes "[Cylrnel]";
+	mes "But I found a treatment...";
+	mes "And...it's..a...secret! Haha~!";
+	emotion e_ho;
 	close;
 }
 
 yuno_in01,104,94,0	script	go away#gnbs	139,2,1,{
+OnTouch:
 	if (b_sword < 22) {
 		mes "[??????]";
 		mes "^FF0000What are you doing here?";
-		mes "Get out!^000000";
+		mes "Get out of here!^000000";
 		close2;
 		warp "yuno",246,143;
 		end;
-	} else if (b_sword == 22) {
+	}
+	else if (b_sword == 22) {
 		if (rand(1,10) == 10) {
 			mes "[??????]";
-			mes "I am very busy right now. please leave.";
+			mes "I am very busy right now. Please leave.";
 			set b_sword,23;
 			close;
-		} else {
-			mes "[??????]";
-			mes "^FF0000What are you doing here?";
-			mes "Get out!^000000";
-			close2;
-			warp "yuno",246,143;
-			end;
 		}
-	} else {
-		mes "[Cylrnel]";
-		mes "Who are you?";
+		mes "[??????]";
+		mes "^FF0000What are you doing here?";
+		mes "Get out of here!^000000";
+		close2;
+		warp "yuno",246,143;
+		end;
+	}
+	end;
+}					
+
+// Lost Knife
+//============================================================ 
+gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
+	if (nakha == 0) {
+		mes "[Han Ran Jiao]";
+		mes "Oh no! What will I do?!";
+		mes "I can't believe I dropped";
+		mes "my irreplaceable knife! Ahhhhhh!";
+		next;
+		if (BaseLevel >= 20) {
+			set nakha,1;
+			mes "[Han Ran Jiao]";
+			mes "I need to go down to get it";
+			mes "but...the monsters...";
+			mes "I'm so scared... What should I do?!";
+			close;
+		}
+	}
+	if (nakha == 1) {
+		mes "[Han Ran Jiao]";
+		mes "Oh no! What will I do?";
+		mes "I can't believe I dropped";
+		mes "my irreplaceable knife! Ahhhhhh!";
+		next;
+		mes "[Han Ran Jiao]";
+		mes "I need to go down to get it";
+		mes "but...the monsters...";
+		mes "I'm so scared... What should I do?!";
+		close;
+	}
+	if (nakha == 2 && countitem(1201) > 0) {
+		mes "[Han Ran Jiao]";
+		mes "Ehhhh... what should I do...";
+		mes "Oh~! I didn't notice you there.";
+		mes "Can I help you with anything?";
+		mes "Hmm?";
+		next;
+		mes "[Han Ran Jiao]";
+		mes "That...that knife!";
+		mes "That's my ancestor's sacred knife";
+		mes "that I accidentally dropped from";
+		mes "here! Where did you get it!?";
+		next;
+		mes "[Han Ran Jiao]";
+		mes "I dropped that knife from being";
+		mes "careless. It belongs to one of my";
+		mes "ancestors. I know it looks like";
+		mes "a cheap knife...";
+		next;
+		mes "[Han Ran Jiao]";
+		mes "But it has been in the";
+		mes "family for a very long time.";
+		mes "Would you please return that";
+		mes "knife to me?";
+		next;
+		if (select("Return the knife.:Refuse.") == 1) {
+			set nakha,3;
+			delitem 1201,1; //Knife
+			mes "[Han Ran Jiao]";
+			mes "Thank you! Thank you so much!";
+			mes "Please take these potions.";
+			mes "They may not be much, but they";
+			mes "are the best I can give you.";
+			getitem 505,2; //Blue_Potion
+			next;
+			mes "[Han Ran Jiao]";
+			mes "You kept my family heirloom safe!";
+			mes "I give you my deepest gratitude";
+			mes "for returning this.";
+			close;
+		}
+		mes "[Han Ran Jiao]";
+		mes "No~! My family heirloom!!";
+		mes "You scoundrel! May the spirits";
+		mes "forever haunt you! My curse shall be upon your head!";
+		close;
+	}
+	if (nakha == 2) {
+		mes "[Han Ran Jiao]";
+		mes "Oh no! What will I do?";
+		mes "I can't believe I dropped";
+		mes "my irreplaceable knife! Ahhhhhh!";
+		next;
+		mes "[Han Ran Jiao]";
+		mes "I need to go down to get it";
+		mes "but...the monsters...";
+		mes "I'm so scared... What should I do?!";
 		close;
 	}
+	if (nakha == 3) {
+		mes "[Han Ran Jiao]";
+		mes "My neighbor seemed looked pretty bothered about something...";
+		mes "Oh well, I have better things to worry about than his fancy tea.";
+		close;
+	}
+}
+
+gon_fild01,245,257,0	script	#gonknife	111,3,3,{
+OnTouch:
+	if (nakha == 1) {
+		set nakha,2;
+		mes "^3355FFHm? What's this?";
+		mes " ";
+		mes "Something was hidden beneath the leaves...^000000";
+		mes " ";
+		mes "- You have found an old knife -";
+		close2;
+		getitem 1201,1; //Knife
+	}
+	end;
 }
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
index f63c8ee42..5c7993dae 100644
--- a/npc/warps/cities/comodo.txt
+++ b/npc/warps/cities/comodo.txt
@@ -3,48 +3,43 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points Comodo city
-//= Rogue guild
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-
-//Comodo City =====================================================
-comodo,115,291,0	warp	cmd09		1,1,cmd_in02,67,132
-comodo,126,98,0	warp	cmd02		1,1,cmd_in02,144,97
-comodo,130,195,0	warp	cmd05		1,1,cmd_in02,143,173
-comodo,140,111,0	warp	cmd04		1,1,cmd_in02,178,132
-comodo,140,90,0	warp	cmd01		1,1,cmd_in02,74,25
-comodo,145,328,0	warp	cmd11		1,1,cmd_in01,120,71
-comodo,153,97,0	warp	cmd03		1,1,cmd_in02,212,97
-comodo,176,358,0	warp	cmd002		1,1,beach_dun2,154,25
-comodo,192,294,0	warp	cmd17		1,1,cmd_in01,177,123
-comodo,236,298,0	warp	cmd08		1,1,cmd_in01,179,81
-comodo,25,214,0	warp	cmd001		1,1,beach_dun,266,67
-comodo,265,74,0	warp	cmd06		1,1,cmd_in01,123,180
-comodo,271,271,0	warp	cmd10		1,1,cmd_in01,113,125
-comodo,332,175,0	warp	cmd003		1,1,beach_dun3,23,260
-comodo,92,128,0	warp	cmd07		1,1,cmd_in01,85,174
-cmd_in01,109,125,0	warp	cmd10-1		1,1,comodo,269,273
-cmd_in01,120,67,0	warp	cmd11-1		1,1,comodo,145,324
-cmd_in01,123,186,0	warp	cmd06-1		1,1,comodo,265,79
-cmd_in01,183,123,0	warp	cmd17-1		1,1,comodo,195,294
-cmd_in01,183,81,0	warp	cmd08-1		1,1,comodo,239,296
-cmd_in01,90,174,0	warp	cmd07-1		1,1,comodo,97,128
-cmd_in02,139,169,0	warp	cmd05-1		1,1,comodo,127,191
-cmd_in02,139,97,0	warp	cmd02-1		1,1,comodo,122,98
-cmd_in02,168,113,0	warp	cmd15-1		1,1,cmd_in02,63,73
-cmd_in02,178,136,0	warp	cmd04-1		1,1,comodo,140,115
-cmd_in02,187,78,0	warp	cmd14-2		1,1,cmd_in02,84,37
-cmd_in02,208,206,0	warp	cmd16		1,1,cmd_in02,97,211
-cmd_in02,216,97,0	warp	cmd03-1		1,1,comodo,157,97
-cmd_in02,58,74,0	warp	cmd15		1,1,cmd_in02,166,116
-cmd_in02,69,129,0	warp	cmd09-1		4,4,comodo,115,288
-cmd_in02,74,21,0	warp	cmd01-1		1,1,comodo,140,86
-cmd_in02,90,37,0	warp	cmd14		1,1,cmd_in02,191,77
-cmd_in02,98,216,0	warp	cmd16-1		1,1,cmd_in02,207,210
+comodo,92,128,0	warp	cmd_tools1-1	1,1,cmd_in01,85,174
+cmd_in01,90,174,0	warp	cmd_tools1-2	1,1,comodo,97,128
+comodo,265,74,0	warp	cmd_weapon1-1	1,1,cmd_in01,123,180
+cmd_in01,123,186,0	warp	cmd_weapon1-2	1,1,comodo,265,79
+comodo,271,271,0	warp	cmd_house1-1	1,1,cmd_in01,113,125
+cmd_in01,109,125,0	warp	cmd_house1-2	1,1,comodo,269,273
+comodo,192,294,0	warp	cmd_house2-1	1,1,cmd_in01,177,123
+cmd_in01,183,123,0	warp	cmd_house2-2	1,1,comodo,195,294
+comodo,145,328,0	warp	cmd_house3-1	1,1,cmd_in01,120,71
+cmd_in01,120,67,0	warp	cmd_house3-2	1,1,comodo,145,324
+comodo,236,298,0	warp	cmd_house4-1	1,1,cmd_in01,179,81
+cmd_in01,183,81,0	warp	cmd_house4-2	1,1,comodo,239,296
+comodo,130,195,0	warp	cmd_KAFRA1-1	1,1,cmd_in02,143,173
+cmd_in02,139,169,0	warp	cmd_KAFRA1-2	1,1,comodo,127,191
+cmd_in02,208,206,0	warp	cmd_KAFRA2-1	1,1,cmd_in02,97,211
+cmd_in02,98,216,0	warp	cmd_KAFRA12-2	1,1,cmd_in02,207,210
+comodo,115,291,0	warp	cmd_chief1-1	1,1,cmd_in02,67,132
+cmd_in02,69,129,0	warp	cmd_chief1-2	1,1,comodo,115,288
+comodo,140,111,0	warp	cmd_casino1-1	1,1,cmd_in02,178,132
+cmd_in02,178,136,0	warp	cmd_casino1-2	1,1,comodo,140,115
+comodo,153,97,0	warp	cmd_casino2-1	1,1,cmd_in02,212,97
+cmd_in02,216,97,0	warp	cmd_casino2-2	1,1,comodo,157,97
+comodo,126,98,0	warp	cmd_casino3-1	1,1,cmd_in02,144,97
+cmd_in02,139,97,0	warp	cmd_casino3-2	1,1,comodo,122,98
+comodo,140,90,0	warp	cmd_casino4-1	1,1,cmd_in02,74,25
+cmd_in02,74,21,0	warp	cmd_casino4-2	1,1,comodo,140,86
+cmd_in02,168,113,0	warp	cmd_casino5-1	1,1,cmd_in02,63,73
+cmd_in02,58,74,0	warp	cmd_casino5-2	1,1,cmd_in02,166,116
+cmd_in02,187,78,0	warp	cmd_casino6-1	1,1,cmd_in02,84,37
+cmd_in02,90,37,0	warp	cmd_casino6-2	1,1,cmd_in02,191,77
\ No newline at end of file
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index afbba5ac9..98e17572a 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -1,34 +1,35 @@
 //===== eAthena Script =======================================
-//= Gonryun Town Warp Script
+//= Kunlun Town Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
-//= Warp Points for Gonryun
+//= [Aegis Conversion]
+//= Warp Points for Kunlun
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Gonryun ==================================================
-gonryun,161,8,0	warp	gon02	1,1,gon_fild01,191,261
-gonryun,195,93,0	warp	gon03	1,1,gon_in,95,23
-gonryun,109,131,0	warp	gon15	1,1,gon_in,44,24
-gonryun,215,114,0	warp	gon05	1,1,gon_in,152,24
-gonryun,107,184,0	warp	gon13	1,1,gon_in,72,70
-gonryun,221,162,0	warp	gon11	1,1,gon_in,112,98
-gonryun,159,201,0	warp	gon19	1,1,gon_dun01,153,48
-gon_in,95,26,0	warp	gon04	1,1,gonryun,195,96
-gon_in,149,24,0	warp	gon06	1,1,gonryun,212,114
-gon_in,184,11,0	warp	gon07	1,1,gon_in,189,85
-gon_in,186,85,0	warp	gon08	1,1,gon_in,181,11
-gon_in,186,107,0	warp	gon09	1,1,gon_in,181,36
-gon_in,184,36,0	warp	gon10	1,1,gon_in,189,107
-gon_in,109,98,0	warp	gon12	1,1,gonryun,218,162
-gon_in,72,67,0	warp	gon14	1,1,gonryun,107,181
-gon_in,47,24,0	warp	gon16	1,1,gonryun,112,131
-gon_in,42,35,0	warp	gon17	1,1,gon_in,34,97
-gon_in,31,97,0	warp	gon18	1,1,gon_in,39,35
-gon_fild01,192,266,0	warp	gon01	1,1,gonryun,161,11
+gonryun,221,162,0	warp	gon_house1-1	1,1,gon_in,112,98
+gon_in,109,98,0	warp	gon_house1-2	1,1,gonryun,218,162
+gonryun,195,93,0	warp	gon_house2-1	1,1,gon_in,95,23
+gon_in,95,26,0	warp	gon_house2=2	1,1,gonryun,195,96
+gonryun,107,184,0	warp	gon_tea1-1	1,1,gon_in,72,70
+gon_in,72,67,0	warp	gon_tea2-1	1,1,gonryun,107,181
+gonryun,215,114,0	warp	gon_tavern1-1	1,1,gon_in,152,24
+gon_in,149,24,0	warp	gon_tavern1-2	1,1,gonryun,212,114
+gon_in,184,36,0	warp	gon_inn1-1	1,1,gon_in,189,107
+gon_in,186,107,0	warp	gon_inn1-2	1,1,gon_in,181,36
+gon_in,184,11,0	warp	gon_inn2-1	1,1,gon_in,189,85
+gon_in,186,85,0	warp	gon_inn2-2	1,1,gon_in,181,11
+gonryun,109,131,0	warp	gon_castle1-1	1,1,gon_in,44,24
+gon_in,47,24,0	warp	gon_castle1-2	1,1,gonryun,112,131
+gon_in,42,35,0	warp	gon_castle2-1	1,1,gon_in,34,97
+gon_in,31,97,0	warp	gon_castle2-2	1,1,gon_in,39,35
+gonryun,161,8,0	warp	gon_fild1-1	1,1,gon_fild01,191,261
+gon_fild01,192,265,0	warp	gon_fild1-2	1,1,gonryun,161,11
+
+
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index a86a7b111..114439865 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -3,36 +3,37 @@
 //===== By: ==================================================
 //= Athena (1.0) Nana (1.1)
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points for Lutie
 //===== Additional Comments: =================================
 //= 1.2a Re-fixed endless warping loop
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-xmas,150,41,0	warp	xmas2-1	3,3,xmas_fild01,80,246
-xmas,120,131,0	warp	xmas3	3,3,xmas_in,41,33
-xmas_in,46,33,0	warp	xmas3-1	3,3,xmas,125,131
-xmas,120,161,0	warp	xmas4	3,3,xmas_in,33,91
-xmas_in,38,89,0	warp	xmas4-1	3,3,xmas,125,159
-xmas,175,132,0	warp	xmas5	3,3,xmas_in,158,31
-xmas_in,153,31,0	warp	xmas5-1	3,3,xmas,170,132
-xmas,174,161,0	warp	xmas6	3,3,xmas_in,166,98
-xmas_in,163,93,0	warp	xmas6-1	3,3,xmas,169,158
-xmas,182,169,0	warp	xmas7	3,3,xmas_in,174,108
-xmas_in,179,109,0	warp	xmas7-1	3,3,xmas,185,168
-xmas,142,240,0	warp	xmas8	3,3,xmas_in,95,87
-xmas_in,95,82,0	warp	xmas8-1	3,3,xmas,142,235
-xmas,149,240,0	warp	xmas9	3,3,xmas_in,105,87
-xmas_in,105,82,0	warp	xmas9-1	3,3,xmas,149,235
-xmas,149,256,0	warp	xmas10	3,3,xmas_in,105,112
-xmas_in,105,117,0	warp	xmas10-1	2,2,xmas,149,261
-xmas,142,256,0	warp	xmas11	3,3,xmas_in,96,114
-xmas_in,95,117,0	warp	xmas11-1	2,2,xmas,142,261
-xmas,104,290,0	warp	xmas12	3,3,xmas_in,30,166
-xmas_in,30,161,0	warp	xmas12-1	3,3,xmas,104,285
-xmas,189,279,0	warp	xmas13	3,3,xmas_in,168,166
-xmas_in,168,161,0	warp	xmas13-1	3,3,xmas,189,274
-xmas,143,313,0	warp	xmas14	3,3,xmas_dun01,205,17
+xmas,149,41,0	warp	x_fild_out	8,1,xmas_fild01,80,248
+xmas,120,131,0	warp	xmas_tool1-1	1,1,xmas_in,43,33
+xmas_in,46,33,0	warp	xmas_tool1-2	1,1,xmas,123,131
+xmas,174,131,0	warp	xmas_gift1-1	1,1,xmas_in,155,32
+xmas_in,153,32,0	warp	xmas_gift1-2	1,1,xmas,172,131
+xmas,119,162,0	warp	xmas_house1-1	1,1,xmas_in,36,91
+xmas_in,38,89,0	warp	xmas_house1-2	1,1,xmas,122,159
+xmas,189,278,0	warp	xmas_house2-1	1,1,xmas_in,168,164
+xmas_in,168,160,0	warp	xmas_house2-2	1,1,xmas,189,275
+xmas,173,160,0	warp	xmas_weapon1-1	1,1,xmas_in,165,95
+xmas_in,163,93,0	warp	xmas_weapon1-2	1,1,xmas,172,158
+xmas,181,169,0	warp	xmas_weapon2-1	1,1,xmas_in,177,107
+xmas_in,179,109,0	warp	xmas_weapon2-2	1,1,xmas,184,168
+xmas,142,239,0	warp	xmas_santa1-1	1,1,xmas_in,94,85
+xmas_in,94,83,0	warp	xmas_santa1-2	1,1,xmas,142,237
+xmas,149,239,0	warp	xmas_santa2-1	1,1,xmas_in,104,85
+xmas_in,104,83,0	warp	xmas_santa2-2	1,1,xmas,149,237
+xmas,142,258,0	warp	xmas_santa3-1	1,1,xmas_in,94,115
+xmas_in,94,117,0	warp	xmas_santa3-2	1,1,xmas,142,260
+xmas,149,258,0	warp	xmas_santa4-1	1,1,xmas_in,104,115
+xmas_in,104,117,0	warp	xmas_santa4-2	1,1,xmas,149,260
+xmas,104,289,0	warp	xmas_church1-1	1,1,xmas_in,30,163
+xmas_in,30,161,0	warp	xmas_church2-2	1,1,xmas,104,286
diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt
index ba6e36989..4fd5f181c 100644
--- a/npc/warps/dungeons/beach_dun.txt
+++ b/npc/warps/dungeons/beach_dun.txt
@@ -3,17 +3,21 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points Comodo Dungeon
+//= [Aegis Conversion]
+//= Comodo Beach Dungeon warp script
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//Beach Dungeon ==============================================
-beach_dun,276,67,0	warp	cmd004	1,1,comodo,31,215
-beach_dun2,154,13,0	warp	cmd005	2,1,comodo,176,353
-beach_dun3,17,265,0	warp	cmd007	1,1,comodo,328,175
-beach_dun3,286,57,0	warp	cmd006	1,1,cmd_fild01,30,317
+comodo,24,214,0	warp	cmd_beach_dun1-1	1,1,beach_dun,266,67
+beach_dun,276,67,0	warp	cmd_beach_dun1-2	1,1,comodo,31,215
+comodo,176,358,0	warp	cmd_beach_dun2-1	1,1,beach_dun2,154,25
+beach_dun2,154,13,0	warp	cmd_beach_dun2-2	2,1,comodo,176,353
+comodo,333,175,0	warp	cmd_beach_dun3-1	1,1,beach_dun3,23,260
+beach_dun3,17,265,0	warp	cmd_beach_dun3-2	1,1,comodo,328,175
+beach_dun3,286,57,0	warp	cmd_beach_dun4-1	1,1,cmd_fild01,30,317
+cmd_fild01,26,318,0	warp	cmd_beach_dun4-2	1,1,beach_dun3,281,56
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
index 847f4bde8..7924fb513 100644
--- a/npc/warps/dungeons/gon_dun.txt
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -1,40 +1,41 @@
 //===== eAthena Script =======================================
-//= Gonryun Dungeon Warp Script
+//= Kunlun Dungeon Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 5+
 //===== Description: =========================================
-//= Warp Points for Gonryun
+//= [Aegis Conversion]
+//= Warp Points for Kunlun dungeon
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Gonryun Dungeon ==========================================
-gon_dun01,153,45,0	warp	gon20	1,1,gonryun,159,198
-gon_dun01,162,273,0	warp	gon21	1,1,gon_dun02,17,113
-gon_dun02,14,113,0	warp	gon22	1,1,gon_dun01,162,270
-gon_dun02,56,119,0	warp	gon23	1,1,gon_dun02,47,210/*‘ŠŒÝF*/
-gon_dun02,92,190,0	warp	gon24	1,1,gon_dun02,199,20/*‘ŠŒÝE*/
-gon_dun02,44,213,0	warp	gon25	1,1,gon_dun02,51,119/*‘ŠŒÝF*/
-gon_dun02,44,166,0	warp	gon26	1,1,gon_dun02,97,121/*Šm’è*/
-gon_dun02,94,118,0	warp	gon27	1,1,gon_dun02,177,189/*Šm’è*/
-gon_dun02,76,100,0	warp	gon28	1,1,gon_dun02,145,62/*Šm’è*/
-gon_dun02,63,66,0	warp	gon29	1,1,gon_dun02,203,94/*‘ŠŒÝA*/
-gon_dun02,86,44,0	warp	gon30	1,1,gon_dun02,145,233/*Šm’è*/
-gon_dun02,148,236,0	warp	gon31	1,1,gon_dun02,234,194/*‘ŠŒÝD*/
-gon_dun02,171,258,0	warp	gon32	1,1,gon_dun02,76,96/*Šm’è*/
-gon_dun02,180,189,0	warp	gon33	1,1,gon_dun02,170,164/*Šm’è*/
-gon_dun02,165,189,0	warp	gon34	1,1,gon_dun02,235,135/*‘ŠŒÝC*/
-gon_dun02,170,161,0	warp	gon35	1,1,gon_dun02,89,41/*Šm’è*/
-gon_dun02,168,92,0	warp	gon36	1,1,gon_dun02,273,76/*‘ŠŒÝB*/
-gon_dun02,145,66,0	warp	gon37	1,1,gon_dun02,199,20/*Šm’è*/
-gon_dun02,234,191,0	warp	gon38	1,1,gon_dun02,145,233/*‘ŠŒÝD*/
-gon_dun02,235,138,0	warp	gon39	1,1,gon_dun02,168,189/*‘ŠŒÝC*/
-gon_dun02,199,94,0	warp	gon40	1,1,gon_dun02,60,70/*‘ŠŒÝA*/
-gon_dun02,276,76,0	warp	gon41	1,1,gon_dun02,163,87/*‘ŠŒÝB*/
-gon_dun02,196,20,0	warp	gon42	1,1,gon_dun02,95,190/*‘ŠŒÝE*/
-gon_dun02,251,268,0	warp	gon43	1,1,gon_dun03,68,9
-gon_dun03,68,6,0	warp	gon44	1,1,gon_dun02,251,265
+gonryun,159,201,0	warp	gon_dun1-1	1,1,gon_dun01,153,48
+gon_dun01,153,45,0	warp	gon_dun1-2	1,1,gonryun,159,198
+gon_dun01,162,273,0	warp	gon_dun2-1	1,1,gon_dun02,17,113
+gon_dun02,14,113,0	warp	gon_dun2-2	1,1,gon_dun01,162,270
+gon_dun02,44,213,0	warp	gon_dun3-1	1,1,gon_dun02,51,119
+gon_dun02,92,190,0	warp	gon_dun3-2	1,1,gon_dun02,199,20
+gon_dun02,44,166,0	warp	gon_dun3-3	1,1,gon_dun02,97,121
+gon_dun02,148,236,0	warp	gon_dun3-4	1,1,gon_dun02,234,194
+gon_dun02,171,258,0	warp	gon_dun3-5	1,1,gon_dun02,76,96
+gon_dun02,234,191,0	warp	gon_dun3-6	1,1,gon_dun02,145,233
+gon_dun02,165,189,0	warp	gon_dun3-7	1,1,gon_dun02,235,135
+gon_dun02,180,189,0	warp	gon_dun3-8	1,1,gon_dun02,170,164
+gon_dun02,170,161,0	warp	gon_dun3-9	1,1,gon_dun02,89,41
+gon_dun02,56,119,0	warp	gon_dun3-10	1,1,gon_dun02,47,210
+gon_dun02,94,118,0	warp	gon_dun3-11	1,1,gon_dun02,177,189
+gon_dun02,76,100,0	warp	gon_dun3-12	1,1,gon_dun02,145,62
+gon_dun02,63,66,0	warp	gon_dun3-14	1,1,gon_dun02,203,94
+gon_dun02,86,44,0	warp	gon_dun3-15	1,1,gon_dun02,145,233
+gon_dun02,168,92,0	warp	gon_dun3-16	1,1,gon_dun02,273,76
+gon_dun02,145,66,0	warp	gon_dun3-17	1,1,gon_dun02,199,20
+gon_dun02,235,138,0	warp	gon_dun3-18	1,1,gon_dun02,168,189
+gon_dun02,199,94,0	warp	gon_dun3-19	1,1,gon_dun02,60,70
+gon_dun02,276,76,0	warp	gon_dun3-20	1,1,gon_dun02,163,87
+gon_dun02,196,20,0	warp	gon_dun3-21	1,1,gon_dun02,95,190
+gon_dun02,251,268,0	warp	gon_dun4-1	1,1,gon_dun03,68,9
+gon_dun03,68,6,0	warp	gon_dun4-2	1,1,gon_dun02,251,265
diff --git a/npc/warps/dungeons/xmas_dun.txt b/npc/warps/dungeons/xmas_dun.txt
index ff14558bb..fbcb6b511 100644
--- a/npc/warps/dungeons/xmas_dun.txt
+++ b/npc/warps/dungeons/xmas_dun.txt
@@ -3,16 +3,17 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
-//= Warp Points for Lutie Dungeon (Toy Factory)
+//= Warp Points for Toy Factory
 //===== Additional Comments: =================================
 //= 1.1 Fixed endless warping loop
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Toy Factory ==============================================
-xmas_dun01,128,133,0	warp	xmas15	3,3,xmas_dun02,129,133
-xmas_dun01,205,13,0	warp	xmas14-1	3,3,xmas,143,308
-xmas_dun02,129,129,0	warp	xmas15-1	3,3,xmas_dun01,128,128
+xmas,143,314,0	warp	xmas_dun1-1	1,1,xmas_dun01,205,16
+xmas_dun01,205,13,0	warp	xmas_dun1-2	1,1,xmas,143,311
+xmas_dun01,129,130,0	warp	xmas_dun2-1	1,1,xmas_dun02,131,130
+xmas_dun02,129,130,0	warp	xmas_dun2-2	1,1,xmas_dun01,132,130
\ No newline at end of file
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
index 5e60150b3..a44fff690 100644
--- a/npc/warps/fields/com_fild.txt
+++ b/npc/warps/fields/com_fild.txt
@@ -1,53 +1,50 @@
 //===== eAthena Script =======================================
-//= Comodo Warp Script
+//= Comodo Field Warp Script
 //===== By: ==================================================
 //= Nana
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points Comodo Fields
+//= [Aegis Conversion]
+//= Warp Points for Comodo Fields
 //===== Additional Comments: =================================
-//= No comment!
+//= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //============================================================
 
-//= Comodo Fields ============================================
-cmd_fild01,222,24,0	warp	cmdf01	1,1,cmd_fild02,222,372
-cmd_fild01,26,318,0	warp	cmdf001	1,1,beach_dun3,281,56
-cmd_fild01,362,263,0	warp	cmdf03	1,1,cmd_fild03,27,269
-cmd_fild01,362,73,0	warp	cmdf02	1,1,cmd_fild03,27,68
-cmd_fild02,222,376,0	warp	cmdf01-1	1,1,cmd_fild01,222,30
-cmd_fild02,358,95,0	warp	cmdf04	1,1,cmd_fild04,35,94
-cmd_fild02,382,269,0	warp	cmdf05	1,1,cmd_fild04,25,275
-cmd_fild03,181,17,0	warp	cmdf06	1,1,cmd_fild04,181,367
-cmd_fild03,23,269,0	warp	cmdf03-1	1,1,cmd_fild01,359,260
-cmd_fild03,23,68,0	warp	cmdf02-1	1,1,cmd_fild01,359,76
-cmd_fild03,384,165,0	warp	cmdf07	1,1,cmd_fild05,26,161
-cmd_fild04,180,372,0	warp	cmdf06-1	1,1,cmd_fild03,183,23
-cmd_fild04,21,275,0	warp	cmdf05-1	1,1,cmd_fild02,378,264
-cmd_fild04,31,92,0	warp	cmdf04-1	1,1,cmd_fild02,351,92
-cmd_fild04,376,287,0	warp	cmdf08	1,1,cmd_fild06,26,288
-cmd_fild05,148,19,0	warp	cmdf09	1,1,cmd_fild06,150,374
-cmd_fild05,21,163,0	warp	cmdf07-1	1,1,cmd_fild03,377,167
-cmd_fild06,150,380,0	warp	cmdf09-1	1,1,cmd_fild05,146,27
-cmd_fild06,151,27,0	warp	cmfd10	1,1,cmd_fild07,147,370
-cmd_fild06,21,285,0	warp	cmdf08-1	1,1,cmd_fild04,371,288
-cmd_fild06,368,96,0	warp	cmdf11	1,1,cmd_fild08,25,102
-cmd_fild06,372,359,0	warp	cmdf12	1,1,cmd_fild08,31,359
-cmd_fild06,379,174,0	warp	cmdf13	1,1,cmd_fild08,28,166
-cmd_fild07,149,379,0	warp	cmdf10-1	10,1,cmd_fild06,147,36
-cmd_fild07,389,186,0	warp	cmdf14-1	1,3,cmd_fild09,18,170
-cmd_fild08,15,102,0	warp	cmdf11-1	1,1,cmd_fild06,361,96
-cmd_fild08,25,170,0	warp	cmdf13-1	1,1,cmd_fild06,374,167
-cmd_fild08,25,355,0	warp	cmdf12-1	1,1,cmd_fild06,369,359
-cmd_fild08,309,48,0	warp	cmdf16	2,1,cmd_fild09,307,374
-cmd_fild08,76,31,0	warp	cmdf15	2,1,cmd_fild09,76,375
-cmd_fild09,12,170,0	warp	cmdf14-2	1,4,cmd_fild07,382,184
-cmd_fild09,309,381,0	warp	cmdf16-1	2,1,cmd_fild08,309,60
-cmd_fild09,75,382,0	warp	cmdf15-1	2,1,cmd_fild08,75,42
-
-//Others =======================
-cmd_fild08,354,324,0	warp	cmd008	1,1,moc_fild12,26,305
-cmd_fild09,369,164,0	warp	cmd009	2,2,moc_fild18,55,170
-moc_fild18,51,170,0	warp	cmd010	1,3,cmd_fild09,363,164
+cmd_fild01,222,24,0	warp	cmd_fild01-1	1,1,cmd_fild02,222,372
+cmd_fild01,362,73,0	warp	cmd_fild01-2	1,1,cmd_fild03,27,68
+cmd_fild01,362,263,0	warp	cmd_fild01-3	1,1,cmd_fild03,27,269
+cmd_fild02,222,376,0	warp	cmd_fild02-1	1,1,cmd_fild01,222,30
+cmd_fild02,382,269,0	warp	cmd_fild02-2	1,1,cmd_fild04,25,275
+cmd_fild02,358,95,0	warp	cmd_fild02-3	1,1,cmd_fild04,35,94
+cmd_fild03,23,269,0	warp	cmd_fild03-1	1,1,cmd_fild01,359,260
+cmd_fild03,23,68,0	warp	cmd_fild03-2	1,1,cmd_fild01,359,76
+cmd_fild03,181,17,0	warp	cmd_fild03-3	1,1,cmd_fild04,181,367
+cmd_fild03,384,165,0	warp	cmd_fild03-4	1,1,cmd_fild05,26,161
+cmd_fild04,21,275,0	warp	cmd_fild04-1	1,1,cmd_fild02,378,264
+cmd_fild04,31,92,0	warp	cmd_fild04-2	1,1,cmd_fild02,351,92
+cmd_fild04,376,287,0	warp	cmd_fild04-3	1,1,cmd_fild06,26,288
+cmd_fild04,180,372,0	warp	cmd_fild04-4	1,1,cmd_fild03,183,23
+cmd_fild05,21,163,0	warp	cmd_fild05-1	1,1,cmd_fild03,377,167
+cmd_fild05,148,19,0	warp	cmd_fild05-2	1,1,cmd_fild06,150,374
+cmd_fild06,150,380,0	warp	cmd_fild06-3	1,1,cmd_fild05,146,27
+cmd_fild06,21,285,0	warp	cmd_fild06-4	1,1,cmd_fild04,371,288
+cmd_fild06,151,27,0	warp	cmd_fild06-5	1,1,cmd_fild07,147,370
+cmd_fild06,368,96,0	warp	cmd_fild06-6	1,1,cmd_fild08,25,102
+cmd_fild06,379,174,0	warp	cmd_fild06-7	1,1,cmd_fild08,28,166
+cmd_fild06,372,359,0	warp	cmd_fild06-8	1,1,cmd_fild08,31,359
+cmd_fild07,149,379,0	warp	cmd_fild07-1	10,1,cmd_fild06,147,36
+cmd_fild07,389,186,0	warp	cmd_fild07-2	1,3,cmd_fild09,18,170
+cmd_fild08,25,355,0	warp	cmd_fild08-1	1,1,cmd_fild06,366,359
+cmd_fild08,25,170,0	warp	cmd_fild08-2	1,1,cmd_fild06,374,167
+cmd_fild08,15,102,0	warp	cmd_fild08-3	1,1,cmd_fild06,361,96
+cmd_fild08,76,31,0	warp	cmd_fild08-4	2,1,cmd_fild09,76,375
+cmd_fild08,309,48,0	warp	cmd_fild08-5	2,1,cmd_fild09,307,374
+cmd_fild08,354,324,0	warp	cmd_fild08-6	1,1,moc_fild12,26,305
+cmd_fild09,12,170,0	warp	cmd_fild09-1	1,4,cmd_fild07,382,184
+cmd_fild09,369,164,0	warp	cmd_fild09-2	2,2,moc_fild18,55,170
+cmd_fild09,309,381,0	warp	cmd_fild09-3	2,1,cmd_fild08,309,60
+cmd_fild09,75,382,0	warp	cmd_fild09-4	2,1,cmd_fild08,75,42
+moc_fild18,51,170,0	warp	moc_fild18-1	1,3,cmd_fild09,363,164
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index a7d0f3921..2adb2ed5d 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -3,15 +3,16 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
+//= [Aegis Conversion]
 //= Warp Points for Lutie Field
 //===== Additional Comments: =================================
-//= No Comment!
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-//= Lutie Field ==============================================
-xmas_fild01,80,251,0	warp	xmas2	2,2,xmas,150,45
-xmas_fild01,85,49,0	warp	xmas001	10,3,aldebaran,140,240
+xmas_fild01,69,252,0	warp	xmas_fild1-1	10,2,xmas,149,44
+xmas_fild01,90,252,0	warp	xmax_fild1-2	10,2,xmas,149,44
+xmas_fild01,84,48,0	warp	xmas_fild2	10,2,aldebaran,140,234