summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
authorEmistry <Equinox1991@gmail.com>2016-01-25 23:00:26 +0800
committerHaru <haru@dotalux.com>2016-02-29 01:52:22 +0100
commit05a2538114972de94352e66586f6f2a5affea9c6 (patch)
treef39d3e659d9b3801cc42a7b14e41aeec16c93ddf /npc/cities
parent75ba7024fe3b68718d0f0a289a68ea0719054d3b (diff)
downloadhercules-05a2538114972de94352e66586f6f2a5affea9c6.tar.gz
hercules-05a2538114972de94352e66586f6f2a5affea9c6.tar.bz2
hercules-05a2538114972de94352e66586f6f2a5affea9c6.tar.xz
hercules-05a2538114972de94352e66586f6f2a5affea9c6.zip
Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriate
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/aldebaran.txt2
-rw-r--r--npc/cities/amatsu.txt4
-rw-r--r--npc/cities/einbech.txt4
-rw-r--r--npc/cities/geffen.txt24
-rw-r--r--npc/cities/jawaii.txt8
-rw-r--r--npc/cities/lighthalzen.txt8
-rw-r--r--npc/cities/louyang.txt4
-rw-r--r--npc/cities/payon.txt6
-rw-r--r--npc/cities/prontera.txt2
9 files changed, 31 insertions, 31 deletions
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index d7b97ba25..7cd989574 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -693,7 +693,7 @@ aldeba_in,156,179,4 script Master#alde 1_M_PUBMASTER,{
mes "Who's your";
mes "favorite Kafra girl?";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "[Master]";
mes "Oh, and don't worry. I know that girls have some kind of opinion about how pretty other girls are.";
next;
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 0335e33c9..fd3e66629 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -411,7 +411,7 @@ amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{
mes "Also, this town is the origin of";
mes "legendary play, 'White Dryad.' ";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Garakame sensei]";
mes "If you know a girl who is";
mes "talented in acting, please";
@@ -559,7 +559,7 @@ amatsu,262,197,1 script Legendary Tree HIDDEN_NPC,{
mes "Nymph of cherry tree... What would";
mes "be her position in the play?^000000";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "^3355FFI would like to find";
mes "a person who is talented";
mes "in acting and help her until";
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index 2cc3d1305..20d4725b4 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -528,7 +528,7 @@ einbech,46,107,6 script Shena#ein::EinMonsters 4_F_EINOLD,{
mes "adorable little girl?";
mes "Hello, dearie~";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
select("Excuse me, but I'm actually a guy.");
mes "[Shena]";
mes "Oh, oh are you now?";
@@ -554,7 +554,7 @@ einbech,46,107,6 script Shena#ein::EinMonsters 4_F_EINOLD,{
mes "about the monsters around";
mes "here, young lady?";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
select("I told you, I'm a dude...!");
mes "[Shena]";
mes "Hmm. ''Dude.'' I think";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 9fdf40f5d..4df978a0d 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -147,7 +147,7 @@ geffen,111,48,0 script Stacey 4W_F_01,{
mes "Is that an Orc Helm you're wearing?! That's so cool! Wow...";
next;
mes "[Stacey]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "You look so...";
mes "Rugged and manly~";
}
@@ -168,7 +168,7 @@ geffen,111,48,0 script Stacey 4W_F_01,{
mes "of Orc Hero!";
next;
mes "[Stacey]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
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;
@@ -242,7 +242,7 @@ OnTouch:
mes "You wanna get your hands on some great stuff? Come on over!^000000";
next;
mes "[Suspicious Guy]";
- if (Sex)
+ if (Sex == SEX_MALE)
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!";
@@ -277,7 +277,7 @@ OnTouch:
input .@input;
if (.@input == 0) {
mes "[Suspicious Guy]";
- if (Sex)
+ if (Sex == SEX_MALE)
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!";
@@ -309,7 +309,7 @@ OnTouch:
break;
case 2:
mes "[Suspicious Guy]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
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]";
@@ -374,7 +374,7 @@ OnTouch:
break;
case 3:
mes "[Suspicious Guy]";
- if (Sex)
+ if (Sex == SEX_MALE)
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?";
@@ -628,7 +628,7 @@ geffen_in,27,134,5 script Waitress#elen 4_F_02,{
mes "I hear there's this person somewhere in Rune-Midgard...";
next;
mes "[Elenore]";
- if (Sex)
+ if (Sex == SEX_MALE)
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!";
@@ -668,7 +668,7 @@ geffen_in,27,134,5 script Waitress#elen 4_F_02,{
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 == SEX_MALE) {
mes "Huh...?";
mes "C-come again?";
next;
@@ -784,7 +784,7 @@ geffen_in,70,67,3 script Waitress#elise 4_F_01,{
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 == SEX_MALE) {
mes "Y-y-y-yes, sir!";
next;
mes "^3355FFThat was scary...!";
@@ -1055,7 +1055,7 @@ geffen_in,39,127,2 script Psychic Advisor 4_M_BIBI,{
break;
case 3:
mes "Um...";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "The girl that you";
else
mes "The boy that you";
@@ -1073,7 +1073,7 @@ geffen_in,39,127,2 script Psychic Advisor 4_M_BIBI,{
mes "You didn't let me finish my sentence. What I meant to say was...";
next;
mes "[Psychic Advisor]";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "The girl that you";
else
mes "The boy that you";
@@ -1092,7 +1092,7 @@ geffen_in,39,127,2 script Psychic Advisor 4_M_BIBI,{
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 == SEX_MALE) {
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!";
}
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 2af5ffcbb..c1e199ea1 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -502,7 +502,7 @@ jawaii_in,25,98,0 script Employee#jaw3 4_F_07,{
mes "Oh~";
mes "Look at you...";
mes "You look perfect";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "for your wife~";
else
mes "with your husband~";
@@ -516,7 +516,7 @@ jawaii_in,25,98,0 script Employee#jaw3 4_F_07,{
mes "Hmm...?";
mes "You don't look like";
mes "you're married, are you?";
- if (Sex) {
+ if (Sex == SEX_MALE) {
next;
mes "[Employee Buffy]";
mes "I'm pretty good";
@@ -1175,7 +1175,7 @@ jawaii_in,41,106,3 script Customer#Cage 4W_M_02,{
mes "After all, everyone knows marriage is a sham for desperate, lonely people!";
next;
mes "[Cage]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "I don't trust anybody!";
mes "You're a fool for chaining";
mes "yourself to some gorgeous";
@@ -1357,7 +1357,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
mes "...Wha!?";
mes "Oh man!";
mes "Get outta my face!";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "You smell like,";
mes "whupped boyfriend";
mes "or something!";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index b4e265be1..6ba3babbd 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -891,7 +891,7 @@ lhz_in02,283,276,4 script Customer#amano12 4_F_CHNDRESS1,{
mes "to ask me out or something?";
next;
mes "[Sei]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Well, if he does,";
mes "shouldn't he have";
mes "more guts? Or are ";
@@ -1567,7 +1567,7 @@ lhz_in03,192,19,3 script Haggar#zen1 4_M_EINMAN,{
lhz_in03,193,25,2 script Bartender#12 1_M_PUBMASTER,{
mes "[Tony]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "Hey man, I know this";
}
else {
@@ -2978,7 +2978,7 @@ lhz_in01,139,48,7 script Leimi#mimir 1_F_MERCHANT_01,{
mes "Um, may I help you?";
emotion e_omg;
if (BaseJob == Job_Assassin) {
- if (Sex) {
+ if (Sex == SEX_MALE) {
next;
mes "[Leimi]";
mes "Oh, you're an Assassin!";
@@ -3001,7 +3001,7 @@ lhz_in01,139,48,7 script Leimi#mimir 1_F_MERCHANT_01,{
lhz_in01,138,47,0 script #mimir_camera FAKE_NPC,2,2,{
OnTouch:
if (BaseJob == Job_Assassin) {
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "^3355FF*Click*^000000";
next;
mes "["+strcharinfo(0)+"]";
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 71a9d0e0e..dca5f0376 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -146,7 +146,7 @@ lou_fild01,190,100,7 script Girl#1lou 4_F_CHNDRESS1,{
mes "stay and enjoy the";
mes "the food and the sights!";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Girl]";
mes "And by sights...";
mes "I mean girls!";
@@ -162,7 +162,7 @@ lou_fild01,190,100,7 script Girl#1lou 4_F_CHNDRESS1,{
//== Generic Louyang NPCs ==================================
louyang,297,167,2 script Muscular Woman#lou 4_F_CHNDRESS1,{
- if (!Sex) {
+ if (Sex == SEX_FEMALE) {
mes "[Zhi Ching Li]";
mes "All the members of the Maiden Palace, including myself and our master, are all female.";
next;
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 468fb9811..132ce7331 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -153,7 +153,7 @@ payon,249,156,1 script Woman#payon 1_F_01,{
mes " To be honest, things are getting tough because of all those monsters. ^666666*Sigh...*^000000";
next;
mes "[Woman]";
- if (Sex == 1)
+ if (Sex == SEX_MALE)
mes "Whoa~! I just noticed those arms of yours look pretty solid. You look pretty strong, guy. Just how many monsters have you killed?!";
else
mes "Oooh! I didn't notice before, but you look pretty strong beneath all of that feminine charm.";
@@ -202,7 +202,7 @@ payon,246,158,5 script Woman#2payon 1_F_01,0,0,{
mes "of the people living in Payon by her behavior. She's the only loudmouth. I guess she's just too excited about what the fortune teller told her.";
next;
mes "[Jim's Mother]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Ooh...!";
mes "You've got";
mes "such broad shoulders!";
@@ -397,7 +397,7 @@ payon_in01,180,7,2 script Waitress#payon 4_F_01,{
mes "And lonely...";
next;
mes "[Pub Lady]";
- if (Sex == 1)
+ if (Sex == SEX_MALE)
mes "Where I can find the right person, a hot and Sexy hunk who can take me away from here? Um, hey mister, are you listening?";
else {
mes "Where I can find the right person, a cute, yet hard-bodied hunk who can take me away from here?";
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 4c1ce01dc..9c0fb6af5 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -487,7 +487,7 @@ prt_in,177,18,2 script Marvin#pront 1_F_PUBGIRL,{
mes "Whether it's schmoozing with a member of the opposite sex, or battling monsters, I gotta say, it's all about ^333399skills^000000.";
next;
mes "[Marvin]";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "I can't help you much when it comes to the subject of talking to attractive women such as myself, but I can tell you a little more about skills that help in battle.";
else
mes "I don't really have any advice for skills when it comes to talking to a cute guy, but I can let you in on what I know about skills that help in battle.";