* Updated cities: Morroc, Jawaii, and Izlude

- Moved an NPC out of Prontera because of the Jawaii update.
* Updated Wedding script to official. (Moved previous to custom.)
- Updated the Divorce NPC to Official as well.
* Changed some dialog in the Kafra Functions.
* Updated the Message boards to iRO standards.
* Added the Mail box NPCs even though the mail system is not implemented.
* Near total rewrite of the shops.txt file. Lots of corrections and such.

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

4 files changed, 2237 insertions, 1612 deletions

diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 2b81c9591..61bf57731 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -2,12 +2,14 @@
 //= Izlude Town
 //===== By: ================================================== 
 //= kobra_k88
+//= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.71
+//= 1.8
 //===== Compatible With: ===================================== 
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
+//= Izlude town NPCs
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.1 fixed 2 zeny bugs/checks [Lupus]
@@ -20,61 +22,63 @@
 //= 1.7 Split quest to quests/quests_izlude.txt [Evera]
 //= 1.71 Optimized. Also thanks to CAHTEXHuK [Lupus]
 //= 1.72 Small bugfix [Paradox924X]
+//= 1.8 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
+//=	Removed Honeymoon Helper, as she is a Jawaii NPC.
+//=	Moved Signs to the msg_boards file.
 //============================================================
 
-
-
-// Welcome Sign ----------------------------------------------------------
-izlude,125,116,1	script	Welcome Sign::ws_izlude	111,{
-  mes "~sign reads...~";
-  mes "Salutations and welcome to Izlude! Izlude is the satellite of Prontera and is home to Swordsmen and the Cool Event Corp.'s Monster Arena!";
-  close;
-}
-
-// Sign: Marina -----------------------------------------------------------------
-izlude,179,183,1	script	Izlude Marina	111,{
-  mes "~sign reads...~";
-  mes "Take a boat ride to the city of Alberta or to the island of Byalan.";
-  close;
-}
-
-// Sign: Swordsman Assoc. ----------------------------------------------------
-izlude,54,139,1	script	Swordsman Association	111,{
-  mes "~sign reads...~";
-  mes "The Izlude Swordsman Association is proud to provide Rune-Midgard with the bravest and strongest warriors.";
-  close;
+// Izlude
+//============================================================
+izlude,201,181,2	script	Sailor#izlude	100,{
+	mes "[Sailor]";
+	mes "Hey everybody!";
+	mes "Attention, attention!";
+	mes "Come and ride the wind";
+	mes "on a fascinating Ship!";
+	mes "Hurry, hurry!";
+	next;
+	switch(select("Byalan Island -> 150 Zeny.:Alberta Marina  -> 500 Zeny.:Cancel.")) {
+	case 1:
+		if (zeny < 150) {
+			mes "[Sailor]";
+			mes "150 Zeny!";
+			mes "Only 150 Zeny to ride!";
+			close;
+		}
+		set zeny,zeny-150;
+		warp "izlu2dun",107,50;
+		end;
+	case 2:
+		if (zeny < 500) {
+			mes "[Sailor]";
+			mes "500 Zeny!";
+			mes "Only 500 Zeny to ride!";
+			close;
+		}
+		set zeny,zeny-500;
+		warp "alberta",188,169;
+		end;
+	case 3:
+		close;
+	}
 }
 
-//Bonne-----------------------------------------------------------------------------------
-izlude,55,74,2	script	Bonne	90,{
+izlude,55,74,2	script	Bonne#izlude	90,{
 	mes "[Bonne]";
 	mes "Greetings!";
 	mes "Izlude welcomes you.";
 	next;
 	mes "[Bonne]";
-	mes "Izlude is the satelite city of";
-	mes "Prontera, capital of the";
-	mes "kingdom of Rune-Midgard.";
+	mes "Izlude is the satellite city of Prontera, capital of the Rune-Midgarts kingdom.";
 	next;
 	mes "[Bonne]";
-	mes "Izlude is key to our kingdom";
-	mes "because of the Swordsman";
-	mes "Association located here, as well";
-	mes "as the fact that Izlude is in";
-	mes "charge of protecting the";
-	mes "Rune-Midgard coastline.";
+	mes "Izlude is key to our kingdom because of the Swordsman Association located here, as well as the fact that Izlude is in charge of protecting the Rune-Midgard coastline.";
 	next;
 	mes "[Bonne]";
-	mes "I know, this bridge might look weak";
-	mes "and fragile, but it is actually";
-	mes "state of the art, built with the";
-	mes "most sophisticated technology.";
+	mes "I know, this bridge might look weak and fragile, but it is actually state of the art, built with the most sophisticated technology.";
 	next;
 	mes "[Bonne]";
-	mes "No matter how strong storms may be,";
-	mes "or how many people may stand on it,";
-	mes "this bridge will NEEEEVER";
-	mes "collapse.";
+	mes "No matter how strong storms may be, or how many people may stand on it, this bridge will NEEEEVER collapse.";
 	next;
 	mes "[Bonne]";
 	mes "Please enjoy";
@@ -83,426 +87,202 @@ izlude,55,74,2	script	Bonne	90,{
 	close;
 }
 
-
-//Cuskoal-------------------------------------------------------------------------------------
-izlude,119,121,1	script	Cuskoal	124,{
-	mes "[Cuskoal]";
-	if(rand(2)) {
-		mes "The pubs in Prontera are always";
-		mes "full of people from local areas and";
-		mes "from out-of-town. It can get pretty";
-		mes "busy.";
+izlude,135,78,2	script	Charfri#izlude	91,{
+	switch(rand(2)) {
+	case 1:
+		mes "[Charfri]";
+		mes "Some people may think Izlude is just a satellite city of Prontera, and not really that important...";
 		next;
-		mes "[Cuskoal]";
-		mes "It's a pretty good place to stop by";
-		mes "for general information and to";
-		mes "listen to rumors.";
+		mes "[Charfri]";
+		mes "But Izlude is a beautiful town right next to the ocean, as well as beautiful Bylan Island.";
 		next;
-		mes "[Cuskoal]";
-		mes "So if you listen carefully, you";
-		mes "just might get lucky and learn some";
-		mes "very useful information for";
-		mes "yourself.";
+		mes "[Charfri]";
+		mes "You'll have to board on a ship at the port to get to Byalan Island. There are dangerous dungeons on that island, so don't go snooping around just anywhere.";
 		close;
-	}		
-	mes "The Arena here is THE place for";
-	mes "capable young people from all over";
-	mes "the Rune-Midgarts Kingdom to";
-	mes "challenge themsleves and test their";
-	mes "skills.";
-	next;
-	mes "[Cuskoal]";
-	mes "You can battle with monsters of";
-	mes "different levels. So, the number of";
-	mes "stages you survive will be a";
-	mes "testiment to you battle powers.";
-	next;
-	mes "[Cuskoal]";
-	mes "So, whaddya say?";
-	close;
-}
-
-//Charfri-------------------------------------------------------------------------------------
-izlude,135,78,2	script	Charfri	91,{
-	mes "[Charfri]";
-	if(rand(2)) {
-		mes "Though it is very beautiful, Byalan";
-		mes "Island has a mysterious dungeon";
-		mes "that extends deep under the sea.";
+	Default:
+		mes "[Charfri]";
+		mes "Though it is very beautiful, Byalan Island has a mysterious dungeon that extends deep under the sea.";
 		next;
 		mes "[Charfri]";
-		mes "People who've actually been there";
-		mes "have said that if you go deep";
-		mes "enough, the dungeon actually";
-		mes "descends underwater.";
+		mes "People who've actually been there have said that if you go deep enough, the dungeon actually descends underwater.";
 		next;
 		mes "[Charfri]";
-		mes "Surprisingly, once you're";
-		mes "underwater, you can breathe just";
-		mes "like a fish. Maybe some kind of";
-		mes "supernatural force is in effect.";
+		mes "Surprisingly, once you're underwater, you can breathe just like a fish. Maybe some kind of supernatural force is in effect.";
 		next;
 		mes "[Charfri]";
 		mes "Ah...";
-		mes "The people who've seen the";
-		mes "underwater view say it is so";
-		mes "fantastic that they've kept";
-		mes "dreaming of it ever since.";
+		mes "The people who've seen the underwater view say it is so fantastic that they've kept dreaming of it ever since.";
 		next;
 		mes "[Charfri]";
-		mes "But unfortunately, the monsters are";
-		mes "too strong for ordinary people to";
-		mes "merely go sight seeing there.";
-		mes "Still, just once, I'd like to go";
-		mes "down there...";
+		mes "But unfortunately, the monsters are too strong for ordinary people to merely go sight seeing there. Still, just once, I'd like to go down there...";
 		close;
-	}		
-	mes "Some people may think Izlude is";
-	mes "just a satelite city of Prontera,";
-	mes "and not really that important...";
-	next;
-	mes "[Charfri]";
-	mes "But Izlude is a beautiful town";
-	mes "right next to the ocean, as well as";
-	mes "beautiful Byalan Island.";
-	next;
-	mes "[Charfri]";
-	mes "You'll have to board on a ship at";
-	mes "the port to get to Byalan Island.";
-	mes "There are dangerous dungeons on";
-	mes "that island, so don't go snooping";
-	mes "around just anywhere.";
-	close;
+	}
 }
 
-//Dega-------------------------------------------------------------------------------------
-izlude,150,118,3	script	Dega	84,{
-	mes "[Dega]";
-	if(rand(2)) {
-		if(rand(2)) {
-			mes "There's a very delightful place";
-			mes "where you can find every";
-			mes "type of Poring.";
-			next;
-			mes "[Dega]";
-			mes "It's somewhere near the bridge";
-			mes "connecting the forest and the";
-			mes "desert, on the way to the city of";
-			mes "Payon which is Southeast from";
-			mes "here.";
-			next;
-			mes "[Dega]";
-			mes "There are not only pink Porings but";
-			mes "also Drops, which can be found at";
-			mes "the desert, and the green";
-			mes "Poporing.";
-			next;
-			mes "[Dega]";
-			mes "But be careful, before you realize";
-			mes "it, you may come face to face with";
-			mes "Ghostring, a deadly Poring that";
-			mes "floats around the air like a";
-			mes "ghost.";
-			next;
-			mes "[Dega]";
-			mes "Well, of course, they are all very";
-			mes "cute, but Ghostring is an";
-			mes "EXCEPTION. It is very very";
-			mes "dangerous.";
-			next;
-			mes "[Dega]";
-			mes "If you are lucky enough, you might";
-			mes "even bump into Angeling, the";
-			mes "Poring with Angel wings.";
-			next;
-			menu "Ghostring?",-,"Angeling?",M_1,"End Conversation.",M_End;	
+izlude,119,121,2	script	Cuskoal#izlude	124,{
+	switch(rand(2)) {
+	case 1:
+		mes "[Cuskoal]";
+		mes "The Arena here is THE place for capable young people from all over the Rune-Midgarts Kingdom to challenge themselves and test their skills.";
+		next;
+		mes "[Cuskoal]";
+		mes "You can battle with monsters of differing levels. So, the number of stages you survive will be a testiment to your battle prowess.";
+		next;
+		mes "[Cuskoal]";
+		mes "So, whaddya say?";
+		close;
+	Default:
+		mes "[Cuskoal]";
+		mes "The pubs in Prontera are always full of people from local areas and from out-of-town. It can get pretty busy.";
+		next;
+		mes "[Cuskoal]";
+		mes "It's a pretty good place to stop by for general information and to listen to rumors.";
+		next;
+		mes "[Cuskoal]";
+		mes "So if you listen carefully, you just might get lucky and learn some very useful information for yourself.";
+		close;
+	}
+}
 
+izlude,150,118,2	script	Dega#izlude	84,{
+	switch(rand(4)) {
+	case 1:
+		mes "[Dega]";
+		mes "Mt. Mjornir, located north of Prontera, is a tough";
+		mes "and steep climb.";
+		next;
+		mes "[Dega]";
+		mes "Aside from the dangers of the mountain itself, insanely vicious insects live there too. I mean, they'll just attack you for no reason.";
+		next;
+		mes "[Dega]";
+		mes "If you ever want to visit somewhere past Mt. Mjolnir, then you prepare yourself for the challenge.  Or you could walk around it.";
+		close;
+	case 2:
+		mes "[Dega]";
+		mes "Some monsters in the world have the unique ability to sense mystical energy, and can detect Magic spells before they are cast.";
+		next;
+		mes "[Dega]";
+		mes "Golem of the desert is one of them. Don't underestimate it due to its sluggishness...";
+		next;
+		mes "[Dega]";
+		mes "If you try to cast magic near it, it will notice and saunter over to smash you. So you better watch out for Golem.";
+		close;
+	case 3:
+		mes "[Dega]";
+		mes "There's a very delightful place where you can find every";
+		mes "type of Poring.";
+		next;
+		mes "[Dega]";
+		mes "It's somewhere near the bridge connecting the forest and the desert, on the way to the city of Payon which is Southeast from here.";
+		next;
+		mes "[Dega]";
+		mes "There are not only pink Porings but also Drops, which can be found at the desert, and the green Poporing.";
+		next;
+		mes "[Dega]";
+		mes "But be careful, before you realize it, you may come face to face with Ghostring, a deadly Poring that floats around in the air like a ghost.";
+		next;
+		mes "[Dega]";
+		mes "Well, of course, they are all very cute, but Ghostring is an EXCEPTION. It is very very dangerous.";
+		next;
+		mes "[Dega]";
+		mes "If you are lucky enough, you might even bump into Angelring, the Poring with Angel wings.";
+		next;
+		while(1) {
+			switch(select("Ghostring?:Angelring?:End Conversation.")) {
+			case 1:
 				mes "[Dega]";
-				mes "Ghostring is a grayish Poring that";
-				mes "floats around in the air like a";
-				mes "ghost. Just like other ghosts,";
-				mes "physical attacks can't do any";
-				mes "damage to it.";
+				mes "Ghostring is a grayish Poring that floats around in the air like a ghost. Just like other ghosts, physical attacks can't do any damage to it.";
 				next;
 				mes "[Dega]";
-				mes "Those whose main attack methods are";
-				mes "physical like Swordman and Archer";
-				mes "might have to run for their lives";
-				mes "when facing Ghostrings.";
+				mes "Those whose main attack methods are physical like Swordman and Archer might have to run for their lives when facing Ghostrings.";
 				next;
 				mes "[Dega]";
-				mes "But don't leave just yet~! There is";
-				mes "great news for people with those";
-				mes "jobs. Making a weapon of some";
-				mes "elemental property is the key.";
+				mes "But don't leave just yet~! There is great news for people with those jobs. Making a weapon of some elemental property is the key.";
 				next;
 				mes "[Dega]";
-				mes "This way, even a Swordman or an";
-				mes "Archer can inflict damage, the way";
-				mes "Magic does, on Ghostrings.";
-				close;
-			M_1:
+				mes "This way, even a Swordman or an Archer can inflict damage, the way Magic does, on Ghostrings.";
+				next;
+				break;
+			case 2:
 				mes "[Dega]";
-				mes "Angelings are immune to Magic";
-				mes "attacks. If people who can only";
-				mes "attack with Magic face an";
-				mes "Angeling, then it's time for";
+				mes "Angelrings are immune to Magic attacks. If people who can only attack with Magic face an Angelring, then it's time for";
 				mes "them to run.";
 				next;
 				mes "[Dega]";
-				mes "If you've got an extra knife or";
-				mes "sword, you could give it a shot.";
-				mes "But it will be very difficult";
-				mes "alone, don't you think?";
-				close;
-			M_End:
+				mes "If you've got an extra knife or sword, you could give it a shot. But it will be very difficult alone, don't you think?";
+				next;
+				break;
+			case 3:
 				mes "[Dega]";
 				mes "Good Luck~";
-				close;
-		}			
-		mes "Some monsters in the world have the.";
-		mes "unique ability to sense mystical";
-		mes "energy, and can detect Magic spells";
-		mes "before they are cast.";
-		next;
-		mes "[Dega]";
-		mes "Golem of the desert is one of them.";
-		mes "Don't underestimate it due to it's";
-		mes "sluggishness...";
-		next;
-		mes "[Dega]";
-		mes "If you try to cast magic near it,";
-		mes "it will notice and saunter over to";
-		mes "smash you. So you better watch out";
-		mes "for Golem.";
-		close;
-	}		
-	mes "Mt. Mjolnir, located north of";
-	mes "Prontera, is a tough";
-	mes "and steep climb.";
-	next;
-	mes "[Dega]";
-	mes "Aside from the dangers of the";
-	mes "mountain itself, insanely vicious";
-	mes "insects live there too. I mean,";
-	mes "they'll just attack you for no";
-	mes "reason.";
-	next;
-	mes "[Dega]";
-	mes "If you ever want to visit somewhere";
-	mes "pas Mt. Mjolnir, then you prepare";
-	mes "your self for the challenge. Or you";
-	mes "could walk around it.";
-	close;
+				close2;
+				end;
+			}
+		}
+	}
 }
 
-//Kylick-------------------------------------------------------------------------------------
-izlude,150,143,4	script	Kylick	97,{
-	mes "[Kylick]";
-	if (rand(2)) {
-		mes "I was thinking, even though the";
-		mes "people of Izlude live so close to";
-		mes "the ocean...";
+izlude,150,143,2	script	Kylick#izlude	97,{
+	switch(rand(2)) {
+	case 1:
+		mes "[Kylick]";
+		mes "Don't you think Binoculars";
+		mes "are really COOL?! You can";
+		mes "see all sorts of places...!";
 		next;
 		mes "[Kylick]";
-		mes "There are other cultures that have";
-		mes "completely developed by living off";
-		mes "of the sea. Of course, I'm talking";
-		mes "about Amatsu.";
+		mes "Here in Izlude, we are responsible for maintaining peace not only on land but also at sea. That's why this city has a huge telescope.";
 		next;
 		mes "[Kylick]";
-		mes "I hear the cuisine there is really";
-		mes "good! Although the idea of eating";
-		mes "raw fish is new to me, I would love";
-		mes "to go there, and try it just once!";
+		mes "This telecope constantly watches over the sea, so that we can prevent any serious trouble from happening. You know...";
+		next;
+		mes "[Kylick]";
+		mes "An ounce of";
+		mes "prevention is worth";
+		mes "a pound of cure";
+		mes "after all, right?";
 		close;
-	}
-	mes "Don't you think Binoculars";
-	mes "are really COOL?! You can";
-	mes "see all sorts of places...!";
-	next;
-	mes "[Kylick]";
-	mes "Here in Izlude, we are responsible";
-	mes "for maintaining peace not only on";
-	mes "land but also at sea. That's why";
-	mes "this city has a huge telescope.";
-	next;
-	mes "This telescope constantly watches";
-	mes "over the sea, so that we can";
-	mes "prevent any serious trouble from";
-	mes "happening. You know...";
-	next;
-	mes "An ounce of";
-	mes "prevention is worth";
-	mes "a pound of cure";
-	mes "after all, right?";
-	close;
-}
-
-// Soldier ------------------------------------------------------------------------------
-izlude,124,178,4	script	Soldier	105,{
-	mes "[Soldier]";
-	mes "Hehehehe... Hahahaha";
-	mes "Huh? Why am I so happy?";
-	mes "You wanna know?";
-	next;
-	menu "Sure, why?",-, "Not really, I don't care.",M_1;
-	
-		mes "[Soldier]";
-		mes "Ah~~ There's not much for us to do";
-		mes "these days. You see, Merchants buy";
-		mes "items dropped by monsters. But you";
-		mes "knew that, right?";
+	Default:
+		mes "[Kylick]";
+		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
 		next;
-		menu "Of course",-, "Eh? Really?",sM_1;
-		
-			mes "[Soldier]";
-			mes "Haha, in fact, that used to be part";
-			mes "of our job. But there were more and";
-			mes "more hunters who come in order to";
-			mes "get paid, so it became too much to";
-			mes "handle.";
-			next;
-			mes "[Soldier]";
-			mes "We had to work overtime every day.";
-			mes "Ah, it was a nightmare...! Anyways,";
-			mes "the government eventually made a";
-			mes "wise decision in creating the";
-			mes "Registration System.";
-			next;
-			mes "[Soldier]";
-			mes "The Office of Prize Compensation";
-			mes "only pays those who have the";
-			mes "Registration. Of course, you'd have";
-			mes "to be a merchant and stay in the";
-			mes "same place all day long.";
-			next;
-			mes "[Soldier]";
-			mes "The Office gives away the";
-			mes "registration to any merchant who";
-			mes "fulfills those requirements. So";
-			mes "nowadays, the hunters sell their";
-			mes "goods to the registered merchants.";
-			next;
-			mes "[Soldier]";
-			mes "So nowadays, the hunters sell their";
-			mes "goods to the registered merchants.";
-			mes "Not too many people come to us for";
-			mes "that anymore.";
-			next;
-			mes "[Soldier]";
-			mes "I mean we are still busy, but";
-			mes "that's nothing compared to how it";
-			mes "was before. People who have felt";
-			mes "suffering know how to appreciate";
-			mes "even the slightest comfort.";
-			close;
-		sM_1:
-			mes "[Soldier]";
-			mes "What?! What do you mean you didn't";
-			mes "know?! Well, you know you can get";
-			mes "items by killing monsters. If you";
-			mes "bring and sell those to a merchant,";
-			mes "you can make some money.";
-			next;
-			mes "[Soldier]";
-			mes "HaHa, in fact, that used to be part";
-			mes "of our job. But there were more and";
-			mes "more hunters who come in order to";
-			mes "get paid, so it became too much to";
-			mes "handle.";
-			next;
-			mes "[Soldier]";
-			mes "We had to work overtime every day.";
-			mes "Ah, it was a nightmare...! Anyways,";
-			mes "the government eventually made a";
-			mes "wise decision in creating the";
-			mes "Registration System.";
-			next;
-			mes "[Soldier]";
-			mes "The Office of Prize Compensation";
-			mes "only pays those who have the";
-			mes "Registration. Of course, you'd have";
-			mes "to be a merchant and stay in the";
-			mes "same place all day long.";
-			next;
-			mes "[Soldier]";
-			mes "The Office gives away the";
-			mes "registration to any merchant who";
-			mes "fulfills those requirements. So";
-			mes "nowadays, the hunters sell their";
-			mes "goods to the registered merchants.";
-			next;
-			mes "[Soldier]";
-			mes "I mean we are still busy, but";
-			mes "that's nothing compared to how it";
-			mes "was before. People who have felt";
-			mes "suffering know how to appreciate";
-			mes "even the slightest comfort.";
-			close;
-	M_1:
-		mes "[Soldier]";
-		mes "Okay Good bye~~";
+		mes "[Kylick]";
+		mes "There are other cultures that have completely developed by living off of the sea. Of course, I'm talking about Amatsu.";
+		next;
+		mes "[Kylick]";
+		mes "I hear the cuisine there is really good! Although the idea of eating raw fish is new to me, I would love to go there, and try it just once!";
 		close;
+	}
 }
 
