* 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

1 files changed, 70 insertions, 100 deletions

diff --git a/npc/quests/quests_izlude.txt b/npc/quests/quests_izlude.txt
index addba7087..ad2ade7cb 100644
--- a/npc/quests/quests_izlude.txt
+++ b/npc/quests/quests_izlude.txt
@@ -2,127 +2,97 @@
 //= Quest NPCs related to Izlude
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
+//= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Edgar's Offer
+//= Edgar's Offer:
+//= - [Aegis conversion]
+//= - Variables in use: MISC_QUEST (Bit 16)
 //===== Additional Comments: ================================= 
 //= 1.0 Initial release [Evera]
+//= 1.1 Updated to 10.3 standard. [L0ne_W0lf]
 //============================================================
 
-//==================================================== Edgar's
-//====================================================== Offer
-izlude,182,186,6	script	Edgar	709,{
-	
+// Edgar's Offer
+//============================================================
+izlude,182,186,2	script	Edgar#izlude	49,{
+	if (MISC_QUEST & 16) {
+		mes "[Edgar]";
+		mes "So are you heading to Alberta again? Let me give you the same discount and only charge 250 Zeny, just like the last time.";
+		mes "How's that sound?";
+		next;
+		if (select("Alrighty~!:Why are you being so nice to me?!") == 1) {
+			if (Zeny < 250) {
+				mes "[Edgar]";
+				mes "Um...";
+				mes "This isn't";
+				mes "enough money.";
+				mes "Why don't you go";
+				mes "get some more cash?";
+				close ;
+			}
+			set zeny,zeny-250;
+			warp "alberta",195,164;
+			end;
+		}
+		mes "[Edgar]";
+		mes "It's just the way I am. That, and your devilish smile reminds me of my beloved blond haired son who left home years ago to become a Sailor on his own ship. Bless his soul, wherever he is.";
+		close;
+	}
 	mes "[Edgar]";
-	mes "My town, Izlude is connected to";
-	mes "Alberta by the harbor in the West.";
-	mes "There is so much traffic between";
-	mes "us, I almost become an Albertian.";
-	mes "Hehehe~";
+	mes "My town, Izlude,  is connected to Alberta by the harbor in the West. There is so much traffic between us, I almost become an Albertian.  Hehehe~";
 	next;
 	mes "[Edgar]";
-	mes "There's this guy I know pretty";
-	mes "well, Phelix, who lives in Alberta.";
-	mes "That guy is really stingy... He";
-	mes "charges for everything!";
+	mes "There's this guy I know pretty well, Phelix, who lives in Alberta. That guy is really stingy... He charges for everything!";
 	next;
 	mes "[Edgar]";
-	mes "But he's a really nice guy and";
-	mes "likes helping other people. He has";
-	mes "a good heart and will give you his";
-	mes "support if you meet his price.";
+	mes "But he's really a nice guy and likes helping other people. He has a good heart and will give you his support if you meet his price.";
 	next;
 	mes "[Edgar]";
-	mes "Lately, people in Alberta say that";
-	mes "he is really trying to help folks";
-	mes "and that his demand for Jellopies";
-	mes "is just a cover-up. Well, you";
-	mes "should take a look at what he has";
-	mes "to offer.";
-M_Menu:
+	mes "Lately, people in Alberta say that he is really trying to help folks and that his demand for Jellopies is just a coverup.  Well, you should take a look at what he has to offer.";
 	next;
-	menu "Can you tell me the way to Alberta?",-,"End Conversation",M_End;
-	
+	if (select("Can you tell me how to get to Alberta?:End Conversation") == 1) {
 		mes "[Edgar]";
-		mes "Huh? Well, you can use your feet";
-		mes "and just walk. But if you have";
-		mes "money, I'd like to suggest that you";
-		mes "take a ship.";
+		mes "Huh? Well, you can use your feet and just walk.  But if you have money, I'd like to suggest that you take a ship.";
 		next;
-		menu "Ok, gotcha.",-,"But I'm sick of walking and I'm broke!",sM_1;
-		
+		if (select("Okay, gotcha.:But I'm sick of walking and I'm broke!") == 1) {
 			mes "[Edgar]";
-			mes "Alright, Take  Care~";
+			mes "Alrighty, take care~";
 			close;
-
-		sM_1:
-			if (MISC_QUEST & 16) goto sM_2;
-			mes "[Edgar]";
-			mes "Okay...";
-			mes "You don't want to walk AND you've";
-			mes "got no cash, but you still want to";
-			mes "go there? Oh geez.";
-			next;
-			mes "[Edgar]";
-			mes "Fine fine. Me, being the captain of";
-			mes "a ship, can afford to bring you";
-			mes "there at a lower price. How does";
-			mes "250 Zeny sound?";
-			next;
-			menu "Alrighty~?",-,"Bah, what a rip off!!",sm_1b;
-			
-				set MISC_QUEST,MISC_QUEST | 16;
-				if(Zeny < 250) goto sl_NoZeny;
-				set Zeny, Zeny - 250;
-				warp "alberta",195,164;
-
-			sm_1b:
-				mes "[Edgar]";
-				mes "Boy oh boy,";
-				mes "if you think";
-				mes "that's a rip off...";
-				close;
-
-			sM_2:
-				mes "[Edgar]";
-				mes "So are you heading to Alberta";
-				mes "again? Let me give you the same";
-				mes "discount and only charge 250 Zeny,";
-				mes "just like the last time.";
-				mes "How's that sound?";
-				next;
-				menu "Alrighty~!",-,"Why are you being so nice to me?!",sM_2b;
-
-				if(Zeny < 250) goto sl_NoZeny;
-				set Zeny, Zeny - 250;
-				warp "alberta",195,164;
-
-			sM_2b:
+		}
+		mes "[Edgar]";
+		mes "Okay...";
+		mes "You don't want to walk AND you've got no cash, but you still want to go there? Oh geez...";
+		next;
+		mes "[Edgar]";
+		mes "Fine fine. Me, being the captain of a ship, can afford to bring you there at a lower price. How does 250 Zeny sound?";
+		next;
+		if (select("Alrighty~!:Bah, what a rip off!!") == 1) {
+			set MISC_QUEST,MISC_QUEST | 16;
+			if (Zeny < 250) {
 				mes "[Edgar]";
-				mes "It's just the way I am. That, and";
-				mes "your devilish smile reminds me of";
-				mes "my beloved blond haired son who";
-				mes "left home years ago to become a";
-				mes "Sailor on his own ship. Bless his";
-				mes "soul, wherever he is.";
+				mes "Um...";
+				mes "This isn't";
+				mes "enough money.";
+				mes "Go and get";
+				mes "some more.";
 				close;
-
-				sl_NoZeny:
-					mes "[Edgar]";
-					mes "Um...";
-					mes "This isn't";
-					mes "enough money.";
-					mes "Go and get";
-					mes "some more.";
-					close;
-
-	M_End:
+			}
+			set zeny,zeny-250;
+			warp "alberta",195,164;
+			end;
+		}
 		mes "[Edgar]";
-		mes "Yeah, alright.";
-		mes "See you later~";
+		mes "Boy oh boy,";
+		mes "if you think";
+		mes "that's a rip off...";
 		close;
-
+	}
+	mes "[Edgar]";
+	mes "Yeah, alright.";
+	mes "See you later~";
+	close;
 }