From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001 From: Michieru Date: Thu, 24 Oct 2013 12:10:43 +0200 Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt --- npc/cities/geffen.txt | 59 +++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 28 deletions(-) (limited to 'npc/cities/geffen.txt') diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index bc337bf3c..85595bd66 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -1,15 +1,15 @@ //===== Hercules Script ====================================== //= Geffen Town -//===== By: ================================================== +//===== By: ================================================== //= Everybody mentioned in the comments -//===== Current Version: ===================================== -//= 1.9 -//===== Description: ========================================= -//= [Aegis Conversion] +//===== Current Version: ===================================== +//= 2.0 +//===== Description: ========================================= +//= [Official Conversion] //= Geffen Town NPCs -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Fully working -//= 1.1 - Spell Checked [massdriller] +//= 1.1 Spell Checked [massdriller] //= 1.2 Fixed more typos [Nexon] //= 1.3 added a Level 4 weapon quest related NPC [MasterOfMuppets] //= 1.4 Removed Duplicates [Silent] @@ -20,6 +20,7 @@ //= 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] //= 1.9 Replaced effect numerics with constants. [Samuray22] +//= 2.0 Bug fixes (bugreport:7928) [DeadlySilence] //============================================================ geffen,59,143,0 script Meera 91,{ @@ -99,7 +100,7 @@ geffen,147,26,0 script Ralphie 97,{ mes "With that, anyone could be as strong as Hercules... Even a weakling like me! Hahahahahah,"; mes "I must have it!"; next; - Emotion e_gasp; + emotion e_gasp; mes "[Ralphie]"; mes "...Good Heavens!"; mes "Since when were"; @@ -128,7 +129,7 @@ geffen,111,48,0 script Stacey 101,{ mes "Is that an Orc Helm you're wearing?! That's so cool! Wow..."; next; mes "[Stacey]"; - if (sex) { + if (Sex) { mes "You look so..."; mes "Rugged and manly~"; } @@ -149,11 +150,11 @@ geffen,111,48,0 script Stacey 101,{ mes "of Orc Hero!"; next; mes "[Stacey]"; - if (sex) { + if (Sex) { mes "It's..."; mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistable to all the girls!"; next; - Emotion e_lv; + emotion e_lv; mes "[Stacey]"; mes "And I'm no exception."; } @@ -223,7 +224,7 @@ OnTouch: mes "You wanna get your hands on some great stuff? Come on over!^000000"; next; mes "[Suspicious Guy]"; - if (sex) + if (Sex) mes "Hey there tough guy. You look smart enough to recognize a bargain when it's right in front of your eyes."; else mes "Well, well, well. Aren't you a pretty girl. Today just happens to be your lucky day!"; @@ -258,7 +259,7 @@ OnTouch: input .@input; if (.@input == 0) { mes "[Suspicious Guy]"; - if (sex) + 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!"; @@ -285,12 +286,12 @@ OnTouch: mes "^333333Now I gotta find some other sucker to dump this junk on!^000000 *Ahem* I mean, come again!"; close; } - set zeny,zeny-.@Red_potion_hap; + set Zeny, Zeny-.@Red_potion_hap; getitem 501,.@input; //Red_Potion break; case 2: mes "[Suspicious Guy]"; - if (sex) { + if (Sex) { mes "What would a strong guy like you want a knife for? Those will just break under the force of your incredibly powerful swings!"; next; mes "[Suspicious Guy]"; @@ -350,12 +351,12 @@ OnTouch: mes "When the greatest deal in your life is right before your eyes?! Tragic, truly tragic..."; close; } - set zeny,zeny-.@Main_gauche_hap; + set Zeny, Zeny-.@Main_gauche_hap; getitem 1207,.@input; //Main_Gauche break; case 3: mes "[Suspicious Guy]"; - if (sex) + if (Sex) mes "A Manteau? That's old news! You know what's the latest in protective armors?"; else mes "Now why would such a beautiful woman wear something out of style? You know what would make you look even better?"; @@ -396,13 +397,13 @@ OnTouch: break; } set .@Hood__hap,.@input * 930; - if (zeny < .@Hood__hap) { + if (Zeny < .@Hood__hap) { mes "[Suspicious Guy]"; mes "Oh nuts..."; mes "Short on zeny, eh?"; close; } - set zeny,zeny-.@Hood__hap; + set Zeny, Zeny-.@Hood__hap; getitem 2501,.@input; //Hood break; case 4: @@ -457,7 +458,7 @@ geffen_in,22,125,1 script Crumpler 52,{ mes "[Crumpler]"; mes "Ooooooooh"; mes "crraaaap!"; - Emotion e_gasp; + emotion e_gasp; next; mes "[Crumpler]"; mes "Help meeeee!"; @@ -495,7 +496,7 @@ geffen_in,22,125,1 script Crumpler 52,{ mes "[Crumpler]"; mes "A..."; mes "Sage?"; - Emotion e_What; + emotion e_what; next; mes "[Crumpler]"; mes "I don't know what that is. But I guess it can't be half as bad as a Mage."; @@ -609,7 +610,7 @@ geffen_in,27,134,5 script Waitress#elen 91,{ mes "I hear there's this person somewhere in Rune-Midgard..."; next; mes "[Elenore]"; - if (sex) + if (Sex) 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 "+strcharinfo(0)+"? People say she's one of the prettiest girls in all of Rune-Midgard!"; @@ -649,7 +650,7 @@ geffen_in,27,134,5 script Waitress#elen 91,{ 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 "["+strcharinfo(0)+"]"; - if (sex) { + if (Sex) { mes "Huh...?"; mes "C-come again?"; next; @@ -765,7 +766,7 @@ geffen_in,70,67,3 script Waitress#elise 90,{ 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 "["+strcharinfo(0)+"]"; - if (sex) { + if (Sex) { mes "Y-y-y-yes, sir!"; next; mes "^3355FFThat was scary...!"; @@ -1036,7 +1037,7 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ break; case 3: mes "Um..."; - if (sex) + if (Sex) mes "The girl that you"; else mes "The boy that you"; @@ -1053,8 +1054,8 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ mes "[Psychic Advisor]"; mes "You didn't let me finish my sentence. What I meant to say was..."; next; - mes "[Psychic Advisor]" ; - if (sex) + mes "[Psychic Advisor]"; + if (Sex) mes "The girl that you"; else mes "The boy that you"; @@ -1073,7 +1074,7 @@ 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) { + 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!"; } @@ -1202,6 +1203,7 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ mes "Well, in any case, concentrating on your studies is tough, but it can be rewarding. I hope you do well in whatever you choose to do~"; close; case 5: + mes "[Psychic Advisor]"; mes "The future? I thought it was implied that any fortune I tell you is about the future in the specific field that you choose."; next; mes "[Psychic Advisor]"; @@ -1263,6 +1265,7 @@ geffen_in,39,127,2 script Psychic Advisor 704,{ mes "That's my prediction. Can you really argue with the wisdom of the spirit world?"; close; case 6: + mes "[Psychic Advisor]"; mes "Fashion...?"; mes "What does that have to do with matters of the supernatural? Well, um, let me contact the spirits. Ah! Here we go..."; next; -- cgit v1.2.3-60-g2f50