-//Cebalis-------------------------------------------------------------------------------------
-izlude,56,126,7	script	Cebalis::RedCebalis	85,{
-
+izlude,56,126,2	script	Red#izlude	85,{
 	mes "[Red]";
-	mes "The only skill that's needed for a";
-	mes "Swordman is ^FF0000Bash^000000! Bash, Bash and";
-	mes "ONLY ^FF0000BASH^000000! No need to waste time";
-	mes "and effort for smaller skills!";
-	mes "Everything else is for cowards and";
-	mes "wusses!";
+	mes "The only skill that's needed for a Swordman is ^FF2400Bash^000000! Bash, Bash and ONLY ^FF2400Bash^000000! No need to waste time and effort for smaller skills! Everything else is for cowards and wusses!";
 	next;
 	mes "[Cebalis]";
-	mes "What are you talking about!? The";
-	mes "ideal Swordman resolutely stands";
-	mes "alone, surrounded by countless";
-	mes "enemies and smashing them all with";
-	mes "one awesome attack.";
+	mes "What are you talking about!? The ideal Swordman resolutely stands alone, surrounded by countless enemies and smashing them all with one awesome attack.";
 	next;
 	mes "[Cebalis]";
-	mes "^FF0000MAGNUM BREAK^000000";
+	mes "^EE0000MAGNUM BREAK!^000000";
 	mes "That's right, Magnum Break";
 	mes "is the skill that does";
 	mes "the job right~!!";
 	next;
 	mes "[Cebalis]";
-	mes "Well... Sometimes the explosive";
-	mes "damage might accidentally hit some";
-	mes "wandering monsters, and those guys";
-	mes "end up coming after you, but that's";
-	mes "a risk a Swordman should be willing";
-	mes "to take!!";
+	mes "Well... Sometimes the explosive damage might accidentally hit some wandering monsters, and those guys end up coming after you, but that's a risk a Swordman should be willing to take!!";
 	next;
 	mes "[Red]";
-	mes "That's exactly why you're dumb, you";
-	mes "idiot! And what's this about the";
-	mes "'the ideal Swordman?' I still";
-	mes "remember the last time you used";
-	mes "Magnum Break...";
+	mes "That's exactly why you're dumb, you idiot! And what's this about the 'the ideal Swordman?' I still remember the last time you used Magnum Break...";
 	next;
 	mes "[Red]";
-	mes "You ended up running away from all";
-	mes "those monsters you hit with that";
-	mes "stupid skill! Weakling! All those";
-	mes "Porings around you got hit and they";
-	mes "all tried to kill you.";
+	mes "You ended up running away from all those monsters you hit with that stupid skill! Weakling! All those Porings around you got hit and they all tried to kill you. ";
 	next;
 	mes "[Cebalis]";
-	mes "Hmpf. As I recall, you were running";
-	mes "away too, apparently too busy to";
-	mes "use your precious bash. In any";
-	mes "case, Magnum Break is THE skill for";
-	mes "a Swordman~!!";
+	mes "Hmpf. As I recall, you were running away too, apparently too busy to use your precious Bash. In any case, Magnum Break is THE skill for a Swordman~!!";
 	next;
 	mes "[Cebalis]";
 	mes "Something simplistic like Bash";
-	mes "is just one of the little steps";
-	mes "towards Magnum Break.";
+	mes "is just one of the little steps towards Magnum Break.";
 	next;
 	mes "[Red]";
 	mes "Oh man~";
@@ -511,241 +291,226 @@ izlude,56,126,7	script	Cebalis::RedCebalis	85,{
 	mes "So what do you think?";
 	next;
 	mes "[Red]";
-	mes "Which one do you think is better?";
-	mes "The critical damage skill, ^FF0000Bash^000000, or";
-	mes "the Splash damage skill, ^FF0000Magnum^000000";
-	mes "^FF0000Break^000000?";
+	mes "Which one do you think is better? The critical damage skill, ^FF2400Bash^000000, or the Splash damage skill, ^EE0000Magnum Break^000000?";
 	next;
-	menu "Bash",-,"Magnum Break",M_1;
-	
-		mes "[Red]";
-		if( baseClass != Job_Swordman ){
-			mes "Hahahaha!! See!? Someone who";
-			mes "pursues a different job agrees with";
-			mes "me~! You really are a great guy!";
-			mes "Hahaha!! Undoubtedly, only ^FF0000Bash^000000";
-			mes "suits a Swordman. Please tell that";
-			mes "to this NIMROD over here~ Hahaha!";
+	if (select("Bash:Magnum Break") == 1)  {
+		if (BaseClass == Job_Swordman) {
+			mes "[Red]";
+			mes "Hahahaha!!! I knew you'd see things my way!! You ARE a great guy!! Undoubtedly, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this BONEHEAD over here~ Hahaha!";
+			next;
+			mes "[Red]";
+			mes "Hmm, let me give you a bit of advice. After you achieve level 5 'Bash', the amount of SP consumed by the skill increases greatly, so watch out for your SP.";
 			close;
 		}
-		mes "Hahahaha!!! I knew you'd see things";
-		mes "my way! You ARE a great guy!!";
-		mes "Undoubtedly, only ^FF0000Bash^000000 suits a";
-		mes "Swordman. Please tell that to this";
-		mes "BONEHEAD over here~ Hahaha!";
-		next;
 		mes "[Red]";
-		mes "Hmm, let me give you a bit of";
-		mes "advice. After you achieve level 5";
-		mes "Bash', the amount of SP consumed";
-		mes "by the skill increased greatly, so";
-		mes "watch out for your SP.";
+		mes "Hahahaha!! See!? Someone who pursues a different job agrees with me~! You really are a great guy! Hahaha!! Undoubtedly, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this NIMROD over here~ Hahaha!";
 		close;
-	M_1:
+	}
+	if (BaseClass == Job_Swordman) {
+		mes "[Cebalis]";
+		mes "Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know the stuff~ HaHaHa!";
+		next;
+		mes "[Cebalis]";
+		mes "You wanna know some useful information? Okay, okay lemme tell ya! Magnum Break has Fire Property.";
+		next;
 		mes "[Cebalis]";
-		if( baseClass != Job_Swordman ){
-			mes "Right?! ^FF0000Magnum Break^000000 is THE BEST!!!";
-			mes "You know what you're talking about,";
-			mes "eh? I don't know why this jerk face";
-			mes "is being sooooo stubborn.";
+		mes "So it won't be too effective against monsters with the Water property, but this is THE skill to use against Undead and Earth property monsters!";
+		next;
+		mes "[Cebalis]";
+		mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ ";
+		close;
+	}
+	mes "[Cebalis]";
+	mes "Right?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this jerkface is being sooooo stubborn.";
+	close;
+}
+	
+izlude,58,126,2	script	Cebalis#izlude	98,{
+	mes "[Red]";
+	mes "The only skill that's needed for a Swordman is ^FF2400Bash^000000! Bash, Bash and ONLY ^FF2400Bash^000000! No need to waste time and effort on smaller skills~~ Everything else is for cowards and wusses!";
+	next;
+	mes "[Cebalis]";
+	mes "What are you talking about!? The ideal Swordman resolutely stands alone, surrounded by countless foes, smashing them all with one awesome attack...";
+	next;
+	mes "[Cebalis]";
+	mes "^EE0000MAGNUM BREAK!^000000";
+	mes "That's right, Magnum Break";
+	mes "is the perfect";
+	mes "Swordman skill.";
+	next;
+	mes "[Cebalis]";
+	mes "Well...";
+	mes "Sometimes the explosion accidentally hits some monsters that are just wandering around.";
+	next;
+	mes "[Cebalis]";
+	mes "Then they all end up coming after you, but that's a risk a true Swordman should be willing to take.";
+	next;
+	mes "[Red]";
+	mes "That's exactly why you're dumb, you idiot! And what was that about the 'ideal Swordman?' You remember the last time you used Magnum Break?!";
+	next;
+	mes "[Red]";
+	mes "You had to run away from all those Porings hit by that stupid skill! You weakling! All those Porings that you hit tried to kill you! ";
+	next;
+	mes "[Cebalis]";
+	mes "Oh shut up. And those were Poporings. As I recall, you were running away too, apparently too busy to use your precious Bash.";
+	next;
+	mes "[Cebalis]";
+	mes "In any case, Magnum Break is THE skill for a Swordman~!! Something simplistic like Bash is just one of those little steps towards Magnum Break.";
+	next;
+	mes "[Red]";
+	mes "Oh man~";
+	mes "Hey, I know you";
+	mes "heard everything.";
+	mes "So what do you think?";
+	next;
+	mes "[Red]";
+	mes "Which one do you think is better? The critical damage skill, ^FF2400Bash^000000, or the Splash damage skill, ^EE0000Magnum Break^000000?";
+	next;
+	if (select("Bash:Magnum Break") == 1) {
+		if (BaseClass == Job_Swordman) {
+			mes "[Red]";
+			mes "Hahahaha!!! I knew you'd see things my way!! You ARE a great guy!! Without a doubt, only ^FF2400Bash^000000 suits a Swordman. Please tell that to FUNBOY over here!! Hahaha.";
+			next;
+			mes "[Red]";
+			mes "Hmm, let me give you a bit of advice. After you achieve level 5 Bash, the amount of SP consumed by the skill increases greatly, so watch out for your SP.";
 			close;
 		}
-		mes "Alright!! ^FF0000Magnum Break^000000 is the";
-		mes "BEST!! Now you're talking~!! You";
-		mes "know the stuff~HaHaHa!";
+		mes "[Red]";
+		mes "Hahahaha!!";
+		mes "See!? Someone who pursues a different job agrees with me~! You really are a great guy! Hahaha!!";
+		next;
+		mes "[Red]";
+		mes "Without a doubt, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this MORON over here!! Hahaha~";
+		close;
+	}
+	if (BaseClass == Job_Swordman) {
+		mes "[Cebalis]";
+		mes " Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know your stuff, kid. HaHaHa~!";
 		next;
 		mes "[Cebalis]";
-		mes "You wanna know some useful";
-		mes "information? Okay, lemme tell";
-		mes "ya! Magnum Break has Fire";
-		mes "Property.";
+		mes "You wanna know some useful information? Okay, okay lemme tell ya! The explosion from 'Magnum Break' has the Fire Property.";
 		next;
 		mes "[Cebalis]";
-		mes "So it won't be too effective";
-		mes "against monsters with the Water";
-		mes "property, but this is THE skill to";
-		mes "use against Undead and Earth";
-		mes "property monsters!";
+		mes "So it won't be very effective against Water property monsters, but this is THE skill to use against Undead and Earth property monsters.!";
 		next;
 		mes "[Cebalis]";
-		mes "And most importantly, look around";
-		mes "before you use it. Otherwise you'll";
-		mes "be in BIG trouble~";
+		mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ ";
 		close;
+	}
+	mes "[Cebalis]";
+	mes "I'm right, aren't I?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this LARDFACE is sooooo stubborn.";
+	close;
 }
-//Cebalis-------------------------------------------------------------------------------------------------------------------------------------------
-izlude,58,126,1	duplicate(RedCebalis)	Cebalis	98
 
-//Aaron-------------------------------------------------------------------------------------
-izlude_in,125,164,5	script	Aaron	65,{
+izlude,124,178,2	script	Soldier#izlude	105,{
+	mes "[Soldier]";
+	mes "HeHeHeHe..HaHaHaHa ";
+	mes "Huh? Why am I so happy?";
+	mes "You wanna know?";
+	next;
+	if (select("Sure, why?:Not really, I don't care.") == 1) {
+		mes "[Soldier]";
+		mes "Ah~~ There's not much for us to do these days. You see, Merchants buy items dropped by monsters.  But you knew that, right? ";
+		next;
+		if (select("Of course:Eh? Really?") == 1) {
+			mes "[Soldier]";
+			mes "HaHa~ In fact, that was actually part of our job. But there were more and more hunters who came to us in order to get paid and it became too much to handle.";
+			next;
+			mes "[Soldier]";
+			mes "We had to work overtime every day. Ah, it was a nightmare...! Anyway, the government eventually made a wise decision in creating the Registration System.";
+			next;
+			mes "[Soldier]";
+			mes "The Office of Prize Compensation only pays those who have the Registration. Of course, you'd have to be a merchant and stay in the same place all day long.";
+			next;
+			mes "[Soldier]";
+			mes "The Office gives away the registration to any merchant who fulfills those requirements. So nowadays, the hunters sell their goods to the registered merchants.";
+			next;
+			mes "[Soldier]";
+			mes "So nowadays, the hunters sell their goods to the registered merchants.  Not too many people come to us for that anymore.";
+			next;
+			mes "[Soldier]";
+			mes "I mean we are still busy, but that's nothing compared to how it was before. People who have felt suffering know how to appreciate even the slightest comfort.";
+			close;
+		}
+		mes "[Soldier]";
+		mes "What?! What do you mean you didn't know?! Well, you know you can get items by killing monsters. If you bring and sell those to a merchant, you can make some money. ";
+		next;
+		mes "[Soldier]";
+		mes "HaHa, in fact, that used to be part of our job. But there were more and more hunters who come in order to get paid, so it became too much to handle.";
+		next;
+		mes "[Soldier]";
+		mes "We had to work overtime every day. Ah, it was a nightmare...! Anyway, the government eventually made a wise decision in creating the Registration System.";
+		next;
+		mes "[Soldier]";
+		mes "The Office of Prize Compensation only pays those who have the Registration. Of course, you'd have to be a merchant and stay in the same place all day long.";
+		next;
+		mes "[Soldier]";
+		mes "The Office gives away the registration to any merchant who fulfills those requirements. So nowadays, the hunters sell their goods to the registered merchants.";
+		next;
+		mes "[Soldier]";
+		mes "So nowadays, the hunters sell their goods to the registered merchants.  Not too many people come to us for that anymore.";
+		next;
+		mes "[Soldier]";
+		mes "I mean we are still busy, but that's nothing compared to how it was before. People who have felt suffering know how to appreciate even the slightest comfort.";
+		close;
+	}
+	mes "[Soldier]";
+	mes "Okay Good Bye~~";
+	close;
+}
+
+// Inside Izlude	
+//============================================================
+izlude_in,125,164,2	script	Aaron#izlude	65,{
 	mes "[Aaron]";
-	mes "Don't you think Strong VIT and";
-	mes "training in a unique breathing";
-	mes "method which enables quick HP";
-	mes "recovery are the greatest";
-	mes "advantages for a Swordman?";
+	mes "Don't you think Strong VIT and training in a unique breathing method which enables quick HP recovery are the greatest advantages for a Swordman?";
 	next;
 	mes "[Aaron]";
-	mes "If you train your skills very hard,";
-	mes "you can even see your HP";
-	mes "recovering. The amount of";
-	mes "recovered depends on";
+	mes "If you train your skills very hard, you can even see your HP recovering. The amount";
+	mes "recovered depends";
 	mes "vitality, or VIT.";
 	next;
 	mes "[Aaron]";
-	mes "So if you invest more of your stats";
-	mes "in VIT, you'll recover more HP";
-	mes "overall when resting.";
+	mes "So if you invest more of your stats in VIT, you'll recover more HP overall when resting.";
 	next;
 	mes "[Aaron]";
-	mes "But of course, it'd be good to have";
-	mes "high Attack, wouldn't it? You can";
-	mes "either acquire a good weapon or";
-	mes "bring up your STR to support you";
-	mes "Attack.";
+	mes "But of course, it'd be good to have high Attack, wouldn't it? You can either acquire a good weapon or bring up your STR to support you Attack.";
 	next;
 	mes "[Aaron]";
-	mes "You know you'll need some strength";
-	mes "anyways to swing good weapons";
-	mes "easily, anyway.";
+	mes "You know you'll need some strength anyway to swing good weapons easily, anyway.";
 	next;
 	mes "[Aaron]";
-	mes "Another important thing is how";
-	mes "accurate you can hit your";
-	mes "opponents. DEX is the key here. If";
-	mes "you train DEX, then the gap between";
-	mes "the MIN and MAX damage will also";
-	mes "decrease.";
+	mes "Another important thing is how accurate you can hit your opponents. DEX is the key here. If you train DEX, then the gap between the MIN and MAX damage will also decrease.";
 	next;
 	mes "[Aaron]";
 	mes "Hm...";
-	mes "Are you bored by all this talk? Or";
-	mes "do you want me to go on?";
+	mes "Are you bored by all this talk? Or do you want me to go on?";
 	next;
-	menu "Tell me more please.",-,"End conversation",M_End;
-	
+	if (select("Tell me more please.:End conversation.") == 1) {
 		mes "[Aaron]";
 		mes "Hmm...";
-		mes "In that case, I'll explain about";
-		mes "the other attributes to you";
-		mes "briefly. In order to attack and";
-		mes "evade quickly, you've gotta pay";
-		mes "attention to AGI.";
+		mes "In that case, I'll explain about the other attributes to you briefly. In order to attack and evade quickly, you've gotta pay attention to AGI. ";
 		next;
 		mes "[Aaron]";
-		mes "In case you want to make more";
-		mes "critical hits, it's a good idea to";
-		mes "invest in LUK. INT also increases";
-		mes "Max SP, which is needed to use";
-		mes "various skills... but it's really";
-		mes "up to you.";
-		close;
-	M_End:
-		mes "[Aaron]";
-		mes "Okay then,";
-		mes "train hard~~";
-		close;
-}
-
-//Sailor-------------------------------------------------------------------------------------
-izlude,201,181,2	script	Sailor#06	100,{
-	mes "[Sailor]";
-	mes "Hey Everybody!";
-	mes "Attention, attention!";
-	mes "Come and Ride the Wind";
-	mes "on a Fantastic Ship!";
-	mes "Hurry, hurry";
-	next;
-	menu "Byalan Island -> 150 Zeny.",-,"Alberta Marina -> 500 Zeny.",L_Alb,"Cancel",M_End;
-	
-		if(Zeny < 150){
-			mes "[Sailor]";
-			mes "150 Zeny!";
-			mes "Only 150 Zeny to ride!";
-			close;
-		}
-		set Zeny, Zeny - 150;
-		warp "izlu2dun",107,50;
-		close;
-	L_Alb:
-		if(Zeny < 500){
-			mes "[Sailor]";
-			mes "500 Zeny!";
-			mes "Only 500 Zeny to ride!";
-			close;
-		}
-		set Zeny, Zeny - 500;
-		warp "alberta",188,169;
-	M_End:
+		mes "In case you want to make more critical hits, it's a good idea to invest in LUK. INT also increases Max SP, which is needed to use various skills... But it's really up to you.";
 		close;
+	}
+	mes "[Aaron]";
+	mes "Okay then,";
+	mes "train hard~~";
+	close;
 }
 
