* 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, 182 insertions, 81 deletions

diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index da4c08dfd..b05d4e457 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -2,115 +2,216 @@
 //= Divorcing Deviruchi
 //===== By: ================================================== 
 //= Perkka, Scriptor, LightFighter
+//= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 1 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis COnversion]
+//= Official Divorce script.
+//= Added isloggedin() check, even though Aegis doesn't do it;
+//= should be able to divorce even when the spouse is not online.
 //===== Additional Comments: ================================= 
 //= Both players should be online to get divorced
 //= Fixed menu [Lupus]
 //= 1.1 Added check if the patner's online, added effects [Lupus]
+//= 1.2 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-
-nif_in,190,112,5	script	Deviruchi#divorce	1109,{
-	mes "[Deviruchi]";
-	if (getpartnerid() == 0) {
-		mes "Kekeke, humans are always alone in the end,";
-		mes "The feeling of lonely is just temporarily.";
-		mes "If you feel lonely, how about getting a pet?";
-		mes "I, the Deviruchi is quite popular recently, you know...";
+nif_in,190,112,5	script	Deviruchi#divorce	738,{
+	if (wedding_sign == 0) {
+		mes "[Deviruchi]";
+		mes "Heh heh...";
+		mes "Look at that depressed face.";
+		mes "You must be feeling very lonely.";
+		mes "But that's something everyone";
+		mes "has to deal with.";
+		next;
+		mes "[Deviruchi]";
+		mes "If you feel that lonely,";
+		mes "how about raising a Pet?";
+		mes "I hear that my kind is very";
+		mes "popular nowadays, heh heh~";
+		close;
+	}
+	else if (!getpartnerid()) {
+		mes "[Deviruchi]";
+		mes "Bwah hah hah~!";
+		mes "That look in your eyes~!";
+		if (sex) {
+			mes "Those are definitely the eyes";
+			mes "of a lonely male bachelor.";
+			mes "I'm almost 100 percent sure";
+			mes "you got ditched at the altar.";
+		}
+		else {
+			mes "They're just filled with the";
+			mes "pain of an old maid--!";
+			mes "Couldn't rope some poor guy";
+			mes "into marriage, huh?";
+		}
+		next;
+		mes "[Deviruchi]";
+		mes "HHAHAHAHA~!";
+		mes "Oooooh...Hee hee~";
+		mes "I'd be more sympathetic if,";
+		mes "you know, I weren't a creature";
+		mes "of darkness.";
 		close;
 	}
-	mes "You don't look good...";
-	mes "Anything that you have done that makes you feel regret now?";
-	mes "You must know that I am not willing to help happy people.";
-	mes "Deviruchi bear no interest";
-	mes "to those kind of people. Kekeke";
+	mes "[Deviruchi]";
+	mes "You look awfully depressed...";
+	mes "Lucky for you, I could care";
+	mes "less about happy people...";
+	mes "It's the humans in despair";
+	mes "that I take an interest in.";
+	mes "Hahahahahahah~!";
 	next;
 	mes "[Deviruchi]";
-	mes "Let's put everything aside first.";
-	mes "Let me ask you. Are you happy after you get married?";
-	mes "Don't think about love...";
-	mes "I know more than you can imagine.";
-	mes "There're countless problem behind one grand wedding.";
+	mes "I sense that you carry a";
+	mes "tiresome burden...";
+	mes "If I'm not wrong, you're";
+	if (sex)
+		mes "a married man, aren't you?";
+	else
+		mes "a married woman, aren't you?";
 	next;
 	mes "[Deviruchi]";
-	mes "That's right.";
-	mes "It your fate that you come here.";
-	mes "And I know it's your instinct to change your life too.";
-	mes "Although you have made an oath to your partner,";
-	mes "the heart will still wither somehow...!";
+	mes "Let me ask you one thing.";
+	mes "Are you happy to be married?";
+	mes "Forget about responsibilities,";
+	mes "romance and all that other junk";
+	mes "for now.";
 	next;
 	mes "[Deviruchi]";
-	mes "The method is easy!";
-	mes "Marriage is actually one kind of contract.";
-	mes "Just ask a favor from Deviruchi";
-	mes "and it will destroy the contract for you... Do you get it?";
-	mes "Live a free life!!";
+	mes "I mean, can just one single";
+	mes "person really bring you all that";
+	mes "happiness? I know all about how";
+	mes "special weddings and the magic";
+	mes "of love is supposed to be, but...";
 	next;
 	mes "[Deviruchi]";
-	mes "You don't need to get the agreement of your partner,";
-	mes "You will find another lover soon,";
-	mes "So, why not leave your current partner?";
-	mes "... Want me to help?";
-	mes "I can cancel your marriage now, you know...!";
+	mes "At the end of the day, you and";
+	mes "your partner fight, and you feel";
+	mes "totally totally miserable.";
+	if (sex)
+		mes "...all because of HER.";
+	else
+		mes "...all because of HIM.";
 	next;
-	menu "No, I am very happy now",-,"Yes, I want a new life",M_NewLife;
-
 	mes "[Deviruchi]";
-	mes "Hmmph, lovers... lovers!!";
-	mes "You will regret,";
-	mes "and come back to find Deviruchi someday!";
-	mes "We'll see how long your happiness will last!!";
-	close2;
-	warp "niflheim",169,162;
-	end;
-
-M_NewLife:
+	mes "Yes, it's your destiny to find me";
+	mes "here. We all make mistakes...";
+	mes "Even if you promised everlasting";
+	mes "love, even if you made a vow...";
+	mes "I can free you from that prison";
+	mes "of matrimony.";
+	next;
 	mes "[Deviruchi]";
-	mes "Good, you don't need anything.";
-	mes "I just need your heart and 2,500,000 zeny.";
-	mes "You want to get back your life before you get married, don't you?";
-	mes "So, is that it? You're going to cancel the marriage contract?";
+	mes "It's simple if you look at";
+	mes "marriage as a contract...a";
+	mes "contract that ends with 'till";
+	mes "death do we part.' Here in";
+	mes "Nifleheim, it's easy to use";
+	mes "that little loophole...";
 	next;
-	menu "...I need to consider it again",-, "I am paying you to cancel it now!",M_Divorce;
 	mes "[Deviruchi]";
-	mes "Quit considering. Everyone will be alone in the end.";
-	mes "Just make up your mind and prepare the zeny,";
-	mes "then come and look for me...";
-	mes "Kekekeke.....";
-	close;
-
-M_Divorce:
+	mes "*whispers*";
+	mes "^555555It's not like you're breaking^000000";
+	if (sex) {
+		mes "^555555any promises, and it's not";
+		mes "like your wife will care if she";
+		mes "doesn't know... Don't you";
+		mes "want to be freed from her?^000000";
+	}
+	else {
+		mes "^555555any promises. Hell, your husband";
+		mes "doesn't even have to know";
+		mes "about it... you deserve";
+		mes "real happiness, right?^000000";
+	}
+	next;
+	mes "[Deviruchi]";
+	mes "You can have a brand new love";
+	mes "with a better person...";
+	mes "Wouldn't that be great...?";
+	mes "I can help you if you want...";
+	mes "I can make all of this happen!";
+	next;
+	if (select("No thanks, I am happy.:Yes, please do.") == 1) {
+		mes "[Deviruchi]";
+		mes "Hmpf~! You must still be";
+		mes "fascinated with the silly";
+		mes "notion of eternal love. Well,";
+		mes "if you think you're happy,";
+		mes "then I'll have nothing";
+		mes "to do with you--!";
+		close;
+		warp "niflheim",169,162;
+	}
+	mes "[Deviruchi]";
+	mes "Good, good...";
+	mes "Now all you have to do is give";
+	mes "me what I want in exchange...";
+	mes "Just 2,500,000 zeny and...*cough!*";
+	mes "^666666An eensy piece of your soul.^000000";
+	next;
 	mes "[Deviruchi]";
-	if (!isloggedin(getpartnerid())) {
-		mes "Kekeke, humans are so stupid,";
-		mes "Your lover should be online... Kekeke";
-		emotion e_heh;
+	mes "After that, it's the carefree";
+	mes "single's life. All you have to";
+	mes "do is say the word...";
+	next;
+	if (select("...Give me some time to think.:Any price will do, give me a divorce right now!") == 1) {
+		mes "[Deviruchi]";
+		mes "I understand. But if you think";
+		mes "about anything, think about";
+		if (sex) {
+			mes "your wife's nagging, and";
+			mes "how great it would be to";
+			mes "finally free yourself of the";
+			mes "old ball and chain~";
+		}
+		else {
+			mes "how horrible your husband is,";
+			mes "and what a relief it would";
+			mes "be to be rid of that crumbum~";
+		}
 		close;
 	}
-	if (Zeny < 2500000){
-		mes "Haven't I said 2,500,000 zeny?";
-		mes "This is the payment for Deviruchi to help you.";
-		mes "If you don't even have that money,";
-		mes "you can rot with that married life of yours... kekeke";
+	if (isloggedin(getpartnerid())) {
+		if (Zeny > 2499999) {
+			mes "[Deviruchi]";
+			mes "Excellent choice~";
+			mes "Let's get started right";
+			mes "away! This may take some";
+			mes "time, but it's better than";
+			mes "being hopelessly married";
+			mes "^FF0000for the rest of your life.^000000";
+			next;
+			specialeffect 244; //EF_MAGICROD
+			specialeffect2 372; //EF_DEVIL
+			set zeny,zeny-2500000;
+			percentheal -100,100;
+			divorce;
+			mes "[Deviruchi]";
+			mes "Bwahhahahaha~!";
+			mes "Now you're free~!";
+			mes "Don't you feel so much";
+			mes "better now as a single?";
+			mes "Ah, bachelorhood...";
+			close;
+		}
+		mes "[Deviruchi]";
+		mes "Hmmm...I did tell you to bring";
+		mes "2,500,000 zeny, right?";
+		mes "No one else in this world can";
+		mes "offer this kind of freedom...";
+		mes "You can't put a price on";
+		mes "peace of mind, can you?";
 		close;
 	}
-	set Zeny, Zeny - 2500000;
-	mes "Before you change your mind again, I will proceed with your divorce now!!";
-	mes "It might take some time...";
-	mes "So don't go away, and stay here!";
-	next;
-	specialeffect 244;	//EF_MAGICROD
-	specialeffect2 259;	//EF_DEVIL (now use a custom id)
-	divorce;
-	percentheal -100,-100;
 	mes "[Deviruchi]";
-	mes "Kekeke, you are free now!";
-	mes "Throw away all your sinking feelings!";
-	mes "You should thank Deviruchi.....!";
+	mes "Hmmm...your spouse isn't online...";
 	close;
-}
+}
\ No newline at end of file