From cb7d58ee976b9cde5faa10557741573526c0969f Mon Sep 17 00:00:00 2001 From: Lupus Date: Thu, 3 Apr 2008 17:22:46 +0000 Subject: fixed broken dialogues git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12466 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/cities/geffen.txt | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'npc/cities/geffen.txt') diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 9da8daf59..974cfc7b9 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.6a Small bug fix. (end -> next) care of Lesbian. [L0ne_W0lf] //= 1.7 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf] +//= 1.8 Fixed character's name and swapped gender dialogues [Lupus] //============================================================ geffen,59,143,0 script Meera 91,{ @@ -261,7 +262,7 @@ OnTouch: if (sex) mes "Ah duuuuuude~ You're breakin' my heart! I mean, at these prices, I'm practically performing charity!"; else - mes "W-waaaait! You didn't let me tell you the part about how Red Potions help you lose and gain weight in all the right places! Waaaaait!"; + mes "W-waaaait! You didn't let me tell you the part about how Red Potions help you lose and gain weight in all the right places! Waaaaait!"; close; } else if (.@input > 100) { @@ -478,8 +479,7 @@ geffen_in,22,125,1 script Crumpler 52,{ mes "IT BUUUURNS!"; close; case 3: - set name,0; - mes "["+ name +"]"; + mes "["+strcharinfo(0)+"]"; mes "No..."; mes "I can only use"; mes "my powers for good."; @@ -605,16 +605,15 @@ geffen_in,27,134,5 script Waitress#elen 91,{ mes "[Elenore]"; mes "Gossip, eh?"; next; - set name,rand(1,4); mes "[Elenore]"; mes "Well..."; mes "I hear there's this person somewhere in Rune-Midgard..."; next; mes "[Elenore]"; if (sex) - mes "Tell me, have you ever heard of "+ name +"? He's supposed to be the suavest hero around!"; + mes "Tell me, have you ever heard of "+strcharinfo(0)+"? He's supposed to be the suavest hero around!"; else - mes "Have you ever heard of "+ name +"? People say she's one of the prettiest girls in all of Rune-Midgard!"; + mes "Have you ever heard of "+strcharinfo(0)+"? People say she's one of the prettiest girls in all of Rune-Midgard!"; break; case 4: switch(rand(1,2)) { @@ -650,7 +649,7 @@ geffen_in,27,134,5 script Waitress#elen 91,{ mes "[William's Spirit]"; mes "^990000Hey you sex crazed bastard!! Stop looking at my daughter like that before I rip out your eyes, and eat them with pasta!^000000"; next; - mes "["+ name +"]"; + mes "["+strcharinfo(0)+"]"; if (sex) { mes "Huh...?"; mes "C-come again?"; @@ -659,7 +658,7 @@ geffen_in,27,134,5 script Waitress#elen 91,{ mes "Huh...?"; mes "Oh, Dad must have possessed me again. It happens to me and my sister all the time."; next; - mes "["+ name +"]"; + mes "["+strcharinfo(0)+"]"; mes "No kidding?"; mes "Huh. Total bummer."; next; @@ -766,13 +765,12 @@ geffen_in,70,67,3 script Waitress#elise 90,{ mes "[William's Spirit]"; mes "^990000Stay away from my daughter, or I'll beat your brains out, punk! Elisa's gonna marry a doctor! Or a lawyer!^000000"; next; - mes "["+ name +"]"; + mes "["+strcharinfo(0)+"]"; if (sex) { mes "Y-y-y-yes, sir!"; next; mes "^3355FFThat was scary...!"; - mes "It looks like a father's love endures forever, even in"; - mes "the afterlife.^000000"; + mes "It looks like a father's love endures forever, even in the afterlife.^000000"; } else { mes "But..."; @@ -1040,9 +1038,9 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ case 3: mes "Um..."; if (sex) - mes "The boy that you"; - else mes "The girl that you"; + else + mes "The boy that you"; mes "are currently seeing"; mes "is perfect for you!"; next; @@ -1058,9 +1056,9 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ next; mes "[Psychic Advisor]" ; if (sex) - mes "The boy that you"; - else mes "The girl that you"; + else + mes "The boy that you"; mes "are currently seeing is perfect for you if you want to live the rest of your life in utter misery!"; next; mes "[Psychic Advisor]"; @@ -1076,7 +1074,6 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ mes "Sometimes, I get the future and the present mixed up. You know, since I'm always looking into the future...?"; next; mes "[Psychic Advisor]"; - if (sex) { mes "What I meant to say was"; mes "^3355FFyou and the perfect woman will soon fall in love^000000. Yes, that's what I meant!"; -- cgit v1.2.3-70-g09d2