-//Sailor-------------------------------------------------------------------------------------
-izlu2dun,108,27,4	script	Sailor#07	100,{
+// Izlude Dungeon
+//============================================================
+izlu2dun,108,27,0	script	Sailor#2izlude	100,{
 	mes "[Sailor]";
 	mes "Wanna";
 	mes "head back?";
 	next;
-	menu "Yeah, I am Tired to Death.",-,"Nope I love this place.",M_1;
-	
+	if (select("Yeah, I'm tired to death.:Nope, I love this place!") == 1) {
 		warp "izlude",176,182;
-	M_1:
-		close;
-}
-
-izlude,171,185,3	script	Honeymoon Helper#Izlude I	71,{
-
-	mes "[Marry Happy]";
-	mes "Newly weds and already weds...";
-	mes "You can go to the imaginary recreational area anytime.";
-	mes "Welcome to Jawaii!";
-	next;
-	menu "'Jawaii'?",-,"Let's go to 'Jawaii'~",M_Go,"Cancel",M_End;
-
-		mes "[Marry Happy]";
-		mes "A distant island from the continent of Rune Midgard... ";
-		mes "there is a peaceful and charming recreational area,";
-		mes "that can't be easily reached by people.";
-		mes "Since it is a famous spot for honeymoon,";
-		mes "only married couples are allowed to go there.";
-		next;
-		mes "[Marry Happy]";
-		mes "Since it's a special journey,";
-		mes "the payment will be a bit expensive than normal. It will cost you 10,000z !!";
-		mes "And that's what lets you enjoy";
-		mes "a peaceful and fascinating";
-		mes "honey moon trip...?";
-		close;
-
-	M_Go:
-		if(!getpartnerid()){
-			mes "[Marry Happy]";
-			mes "UhOh, I'm sorry.";
-			mes "You can't go there if you're not married...";
-			mes "Why don't you go to the Prontera Inn,";
-			mes "and cheer yourself up?";
-			close;
-		} else if(Zeny < 10000){
-			mes "[Marry Happy]";
-			mes "I've explained about the trip to 'Jawaii'.";
-			mes "You'll need 10,000 z.";
-			mes "If you do not have enough zeny,";
-			mes "why don't you seek help from your partner...?";
-			close;
-		}
-		set Zeny,Zeny - 10000;
-		mes "[Marry Happy]";
-		mes "Enjoy your trip...!!";
-		mes "Let's go to 'Jawaii'...!!";
-		close2;
-		warp "jawaii",241,115;
 		end;
-
-	M_End:
-		mes "[Marry Happy]";
-		mes "There's nothing that is as exciting as";
-		mes "travelling together, especially when";
-		mes "you're travelling with your loved ones.";
-		mes "You must be very happy, aren't you?";
-		close;
+	}
+	close;
 }
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 36c13f1c2..a8b2eb171 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -3,771 +3,1469 @@
 //===== By: ==================================================
 //= jAthena (1.0)
 //= DNett123 (1.1 - 1.5)
+//= L0ne_w0lf
 //===== Current Version: =====================================
-//= 2.02
+//= 3.0
 //===== Compatible With: =====================================
-//= Latest eAthena SVN
+//= eAthena SVN
 //===== Description: =========================================
+//= [Aegis OCnversion]
 //= Jawaii Town Npcs
 //===== Additional Comments: =================================
-//= 1.0 - Done By jAthena
-//= 1.1 - Rough Translation [DNett123]
-//= 1.2 - Started Grammer Corrections [DNett123]
-//= 1.3 - Some Edits Thanks To Vidar & Fusion [DNett123]
-//= 1.4 - Edited Dancer, Thanks ceskil [DNett123]
-//= 1.5 - Fixed Script, and spelling errors, some thanks to Sparkles [DNett123]
-//= 1.6 - Final corrections (not complete), thanks to the public, and DNett123!
-//= 1.6c - added missing monsters. Still 1 type is missing [Lupus]
-//= 1.7 – Fixed a lot of typo’s [Nexon]
-//= 1.8 - Removed monster spawns, added aegis ep 8.5 spawns to npc/mobs/fields/jawaii.txt [MasterOfMuppets]
-//= 2.0 - Updated the npcs according to iRO [MasterOfMuppets]
+//= 1.0 Done By jAthena
+//= 1.1 Rough Translation [DNett123]
+//= 1.2 Started Grammer Corrections [DNett123]
+//= 1.3 Some Edits Thanks To Vidar & Fusion [DNett123]
+//= 1.4 Edited Dancer, Thanks ceskil [DNett123]
+//= 1.5 Fixed Script, and spelling errors, some thanks to Sparkles [DNett123]
+//= 1.6 Final corrections (not complete), thanks to the public, and DNett123!
+//= 1.6c added missing monsters. Still 1 type is missing [Lupus]
+//= 1.7 Fixed a lot of typo’s [Nexon]
+//= 1.8 Removed monster spawns, added aegis ep 8.5 spawns to npc/mobs/fields/jawaii.txt [MasterOfMuppets]
+//= 2.0 Updated the npcs according to iRO [MasterOfMuppets]
 //= 2.01 fixed missing @ at randomdrink, thanks to theultramage [Lupus]
-//= 2.02 - Fixed Classic Suite NPC warping directly above a warp [Evera]
+//= 2.02 Fixed Classic Suite NPC warping directly above a warp [Evera]
+//= 3.0 Rescripted to Aegis 10.3 standard. Contains all Jawaii-related NPCs. [L0ne_W0lf]
 //============================================================
 
-//===== Shop: ================================================
-jawaii,186,174,2	shop	Jawaii Dealer	85,536:150
-
-//===== Jawaii Scripts ===================================
-jawaii,141,200,3	script	Attendant#Sweetness Suite	798,{
-	
-	mes "[Alowawu]";
-	mes "Welcome.";
-	mes "This is the Sweetness suite.";
-	mes "I have cleaned and tidy up the place.";
-	mes "So please feel free to use it.";
-	next;
-	mes "[Alowawu]";
-	mes "The rental is 1000 zeny per person.";
-	mes "If you give it to me,";
-	mes "I'll transfer you inside.";
-	mes "There's no other way to get inside directly.";
-	next;
-	mes "[Alowawu]";
-	mes "I'll help you with the baggages,";
-	mes "or else, my boss will";
-	mes "beat me up with Triple Blows.";
-	mes "That really hurts.";
-	next;
-	menu "Use it",-,"Cancel",s_Cancel;
-			if(Zeny > 999)
-{
-				mes "[Alowawu]";
-				mes "Thank you.";
-				mes "I'll open a portal for you right now.";
-				mes "Have a nice stay";
-				close2;
-				set Zeny,Zeny - 1000;
-				warp "jawaii_in",116,64;
-				end;
-}
-			else
-{
-				mes "[Alowawu]";;
-				mes "Ah. Dear customer,";
-				mes "you don't have enough zeny to pay for the room.";
-				mes "I can't let you in. Or else,";
-				mes "my boss with get angry and hit me with Triple Blows.";
-				close;
-}
-s_Cancel:
-			mes "[Alowawu]";
-			mes "Haha, this room is better than others.";
-			mes "Believe, it's nice and clean.";
-			mes "If you have any change of mind,";
-			mes "just come and find me.";
-			close;
+// Jawaii
+//============================================================
+jawaii,239,112,7	script	Mariner#toizu	100,{
+	mes "[Mariner]";
+	mes "This ship";
+	mes "is heading";
+	mes "towards ^666699Izlude^000000.";
+	mes "Have you enjoyed your time in Jawaii? You should check to see";
+	mes "if you forgot anything before we go.";
+	next;
+	mes "[Mariner]";
+	mes "Well, then.";
+	mes "Would you like";
+	mes "to go back to Izlude?";
+	next;
+	if (select("Go back.:Cancel.") == 1) {
+		mes "[Mariner]";
+		mes "Now, let me";
+		mes "guide you to";
+		mes "Izlude.";
+		close2;
+		warp "izlude",176,182;
+		end;
+	}
+	mes "[Mariner]";
+	mes "Take your time";
+	mes "and look around as";
+	mes "much as you like.";
+	mes "Somehow,  this is not";
+	mes "a place that you can";
+	mes "visit often, you know?";
+	close;
 }
 
-jawaii,108,199,5	script	Attendant#Classic_Suite	74,{
-	
-	mes "[Poyi Oland]";
-	mes "Welcome.";
-	mes "This is the Classic suite with two rooms.";
-	mes "It's totally perfect for both of you!";
-	mes "Although the appearances of the houses look alike,";
-	mes "the interior is totally different!";
-	next;
-	mes "[Poyi Oland]";
-	mes "The rental is 1000 zeny per person.";
-	mes "and we're on a post paid basis!";
-	mes "Since you're here on a trip,";
-	mes "I suggest that you choose a better room!";
-	next;
-	mes "[Poyi Oland]";
-	mes "If you ever need anything, just call us.";
-	mes "We'll be at your service immediately.";
-	next;
-	menu "Use",-,"Cancel",s_Cancel;
-
-			if (Zeny > 999)
-{
-				mes "[Poyi Oland]";
-				mes "Thank you for using.";
-				mes "Please enjoy your stay.";
-				close2;
-				set Zeny,Zeny - 1000;
-				warp "jawaii_in",130,109;
-				end;
-}
-			else
-{
-				mes "[Poyi Oland]";
-				mes "I'm sorry!";
-				mes "You do not have enough zeny.";
-				mes "Please confirm your zeny and come again!";
-				close;
-}
-s_Cancel:
-			mes "[Poyi Oland]";
-			mes "So, please come again after you've confirmed it.";
-			mes "Presence of any guest is always welcomed.";
-			close;
+jawaii,122,263,5	script	Mariner#toalbe	100,{
+	mes "[Mariner]";
+	mes "This ship";
+	mes "is headed back";
+	mes "towards ^003399Alberta^000000.";
+	mes "Have you enjoyed your time in Jawaii? You should check to see";
+	mes "if you forgot anything before we go.";
+	next;
+	mes "[Mariner]";
+	mes "Now, are you";
+	mes "ready to go back";
+	mes "to Alberta?";
+	next;
+	if (select("Go back.:Cancel.") == 1) {
+		mes "[Mariner]";
+		mes "Now, let me";
+		mes "take you back";
+		mes "to Alberta.";
+		close2;
+		warp "alberta",192,157;
+		end;
+	}
+	mes "[Mariner]";
+	mes "Yeah...";
+	mes "Try to enjoy your";
+	mes "vacation as much";
+	mes "as you can. We'll be";
+	mes "ready to leave when";
+	mes "you are.";
+	close;
 }
 
-jawaii,107,189,5	script	Attendant#Honeymoon Suite	93,{
-	
-	mes "[Saroki Lania]";
-	mes "...This is the Honeymoon suite and the cost is 1000 zeny.";
+jawaii,188,218,7	script	Tavern Lady#Jawaii	80,{
+	mes "[Lady]";
+	mes "Oh, dear!";
+	mes "You're not going";
+	mes "to the tavern, are you?";
 	next;
-	mes "[Saroki Lania]";
-	mes "...Do you want to go in?";
+	if (select("No, I am not.:Hell yeah~") == 1) {
+		mes "[Lady]";
+		mes "Whew~!";
+		mes "Thank goodness!";
+		mes "It's just that...";
+		mes "The tavern probably";
+		mes "isn't the best place for";
+		mes "you to enjoy yourself.";
+		next;
+	}
+	mes "[Lady]";
+	mes "Even though I work there, I still can't believe that kind of place exists! I mean, I thought alcohol was outlawed in the Rune-Midgarts Kingdom!";
 	next;
-	mes "[Poyi Oland]";
-	mes "If you ever need anything, just call us.";
-	mes "We'll be at your service immediately.";
+	mes "[Lady]";
+	mes "I have no idea how singles are";
+	mes "able to find this place. But I've heard that lots of different people come here for different reasons.";
 	next;
-	menu "Yes",-,"Cancel",s_Cancel;
-
-			if(Zeny > 999)
-{
-				mes "[Saroki Lania]";
-				mes "...Please come in.";
-				close2;
-				set Zeny,Zeny - 1000;
-				warp "jawaii_in",86,117;
-				end;
-}
-			else
-{
-				mes "[Saroki Lania]";
-				mes "...Not enough zeny?";
-				close;
-}
-s_Cancel:
-			mes "[Saroki Lania]";
-			mes "...Ok then.";
-			close;
-}
-jawaii,112,173,7	script	Attendant#Villa Suite	93,{
-	
-	mes "[Lakers Lania]";
-	mes "Saroki, this is rude.";
-	mes "Can't you treat the customer nicely?";
-	mes "This will make them feel uneasy. Oh, customer!";
-	mes "Welcome. Are you here on a trip?";
-	next;
-	mes "[Lakers Lania]";
-	mes "This is the Villa suite.";
-	mes "It is as comfortable as your home.";
-	mes "The rental is only 1000 zeny.";
-	next;
-	mes "[Lakers Lania]";
-	mes "If you want to use it, I can serve you right now.";
-	mes "What do you think?";
-	next;
-	menu "Use it",-,"Cancel",s_Cancel;
-			if(Zeny > 999)
-{
-				mes "[Lakers Lania]";
-				mes "Thanks and rest well.";
-				mes "I hope you'll enjoy your trip.";
-				close2;
-				set Zeny,Zeny - 1000;
-				warp "jawaii_in",87,75;
-				end;
+	mes "[Lady]";
+	mes "I've even seen unmarried single people coming here just to get drunk! Oh! And for some reason, people have been disappearing";
+	mes "from the tavern!";
+	next;
+	mes "[Lady]";
+	mes "I wonder what's going on?";
+	mes "^666666*Sigh*^000000 I'm a waitress there, but still I just want to tell you not to go in there...";
+	close;
 }
-			else
-{
-				mes "[Lakers Lania]";
-				mes "Oh, you don't have enough zeny for the stay...?";
-				mes "Maybe you can ask from your partner.";
-				mes "Huhuhuhu-";
-				close;
+
+jawaii,220,235,3	script	Jawaii Resident#heart	724,{
+	mes "[Jawa Jawa]";
+	mes "You know what's";
+	mes "the most beautiful";
+	mes "place in Jawaii?";
+	next;
+	mes "[Jawa Jawa]";
+	mes "It's 'Heart Island,' which is just a little north of here. The water surrounding Heart Island is not that deep, so you can just walk across if you're careful.";
+	next;
+	mes "[Jawa Jawa]";
+	mes "That's the best place to share an intimate moment with the person";
+	mes "you love. It's perfectly secluded and such a beautiful area.";
+	next;
+	mes "[Jawa Jawa]";
+	mes "Of course, it's probably not";
+	mes "a good idea to go there by";
+	mes "yourself if you're single.";
+	mes "You'd look like such";
+	mes "a pathetic loser!";
+	close;
 }
-s_Cancel:
-			mes "[Lakers Lania]";
-			mes "Hmm, maybe you can try the honeymoon suite beside us.";
-			mes "Although Saroki is not sociable,";
-			mes "the room is a true masterpiece!";
-			close;
+
+jawaii,240,146,5	script	Jawaii Resident#desc1	724,{
+	mes "[Waii Waii]";
+	mes "Welcome to Jawaii!";
+	next;
+	mes "[Waii Waii]";
+	mes "Here, you can enjoy your";
+	mes "honeymoon without worrying about any interruptions. You don't even have to bother with that notorious Single Army!";
+	next;
+	mes "[Waii Waii]";
+	mes "Well, there are a few monsters around, but you'll be okay as long as you don't attack them first. Think of them as the original residents of this island, another sight to enjoy.";
+	close;
 }
 
-jawaii,122,263,5	script	Sailor#Alberta	100,{
+jawaii,168,247,5	script	Jawaii Resident#desc2	724,{
+	mes "[Waja Waja]";
+	mes "Ah, you must be a tourist.";
+	mes "If you're lost, just head West. Accomodations for newlyweds";
+	mes "are located in the western part of Jawaii. The lodging here is";
+	mes "pretty amazing.";
+	next;
+	mes "[Waja Waja]";
+	mes "There are four different themed rooms, so you can choose one to your liking. There's a Guide around if you want to ask for more information.";
+	next;
+	mes "[Waja Waja]";
+	mes "When you want to go back, please head to the NorthWest to board";
+	mes "a ship to Alberta. If you want to sail to Izlude, there's a ship waiting in the SouthEast.";
+	close;
+}
 
-	mes "[Sailor]";
-	mes "This ship will bring you back to Alberta.";
-	mes "do you enjoy your stay at Jawaii?";
-	mes "Please make sure that,";
-	mes "you haven't left out anything.";
+jawaii,165,121,1	script	Jawaii Resident#desc3	724,{
+	mes "[Iwa Iwa]";
+	mes "Jawaii~";
+	mes "Jawa~ii~";
+	mes "Where you can";
+	mes "find happiness~";
 	next;
-	mes "[Sailor]";
-	mes "Well then, are you ready to return to Alberta?";
+	mes "[Iwa Iwa]";
+	mes "Oh, isn't it beautiful? You don't have to do anything other than relax and breathe in the peaceful atmosphere. That's one of the";
+	mes "best things about Jawaii.";
 	next;
-	menu "Yes, I am",-,"Cancel",s_Cancel;
+	mes "[Iwa Iwa]";
+	mes "Ooh! Sometimes we hold";
+	mes "concerts on this stage. If you're good at singing, why don't you";
+	mes "go up on stage and sing";
+	mes "a song for us?";
+	next;
+	mes "[Iwa Iwa]";
+	mes "Jawaii~";
+	mes "Jawa~ii~";
+	mes "Where you can";
+	mes "find happiness~";
+	close;
+}
 
-			mes "[Sailor]";
-			mes "Anchors away! Next stop! Alberta!!";
+jawaii,141,200,3	script	Employee#sroom	798,{
+	mes "[Alowa]";
+	mes "W-Welcome...?";
+	mes "This is o-o-our";
+	mes "s-sweet room.";
+	mes "We, we just c-cleaned";
+	mes "this r-room for you";
+	mes "o-of course.";
+	next;
+	mes "[Alowa]";
+	mes "Th-The charge is is";
+	mes "1000 zeny p-p-per person?";
+	mes "P-please pay me the fee and";
+	mes "I,I'll let you in. I ssss...swear!";
+	next;
+	mes "[Alowa]";
+	mes "I, I'll also ca-carry your luggage. B-but pay me first. Otherwise, my bo-boss will be unhappy and... ^666666*Gulp*^000000";
+	next;
+	mes "[Alowa]";
+	mes "^333333Beat me to death...^000000";
+	next;
+	if (select("Use.:Cancel.") == 1) {
+		if (zeny > 999) {
+			mes "[Alowa]";
+			mes "T-Thank you ssso much!";
+			mes "L-Let open the room door";
+			mes "ffffor you. Thank y-you.";
+			mes "Ha-have a good time.";
 			close2;
-			warp "alberta",192,157;
+			set zeny,zeny-1000;
+			warp "jawaii_in",116,64;
 			end;
-
-s_Cancel:
-			mes "[Sailor]";
-			mes "Well then, spend a little more time before you leave!";
-			mes "It's not like you can come here everyday!";
-			close;
+		}
+		mes "[Alowa]";
+		mes "Oh no! Oh no no no no no.";
+		mes "Th-This isn't enough money?";
+		mes "I-I'm ssssorry, but my b-boss w-will beat me if I l-let you";
+		mes "in without paying...";
+		close;
+	}
+	mes "[Alowa]";
+	mes "^666666*Sniff*^000000";
+	mes "B-but I promise th-that this room is the nicest and cl-cleanest room! P-Please! C-come back!";
+	Emotion e_sob;
+	close;
 }
 
-jawaii,239,112,7	script	Sailor#Jawaii2	100,{
-
-	mes "[Sailor]";
-	mes "This ship will bring you back to Izlude Island.";
-	mes "do you enjoy your stay at Jawaii?";
-	mes "Please make sure that,";
-	mes "you haven't left out anything.";
+jawaii,108,199,5	script	Employee#antroom	74,{
+	mes "[Pine Oran]";
+	mes "Welcome to";
+	mes "the Antique room.";
+	next;
+	mes "[Pine Oran]";
+	mes "This room provides lovers with";
+	mes "an atmosphere of plush elegance.";
+	mes "Every comfort is provided for";
+	mes "young couples in this room.";
 	next;
-	mes "[Sailor]";
-	mes "Well then, are you ready to return to Izlude Island?";
+	mes "[Pine Oran]";
+	mes "All the rooms may have the same basic structure, but each of them has their own unqiue interior to suit the tastes of different people.";
 	next;
-	menu "Yes, I am",-,"Cancel",s_Cancel;
+	mes "[Pine Oran]";
+	mes "If you would like to lodge here, it is required to pay a 1,000 zeny fee for each person before entering. Since you're here to make fond memories of your honeymoon,";
+	mes "you should stay in the nicest room.";
+	next;
+	mes "[Pine Oran]";
+	mes "Do not hesitate to let me know when you've decided on the Antique Room. Once you've made your choice,";
+	mes "I will guide you there.";
+	next;
+	if (select("Use.:Cancel.") == 1) {
+		if (zeny > 999) {
+			mes "[Pine Oran]";
+			mes "Thank you";
+			mes "for using";
+			mes "our services.";
+			mes "Please...";
+			mes "Make yourself";
+			mes "comfortable.";
+			close2;
+			set zeny,zeny-1000;
+			warp "jawaii_in",129,110;
+			end;
+		}
+		mes "[Pine Oran]";
+		mes "I am sorry, but you don't seem to have enough money. If it's alright, why don't you check your current funds and see what you can do";
+		mes "about this situation?";
+		close;
+	}
+	mes "[Pine Oran]";
+	mes "Please...";
+	mes "Take your time.";
+	mes "There should be no rush";
+	mes "when it comes to leisure.";
+	close;
+}
 
-			mes "[Sailor]";
-			mes "Anchors away! Next stop! Izlude Island!!";
+jawaii,107,189,5	script	Employee#horoom	93,{
+	mes "[Sharkie Rania]";
+	mes "I'll take you";
+	mes "to the Honey Room.";
+	mes "It costs 1,000 zeny.";
+	next;
+	mes "[Sharkie Rania]";
+	mes "So you wanna go?";
+	next;
+	if (select("Use.:Cancel.") == 1) {
+		if (zeny > 999) {
+			mes "[Sharkie Rania]";
+			mes "Eh, alright.";
+			mes "Let's get going.";
 			close2;
-			warp "izlude",176,182;
+			set zeny,zeny-1000;
+			warp "jawaii_in",86,117;
 			end;
-		
-s_Cancel:
-			mes "[Sailor]";
-			mes "Well then, spend a little more time before you leave!";
-			mes "It's not like you can come here everyday!";
-			close;
+		}
+		mes "[Sharkie Rania]";
+		mes "You...";
+		mes "Don't have";
+		mes "enough money.";
+		mes "C'mon, romance";
+		mes "takes zeny, got it?";
+		close;
+	}
+	mes "[Sharkie Rania]";
+	mes "No prob.";
+	close;
 }
 
-jawaii,220,235,3	script	Jawaii Citizen#Love Bo	724,{
-
-	mes "[JawaJawa]";
-	mes "Do you know where is the most beautiful place in Jawaii?";
-	mes "It's the 'Island of Love',";
-	mes "located at the north of Jawaii.";
-	mes "Since the water is shallow,";
-	mes "you'll be able to reach there if you're careful.";
-	next;
-	mes "[JawaJawa]";
-	mes "It's also a suitable place for a couple to relax and spend some quality time.";
-	mes "If you sit there alone,";
-	mes "you'll look like a castaway,";
-	mes "stranded on a deserted island!";
-	next;
-	mes "[JawaJawa]";
-	mes "Well, of course you can play Castaway";
-	mes "with the letter in empty bottle!";
-	mes "But don't that look pathetic?";
+jawaii,112,173,7	script	Employee#villroom	93,{
+	mes "[Larks Rania]";
+	mes "Hello dear,";
+	mes "how are you?";
+	mes "Are you looking for";
+	mes "a room to stay in?";
+	next;
+	mes "[Larks Rania]";
+	mes "This is called the Villa Room.";
+	mes "I recommend this room to people";
+	mes "who prefer to stay in a place with";
+	mes "a comfortable atmosphere";
+	mes "much like home.";
+	next;
+	mes "[Larks Rania]";
+	mes "Just like all the other rooms,";
+	mes "the lodging charge is 1,000 zeny.";
+	mes "I can guide you to the Villa Room";
+	mes "right now, if you wish. Would you";
+	mes "like to stay?";
+	next;
+	if (select("Use.:Cancel.") == 1) {
+		if (zeny > 999) {
+			mes "[Larks Rania]";
+			mes "Thank you~";
+			mes "Enjoy your stay.";
+			close2;
+			set zeny,zeny-1000;
+			warp "jawaii_in",87,75;
+			end;
+		}
+		mes "[Larks Rania]";
+		mes "Oh what a shame!";
+		mes "You don't seem";
+		mes "to have enough money...?";
+		mes "Why don't you ask your";
+		mes "partner to help you";
+		mes "with the charge?";
+		close;
+	}
+	mes "[Larks Rania]";
+	mes "No problem~";
+	mes "If you like, you may wish to check the Honey Room. Although the roomkeeper, Sharkie, is a shy girl, the room is really beautiful.";
 	close;
 }
 
-jawaii,239,146,3	script	Jawaii Citizen#Explain1	100,{
-	
-	mes "[WaiiWaii]";
-	mes "Welcome to Jawaii!";
-	mes "What would a marriage be without a honeymoon?";
-	mes "At this place,";
-	mes "you can ignore the threat from those pathetic dateless losers.";
-	next;
-	mes "[WaiiWaii]";
-	mes "You might encounter some monsters here.";
-	mes "But as long as you leave them alone, it will be fine!";
-	mes "They have inhabited this place for a long time,";
-	mes "so you can just take them a part of the view.";
+jawaii,214,168,5	script	Honeymoon Helper#Jawaii	71,{
+	mes "[Helper]";
+	mes "There is no place";
+	mes "better for having your";
+	mes "honeymoon than Jawaii.";
+	next;
+	mes "[Helper]";
+	mes "Why don't you make the best of your time here, and make a lot of sweet memories that you will cherish for years to come?";
+	next;
+	mes "[Helper]";
+	mes "Mementos that remind you of your happy times can be your most precious possessions. Like your wedding ring, for instance, or the tuxedo and wedding dress worn during your wedding ceremony...";
+	next;
+	mes "[Helper]";
+	mes "Even if the wedding ceremony";
+	mes "is over, isn't it nice to look back upon the happy memories of your marriage ceremony? With the magical photo album at a cheap price, now you can!";
+	next;
+	mes "[Helper]";
+	mes "Its name is...";
+	mes "'Sweet Memory of Marriage'!!";
+	next;
+	mes "[Helper]";
+	mes "It will instantly bring you to the wedding hall with magic power!";
+	mes "And it only costs 50,000 zeny...";
+	next;
+	if (select("I shall buy it.:No, thanks.") == 1) {
+		if (zeny > 49999) {
+			set zeny,zeny-50000;
+			getitem 681,1; //Memory_Of_Wedding 
+			mes "[Helper]";
+			mes "Thank you very much~!";
+			mes "Please remember, you";
+			mes "should use this with your";
+			mes "partner in a place that is";
+			mes "special to the both of you.";
+			close;
+		}
+		mes "[Helper]";
+		mes "'Sweet Memory of Marriage' is 50,000 zeny. But don't seem to have enough money with you right now. Maybe you and your partner could help each other to buy the Sweet Memory of Marriage?";
+		close;
+	}
+	mes "[Helper]";
+	mes "Even if your relationship ends,";
+	mes "the memories the both of you have shared will remain forever...";
 	close;
 }
 
-jawaii,168,247,5	script	Jawaii Citizen#Explain2	724,{
+// Inside Jawaii
+//============================================================
+jawaii_in,25,94,0	script	Employee#jaw1	724,{
+	mes "[Employee Tryteh]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		mes "Anyway, I am so glad that you two have gotten married. I hope you both will live happily ever after~";
+		next;
+		mes "[Employee Tryteh]";
+		mes "Try to be a little careful if you bump into any rude customers.";
+		mes "They might be drunk and do something stupid. You know";
+		mes "how it is...";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		mes "I hope you enjoy your stay";
+		mes "over here. But try not";
+		mes "to drink too much~";
+		close;
+	}
+	mes "I hope you will have a good time.";
+	close;
 
-	mes "[WajaWaja]";
-	mes "The hostels are located at the west.";
-	mes "Every room has a different environment.";
-	mes "So choose the one suitable for you.";
-	mes "It would be better if you ask the staff there.";
-	next;
-	mes "[WajaWaja]";
-	mes "Please use the ship at the northwest";
-	mes "and southeast if you want to go back.";
-	mes "There're boats scheduled to";
-	mes "Alberta and Izlude Island.";
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
+}
+
+jawaii_in,25,96,0	script	Employee#jaw2	724,{
+	mes "[Employee Fey]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		next;
+		mes "[Employee Fey]";
+		mes "We hope that you enjoy your time here with the one that you love. Isn't this place nice and cozy,";
+		mes "a perfect romantic atmosphere?";
+		next;
+		mes "[Employee Fey]";
+		mes "It would be absolutely perfect if it weren't for those 'Invincible Single Army' weirdos. Somehow,";
+		mes "a few of those dorks found their way here. To hell with them!";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		mes "Have a good time! But please,";
+		mes "try not to interrupt the happily married people here!";
+		close;
+	}
+	mes "I hope you will have a good time~";
 	close;
+
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
 }
 
-jawaii,165,121,1	script	Jawaii Citizen#Explain3	724,{
+jawaii_in,25,98,0	script	Employee#jaw3	724,{
+	mes "[Employee Buffy]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		next;
+		mes "[Employee Buffy]";
+		mes "Oh~";
+		mes "Look at you...";
+		if (sex) {
+			mes "You look perfect";
+			mes "for your wife~";
+		}
+		else {
+			mes "You look perfect";
+			mes "with your husband~";
+		}
+		mes "Awwww, I want to";
+		mes "get married soon~!";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		next;
+		mes "[Employee Buffy]";
+		mes "Hmm...?";
+		mes "You don't look like";
+		mes "you're married, are you?";
+		if (sex) {
+			next;
+			mes "[Employee Buffy]";
+			mes "I'm pretty good";
+			mes "at cooking and cleaning";
+			mes "^666666*AHEM*^000000 I've got a ^FF0000nice body^000000.";
+			mes "So what do you think...?";
+		}
+		close;
+	}
+	mes "I hope you will have a good time.";
+	close;
 
-	mes "[IwaIwa]";
-	mes "Jawaii~ Isn't this island of happiness great?";
-	mes "You can just lay down";
-	mes "and do nothing for the whole day.";
-	mes "That what Jawaii is meant for.";
-	next;
-	mes "[IwaIwa]";
-	mes "This is the stage,";
-	mes "wher they hold a performance sometimes.";
-	mes "Do you want to go up there and sing us a song?";
-	mes "Jawaii~ Island of Happiness.";
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
+}
+
+jawaii_in,25,100,0	script	Employee#jaw4	724,{
+	mes "[Employee Itere]";
+	mes "Welcome to";
+	mes "Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		next;
+		mes "[Employee Itere]";
+		mes "Oh~";
+		mes "You look so happy";
+		mes "to be here with your";
+		mes "partner! How precious~";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		mes "I hope you";
+		mes "enjoy your st--";
+		mes "Wait a minute...!";
+		next;
+		mes "[Employee Itere]";
+		mes "You're...";
+		mes "You better not be part of";
+		mes "the Invincible Single Army!";
+		next;
+		mes "[Employee Itere]";
+		mes "Well, whatever you do, don't despair, get drunk and then";
+		mes "bother the married couples!";
+		close;
+	}
+	mes "I hope you will have a good time.";
 	close;
+
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
 }
 
-jawaii_in,43,115,0	script	Customer#jaw_1	97,{
+jawaii_in,30,94,4	script	Employee#jaw5	724,{
+	mes "[Employee Tonia]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		next;
+		mes "[Employee Tonia]";
+		mes "Congratulations to both of you!";
+		next;
+		mes "[Employee Tonia]";
+		mes "^666666*Sigh...*^000000";
+		mes "^333333I hope those Single Army morons don't get drunk and do something stupid again...";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		mes "Wait a sec. You're...!";
+		next;
+		mes "[Employee Tonia]";
+		mes "Hey--!";
+		mes "You're not welcome here!";
+		mes "S-Stop drinking! Right this instant!";
+		close;
+	}
+	mes "I hope you will have a good time.";
+	close;
 
-	mes "[Boogie]";
-	mes "uhOh....Oh my! How do I come to a place like this?";
-	mes "Everyone here is filled with happiness!";
-	next;
-	mes "[Boogie]";
-	mes "But for a dateless person like me, it just makes me look more like a loser!!";
-	mes "You, you must have felt the same too, right?";
-	next;
-	mes "[Boogie]";
-	mes "Urgh....";
-	mes "Boss, give me another shot!";
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
+}
+
+jawaii_in,30,96,4	script	Employee#jaw6	724,{
+	mes "[Employee Kay]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		next;
+		mes "[Employee Kay]";
+		mes "Oh gosh...!";
+		mes "Lately, I've been dealing with too many drunks in this place! It's been really hard for me to take care of it all...";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		mes "I understand that you want to relax and take a break, but please be careful and don't drink too much.";
+		close;
+	}
+	mes "I hope you will have a good time.";
 	close;
+	
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
 }
 
-jawaii_in,41,106,3	script	Customer#Kyle Jeet	98,{
+jawaii_in,30,98,4	script	Employee#jaw7	724,{
+	mes "[Employee Amy]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		mes "Oh! You and your partner look perfect for each other. Like, um,";
+		mes "a gun and a bullet! No...?";
+		next;
+		mes "[Employee Amy]";
+		mes "How about...";
+		mes "Milk and cookies?";
+		mes "Gin and tonic?";
+		mes "Jackie Tucker";
+		mes "and Chris Chan...?";
+		mes "Ummmm....";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		next;
+		mes "[Employee Amy]";
+		mes "Hmm, I don't think this place is for you. But, I see no problem in letting you drink and have a good time, so long as you don't";
+		mes "make a fuss.";
+		close;
+	}
+	mes "I hope you will have a good time.";
+	close;
+
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
+}
 
-	mes "[Kyle Jeet]";
-	mes "Eat and eat...!!";
-	mes "Drink! Drink...!!";
-	next;
-	mes "[Kyle Jeet]";
-	mes "We are released...!";
-	mes "from being a couple in hell...!";
-	mes "to a healthy and precious single in heaven...!";
+jawaii_in,30,100,4	script	Employee#jaw8	724,{
+	mes "[Employee Yasmine]";
+	mes "Welcome to Jawaii Tavern~";
+	if (getpartnerid() == 1) {
+		mes "Just like the moon and the stars, you and your partner look perfect together. I'm really happy for you!";
+		close;
+	}
+	else if (getpartnerid() == 0) {
+		next;
+		mes "[Employee Yasmine]";
+		mes "You don't look like you belong here, but I hope you find your perfect match one of these days. Have fun!";
+		close;
+	}
+	mes "I hope you will have a good time.";
 	close;
+
+OnWelcome:
+	Emotion e_kis;
+	end;
+OnSolo:
+	Emotion e_omg;
+	end;
+}
+
+jawaii_in,28,96,0	script	jaw_em_order#Jawaii	-1,3,3,{
+OnTouch:
+	if (getpartnerid()) {
+		donpcevent "Employee#jaw8::OnWelcome";
+		donpcevent "Employee#jaw7::OnWelcome";
+		donpcevent "Employee#jaw6::OnWelcome";
+		donpcevent "Employee#jaw5::OnWelcome";
+		donpcevent "Employee#jaw4::OnWelcome";
+		donpcevent "Employee#jaw3::OnWelcome";
+		donpcevent "Employee#jaw2::OnWelcome";
+		donpcevent "Employee#jaw1::OnWelcome";
+		end;
+	}
+	donpcevent "Employee#jaw8::OnSolo";
+	donpcevent "Employee#jaw7::OnSolo";
+	donpcevent "Employee#jaw6::OnSolo";
+	donpcevent "Employee#jaw5::OnSolo";
+	donpcevent "Employee#jaw4::OnSolo";
+	donpcevent "Employee#jaw3::OnSolo";
+	donpcevent "Employee#jaw2::OnSolo";
+	donpcevent "Employee#jaw1::OnSolo";
+	end;
 }
+	
+jawaii_in,15,104,0	script	Waitress#jawaii	80,{
+	//var max_max_c = CheckMaxCount 1201 1
+	//if (max_max_c == 1) {
+	//	mes "^3355FF * Wait a minute! *"
+	//	mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000"
+	//	close
+	//	return
+	//}
+	if (getpartnerid() == 1) {
+		mes "[Waitress]";
+		mes "Hello,";
+		mes "how can I help you?";
+		Emotion e_kis;
+		next;
+		switch(select("Give me food.:Bring me drink.:Where's the bar?")) {
+		case 1:
+			mes "[Waitress]";
+			mes "You can have";
+			mes "1 Meat for 1,000 zeny.";
+			mes "Would you like one?";
+			next;
+			if (select("Yes.:Wha--! It's too expensive!") == 1) {
+				if (zeny > 999) {
+					set zeny,zeny-1000;
+					getitem 517,1; //Meat
+					mes "[Waitress]";
+					mes "There you go~";
+					mes "Enjoy your meal~!";
+					close;
+				}
+				mes "[Waitress]";
+				mes "I'm sorry but...";
+				mes "This isn't enough money...";
+				close;
+			}
+			mes "[Waitress]";
+			mes "If you";
+			mes "need anything,";
+			mes "please let me know.";
+			close;
 
-jawaii_in,15,104,0	script	Field Attendant#jawaii	80,{
+		case 2:
+			mes "[Waitress]";
+			mes "You can have";
+			mes "1 Yellow Potion";
+			mes "at 1,000 zeny.";
+			mes "Would you like one?";
+			next;
+			if (select("Yes.:Wha--! It's too expensive!") == 1) {
+				if (zeny > 999) {
+					set zeny,zeny-1000;
+					getitem 503,1; //Yelow_Potion
+					mes "[Waitress]";
+					mes "There you go~";
+					mes "Enjoy your meal~!";
+					close;
+				}
+				mes "[Waitress]";
+				mes "I am sorry but you don't have enough money?!";
+				close;
+			}
+			mes "[Waitress]";
+			mes "If you";
+			mes "need anything,";
+			mes "please let me know.";
+			close;
 
-	mes "[Attendant]";
-	mes "....Well, I don't know what's your purpose of coming here.";
-	//Emotion?
+		case 3:
+			mes "[Waitress]";
+			mes "Oh, just go toward the center";
+			mes "of the tavern. I hope you have";
+			mes "a good time, but be careful and";
+			mes "don't drink too much! Have fun!";
+			close;
+		}
+	}
+	Emotion e_omg;
+	mes "[Waitress]";
+	mes "Hey, hey...!";
+	mes "I have no idea";
+	mes "why you're here...";
 	next;
-	mes "[Attendant]";
-	mes "If you try to disturb those people in happiness,";
-	mes "Get a drink from the bar tender and go away after you finish it!";
+	mes "[Waitress]";
+	mes "But we don't tolerate singles messing around with the happily married couples around here.";
+	mes "Just have your drink";
+	mes "and then leave!";
 	next;
-	menu "I am the great single!!",-,"...I just came to congratulate...",s_Cong;
-
-		mes "[Attendant]";
-		mes "How selfish of you...";
-		mes "You should congratulate those happy couples!";
-		mes "Whether you are single of married, don't cause any troube!!";
+	if (Select("I'm a member of Single Army!!:...I just wanted to congratulate them...") == 1) {
+		mes "[Employee]";
+		mes "Yeah, right.";
+		mes "Knock it off already.";
+		mes "Why can't you be happy";
+		mes "for other people?!";
 		next;
-		mes "[Attendant]";
-		mes "Or else, get married and come here for honeymoon. I'll be glad to serve you.";
-		close;
-s_Cong:
-		mes "[Attendant]";
-		mes "....? What? You're here to celebrate?";
-		mes "Oh my god! I'm so sorry! How rude of me!";
-		mes "Please rest well then~";
+		mes "[Employee]";
+		mes "^666666*Sigh*^000000";
+		mes "You will be welcome";
+		mes "here when you visit";
+		mes "with your partner, okay?";
 		close;
+	}
+	mes "[Employee]";
+	mes "Huh? Did you just";
+	mes "say you wanted to";
+	mes "congratulate them?";
+	mes "Oh, you must be close";
+	mes "friends with one";
+	mes "of the couples...";
+	next;
+	mes "[Employee]";
+	mes "I'm sorry!";
+	mes "Let me apologize";
+	mes "for my rudeness.";
+	mes "I hope you have";
+	mes "a good time.";
+	close;
 }
 
 jawaii_in,28,124,0	script	Bartender#jaw	46,{
-
-	set @drinkcount,0;
 	mes "[Bartender]";
-	mes "Welcome, dear customer.";
-	mes "So, what's your order?";
+	mes "Welcome to the";
+	mes "Jawaii Tavern bar.";
+	mes "What would you";
+	mes "like to drink?";
 	next;
-	Loopback:
-		menu "Today's special",-,"Nimi",s_Nimi,"Refreshing",s_Refreshing,"Misa",s_Misa,"Magnificent Blue",s_Magn;
-
-			if(@drinkcount >= 4)
-{
+	if (zeny < 99) {
+		set .@r_jaw,rand(1,100);
+		if (.@r_jaw > 29) {
+			mes "[Bartender]";
+			mes "Hm, I'm sorry";
+			mes "but you do not";
+			mes "have enough";
+			mes "money for a drink.";
+			close;
+		}
+		mes "[Bartender]";
+		mes "....Hmm...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hey...!";
+		mes "Bartender...";
+		mes "Gimmie one more.";
+		next;
+		mes "[Bartender]";
+		mes "Okay...";
+		mes "It's on me.";
+		mes "Have a drink.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Thank you.";
+		close2;
+		percentheal -100,0;
+		end;
+	}
+	while (1) {
+		switch(select("Follow Bartender's Recommendation.:I want a Gunslinger.:I want a Cobo.:I want a Bomb.:I want a Boogieman.")) {
+		case 1:
+			set .@roof_jaw,.@roof_jaw+3;
+			if (.@roof_jaw > 9) {
 				mes "[Bartender]";
-				mes "You have taken a lot of drinks. Do you still want to continue?";
+				mes "Hmmm...";
+				mes "You seem to have";
+				mes "had enough to drink.";
+				mes "Are you sure you'll be okay?";
 				next;
-				input @jawaiitstring$;
-				mes "[" + strcharinfo(0) + "]";
-				mes "Boss, because of ";
-				mes @jawaiitstring$;
-				mes "I'm not feeling well...";
+				mes "["+strcharinfo(0)+"]";
+				mes "Bartender,";
+				mes "I'm so depressed";
+				mes "because of...";
+				input .@inputstr$;
+				mes ""+.@inputstr$+"...";
 				next;
 				mes "[Bartender]";
-				mes "....Here, this is my recommendation, ^0000FF`Special J&J screw file driver ver.¨¤«×¾¹'^000000 ";
-				mes "It's on the house.";
+				mes "There you go...";
+				mes "Let me make";
+				mes "a ^0000FF'Special J&Z'^000000 for you.";
+				mes "And this is on me.";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "Thank you, boss...";
+				mes "["+strcharinfo(0)+"]";
+				mes "Thank you...";
+				mes "So much...";
+				close2;
 				percentheal -100,0;
-				close;
-}
-			else
-{
-				set @randomdrink,rand(1,4);
-				if(@randomdrink == 1)
-{
-					mes "[Bartender]";
-					mes "Well...How about this..?";
-					set Zeny,Zeny - 100;
-					next;
-					mes "[Bartender]";
-					mes "I recommend this ^0000FF`Hot Kiss Assault'^000000¡A";
-					mes "a mixture of sweet scent with the unique scarlet color that bring great passions.";
-					next;
-					mes "You receive a sugar coated overturned triangular glass. -";
-					mes "It is releasing a great amount of sweet scent.-";
-					mes "Although the scent is attractive, it seems dangerous. -";
-					next;
-					mes "[Bartender]";
-					mes "The first encounter is the most important stage.";
-					mes "The feeling of sugar jumping in your mouth is totally awesome.";
-					next;
-					mes "Adjust the direction you sip the drink and taste it slowly.";
-					percentheal -20,0;
-					specialeffect2 38;
-					set @drinkcount,@drinkcount + 1;
-					next;
-					mes "[" + strcharinfo(0) + "]";
-					mes "Boss...Give me another shot...";
-					next;
-}
-				else if(@randomdrink == 2)
-{
-					mes "[Bartender]";
-					mes "How about this one?";
-					next;
-					mes "[Bartender]";
-					mes "I recommend this ^0000FF`Black Siberian Double Shot'^000000 ";
-					mes "A drink that let you feel the power of Russia and the greatness of land.";
-					next;
-					mes "- You look at the mixture of ice cube and black liquid.-";
-					mes "- Although the scent is sweet-";
-					mes "- You find a slight scent of male after shave.-";
-					next;
-					mes "[Bartender]";
-					mes "It's suitable to taste it bits by bits due to its strong taste.";
-					mes "It is a special mixture loved by the Siberians.";
-					next;
-					mes "- You feel the scent and drink it bits by bits. -";
-					percentheal -20,0;
-					specialeffect2 63; //Fire Ivy?
-					set @drinkcount,@drinkcount + 1;
-					next;
-					mes "[" + strcharinfo(0) + "]";
-					mes "Boss...Give me another shot...";
-					next;
-}
-				else if(@randomdrink == 3)
-{
-					mes "[Bartender]";
-					mes "Let me recommend...";
-					next;
-					mes "[Bartender]";
-					mes "I recommend this ^0000FF`White Hot Magarita'^000000 ";
-					mes "The sour scent of lemon is really special, especially when you feel the soul of a Mexican within!";
-					next;
-					mes "- You receive an overturned triangular glass coated with lemon juice.-";
-					mes "- It is releasing a sweet and sour scent.-";
-					mes "- As attractive as it looks, you cannot ignore the danger behind it.";
-					next;
-					mes "[Bartender]";
-					mes "The sweet and refreshing taste make it popular among the girls,";
-					mes "especially when it contains the sensation of a Mexican.";
-					next;
-					mes "- You can imagine yourself wearing a Mexican Sombrero-";
-					mes "- and drinking this cocktail! -";
-					percentheal -20,0;
-					specialeffect2 17;
-					set @drinkcount,@drinkcount + 1;
-					next;
-					mes "[" + strcharinfo(0) + "]";
-					mes "Boss...Give me another shot...";
-					next;
-}
-				else if(@randomdrink == 4)
-{
-					mes "[Bartender]";
-					mes "Hmm... How about this?";
-					next;
-					mes "[Bartender]";
-					mes "I recommend this ^0000FF`Barcardi 151 Barcelona Crusade'^000000";
-					mes "It's a pirate cocktail with a lot of memories";
-					next;
-					mes "-You look at the yellow liquid in the small glass. -";
-					mes "-Although it looks like you can finish it in 1 sip, -";
-					mes "-it looks like a really dangerous drink. -";
-					next;
-					mes "[Bartender]";
-					mes "This flaming baby will burn you up.";
-					mes "Finish it in one sip to feel the burning sensation.";
-					next;
-					mes "- You finish it in one sip. -";
-					percentheal -20,0;
-					specialeffect2 171;
-					set @drinkcount,@drinkcount + 1;
-					next;
-					mes "[" + strcharinfo(0) + "]";
-					mes "Boss...Give me another shot...";
-					next;
-}
-}
-
-s_Nimi:
-			if(@drinkcount >= 5)
-{
+				end;
+			}
+			set zeny,zeny-100;
+			switch(rand(4)) {
+			case 1:
 				mes "[Bartender]";
-				mes "...I'll buy you a drink.";
+				mes "Hmm...";
+				mes "How about this cocktail?";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "...Thanks ...Boss...";
-				percentheal -100,0;
-				close;
-}
-			else
-{
 				mes "[Bartender]";
-				mes "Here, try this.";
-				set Zeny,Zeny - 100;
+				mes "I recommend";
+				mes "a '^0000FFBarcadie 150^000000.'";
+				mes "It's the drink of pirates!";
 				next;
-				mes "[Bartender]";
-				mes "If you want to show your interest to a girld, choose this!";
-				mes "With the special and strong scent,";
-				mes "it makes  you look like a special person too.";
+				mes "^3355FFYou examined";
+				mes "the small glass";
+				mes "containing a glossy";
+				mes "brown liquid...^000000";
 				next;
-				mes "- You receive a simple looking glass containing white liquid-";
-				mes "- Although there's a slight scent of sweetness, it tastes sour -";
-				mes "- And it makes you want to shout out loud. - ";
+				mes "^3355FFAlthough the glass is tiny and only holds a small amount, the liquid inside still smells pretty dangerous...^000000";
 				next;
 				mes "[Bartender]";
-				mes "A lot of people say taht mixed taste of sweet and bitter is like the taste of life.";
-				mes "So it's best for you to taste it with the tip of your tounge.";
+				mes "It's strong and flammable,";
+				mes "so you might feel like your";
+				mes "throat is burning.";
 				next;
-				mes "- Drink it from the tip of  your tounge -";
-				next;
-				mes "-And it makes me feel.... Bang !!' -";
-				percentheal -10,0;
-				specialeffect2 18;
-				set @drinkcount,@drinkcount + 1;
+				mes "^3355FFYou gulped it down.^000000";
+				specialeffect2 124; //EF_VENOMDUST
+				percentheal -20,0;
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "Boss...Give me another shot...";
-				next;
-}
-s_Refreshing:
-			if (@drinkcount >= 5)
-{
+				break;
+			case 2:
 				mes "[Bartender]";
-				mes "...I'll buy you a drink.";
+				mes "Hmm...";
+				mes "How about this cocktail?";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "...Thanks ...Boss...";
-				percentheal -100,0;
-				close;
-}
-			else
-{
 				mes "[Bartender]";
-				mes "Here, try this!";
-				set Zeny,Zeny - 100;
+				mes "I recommend a '^0000FFBlack Russian Double^000000.' It will make you dream of lying in a vast Russian field...";
 				next;
-				mes "[Bartender]";
-				mes "This one tastes like an old friend.";
-				mes "The more you drink, the better you'll feel.";
-				mes "You can drink it whenever, wherever and with whoever you want.";
-				next;
-				mes "- The tasty looking blue liquid is served to you. -";
-				mes "- Contained in a fancy looking glass, -";
-				mes "- it gives excitement to your nostril with the sour yet sweet scent. -";
+				mes "^3355FFYou examined the large glass holding a dark brown liquid chilled with ice cubes. There's a faint sweetness in the aroma, as well";
+				mes "a musk that reminds you of an old, mustached man.^000000";
 				next;
 				mes "[Bartender]";
-				mes "Don't just take one shot of this.";
-				mes "It will get better the more you drink it!";
-				next;
-				mes "- Your mouth is filled with the sour yet sweet scent after you finish the drink in 3 sips-";
-				mes "- It's really a special blend... -";
-				percentheal -10,0;
-				specialeffect2 84; //Magnificat?
-				set @drinkcount,@drinkcount + 1;
+				mes "I suggest you take your time";
+				mes "drinking this since it's very strong. The Black Russian Double is rumored to be the favorite drink of the Russian mafia.";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "Boss...Give me another shot...";
+				mes "^3355FFYou drank it sip by sip,";
+				mes "savoring its rich,";
+				mes "robust flavor.^000000";
+				specialeffect2 118; //EF_FIREIVY
+				percentheal -20,0;
 				next;
-}
-s_Misa:
-			if (@drinkcount >= 5)
-{
+				break;
+			case 3:
 				mes "[Bartender]";
-				mes "...I'll buy you a drink.";
+				mes "So...";
+				mes "How about this..?";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "...Thanks ...Boss...";
-				percentheal -100,0;
-				close;
-}
-			else
-{
 				mes "[Bartender]";
-				mes "Here, try this!";
-				set Zeny,Zeny - 100;
+				mes "Why don't you try";
+				mes "a '^0000FFKiss of Fire";
+				mes "the Spinbird Kick^000000?'";
 				next;
 				mes "[Bartender]";
-				mes "This one tastes like an old friend.";
-				mes "The more you drink, the better you'll feel.";
-				mes "You can drink it whenever, wherever and with whoever you want.";
+				mes "Don't be fooled by its sweet scent or beautiful red color. This is one of the strongest drinks around.";
 				next;
-				mes "- The tasty looking blue liquid is served to you. -";
-				mes "- Contained in a fancy looking glass, -";
-				mes "- it gives excitement to your nostril with the sour yet sweet scent. -";
+				mes "^3355FFYou receive a crystal cocktail glass with a little bit of sugar sprinkled around the rim. It has";
+				mes "a sweet fragrance that makes your mouth water. However, you can also feel that it is a dangerously strong cocktail.";
 				next;
 				mes "[Bartender]";
-				mes "Don't just take one shot of this.";
-				mes "It will get better the more you drink it!";
+				mes "Lick the sugar before taking a sip. That will make it taste a little sweeter and will soften the taste.";
 				next;
-				mes "- Your mouth is filled with the sour yet sweet scent after you finish the drink in 3 sips-";
-				mes "- It's really a special blend... -";
-				percentheal -10,0;
-				specialeffect2 97;
-				set @drinkcount,@drinkcount + 1;
+				mes "^3355FFYou carefully took a sip.^000000";
+				specialeffect2 38; //EF_DECAGILITY
+				percentheal -20,0;
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "Boss...Give me another shot...";
-				next;
-}
-
-s_Magn:
-			if (@drinkcount >= 5)
-{
+				break;
+			Default:
 				mes "[Bartender]";
-				mes "...I'll buy you a drink.";
+				mes "I see...";
+				mes "Let me think";
+				mes "of something";
+				mes "you might like.";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "...Thanks ...Boss...";
-				percentheal -100,0;
-				close;
-}
-			else
-{
 				mes "[Bartender]";
-				mes "Here, try this.";
-				set Zeny,Zeny - 100;
+				mes "Okay, how about";
+				mes "a '^0000FFWhite Margarita'^000000?'";
 				next;
 				mes "[Bartender]";
-				mes "This is recommended for those who miss the glorious memories of the pass...";
-				mes "For those who starts a war to preserve the peace...";
-				mes "And of course... For those who fake the truth of history.";
+				mes "You will smell a sourish lemon scent which makes your mouth water. As you taste it, you will be filled with a pleasant, comforting warmth that spreads throughout your body.";
 				next;
-				mes "- You receive a brown liquid in a shaking bottle. -";
-				mes "- You feel the heavy and thick scent like the machines oil. -";
-				mes "- Scent of fireworks? No, it's a little different than that... -";
+				mes "^3355FFYou receive a fancy cocktail glass with salt and lemon juice sprinkled on the rim. Its sour scent does make your mouth water. How could something so appetizing be dangerous?";
 				next;
 				mes "[Bartender]";
-				mes "It might look a lot but you better finish it in 1 sip.";
-				mes "You'll lose its taste if you drink it too slow.";
-				next;
-				mes "- Grabbing the Shake bottle, you immediately finish it.-";
-				next;
-				mes "- And it feels like you're hit by a canon.-";
-				percentheal -10,0;
-				specialeffect2 132;
-				set @drinkcount,@drinkcount + 1;
+				mes "It has a sweet and sour taste so it's favored by female customers";
+				mes "as well. I guarantee that you will enjoy its flavor.";
 				next;
-				mes "[" + strcharinfo(0) + "]";
-				mes "Boss...Give me another shot...";
+				mes "^3355FFYou gulp the delicious";
+				mes "Margarita down in one sip.^000000";
+				specialeffect2 17; //EF_MAGNUMBREAK
+				percentheal -20,0;
 				next;
-}
-goto Loopback;
-}
+			}
+			break;
+		case 2:
+			callsub S_KillChar,2;
+			mes "When you want to look super cool, this will be the best drink for you. It's a strong drink with a particular scent, so people who drink Gunslingers are usually seen as having impressive of taste.";
+			next;
+			mes "^3355FFYou received a simple glass containing a gray liquid. Although it smells faintly sweet, it looks like industrial strength liquor. It's time to summon your courage and take a sip~";
+			next;
+			mes "[Bartender]";
+			mes "That drink is bitter and sweet, just like life. Taste it with your tongue, don't drink it all at once.";
+			next;
+			mes "^3355FFYou slowly drank some";
+			mes "of your Gunslinger drink.^000000";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Yeeehaw~!";
+			mes "I'm a cowboy hero!";
+			mes "Bang Bang Bang!";
+			next;
+			specialeffect2 18; //EF_STEAL
+			percentheal -10,0;
+			next;
+			break;
 
-jawaii_in,25,94,5	script	Attendant#jaw1	724,{
+		case 3:
+			callsub S_KillChar,2;
+			mes "People say that the more you drink a mixed Cobo, the tastier it will be. It grows on you, kind of like the company of an old friend. This is a nice drink to have with anyone at anytime.";
+			next;
+			mes "^3355FFThe Bartender brought a beautifully engraved glass holding a cobalt blue liquid and placed it in front of you. It smells pleasantly sweet and sour.";
+			next;
+			mes "[Bartender]";
+			mes "Once you taste this once, you almost can't stop drinking. It tastes so smooth and goes";
+			mes "down even smoother.";
+			next;
+			mes "^3355FFYou finished";
+			mes "your drink in 3 sips.";
+			mes "Your mouth was filled";
+			mes "with a luxurious, sweet and";
+			mes "sour flavor.^000000";
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Aaaaaahhhhhh~!";
+			mes "This drink is really good!";
+			specialeffect2 83; //EF_SANCTUARY
+			percentheal -10,0;
+			next;
+			break;
 
-	mes "[Attendant Teleteer]";
-	mes "Welcome to the Inn of Jawaii~";
-	mes "I hope you'll enjoy your stay here...";
-	mes "But don't get drunk and cause any trouble!";
-	close;
-}
+		case 4:
+			callsub S_KillChar,2;
+			mes "This is for one who wants to relive wild, youthful days, honor those who have fought for justice and liberty, or just to drink alcohol until they vomit stomach acid.";
+			mes "for one who wants to remember people fighting for liberty...";
+			next;
+			mes "^3355FFYou receive a tumbler filled with brown liquid. It a has a very thick, machine like smell. It kind of reminds you of gunpowder.^000000";
+			next;
+			mes "[Bartender]";
+			mes "It might look too big to drink at once, but I suggest that you finish it in one gulp. If you drink it slowly, you'll pass out.";
+			next;
+			mes "^3355FFYou firmly grabbed";
+			mes "the tumbler and";
+			mes "gulped it down.^000000";
+			next;
+			mes "^3355FFYou feel pretty hammered.^000000";
+			specialeffect2 106; //EF_BLASTMINEBOMB
+			percentheal -10,0;
+			next;
+			break;
 
-jawaii_in,25,96,5	script	Attendant#jaw2	724,{
+		case 5:
+			callsub S_KillChar,1;
+			mes "[Bartender]";
+			mes "There are not many people who like this drink. But the ones that do like this drink, love it.";
+			next;
+			mes "[Bartender]";
+			mes "Although it has a beautiful, appetizing color, its appearance can be misleading. Most people feel cold and empty after having some";
+			mes "of this.";
+			next;
+			mes "^3355FFYou receive a crooked glass";
+			mes "filled with purple fluid. Although it smells pleasnt, you have a strange feeling of disgust as you draw it closer to your face.";
+			next;
+			mes "[Bartender]";
+			mes "If you don't want to drink it, tell me now. But it might be good to try it once, just to experience it.";
+			next;
+			mes "^3355FFYou took a sip of it and sighed.^000000";
+			next;
+			mes "^3355FFAnd promised yourself that you would never drink it ever again.^000000";
+			specialeffect2 5; //EF_HIT6
+			percentheal -10,0;
+			next;
+			break;
+		}
 
-	mes "[Attendant PoYi]";
-	mes "Welcome to the Inn of Jawaii~";
-	mes "I hope you'll enjoy yourself~";
-	mes "But, don't get jealous and criticize people who are blessed with happiness!";
-	close;
-}
-
-jawaii_in,25,98,5	script	Attendant#jaw3	724,{
+		mes "["+strcharinfo(0)+"]";
+		mes "Master...";
+		mes "One more please...";
+		next;
+	}
+	end;
 
-	mes "[Attendant Poppy]";
-	mes "Welcome to the Inn of Jawaii~";
+S_KillChar:
+	if (.@roof_jaw > 8) {
+		mes "[Bartender]";
+		mes "It's on me.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Thank you...";
+		mes "Mr. Bartender...";
+		close2;
+		percentheal -100,0;
+		end;
+	}
+	set zeny,zeny-100;
+	set .@roof_jaw,.@roof_jaw+getarg(0);
+	mes "[Bartender]";
+	mes "There you go.";
 	next;
-	mes "[Attendant Poppy]";
-	mes "May I ask....are you from a foreign land?";
-	mes "You're still single, right?";
-	mes "I am a good cook too, will you consider me?";
-	mes "How about that? Huh?";
-	close;
+	mes "[Bartender]";
+	return;
 }
-
-jawaii_in,25,100,5	script	Attendant#jaw4	724,{
-
-	mes "[Attendant Ether]";
-	mes "Welcome to the Inn of Jawaii~";
-	mes "Criticizing, no! Discouraging, no!";
-	mes "Get drunk, no! Congratulate, YES!";
+	
+jawaii_in,43,115,0	script	Customer#jaw_1	97,{
+	if (!getpartnerid()) {
+		if (zeny > 99) {
+			mes "[Buchi]";
+			mes "Grrrr...";
+			mes "Damn! I don't";
+			mes "like this place!";
+			mes "I don't like this at all!";
+			next;
+			mes "[Buchi]";
+			mes "I can't believe my eyes! Everyone else looks disgustingly happy! It makes me feel so miserable!";
+			mes "You agree, don't you?!";
+			next;
+			mes "[Buchi]";
+			mes "Grrrr...";
+			mes "Bartender!";
+			mes "Give me one more!";
+		}
+		mes "[Buchi]";
+		mes "Hey, why aren't you drinking?";
+		mes "I guess you're all out of dough.";
+		mes "But I know how you feel. Disgusted with all the lovey dovey around this place, aren't you?";
+		next;
+		mes "[Buchi]";
+		mes "Heh.";
+		mes "Lemme buy";
+		mes "you a drink!";
+		next;
+		mes "[Buchi]";
+		mes "Drink this at once, and forget about your miserable life! Cheer up, you got the whole future ahead of you and a drink in front of you! Come on, now~!";
+		next;
+		mes "^3355FFHe ordered a JJ special for me.^000000";
+		next;
+		mes "["+ name +"]";
+		mes "Damn...!";
+		mes "Damn! I will be";
+		mes "the one who laughs last!";
+		next;
+		mes "^3355FFYou drank to your fill.^000000";
+		close;
+		percentheal -100,0;
+	}
+	mes "[Buchi]";
+	mes "You look happy...";
+	mes "I hope you'll be";
+	mes "able to feel that";
+	mes "way forever...";
+	mes " ";
+	mes "^666666*Hiccup...!*^000000";
 	close;
 }
 
-jawaii_in,30,94,4	script	Attendant#jaw5	724,{
-
-	mes "[Attendant Donna]";
-	mes "Welcome to the Inn of Jawaii~";
-	mes "......Oh no.....";
-	mes "...Welcome! But please don't get drunk and cause trouble again! ";
+jawaii_in,41,106,3	script	Customer#Cage	98,{
+	if (getpartnerid()) {
+		mes "[Cage]";
+		mes "....Bah!";
+		mes "What are you so happy about?";
+		mes "After all, everyone knows marriage is a sham for desperate, lonely people!";
+		next;
+		if (sex) {
+			mes "[Cage]";
+			mes "I don't trust anybody!";
+			mes "You're a fool for chaining";
+			mes "yourself to some gorgeous";
+			mes "woman for life!";
+			mes "You hear me?!";
+			mes "A FOOL!";
+		}
+		else {
+			mes "[Cage]";
+			mes "Look at you!";
+			mes "You're a fool for";
+			mes "chaining yourself to";
+			mes "some pretty boy for life!";
+			mes "You hear me?! A FOOL!";
+		}
+		next;
+		mes "[Cage]";
+		mes "The single life is";
+		mes "what it's all about!";
+		mes "Women may break my";
+		mes "spirit, but they'll never take...";
+		mes "MY FREEDOM!";
+		close;
+	}
+	mes "[Cage]";
+	mes "Drink, drink...!!";
+	mes "Eat, eat...!!";
+	mes "Join me,";
+	mes "my brother";
+	mes "in singlehood!";
+	next;
+	mes "[Cage]";
+	mes "We are free...!";
+	mes "We are free from";
+	mes "the hell of marriage...!";
+	mes "We are the sincere and";
+	mes "competent singles...!";
 	close;
 }
 
-jawaii_in,30,96,4	script	Attendant#jaw6	724,{
-
-	mes "[Attendant Ken]";
-	mes "Welcome to the Inn of Jawaii~";
-	mes "It's ok for you to relax, but...";
-	mes "Please control yourself...";
+// Inside Prontera
+//============================================================
+prt_in,173,13,4	script	Customer#SoloHan	86,{
+	if (!getpartnerid()) {
+		mes "[SoloHan]";
+		mes "Oh man...";
+		mes "I think I'm drunk~";
+		mes "^666666*Hiccup...!*^000000";
+		next;
+		mes "[SoloHan]";
+		mes "Hey, you...!";
+		mes "You understand, don't you?!";
+		mes "Aren't you upset looking at all these happily married couples?!";
+		mes "Yeah~? Me too!";
+		next;
+		mes "[SoloHan]";
+		mes "How dare they show off their happiness in front of people like us--!! ^666666*Sniff*^000000 Just because they found everlasting love, they think they're better than we are?!";
+		next;
+		mes "[SoloHan]";
+		mes "I remember when couples were polite and were lovey dovey behind closed doors. Nowadays they hold hands, and even cuddle in public. I mean, come on! Get a room!";
+		next;
+		mes "[SoloHan]";
+		mes "I mean, ^666666*Sniff*^000000, it's not like,";
+		mes "I'm lonely or anything. I don't neeeeeeeed a woman~!";
+		mes "Right, Bachewcca!";
+		next;
+		mes "[Bachewcca]";
+		mes "...!";
+		donpcevent "Customer#Bachewcca::OnEmote";
+		next;
+		mes "[SoloHan]";
+		mes "It's doesn't really matter whether you're married";
+		mes "or not, right buddy? Right?!";
+		mes "Come on! Drink with me!!";
+		next;
+		mes "^3355FFSuddenly he treated me as a close friend. It's a little embarassing, but it's not a bad idea to accept";
+		mes "a free drink...^000000";
+		next;
+		mes "^3355FF* Gulp Gulp Gulp *^000000";
+		percentheal -10,0;
+		next;
+		set .@jaw_roof,1;
+		mes "[SoloHan]";
+		mes "So, what do you say?";
+		mes "Let's go somewhere";
+		mes "with some real liquor.";
+		while (1) {
+			next;
+			if (select("...One more drink.:...What kind of place is it?") == 1) {
+				mes "[SoloHan]";
+				mes "Yeah~!";
+				mes "That's the spirit!";
+				mes "Hey, Bachewcca...";
+				mes "Let's drink!";
+				next;
+				mes "[Bachewcca]";
+				mes "^666666*Grunt!*^000000";
+				donpcevent "Customer#Bachewcca::OnEffect1";
+				next;
+				mes "[SoloHan]";
+				mes "To...";
+				mes "To being single!";
+				mes "F-Forever!!!";
+				next;
+				mes "^3355FF* Gulp Gulp Gulp *^000000";
+				percentheal -10,0;
+				next;
+				set .@jaw_roof,.@jaw_roof+2;
+				if (.@jaw_roof > 8) {
+					mes "[SoloHan]";
+					mes "Whoa...";
+					mes "You alright?";
+					mes "You seem kind of drunk...";
+					next;
+					mes "[SoloHan]";
+					mes "I guess now's the perfect time to have you sign this! Don't worry, I'll send you straight to paradise!";
+					next;
+					if (select("Sign:Refuse to Sign") == 1) {
+						mes "[SoloHan]";
+						mes "Alright!";
+						mes "Take care!";
+						mes "Hahaha!";
+						close2;
+						percentheal 100,0;
+						break;
+					}
+					mes "[SoloHan]";
+					mes "Oh...";
+					mes "Man.";
+					mes "So, you spoil parties";
+					mes "like this all the time, eh?";
+					close2;
+					end;
+				}
+			}
+			if (.@jaw_roof > 6) {
+				mes "[SoloHan]";
+				mes "^666666*Hiccup!*^000000";
+				mes "So you feel like having some";
+				mes "real fun? Okay, then just sign over here. Count on me, I'll send you to paradise.";
+				next;
+				if (select("Sign:Refuse to Sign") == 1) {
+					mes "[SoloHan]";
+					mes "Alright~!";
+					mes "Take care and have fun!";
+					mes "Harass some couples over there for me, will you?";
+					close2;
+					percentheal 100,0;
+					break;
+				}
+				mes "[SoloHan]";
+				mes "Oh...";
+				mes "Man.";
+				mes "No wonder you're single. You can't even recognize a good time when it's right in front of you.";
+				close2;
+				end;
+			}
+			set .@jaw_roof,.@jaw_roof+3;
+			mes "[SoloHan]";
+			mes "Drink, drink!";
+			mes "That's not enough!";
+			mes "Drink more, buddy!";
+			next;
+			mes "[SoloHan]";
+			mes "To...";
+			mes "To being single!";
+			mes "FOR EVER.";
+			next;
+			mes "^3355FF*Gulp Gulp Gulp*^000000";
+			percentheal -10,0;
+			next;
+		}
+		warp "jawaii_in",44,124;
+		end;
+	}
+	else if (getpartnerid()) {
+		mes "[SoloHan]";
+		mes "Oh man...";
+		mes "I think I'm drunk~";
+		mes "*Hiccup!*";
+		next;
+		mes "[SoloHan]";
+		mes "...Wha!?";
+		mes "Oh man!";
+		mes "Get outta my face!";
+		if (sex) {
+			mes "You smell like,";
+			mes "whupped boyfriend";
+			mes "or something!";
+		}
+		else {
+			next;
+			mes "[SoloHan]";
+			mes "I think I know a naggy wife";
+			mes "when I see one! Go boss your";
+			mes "hubby around or something!";
+		}
+		next;
+		mes "[SoloHan]";
+		mes "Leave me alone!";
+		mes "I don't want any of your marital bliss to rub off on me. Come on, Bachewcca! Tell 'em their kind ain't welcome here!";
+		next;
+		mes "[Bachewcca]";
+		mes "^666666*Grrr...!*^000000";
+		donpcevent "Customer#Bachewcca::OnEffect2";
+		close;
+	}
+	mes "[SoloHan]";
+	mes "Oh man...";
+	mes "I think I'm drunk~";
+	mes "^666666*Hiccup!*^000000";
+	next;
+	mes "[SoloHan]";
+	mes "What is that...?";
+	mes "Is this the third time this week I've gotten plastered? Bachewcca, help me count!";
 	close;
 }
+	
+prt_in,170,14,0	script	Customer#Bachewcca	89,{
+	mes "[Bachewcca]";
+	mes "..............";
+	mes "^666666*Gulp....gulp...*^000000";
+	mes "Grrrrr!! That hit the spot!";
+	Emotion e_sob;
+	close;
 
-jawaii_in,30,98,4	script	Attendant#jaw7	724,{
+OnEmote:
+	emotion e_no1;
+	end;
+OnEffect1:
+	specialeffect 296; //EF_TALK_SCREAM
+	end;
+OnEffect2:
+	specialeffect 291; //EF_THROWITEM
+	end;
+}
 
-	mes "[Attendant Emater]";
-	mes "Welcome to the Inn of Jawaii~";
+// Izlude
+//============================================================
+izlude,171,185,3	script	Honeymoon Helper#Izlude	71,{
+	mes "[Helper]";
+	mes "Newlyweds and";
+	mes "long time couples...";
+	mes "We invite you to Jawaii,";
+	mes "the honeymoon resort!";
 	next;
-	mes "[Attendant Emater]";
-	mes "...You're like a wandering soul.";
-	mes "This place is not suitable for you!";
-	mes "Well, as long as you like it,";
-	mes "have fun but please don't cause any trouble~";
-	close;
-}
+	switch(select("Jawaii?:Let's go to Jawaii~!:Cancel.")) {
+	case 1:
+		mes "[Helper]";
+		mes "There is an island far, far away from the Rune-Midgard continent.";
+		mes "It is a very quiet and beautiful island resort that only opens";
+		mes "its doors to couples.";
+		next;
+		mes "[Helper]";
+		mes "This is an exclusive travel offer to the special honeymoon resort for Rune-Midgard's citizens. The price, 100,000 zeny, may be expensive, but you really get what you pay for.";
+		next;
+		mes "[Helper]";
+		mes "I guarantee you that some of";
+		mes "the happiest moments you can";
+		mes "experience in your marriage will be on this island. Can you really put a price on that?";
+		close;
 
-jawaii_in,30,100,4	script	Attendant#jaw8	724,{
+	case 2:
+		if (!getpartnerid()) {
+			mes "[Helper]";
+			mes "Errm...";
+			mes "Unfortunately, singles are not allowed on the island. Why don't you go forget your loneliness in the Prontera pub?";
+			close;
+		}
+		else if (zeny > 99999) {
+			set zeny,zeny-100000;
+			mes "[Helper]";
+			mes "Bon Voyage...!!";
+			mes "Let me guide";
+			mes "you to 'Jawaii!'";
+			close2;
+			warp "jawaii",245,125;
+			end;
+		}
+		mes "[Helper]";
+		mes "As I explained, you must have 100,000 zeny in order to visit Jawaii. Why don't you ask your partner for help in gathering the zeny for this trip?";
+		close;
 
-	mes "[Attendant GoYa]";
-	mes "Welcome to the Inn of Jawaii~";
-	next;
-	mes "[Attendant GoYa]";
-	mes "Just like a story with a chapter missing,";
-	mes "you look disgusting.";
-	mes "Find yourself a partner so that you can enjoy your adventure~";
-	close;
+	case 3:
+		mes "[Helper]";
+		mes "There's there no better way to share special, secluded moments with your beloved than through";
+		mes "a secret trip to a remote, exotic area.";
+		next;
+		mes "[Helper]";
+		mes "A vacation in Jawaii could very well be the greatest gift that you could give to the one you love~";
+		close;
+	}
 }
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index b3e85e1b7..89312bd8d 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -18,350 +18,618 @@
 //= 1.5 Added a lvl 4 weapon quest related NPC [MasterOfMuppets]
 //= 1.6 Added Bartender NPC, made by Persian69 [Vicious_Pucca]
 //= 1.7 Removed Duplicates [Silent]
+//= 1.8 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //============================================================
 
+// Morroc
+//============================================================
+morocc,68,260,0	script	Towner#Spencer	99,{
+	switch(rand(3)) {
+	case 1:
+	case 2:
+		mes "[Spencer]";
+		mes "You know...";
+		mes "Those giant, triangular buildings at the NorthWest corner of Morroc known are known to us as Pyramids...";
+		next;
+		mes "[Spencer]";
+		mes "Those things have been around here for thousands and thousands of years. No one knows when and why they were built, or who built them.";
+		next;
+		mes "[Spencer]";
+		mes "All we know is that tons of monsters live inside those weird buildings. You might wanna stay away from those really dangerous places.";
+		close;
 
-//==================================================== Town of Morroc ====================================================\\
+	Default:
+		mes "[Spencer]";
+		mes "Man...";
+		next;
+		mes "[Spencer]";
+		mes "Oh...";
+		mes "Oh man...";
+		next;
+		mes "[Spencer]";
+		mes "Man, I'm freaking bored!";
+		next;
+		mes "[Spencer]";
+		mes "Hey.";
+		mes "Let's play...";
+		mes "Rock, paper, scissors, yeah?";
+		next;
+		mes "[Spencer]";
+		mes "I feel it's fair to warn you, though, that here I'm the official regional champion of this time honored game of intellectual strategy.";
+		next;
+		if (select("Alright~:What...?!") == 1) {
+			mes "[Spencer]";
+			mes "Alright...";
+			mes "One, two...";
+			mes "Three!";
+			next;
+			switch(select("Rock:Paper:Scissors")) {
+			case 1:
+				switch(rand(3)) {
+				case 1:
+					Emotion e_rock;
+					mes "["+strcharinfo(0)+"]";
+					mes "Rock...!";
+					next;
+					mes "[Spencer]";
+					mes "What the...?!";
+					mes "I see great minds think alike! But then again, so do stupid minds...";
+					close;
+				case 2:
+					Emotion e_paper;
+					mes "["+strcharinfo(0)+"]";
+					mes "Rock...!";
+					next;
+					mes "[Spencer]";
+					mes "Looks like I win!";
+					mes "Heh heh~ Still got it.";
+					close;
+				Default:
+					Emotion e_scissors;
+					mes "["+strcharinfo(0)+"]";
+					mes "Rock...!";
+					next;
+					mes "[Spencer]";
+					mes "...What?!";
+					mes "No way!";
+					mes "How did I lose?!";
+					next;
+					mes "[Spencer]";
+					mes "So...";
+					mes "I see you're";
+					mes "not just a";
+					mes "mere rookie...";
+					close;
+				}
+			case 2:
+				switch(rand(3)) {
+				case 1:
+					Emotion e_rock;
+					mes "["+strcharinfo(0)+"]";
+					mes "Paper...!";
+					next;
+					mes "[Spencer]";
+					mes "It can't be...";
+					mes "Impossible...";
+					mes "I lost?!";
+					next;
+					mes "[Spencer]";
+					mes "You're not able";
+					mes "to read minds...";
+					mes "Are you?";
+					close;
+				case 2:
+					Emotion e_paper;
+					mes "["+strcharinfo(0)+"]";
+					mes "Paper...!";
+					next;
+					mes "[Spencer]";
+					mes "So...";
+					mes "It seems we are";
+					mes "evenly matched...";
+					next;
+					mes "[Spencer]";
+					mes "You are truly a";
+					mes "worthy opponent...";
+					close;
+				case 3:
+					Emotion e_scissors;
+					mes "["+strcharinfo(0)+"]";
+					mes "Paper...!";
+					next;
+					mes "[Spencer]";
+					mes "Bwah Hah Hah!";
+					mes "You lose!";
+					next;
+					mes "[Spencer]";
+					mes "Still...";
+					mes "That was too";
+					mes "close for comfort...";
+					next;
+					mes "[Spencer]";
+					mes "I...";
+					mes "I almost chose Rock...";
+					close;
+				}
+			case 3:
+				switch(rand(3)) {
+				case 1:
+					Emotion e_rock;
+					mes "["+strcharinfo(0)+"]";
+					mes "Scissors...!";
+					next;
+					mes "[Spencer]";
+					mes "BAM...!";
+					mes "Smashed you up!";
+					mes "Who's your daddy?!";
+					close;
+				case 2:
+					Emotion e_paper;
+					mes "["+strcharinfo(0)+"]";
+					mes "Scissors...!";
+					next;
+					mes "[Spencer]";
+					mes "It can't be...!";
+					mes "I've spent seven years training to get a black belt in this game!";
+					close;
+				case 3:
+					Emotion e_scissors;
+					mes "["+strcharinfo(0)+"]";
+					mes "Scissors...!";
+					next;
+					mes "[Spencer]";
+					mes "Uh oh...";
+					mes "Looks like";
+					mes "you've got the";
+					mes "eye of the tiger.";
+					next;
+					mes "[Spencer]";
+					mes "It may be a tie,";
+					mes "But next time...";
+					mes "I will crush you.";
+					close;
+				}
+			}
+		}
+		mes "[Spencer]";
+		mes "That's fine...";
+		mes "I understand if you're a little intimidated to take on ^7A378BThe Master^000000.";
+		close;
+	}
+}
 
-// Old Scholar ===============================
-morocc_in,112,122,2	script	Old Scholar	61,{
-	mes "[Old Scholar]";
-	mes "I've devoted my Life to researching the Pyramids.  Although I not found anything significant yet, I am confident that I will find the Tomb of Ancient King, Osiris!";
+morocc,116,266,0	script	Towner#moc	85,{
+	if (BaseLevel > 98) {
+		mes "[Ogleson]";
+		mes "Oh man...";
+		next;
+		mes "[Ogleson]";
+		mes "That blueish glow around you! You're really, really strong! That's soooo cool! You must not be afraid of anything, not even Desert Wolves.";
+		next;
+		mes "[Ogleson]";
+		mes "I'm so jealous!";
+		mes "Everyone must like you!";
+		close;
+	}
+	mes "[Ogleson]";
+	mes "If you have to go through the desert, you have to look out for the Desert Wolves. Those things are so mean and vicious...";
 	next;
-	mes "[Old Scholar]";
-	mes "It is within the largest of the Morroc Pyramids, that the Greatest King in History sleeps the eternal sleep.  That is... if my memory serves me correctly......";
+	mes "[Ogleson]";
+	mes "Those wolves are always traveling around in a pack. If they find that you're threatening one of them, you'll have to take all of them on.";
+	next;
+	mes "[Ogleson]";
+	mes "I'm just so glad that, somehow, they keep those wild creatures out of the city. Otherwise, none of us would be able to sleep at night.";
 	close;
 }
 
-// Drunk Man =================================
-morocc,44,180,8	script	Drunk Man	89,{
-	mes "[Drunk Man]";
-	mes "Heh Heh... (Hiccup)! Oh, Are you new here? Nice to meet ya, Buddy! So how was your trip?";
-	mes "This was predestined that you and I meet here, I tell you what (Hiccup). Let me tell you something I just heard from the pub....";
+morocc,208,85,0	script	Towner#2moc	83,{
+	mes "[Silas]";
+	mes "I work in the trading business, so I always have to cross the hot, dry Morroc Desert on business.";
 	next;
-	mes "[Drunk Man]";
-	mes "It's rumored that there is a special Dagger that can bring great fortune to its owner.";
-	mes "There is a well-know Thief in Rune-Midgard that possesses this Dagger, and has never been caught";
+	mes "[Silas]";
+	mes "One time, while I was in the middle of the desert, I was so thirsty that I caught a cactus. As you may know, you can find water inside of those things.";
 	next;
-	mes "[Drunk Man]";
-	mes "What I would give to get my hands something like that(Hiccup).  But only in my dreams....";
+	mes "[Silas]";
+	mes "But before I was able to cut it, it slapped me! Then it shot me in the arse with all these needles. Man, did that smart!";
 	next;
-	mes "[Drunk Man]";
-	mes "How about you? Why don't you Look for it? It shouldn't be a problem for someone as brave as yourself?";
-	mes "Kekeke keke(Hiccup)! Buy me a drink later if you ever find that dagger.  Promise me, alright?(Hiccup!)";
-	emotion e_hmm;
+	mes "[Silas]";
+	mes "The worst part of it all? I had to buy some Holy Water from a stingy Merchant. Man, I hate it when they know Overcharge!";
+	next;
+	mes "[Silas]";
+	mes "Later, I learned that it wasn't a normal cactus I found, but the monster we call 'Muka.' So, try to bring water on your long trips, it might save you some pain.";
 	close;
 }
 
-// Towner =================================
-morocc,68,260,8	script	Towner	99,{
-	mes "[Towner]";
-	mes "Those giant, Triangular Buildings North West of town are called Pyramids... They have been there for thousands and thousands of years.";
+morocc,150,50,0	script	Towner#3moc	99,{
+	mes "[Lapidary]";
+	mes "The undisputed queen of jewels has to be the Diamond. After looking at it just once, no one can deny its beauty.";
 	next;
-	mes "[Towner]";
-	mes "Nobody knows when and why they were built or who built them.  All we know for sure is that there are tons of Horrendous Monsters inside of them.";
+	mes "[Lapidary]";
+	mes "Many factors determine its value, but the most important thing is its size.";
 	next;
-	mes "[Towner]";
-	mes "I think you'd better stay away from them.  The monsters in the Pyramid LOVE to feed on strangers.  Kekekekek...";
+	mes "[Lapidary]";
+	mes "It should also be a perfect crystal, not cracked or chipped, if you want to sell the Diamond for a lot of zeny.";
 	close;
 }
 
-// Ant Man Akira =============================
-morocc,76,75,4	script	Ant Man Akira	47,{
-	mes "[Ant Man Akira]";
-	mes "About 1 map north and 3 maps east of Morroc, there lies the entrance to a cave known as ^ff0000ANTHELL^000000 ...";
-M_Menu:
-	next;
-	menu "'Anthell ?'",M_Anthell,"Ants?",M_Ants,"End conversation",M_End;
-	
-	M_Anthell:
-		mes "[Ant Man Akira]";
-		mes "Anthell gets it's name from the fact that the cave is home to the largest colony of giant ants in Rune-Midgard.";
-		mes "There are literally thousands of ants performing work for the colony while their queens lay hundreds and hundreds of eggs.";
-		next;
-		mes "[Ant Man Akira]";
-		mes "Many people go there to train because of the numerous amounts of ant eggs.  But be careful...";
-		next;
-		mes "[Ant Man Akira]";
-		mes "Attack an ant by mistake, and you'll find yourself surrounded by a swarm of them before you can even use a fly wing!";
-		emotion e_gasp;
-		goto M_Menu;
-	M_Ants:
-		mes "[Ant Man Akira]";
-		mes "There are 3 different kinds of Ant, each with a unique color and name.  Each one has a different role in the colony.";
-		mes "Andres are white, Pieres are green, and Deniros are red colored.  Their differences are not merely cosmetic however.";
-		next;
-		mes "[Ant Man Akira]";
-		mes "Andres are the weakest of the ants while Deniros are the most fierce some of the ants.  Pieres lay somewhere in the middle.";
-		next;
-		mes "[Ant Man Akira]";
-		mes "Be careful when your around them.  If you hit 1 Andre the other Andres in the area with swarm and attack you.";
-		mes "The same goes for Deniros and Pieres.  You should also know that ants are looters so watch out for your items.";
-		goto M_Menu;
-	M_End:
-		mes "[Ant Man Akira]";
-		mes "Before you go, let me tell you about Giearths.  They are not ants but they live in Anthell.  Don't underestimate them because of their small size.";
-		mes "They are extremely tough and should only be handled by high level wariors.";
+morocc,44,180,0	script	Towner#4moc	89,{
+	switch(rand(2))  {
+	case 1:
+		mes "[Trevor]";
+		mes "Hey guy.";
+		mes "What are you doing here all the way in Morroc? You know, this place is full of Thieves, Rogues and Assassins, right?";
+		next;
+		if (BaseClass == Job_Thief) {
+			mes "[Trevor]";
+			mes "Heh heh~";
+			mes "I guess that means you fit right in! It's nice to be in your element, don't you agree?";
+		}
+		else {
+			mes "[Trevor]";
+			mes "Wait a second...";
+			mes "Only people of bravery, or maybe even greed, would wander around here for fun. You must be an adventurer, right?";
+		}
+		next;
+		mes "[Trevor]";
+		mes "Anyway, there's this dagger that brings incredible luck to however possesses it. Luck... I'm use we can all use more of that. Supposedly, the Thief that used to own it has never been caught!";
+		next;
+		mes "[Trevor]";
+		mes "I guess that could be a helpful tip to someone like you.";
+		close;
+	Default:
+		mes "[Trevor]";
+		mes "There's some guy around here that's making these toootally funky hats. Yeah, they're pretty weird.";
+		next;
+		mes "[Trevor]";
+		mes "Supposedly, he's studied science, and he's making these hats that you can wear to beat the heat on hot days. But the way they look is totally ridiculous.";
 		next;
-		mes "[Ant Man Akira]";
-		mes "Well see ya around.";
+		mes "[Trevor]";
+		mes "Actually, to tell the truth, some of them might actually be cute. But I saw someone leave him wearing a fish on his head! It was soooo weird!";
 		close;
+	}
 }
 
-// Poring Lady Syvia ==================================
-morocc,79,111,2	script	Poring Lady Syvia	700,{
-	mes "[Poring Lady Syvia]";
-	mes "All over Rune-Midgard you can see lots of cute monsters such as Spores, the mushroom type creature....";
+morocc,79,111,4	script	Picky Lady#moc	66,{
+	mes "[Syvia]";
+	mes "The fields of Rune-Midgard are infested with wild and dangerous monsters that threaten the lives of traveling adventurers...";
 	next;
-	mes "[Poring Lady Syvia]";
-	mes "Or Pickys, desert chicks that wear egg shells on their heads and jump around in the Morroc Desert..!";
-	mes "However you can't deny that the ^FF8888Poring^000000 is the cutest and most popular creature in all of Rune-Midgard.";
+	mes "[Syvia]";
+	mes "But, you've got to admit a bunch of them are soooo cute!";
 	next;
-	mes "[Poring Lady Syvia]";
-	mes "Although everybody knows about the common pink Poring, there are 2 Rare porings that live near Prontera and are getting a lot of attention.";
+	mes "[Syvia]";
+	mes "You know, like how Spore sticks out its tongue after you kill it, or how little Picky wears that tiny egg shell sometimes?";
 	next;
-	mes "[Poring Lady Syvia]";
-	mes "They are the ^ffaa00Angeling^000000 and the ^5555ffGhostring^000000";
-M_Menu:
+	mes "[Syvia]";
+	mes "And you certainly can't deny that ^F08080Poring^000000 is the cutest of them all!";
 	next;
-	menu "Angeling?",M_Angel,"Ghostring?",M_Ghost,"Quit Conversation",M_Quit;
-	
-	M_Angel:
-		mes "[Poring Lady Syvia]";
-		mes "The Angeling is a poring with angel wings.  It is rarely seen but it is quite a sight.  Don't not be fooled by it's angelic look however.";
-		mes "It is a high level monster armed with the Holy property.  It is immune to almost all magic attacks except those of the neutral & shadow property.";
+	switch(select("What about Angeling?:How about Ghostring?:Quit Conversation")) {
+	case 1:
+		mes "[Syvia]";
+		mes "Ooh! Angeling is even cuter! It's just like Poring, except it has angel wings! Of course, I don't know if they can actually fly...";
 		next;
-		mes "[Poring Lady Syvia]";
-		mes "Physical attacks are definitely the way to go against these monsters.";
+		mes "[Syvia]";
+		mes "Angelings are rarely seen, but can be found among large groups of Porings living in one of the fields south of Prontera.";
 		next;
-		mes "[Poring Lady Syvia]";
-		mes "Don't I know a lot about porings?  Quite frankly I'm in love with them.... =P";
-		goto M_Menu;
-
-	M_Ghost:
-		mes "[Poring Lady Syvia]";
-		mes "The Ghostring is an evil ghost poring.  It is rarely seen and luckly so.";
+		mes "[Syvia]";
+		mes "Angeling is a high level monster with Holy property, so it's immune to most magic, aside from spells that have Neutral or Shadow attack properties.";
+		next;
+		mes "[Syvia]";
+		mes "Hehe~ Don't you think I know a lot about Porings? I love them soooo much~";
+		close;
+	case 2:
+		mes "[Syvia]";
+		mes "Ghostring?!";
+		mes "Yeah, that";
+		mes "little guy";
+		mes "is kind of... ";
+		mes "gnarly looking.";
 		next;
-		mes "[Poring Lady Syvia]";
-		mes "It is a high-level monster armed with the ghost property.  This makes it immune to physical attacks.  So Archers, Swordsman, and Thieves beware!";
-		mes "Only weapons with elemental properties will work on Ghostrings.  Of course magic attacks work very well on them also.";
+		mes "[Syvia]";
+		mes "Ghostring is an evil ghost Poring. It's rarely seen, but can be found among mass groups of Porings living in one of the fields south of Prontera.";
 		next;
-		mes "[Poring Lady Syvia]";
-		mes "Don't I know a lot about porings?  Quite frankly I'm in love with them.... =P";
-		goto M_Menu;
-
-	M_Quit:
-		mes "[Poring Lady Syvia]";
-		mes "OMG!";
-		emotion e_omg;
+		mes "[Syvia]";
+		mes "Ghostring is a high-leveled monster with the Ghost property, so it can withstand all physical attacks.";
 		next;
-		mes "[Poring Lady Syvia]";
-		mes "You dare dismiss a poring expert such as myself? I am proud of my knowledge about all things poring!!";
+		mes "[Syvia]";
+		mes "Damage can only be caused to Ghostring through magic spells or weapons with an a specific property.";
 		next;
-		mes "[Poring Lady Syvia]";
-		mes "Hmf!";
-		emotion e_pif;
+		mes "[Syvia]";
+		mes "Hehe~ Don't you think I know a lot about Porings? I love them soooo much~";
 		close;
+	case 3:
+		mes "[Syvia]";
+		mes "Huh?! Where are you going? I was just about to tell you how cute Porings are! W-Wait~!";
+		close;
+	}
 }
 
-// Slayer Kid ====================================
-morocc,123,58,4	script	Slayer Kid	118,{
-	mes "[Slayer Kid]";
-	mes ".... An expert in hand to hand combat who polishes off enemies quickly and quietly....";
+morocc,76,75,4	script	Ant Man#moc	47,{
+	mes "[Akira]";
+	mes "When you walk through the desert about one map North and 3 maps East, you'll find the entrance to Ant Hell.";
 	next;
-	mes "[Slayer Kid]";
-	mes "That is the ^ff00ffAssassin^000000!!";
-M_Menu:
+	switch(select("Ant Hell?:Ants?:End Conversation")) {
+	case 1:
+		mes "[Akira]";
+		mes "Ant Hell seems to be a colony of giant ant monsters. If you wander in there, look out. They can be pretty dangerous.";
+		next;
+		mes "[Akira]";
+		mes "Giearth, the elderly fairy, also roams around Ant Hill mining for Ores. If you bother him, you'll be in trouble, so watch out for him too.";
+		next;
+		mes "[Akira]";
+		mes "To get to Ant Hell, you can head east till you see the bridge which connects to the Payon Forest. In the map right before that bridge, head north to find the entrance to Ant Hell.";
+		close;
+	case 2:
+		mes "[Akira]";
+		mes "Ant Hell is swarming with Ant monsters. You'll notice that they all classed with different names.";
+		next;
+		mes "[Akira]";
+		mes "Andre is the weakest, Piere is comparatively average, and Deniro is the strongest Ant. Keep that in mind so you can fight the Ants suitable to your level.";
+		next;
+		mes "[Akira]";
+		mes "Oh, and you should be especially careful not to drop items. Those ants will grab anything on the ground in a flash!";
+		close;
+	case 3:
+		close;
+	}
+}
+
+morocc,123,58,4	script	Assassin Boy#moc	118,{
+	mes "[Timmy]";
+	mes "Unbeatable in man-to-man fights, Assassins always overcome their enemies! Erm, always overcome their enemies without a trace.";
 	next;
-	menu "Hmm??",M_0,"Where can I find the Assassin Clan?",M_1,"End conversation",M_End;
-	
-	M_0:
-		mes "[Slayer Kid]";
-		mes "Assassins are a secretive group of elite killers.  People say Assassins are highly trained in 'eliminating' their targets without leaving a trace.";
-		next;
-		mes "[Slayer Kid]";
-		mes "It's been 3 months since I left home to search for the Assassin clan.... Just where are they??!!!";
-		goto M_Menu;
-	M_1:
-		mes "[Slayer Kid]";
-		mes "People say that if you go 2 maps on the east of Morroc, then 2 maps south, you'll be able to find the Assassin Clan.";
-		next;
-		mes "[Slayer Kid]";
-		mes "If you are granted an Assassin Cross, the emblem of the clan master, you will be allowed to become an Assassin.";
-		mes "The Assassin Cross is a high honor and is given to the best Assassin among Assassins!";
-		next;
-		mes "[Slayer Kid]";
-		mes "To tell you the truth however... I don't think they the clan really exists...";
-		next;
-		mes "[Slayer Kid]";
-		mes "I've been searching for them for over 3 months now and nothing.  It seems almost impossible for me to become an Assassin now......";
-		goto M_Menu;
-	M_End:
+	switch(select("Say what?:Where I can find the Assassin clan?:End Conversation")) {
+	case 1:
+		mes "[Timmy]";
+		mes "I hear Assassins practice killing people, quietly and stealthfully of course, everyday! I want to become one so bad!";
+		next;
+		mes "[Timmy]";
+		mes "But...";
+		mes "I left home three months ago, and have been searching for their secret base ever since. Are they really that invisible?!";
 		close;
+	case 2:
+		mes "[Timmy]";
+		mes "Well, I hear that if you leave this town and go 2 maps east, and then 2 maps South, you should be able to find it.";
+		next;
+		mes "[Timmy]";
+		mes "The 'Mirage Tower,' the head building of Sograt Desert, is supposed to appear in this awesome sandstorm! But, I still haven't found it.";
+		next;
+		mes "[Timmy]";
+		mes "If you find them, and the clan master thinks you're qualified, you can become an Assassin! Or, at least, I think...";
+		next;
+		mes "[Timmy]";
+		mes "Oh..!";
+		mes "And I hear the coolest Assassin of them all is the Assassin Cross! But, that's even a bigger mystery~";
+		close;
+	case 3:
+		mes "[Timmy]";
+		mes "Assassin is one of the advanced jobs for Thief, and specializes in fighting with Neutral and Poison property attacks.";
+		next;
+		mes "[Timmy]";
+		mes "They're also very sneaky! I hear that they're able to cloak so that no one can see them!";
+		close;
+	}
+}
 
+morocc,180,155,4	script	Dimitri#moc	49,{
+	mes "[Dimitri]";
+	mes "Man, this place is so hot! You would think they would sell Deodorant, maybe even some cologne in this city, but noooooo...";
+	next;
+	switch(Select("About the desert sands:About the remedy for Fatigue:End Conversation")) {
+	case 1:
+		mes "[Dimitri]";
+		mes "The desert?!";
+		mes "It's definitely";
+		mes "much hotter than";
+		mes "this city.";
+		next;
+		mes "[Dimitri]";
+		mes "Still, you can sit down and take a rest whenever you need to and your ass won't burn. I guess the Morroc sand doesn't conduct heat as much as it should.";
+		next;
+		mes "[Dimitri]";
+		mes "I mean, when I sit down, it does feel ^EE2C2Cpleasantly toasty^000000. I get almost a guilty sensation when I do that.";
+		next;
+		mes "[Dimitri]";
+		mes "Try it when you're in the desert sometime. You'll see that you can still recover your HP and SP.";
+		close;
+	case 2:
+		mes "[Dimitri]";
+		mes "When you're tired, just drink a Potion. Those things taste great!";
+		next;
+		mes "[Dimitri]";
+		mes "I know, the Pharmacist who can make them always says ^EE3B3BDon't drink too much, it's abuse, blah blah blah^000000, but whatever.";
+		next;
+		mes "[Dimitri]";
+		mes "Red Potions have become steadily popular since they're so affordable, even though they only recover a little bit of HP.";
+		next;
+		mes "[Dimitri]";
+		mes "So...";
+		mes "Just know that you should try to carry Potions in case you run into some sort of crazy situation, alright?";
+		close;
+	case 3:
+		mes "[Dimitri]";
+		mes "Sometimes 'Milk' comes out of 'PecoPeco's Egg.' Now...";
+		next;
+		mes "[Dimitri]";
+		mes "I may not be a man of science, but how is that even possible?";
+		next;
+		mes "[Dimitri]";
+		mes "I mean, did the Milk come prepackaged with the egg, or did it get in there somehow?";
+		close;
+	}
 }
 
-// Lapidary =======================================
-morocc,150,50,8	script	Lapidary	99,{
-	mes "[Lapidary]";
-	mes "The Queen of Jewelry is the Diamond.  No one can deny its beautiful appearance.  That's why it cost so much to buy...";
+morocc,234,273,4	script	Fly Man#moc	54,{
+	mes "[Armani]";
+	mes "I really saw it...";
+	mes "The Fly Lord!";
+	mes "Why doesn't anyone";
+	mes "believe me?!";
 	next;
-	mes "[Lapidary]";
-	mes "Many factors increase its value, with the most important factor being size.";
+	if (select("The Fly Lord?!:Isn't that a book?") == 1) {
+		mes "[Armani]";
+		mes "Yes, yes! I'm talking about the Dragon Fly, master of all flies!";
+		next;
+		mes "[Armani]";
+		mes "It's much stronger than the other flies, and when you kill it, there's even a chance that you might earn a ^880000Clip^000000 item!";
+		next;
+		mes "[Armani]";
+		mes "You can insert certain monster cards into the Clip item. Those Clip accessories seem pretty valuable to you adventurers...";
+		next;
+		mes "[Armani]";
+		mes "Anyhow, why don't you go search for it? I'm sure if you're lucky, you'll find a Dragon Fly around here!";
+		close;
+	}
+	mes "[Armani]";
+	mes "Yes...";
+	mes "Yes, it is.";
 	next;
-	mes "[Lapidary]";
-	mes "A high quality Diamond should be perfect and not chipped or cracked in any way.";
+	mes "[Armani]";
+	mes "It's a pretty good novel, even though 'The Fly Lord' isn't really the exact title. It's actually Lord of the--Wait, why are we talking about this?";
 	close;
 }
 
-// Uncle Dimitrii ==========================================
-morocc,180,155,4	script	Uncle Dimitri	49,{
-	mes "[Uncle Dimitrii]";
-	mes "The avarage temperature in the Morroc Desert is many times higher than anywhere else in the Rune-Midgard Kingdom.";
-	next;
-	mes "[Uncle Dimitrii]";
-	mes "Be careful of where you choose to sit down and rest.  Choose the wrong spot and your butt may catch on fire!!";
-M_Menu:
+morocc,277,213,4	script	Uncle Morroc#moc	48,{
+	mes "[Phlanette]";
+	mes "Morroc is located in an extremely dry region, surrounded by desert. No place in the world is as hot as Morroc.";
 	next;
-	menu "About the Desert sand",M_1,"About the remedy for Fatigue",M_2,"End conversation",M_End;
-	
-	M_1:
-		mes "[Uncle Dimitri]";
-		mes ". . . . . Well";
-		next;
-		mes "[Uncle Dimitri]";
-		mes "It's SUPPOSED to be HOT!!! But it actually isn't really that hot.....";
-		next;
-		mes "[Uncle Dimitri]";
-		mes "For some odd reason the sand in the Morroc desert doesn't conduct as much heat as the sand in other deserts.";
-		mes "Instead of being scorching hot, the sand just feels warm.... so it's ok for you to sit down for a good rest";
-		next;
-		mes "[Uncle Dimitri]";
-		mes "So everybody can recover their HP and SP without fear of catching on fire.";
-		goto M_Menu;
-	M_2:
-		mes "[Uncle Dimitri]";
-		mes "Aaaaahhh!!!!";
-		next;
-		mes "[Uncle Dimitri]";
-		mes "Nothing beats desert fatigue like a couple of potions! The ^ff0000Red^000000 ones are especially popular because of their low cost and light weight.";
-		next;
-		mes "[Uncle Dimitri]";
-		mes "They only recover a small amount of hp, but combined with a dip in a desert oasis, a couple ^ff0000Reds^000000 are all you need.";
-		goto M_Menu;
-	M_End:
-		mes "[Uncle Dimitri]";
-		mes "Did you know that you can get ^0000bb'Milk'^000000 from a 'PecoPeco's Egg'? I wonder how that works......?";
+	if (select("Tell me about the desert.:Quit Conversation") == 1) {
+		mes "[Phlanette]";
+		mes "You want to";
+		mes "know about";
+		mes "the desert?";
+		mes "Well, um...";
+		next;
+		mes "[Phlanette]";
+		mes "Due to low annual rainfall, low humidity and high evaporation rate, little vegetation can be found in the desert.";
+		next;
+		mes "[Phlanette]";
+		mes "Nonetheless, there are a few hardy plants that can survive and grow in the desert. I learned all that in the Juno Library.";
+		next;
+		mes "[Phlanette]";
+		mes "Unfortunately some of those plants growing around Morroc have been mutated into monsters. One of those is Muka, the mutated cactus.";
+		next;
+		mes "[Phlanette]";
+		mes "Although it can be pretty uncomfortable for us, other creatures can thrive in the desert near Morroc.";
 		close;
+	}
+	close;
 }
 
-// Trader Joe =====================================
-morocc,208,85,7	script	Trader Joe	83,{
-	mes "[Trader Joe]";
-	mes "I earn a living as a Trader so I'm constantly traveling between Morroc and Prontera.";
-	mes "I can't even count how many times I've been across the Hot, Dry desert.";
+// Inside Morroc
+//============================================================
+morocc_in,112,122,0	script	Grampa#moc	61,{
+	mes "[Old Scholar]";
+	mes "I've devoted my life to researching the mysterious pyramids near Morroc. I haven't been able to concretely confirm anything yet, but...";
 	next;
-	mes "[Trader Joe]";
-	mes "One day, while I was out in the Desert, I unexpectedly ran out of water and became extremely thirsty.";
-	mes "I was desperate so I decided to try to get some water out of a cactus when.......";
+	mes "[Old Scholar]";
+	mes "I'm sure that the largest pyramid contains the tomb of the ancient king, Osiris! I'm willing to stake my life on it!";
 	next;
-	mes "[Trader Joe]";
-	mes "ALL OF THE SUDDEN!!! The cactus let out this LOUD SCREAM and started to SHOOT its NEEDLES at me!!";
-	emotion e_omg;
+	mes "[Old Scholar]";
+	mes "According to my notes, Osiris, one of the greatest kings in history, sleeps eternally within the depths of that pyramid. If only I were younger, I could see it for myself...";
 	next;
-	mes "[Trader Joe]";
-	mes "It was THE WORST experience of my ENTIRE LIFE.";
+	if (countitem(1030) > 0) {
+		mes "[Old Scholar]";
+		mes "Wait...";
+		mes "Do I smell...?";
+		mes "It is! That's the scent of ^993300Tiger's Footskin^000000!";
+		next;
+		mes "[Old Scholar]";
+		mes "One glance at it can restore your strength, one sniff and your blood boils with vigorous pleasure...";
+		next;
+		mes "[Old Scholar]";
+		mes "Just one bite... Will revive my virility!!!! The Tiger's Footskin~!! Ohhhh! Ohh My God !! Please!!! Please give me that... Please...";
+		next;
+		mes "[Old Scholar]";
+		mes "It's just...";
+		mes "If you gave it to me, I would give you absolutely nothing in return. ^EE0000Nothing at all^000000...";
+		close;
+	}
+	mes "[Old Scholar]";
+	mes "I guess it'll be up to the younger generation to explore the mysteries of the past firsthand...";
+	close;
+}
+
+
+// Morroc Field
+//============================================================
+moc_fild16,199,212,4	script	Uncle Assassin#moc	55,{
+	mes "[Hashisid]";
+	mes "Assassins are trained to approach their enemies steathily, as well as to shroad their intent. For this purpose, we never look our targets in the eye.";
 	next;
-	mes "[Trader Joe]";
-	mes "I figured out later that it wasn't a normal cactus that attacked me but it was ^00cc00Muka^000000, the cactus monster.";
+	if (select("Notion of Assassin:Quit Conversation") == 1) {
+		mes "[Hashisid]";
+		mes "Assassins may be commonly known as infiltrators and murderers who kill without remorse.";
+		next;
+		mes "[Hashisid]";
+		mes "In actuality, the Assassin clan is forbidden to harm innocent people, or at least, not without good reason.";
+		next;
+		mes "[Hashisid]";
+		mes "Our true directive is to assassinate evil creatures, and to use our stealth to gather intelligence for the good of all Rune-Midgard.";
+		close;
+	}
+	mes "[Hashisid]";
+	mes "Once upon a time, our ancestors would smoke tobacco before performing their duties.";
 	next;
-	mes "[Trader Joe]";
-	mes "So be careful the next time you're out in the desert.  You don't want to make the same mistake I made. (~Sigh~)";
+	mes "[Hashisid]";
+	mes "However, we no longer do so, since insect or animal monsters are very senstive to the smell.";
+	next;
+	mes "[Hashisid]";
+	mes "There are many factors that contribute to successful stealth. Depending on your opponent, it's not enough to just be invisible sometimes...";
 	close;
 }
 
-// Fly Man Armani ===============================
-morocc,234,273,3	script	Fly Man Armani	54,{
-	mes "[Fly Man Armani]";
-	mes "I SAW IT!! I SAW IT!!!";
-	emotion e_ic;
+moc_fild16,177,246,4	script	Assassin#moc	118,{
+	mes "[La Conte]";
+	mes "Once Thiefs are promoted to Assassins, they will be able to vary their battle style.";
 	next;
-	mes "[Fly Man Armani]";
-	mes "I saw the rare ^ff0000Dragon Fly^000000 just South of here! It was incredible!!";
+	mes "[La Conte]";
+	mes "There are 2 main battle styles available to Assassins. They may either wield dual daggers, or fight with a set of Katars.";
 	next;
-	menu "What... Dragon Fly?!",M_0,"So what?",M_1;
-	
-	M_0:
-		mes "[Fly Man Armani]";
-		mes "It is the boss of desert flies and its much stronger than any other ordinary fly.";
-		mes "It's a rare sight to behold, and for anybody strong enough and lucky enough to defeat it.... ";
+	switch(select("Specialty of Katar:Specialty of Dual Daggers:Quit Conversation")) {
+	case 1:
+		mes "[La Conte]";
+		mes "A set of Katars is worn on both of the hands, and allows Assassins to quickly slash their enemies.";
 		next;
-		mes "[Fly Man Armani]";
-		mes "The Dragon Fly may even drop an UTLRA RARE item called a ^0000ddClip^000000!";
-		mes "Clips are items that you can attach to weapons, armor, and almost every kind of accessory.";
+		mes "[La Conte]";
+		mes "Anyone can actually buy a basic set of Katars in Morroc somewhere. Of course, only Assassins can use them.";
 		next;
-		mes "[Fly Man Armani]";
-		mes "Clips are ^ffaa00slotted^000000 and therefore you can insert cards into them.  That's what makes them so valuable.";
-		mes "It seems like everyone is yearning for a clip these days.";
-		next;
-		mes "[Fly Man Armani]";
-		mes "Say.... why don't YOU challenge the Dragon Fly?";
-		emotion e_hmm;
-		close;
-	M_1:
-		mes "[Fly Man Armani]";
-		mes "SO WHAT!!??";
-		emotion e_omg;
+		mes "[La Conte]";
+		mes "The right Katar usually does more damage, while the left Katar is used for the follow-through.";
 		next;
-		mes "[Fly Man Armani]";
-		mes "Do you dare underestimate the Dragon Fly??  Bleh! It may be a fly, but I guarantee you THIS FLY is more than you can handle!";
-		emotion e_pif;
+		mes "[La Conte]";
+		mes "But since Katars are equipped on both hands, you can't equip a shield or an extra weapon.";
 		next;
-		mes "[Fly Man Armani]";
-		mes "No matter.  If you ARE fortunate enough to run into it, you'll quickly see what I mean.  After all, it IS the FLY of ALL FLIES!!!!";
+		mes "[La Conte]";
+		mes "Compared to Dual Daggers, Katars have faster attack speed. Also, the ^663399Sonic Blow^000000 skill can only be used with Katars.";
 		next;
-		mes "[Fly Man Armani]";
-		mes "^ff0000Dragon Fly^000000.  Remember this name well!!";
+		mes "[La Conte]";
+		mes "You can learn the Sonic Blow skill at ^663399Level 4 Katar Mastery^000000. If you're an Assassin, it's a handy skill to know.";
 		close;
-}
-
-// Uncle Phlanette ================================
-morocc,277,213,4	script	Uncle Phlanette	48,{
-	mes "[Uncle Phlanette]";
-	mes "Morroc is a highly dry region surrounded by desert.  There isn't a place as hot or dry as Morroc anywhere in Rune-Midgard.";
-M_Menu:
-	next;
-	menu "Desert Story",M_0,"Quit Coversation",M_End;
-	
-	M_0:
-		mes "[Uncle Phlanette]";
-		mes "Let me tell you a little about the desert.....";
+	case 2:
+		mes "[La Conte]";
+		mes "Dual Daggers enables you to equip 2 different kinds of Daggers at the same time.";
 		next;
-		mes "[Uncle Phlanette]";
-		mes "You see the desert is a place that is bare of vegetation due to low rainfall and a high evaporation rate.";
-		mes "Even so there are plants that seem to thrive in the desert.  And where there are plants, there are animals.";
+		mes "[La Conte]";
+		mes "Of course, there are other weapons you can equip aside from daggers, but they'll probably be lacking in attack speed.";
 		next;
-		mes "[Uncle Phlanette]";
-		mes "So even with the high temperatures, and limited water, living creatures still find a way to survive in the desert."; 
-		next;
-		mes "[Uncle Phlanette]";
-		mes "Unfortunately, for unknown reasons, some of the plants and animals in the desert have turned into dangerous monsters.";
-		mes "The ^00cc00'Mukas'^000000 are one of those monsters.  They were originally cactus plants.";
-		goto M_Menu;
-	M_End:
-		mes "[Uncle Phlanette]";
-		mes "Sand HERE! Sand THERE! Sand EVERYWHERE!!!!";
-		emotion e_gasp;
+		mes "[La Conte]";
+		mes "Also, without a dagger in your right hand, you won't be able to use the ^663399Double Attack^000000 skill.";
 		next;
-		mes "[Uncle Phlanette]";
-		mes "(~Sigh~) I'm SICK and TIRED of this sand and desert...";
+		mes "[La Conte]";
+		mes "So with Dual Daggers, you would have a double attack with the right hand dagger, and a single attack with your left hand weapon.";
 		next;
-		mes "[Uncle Phlantette]";
-		mes "Morroc......!! I HATE YOU!!!!!!";
-		emotion e_pif;
+		mes "[La Conte]";
+		mes "So that's three strikes in one blow! You can't argue against that kind of damage!";
 		close;
+	case 3:
+		mes "[La Conte]";
+		mes "Hopefully you will make good use of the weapons at your disposal. Remember the importance of strategy and planning your attacks.";
+		close;
+	}
 }
 
+// Other NPCs
+//============================================================
 //Bartender
 morocc_in,166,76,3	script	Bartender#02	46,{
 	mes "[Bartender]";
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index f68b4ebdf..6ad025d55 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.8a
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -18,7 +18,8 @@
 //= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus]
 //= 1.7 Removed Duplicates [Silent]
 //= 1.8 Moved Culvert to quests/quests_prontera.txt
-//= 1.9 Rescript from the ground up. [L0ne_W0lf]
+//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.0 Removed "Hans Solo", as he is a Jawaii NPC. [L0ne_W0lf]
 //============================================================
 
 // Prontera
@@ -759,110 +760,3 @@ prt_maze02,110,69,0	script	Soldier#2pront	105,{
 	mes "Whaaaat a stupid guy. Why would anyone want to throw his life away just to collect some silly Herbs?";
 	close;
 }
-
-// Drunken man in the inn -----------------------------------------------
-prt_in,173,13,4	script	Customer#Hans Solo	86,{
-
-	set @number_drink,0;
-	set @number_place,0;
-	mes "[Hans Solo]";
-	mes "UhOh... I'm drunk. hiccups!";
-	mes "Hey, you. You look lonely!";
-	next;
-	mes "[Hans Solo]";
-	mes "You must be angry seeing others busy getting marry too? You're upset, aren't you?";
-	next;
-	mes "[Hans Solo]";
-	mes "You must be upset with the couples who ignore everyone and drown themselves in happiness,";
-	mes "aren't you?";
-	next;
-	mes "[Hans Solo]";
-	mes "I wonder since when everybody starts praising only themselves?";
-	mes "It used to be peaceful before that...";
-	next;
-	mes "[Hans Solo]";
-	mes "Anyway, it's ok even if you're not married, friend!!";
-	mes "Come, I'll buy you a drink.";
-	next;
-	mes "- How do I become his friend all of a sudden?! -";
-	mes "- Anyway, a free drink won't do any harm.... -";
-	next;
-	mes "- Gulu Gulu GuLu -";
-	percentheal -10,0;
-	next;
-	mes "[Hans Solo]";
-	mes "It's good, isn't it? I know a great place to hang out.";
-	mes "Do you want to tag along?";
-	next;
-	Loopback:
-		menu "...Give me another drink",-,"........What place is that?",s_What;
-
-			mes "[Hans Solo]";
-			mes "Well then, another drink it is.";
-			mes "Hey,BaZooKa...let's have a drink!";
-			next;
-			mes "[Hans Solo]";
-			mes "Cheers to the dateless adventurers!";
-			next;
-			mes "- Gulu Gulu GuLu -";
-			percentheal -10,0;
-			next;
-			set @number_drink,@number_drink + 1;
-			if (@number_drink == 5)goto s_Five;
-			goto s_While;
-s_What:
-			mes "[Hans Solo]";
-			mes "Eat and drink as much as you like!";
-			mes "Still don't have enough!";
-			mes "Come, have more!";
-			next;
-			mes "[Hans Solo]";
-			mes "Cheers for the dateless adventurers!";
-			next;
-			mes "- Gulu Gulu GuLu -";
-			percentheal -10,0;
-			next;
-			set @number_place,@number_place + 1;
-			goto s_While;
-
-s_Five:
-			mes "[Hans Solo]";
-			mes "UhOh... Are you alright?";
-			mes "Come, sign your name here.";
-			mes "I'll take you to a wonderful place!";
-			next;
-			menu "Sign it",-,"Don't sign it",s_Dont;
-
-				mes "[Hans Solo]";
-				mes "Good! Let me send you to that place now...Hehe..";
-				percentheal 100,0;
-				close2;
-				warp "jawaii_in",44,124;
-				end;
-
-s_Dont:
-				mes "[Hans Solo]";
-				mes "....Hey!";
-				close;
-s_While:
-		if (@number_drink >= 4 && @number_place >= 1 || @number_place >= 4)
-{
-			mes "[Hans Solo]";
-			mes "Hiccups... So you finally decide to go there?";
-			mes "Come... Sign your name here,";
-			mes "I'll take you to a great place!";
-			next;
-			menu "Sign it",-,"Don't sign it",s_Dont2; 
-			mes "[Hans Solo]";
-				mes "Good! I'll send you there now...Hehe..";
-				mes "Grumble about your pityful life while you can...Hehe...";
-				percentheal 100,0;
-				warp "jawaii_in",44,124;
-				close;
-s_Dont2:
-				mes "[Hans Solo]";
-				mes "....Hey!";
-				close;
-}
-goto Loopback;
-}