summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/bard_quest.txt10
-rw-r--r--npc/quests/cooking_quest.txt4
-rw-r--r--npc/quests/dandelion_request.txt18
-rw-r--r--npc/quests/first_class/tu_archer.txt4
-rw-r--r--npc/quests/first_class/tu_merchant.txt5
-rw-r--r--npc/quests/first_class/tu_sword.txt2
-rw-r--r--npc/quests/kiel_hyre_quest.txt2
-rw-r--r--npc/quests/monstertamers.txt8
-rw-r--r--npc/quests/newgears/2004_headgears.txt10
-rw-r--r--npc/quests/newgears/2005_headgears.txt2
-rw-r--r--npc/quests/obb_quest.txt6
-rw-r--r--npc/quests/quests_13_2.txt2
-rw-r--r--npc/quests/quests_airship.txt2
-rw-r--r--npc/quests/quests_alberta.txt22
-rw-r--r--npc/quests/quests_ayothaya.txt2
-rw-r--r--npc/quests/quests_comodo.txt4
-rw-r--r--npc/quests/quests_ein.txt20
-rw-r--r--npc/quests/quests_gonryun.txt8
-rw-r--r--npc/quests/quests_hugel.txt2
-rw-r--r--npc/quests/quests_lighthalzen.txt32
-rw-r--r--npc/quests/quests_morocc.txt2
-rw-r--r--npc/quests/quests_moscovia.txt15
-rw-r--r--npc/quests/quests_nameless.txt12
-rw-r--r--npc/quests/quests_niflheim.txt2
-rw-r--r--npc/quests/quests_prontera.txt6
-rw-r--r--npc/quests/quests_veins.txt2
-rw-r--r--npc/quests/seals/brisingamen_seal.txt6
-rw-r--r--npc/quests/seals/megingard_seal.txt2
-rw-r--r--npc/quests/skills/alchemist_skills.txt28
-rw-r--r--npc/quests/skills/archer_skills.txt2
-rw-r--r--npc/quests/skills/dancer_skills.txt2
-rw-r--r--npc/quests/skills/swordman_skills.txt4
-rw-r--r--npc/quests/the_sign_quest.txt32
33 files changed, 148 insertions, 132 deletions
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index a63a7b3b2..7a2166836 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -524,7 +524,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "At Nine, love is reborn.";
mes "At Ten, my Love is gone.";
mes "At Eleven I find out why.";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "At Twelve I see his new girlfriend?";
else
mes "At Twelve I see her new boyfriend?";
@@ -858,7 +858,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "At Nine, love is reborn.";
mes "At Ten, my Love is gone.";
mes "At Eleven I find out why.";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "At Twelve I see her new boyfriend?";
else
mes "At Twelve I see his new girlfriend?";
@@ -1261,7 +1261,7 @@ S_StorySong:
// For 3 and 4 cases we set more chance earlier on .@random
if(getarg(0) == 3 || getarg(0) == 4){
mes "[Errende]";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "Heroic warrior,";
else
mes "My fair lady,";
@@ -2037,7 +2037,7 @@ morocc,134,111,3 script Bard#3 2_M_BARD_ORIENT,{
}
} else {
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Kino Kitty]";
mes "You're such a nice young man. I will remember your name. I would much appreciate it if you would also remember mine.";
next;
@@ -2897,7 +2897,7 @@ yuno_in04,33,119,3 script Adventurer#1 4_M_ROGUE,{
mes "Err...?";
mes "What is it?";
next;
- if (!Sex) {
+ if (Sex == SEX_FEMALE) {
emotion e_heh;
mes "[Energetic Young Man]";
mes "Oh...!";
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index d81372fe1..b1fb24982 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -51,7 +51,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
end;
}
if (BaseJob == Job_Novice) {
- if (Sex) {
+ if (Sex == SEX_MALE) {
cutin "orleans_5",0;
mes "[Charles Orleans]";
mes "Excuse me, monsieur?";
@@ -88,7 +88,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
goto L_End;
}
else if (getequipid(1) != 5026) {
- if (Sex) {
+ if (Sex == SEX_MALE) {
cutin "orleans_5",0;
emotion e_an;
mes "[Charles Orleans]";
diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index 20ccb9332..c7add936e 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -3642,8 +3642,10 @@ que_job01,84,17,3 script Lin#2-1 4_F_ACROSS,{
mes "[Lin]";
mes "Ah, this is "+ strcharinfo(0) +",";
mes "my partner for this assignment.";
- if(Sex == 1) mes "Don't worry, you can trust him.";
- else mes "Don't worry, you can trust her.";
+ if (Sex == SEX_MALE)
+ mes "Don't worry, you can trust him.";
+ else
+ mes "Don't worry, you can trust her.";
next;
mes "[R.]";
mes "Ah, I see. Please,";
@@ -3938,8 +3940,10 @@ que_job01,84,17,3 script Lin#2-1 4_F_ACROSS,{
mes "[Lin]";
mes "I'm sending "+ strcharinfo(0) +"";
mes "on a snack errand and it won't";
- if(Sex == 1) mes "take too long. Did you want him";
- else mes "take too long. Did you want her";
+ if (Sex == SEX_MALE)
+ mes "take too long. Did you want him";
+ else
+ mes "take too long. Did you want her";
mes "to bring you back anything?";
next;
cutin "mocseal_dan01.bmp",0;
@@ -4186,8 +4190,10 @@ que_job01,79,15,1 script R 4_M_MASKMAN,{
mes "[Lin]";
mes "Ah, this is "+ strcharinfo(0) +",";
mes "my partner for this assignment.";
- if(Sex == 1) mes "Don't worry, you can trust him.";
- else mes "Don't worry, you can trust her.";
+ if (Sex == SEX_MALE)
+ mes "Don't worry, you can trust him.";
+ else
+ mes "Don't worry, you can trust her.";
next;
mes "[R.]";
mes "Ah, I see. Please, for";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index be6f177d1..79dc4ebbe 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -76,7 +76,7 @@ payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
mes "up a joke~!";
emotion e_gg;
next;
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
select("A joke, eh?");
specialeffect2 EF_TALK_FROSTJOKE;
mes "[Jet]";
@@ -1455,7 +1455,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; }
mes "he already has a girlfriend...";
next;
mes "[Acolyte]";
- if(Sex){
+ if (Sex == SEX_MALE) {
mes "W-wait!";
mes "Y-you're a man!";
mes "D-d-d-don't tease me";
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 5b2054193..56bfb7390 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -602,11 +602,10 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{
if(getskilllv(MC_INCCARRY) < 4){
setquest 8229;
mes "[Guarnien]";
- if(Sex == 1){
+ if (Sex == SEX_MALE)
mes "Atta boy~!";
- } else {
+ else
mes "Atta girl~!";
- }
mes "But first things first!";
mes "You better learn the";
mes "^871F78Increase Weight Limit^000000 skill!";
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 4fd5f79ab..59e64fb89 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -63,7 +63,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER|EAJL_THIRD)){
mes "From your raiment,";
mes "I see that you are";
- if(Sex)
+ if (Sex == SEX_MALE)
mes "a man of the sword.";
else
mes "a woman of the sword.";
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index ae8399227..f1bb67223 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -4418,7 +4418,7 @@ kh_mansion,22,28,4 script Kiel Hyre#kh 4_M_KHKYEL,{
getitem Fancy_Key_Card,1;
KielHyreQuest = 108;
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
if (getpartnerid() == 0) .@KHTitle$ = "Miss";
else .@KHSTitle$ = "Mrs";
}
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index 66faad8b9..503fc23bd 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -645,7 +645,7 @@ comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{
mes "[Munak's grandma]";
mes "Oh my...";
mes "Have you seen my granddaughter,";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "boy? My poor granddaughter";
}
else {
@@ -697,7 +697,7 @@ comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{
mes "Th-This is her writing! Oh my...!";
next;
mes "[Munak's Grandma]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Young man... I'll read this to you if";
}
else {
@@ -711,7 +711,7 @@ comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{
case 1:
mes "[Munak's Grandma]";
mes "Oh...?";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Alright, young man.";
mes "Thank you anyway.";
}
@@ -729,7 +729,7 @@ comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{
delitem 1558,1;
delitem 901,1;
mes "[Munak's Grandma]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Oh!";
mes "Thank you,";
mes "young man~!";
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index a16309740..7a3757619 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -138,7 +138,7 @@ geffen,129,148,3 script Argen#1 4_M_YOYOROGUE,{
mes "Impress the ladies...?";
next;
emotion e_gasp;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Argen]";
mes "Yeah dude. There are two things chicks dig. Small, adorable presents. And suave dudes.";
next;
@@ -446,7 +446,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{
mes "[Nephia]";
mes "Ooh~! You know what would make your hair so much cuter? I think if you tied it back with a big, red ribbon, you would look sooo ^FF66CCadorable^000000!";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
if (select("Um, lady, I'm a dude.", "^FF66CCOoh~! You're right!^000000") == 1) {
mes "["+ strcharinfo(0) +"]";
mes "Woman, can't you that I'm a man?";
@@ -1016,7 +1016,7 @@ xmas,183,267,3 script Pretty Lindsay#1 4_F_NFLOSTGIRL,{
mes "I made this hat with all my heart, so you gotta promise me you will take care of this, okay?";
close;
}
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "[Pretty Lindsay]";
mes "Hello, there?";
mes "Mister...?";
@@ -1136,7 +1136,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{
mes "My specialty is the 'Teddybear Hat.' When it's worn, it makes you as cute as a teddy bear, and your hugs twice as warm and cuddly.";
next;
mes "[Fuzzy Fuzz]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "The 'Teddybear Hat' can't be worn by just anyone, since it's cuddling powers are easily abused.";
next;
mes "[Fuzzy Fuzz]";
@@ -3300,7 +3300,7 @@ OnTouch:
next;
mes "[Orc Warrior]";
mes "You are now...";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "an Orc Warrior!!";
else
mes "an Orc Lady!!";
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 63283f33a..065e1f300 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -768,7 +768,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 1_M_01,{
lighthalzen,360,313,3 script Kid#LhzHat 4_M_KID1,{
mes "[Kid]";
- if(Sex)
+ if (Sex == SEX_MALE)
mes "Hello, mister!";
else
mes "Hello, ma'am!";
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index e4115a574..9ce1bacf9 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -757,7 +757,7 @@ moc_ruins,105,62,4 script Jacob#thai 1_M_04,{
mes "to lie to nowadays...^000000";
next;
mes "[Tommy]";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "So, mister, do you think my Daddy can catch a Munak with this?";
else
mes "So, lady, do you think my Daddy can catch a Munak with this?";
@@ -774,7 +774,7 @@ moc_ruins,105,62,4 script Jacob#thai 1_M_04,{
close;
case 2:
mes "[Tommy]";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "So tell me, mister. Did he lie to me, then?";
else
mes "So tell me, lady. Did he lie to me, then?";
@@ -973,7 +973,7 @@ moc_ruins,105,62,4 script Jacob#thai 1_M_04,{
mes "to behave in front of other people?!";
next;
mes "[Jacob]";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "Say you're sorry to him!";
else
mes "Say you're sorry to her!";
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 719941081..6ba10b8d6 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -2382,7 +2382,7 @@ spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
mes "[Arc]";
mes "Ah, finally. I've been speaking with Terra while we waited for you.";
mes "Terra. This is who saved you...";
- mes "You should thank "+((Sex)?"him.":"her.");
+ mes "You should thank "+ (Sex == SEX_MALE ? "him." : "her.");
next;
mes "[Terra]";
mes "Thank you...";
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index bf563212c..5bb788a3f 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -906,7 +906,7 @@ ein_in01,121,99,3 script Mirror#ein HIDDEN_NPC,{
mes "first thing you'll";
mes "see is yourself.";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
switch(rand(1,5)) {
case 1:
mes "["+strcharinfo(0)+"]";
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 1c5e61ae4..3a9aa616b 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -52,7 +52,7 @@ alberta,117,135,0 script Elin 4W_KID,{
close;
}
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Hello~!";
mes "Heh heh, you're a boy, so you probably don't like dolls, right? Well, I like dolls very very much!";
} else {
@@ -72,7 +72,7 @@ alberta,117,135,0 script Elin 4W_KID,{
case 2:
if (MaxWeight - Weight < 1000) {
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
} else {
mes "Do you always carry so much with you? Put some of your things away first, okay?";
@@ -80,7 +80,7 @@ alberta,117,135,0 script Elin 4W_KID,{
close;
}
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Oh my goodness!";
mes "Really? You're";
mes "such a sweetie~!";
@@ -103,7 +103,7 @@ alberta,117,135,0 script Elin 4W_KID,{
mes "of Poring dolls...";
next;
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";
} else {
mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
@@ -114,7 +114,7 @@ alberta,117,135,0 script Elin 4W_KID,{
next;
getitem Candy,1;
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "I don't know if you're too old to like candy, but I guess it's okay.";
} else {
mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
@@ -127,7 +127,7 @@ alberta,117,135,0 script Elin 4W_KID,{
close;
} else {
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Aww...?";
mes "Were you only teasing me?";
} else {
@@ -147,7 +147,7 @@ alberta,117,135,0 script Elin 4W_KID,{
mes "A Ch-Ch, Chonchon doll?!";
next;
mes "[Elin]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "But since... You're... Such a nice guy... I better take it...!";
} else {
mes "But since... Since it's a gift... I guess I'll take it...";
@@ -283,7 +283,7 @@ alberta,117,135,0 script Elin 4W_KID,{
getitem Fruit_Of_Mastela,2;
mes "[Elin]";
mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
} else {
mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
@@ -1024,7 +1024,7 @@ alberta_in,23,104,4 script Grandpa Turtle#tur 2_M_PHARMACIST,{
case 1:
mes "[Grandpa Turtle]";
mes "Ha ha ha~!";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "I like the shine in your eye, my boy! I can see a little bit of myself in those eyes. Yes...";
else
mes "No use hiding the glint in your eyes, my dear! It's adventure you wish for, that much I can tell...";
@@ -2423,7 +2423,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
mes "...Thank you for telling me...";
mes "They are great friends...";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "[Iromo]";
mes "...And? ...What do you...";
mes "Want to say to me this time...";
@@ -2593,7 +2593,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
mes "It is frustrating. But...";
mes "Why do you care about me so much?";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "[Iromo]";
mes "Really, its not that bad...";
mes "I wish I could have a sister like you.";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 48c505631..73769b2a8 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -270,7 +270,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 4_F_THAIAYO,2,2,{
mes "[Powerful-Looking Woman]";
mes "I see. Hmmm...";
mes "You're kind of my type.";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "No no, that doesn't mean I'm interested in you. Plus I'm";
mes "already engaged.";
} else
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 32f0af151..6551920ae 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -51,7 +51,7 @@
// Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
comodo,228,159,3 script Hair Ornament Girl 8_F_GIRL,{
mes "[Hair Ornament Girl]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Oh, hello!";
mes "Would you like to order a hairband? They're great presents to give to your girlfriend, and show that you're thinking of her.";
}
@@ -1593,7 +1593,7 @@ comodo,187,153,4 script Hullaris#cmd 4_F_GODEMOM,{
mes "Love together~";
mes "Love! Love!";
mes "Love togeth-hm?";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "Boy, you're ruining";
mes "my groove! Now beat it!";
}
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index b0376c9ed..baf3de04a 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -587,7 +587,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "some. I guess you can";
mes "still give them to me, but";
mes "you'd get less of a reward";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "...you ^EEA9B8naughty boy^000000.";
}
else {
@@ -653,7 +653,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "a Black Smith!!";
}
mes "This is my present for it.";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "...you ^EEA9B8naughty boy^000000.";
}
else {
@@ -708,7 +708,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "That doesn't change";
mes "the fact that you've";
mes "been very, very bad.";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "...You ^EEA9B8naughty boy^000000.";
}
else {
@@ -753,7 +753,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "some. I guess you can";
mes "still give them to me, but";
mes "you'd get less of a reward";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "...You ^EEA9B8naughty boy^000000.";
}
else {
@@ -805,7 +805,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "When you do get all";
mes "that Large Jellopy,";
mes "just come back to me.";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "...you ^EEA9B8naughty boy^000000.";
}
else {
@@ -853,7 +853,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
else {
mes "a Black Smith!!";
mes "This is my present for it. Huhuhu.";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "...You ^EEA9B8naughty boy^000000.";
}
else {
@@ -896,7 +896,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "a craftsman can enjoy. Ooh,";
mes "what do you think is the most";
mes "important factor in cooking,";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "you ^EEA9B8naughty little man^000000?";
}
else {
@@ -2127,7 +2127,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
next;
mes "[Uwe]";
mes "What brings to";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "me, you ^EEA9B8naughty boy^000000?";
}
else {
@@ -3035,7 +3035,7 @@ einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
mes "So, how can";
mes "I help you, you";
mes "adooooooooorable";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "hunk of a man?";
}
else {
@@ -4556,7 +4556,7 @@ einbech,165,105,7 script Buender Hikeman#ein 4_M_EINOLD,{
mes "[Buender Hikeman]";
mes "Huh.";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "["+strcharinfo(0)+"]";
mes "And...";
mes "I'm a cute girl!";
diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index a2ae3160f..5180b868b 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -2090,7 +2090,7 @@ gon_in,18,27,5 script Madam#gnbs 4_F_TWGRANDMOM,{
mes "Hello, darling~";
close;
}
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "[Shang Hua Yen]";
mes "Hoho~ he's upstairs.";
mes "My, are you such a pretty lady~";
@@ -3044,7 +3044,7 @@ geffen_in,106,106,7 script Girl#gnbs2 4_M_KID2,{
else if (b_sword == 24 || b_sword == 25 || b_sword == 26) {
mes "[Lyroo]";
mes "Ahh...ahh....";
- if (Sex == 0)
+ if (Sex == SEX_FEMALE)
mes "It's ..you.. pretty...sister..";
else
mes "It's ..you.. handsome...brother..";
@@ -3092,7 +3092,7 @@ geffen_in,106,106,7 script Girl#gnbs2 4_M_KID2,{
else if (b_sword == 27) {
mes "[Lyroo]";
mes "uh...umm?";
- if (Sex == 0)
+ if (Sex == SEX_FEMALE)
mes "Ah....It's you, pretty sister...";
else
mes "Ah....It's you, handsome brother...";
@@ -3122,7 +3122,7 @@ geffen_in,106,106,7 script Girl#gnbs2 4_M_KID2,{
}
mes "[Lyroo]";
mes "Heehehe...";
- if (Sex == 0)
+ if (Sex == SEX_FEMALE)
mes "Thank you my pretty sister.";
else
mes "Thank you handsome brother~";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 42ec29ef6..5492de4be 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -5818,7 +5818,7 @@ hugel,76,134,3 script Neha 4W_F_01,{
mes "this soup isn't good if it";
mes "isn't steaming hot?";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Neha]";
mes "But... You're a handsome";
mes "fellow, so I'll forgive you...";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 0637ef18f..044fb10dd 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -1111,7 +1111,7 @@ lhz_cube,234,200,0 script Desk#cube HIDDEN_NPC,{
mes "the clutter on the desk";
mes "proves to be useless to you.^000000";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "^3355FFAn issue of the";
mes "Dancer magazine,";
mes "''Harmonic Lick'' catches";
@@ -5686,7 +5686,7 @@ lhz_in01,273,121,1 script Mad Scientist#li 4_LGTSCIENCE,{
while (1) {
switch(select("Ask about hobbies", "Ask about work")) {
case 1:
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "[Wolfchev]";
mes "Hyuu~ I think you're";
mes "just a little too innocent";
@@ -6787,8 +6787,10 @@ lighthalzen,179,170,4 script Ordinary Man 4W_M_02,{
next;
mes "[??????]";
mes "^666666Now...^000000";
- if(Sex == 1) mes "^666666Make him^000000";
- else mes "^666666Make her^000000";
+ if (Sex == SEX_MALE)
+ mes "^666666Make him^000000";
+ else
+ mes "^666666Make her^000000";
mes "^666666swallow this pill.^000000";
next;
mes "^3355FFYou're forced to swallow";
@@ -7506,8 +7508,10 @@ yuno_pre,69,20,4 script Secretary#1 4_F_LGTGIRL,{
mes "Oh, the president";
mes "is expecting you.";
mes "Please, go right";
- if(Sex == 1) mes "on ahead, sir.";
- else mes "on ahead, ma'am.";
+ if (Sex == SEX_MALE)
+ mes "on ahead, sir.";
+ else
+ mes "on ahead, ma'am.";
close2;
warp "yuno_pre",113,53;
end;
@@ -7597,8 +7601,10 @@ yuno_pre,95,71,5 script Guard 4_M_EIN_SOLDIER,{
mes "Yes, it's about time";
mes "for me to depart. Ah,";
mes "and may I ask who this";
- if(Sex == 1) mes "young gentleman here is?";
- else mes "lovely young lady is?";
+ if (Sex == SEX_MALE)
+ mes "young gentleman here is?";
+ else
+ mes "lovely young lady is?";
next;
mes "[Guard]";
mes "Mr. Keshnaar,";
@@ -7639,12 +7645,12 @@ yuno_pre,95,71,5 script Guard 4_M_EIN_SOLDIER,{
switch( select( "Thank you.","Who was that gentleman...?" ) )
{
case 1:
- if(Sex == 1) mes "A Mister "+strcharinfo(0)+"";
+ if (Sex == SEX_MALE)
+ mes "A Mister " + strcharinfo(0);
+ else if (getpartnerid())
+ mes "A Missis " + strcharinfo(0);
else
- {
- if(getpartnerid()) mes "A Missis "+strcharinfo(0)+"";
- else mes "A Miss "+strcharinfo(0)+"";
- }
+ mes "A Miss " + strcharinfo(0);
mes "has arrived to see you now.";
next;
mes ".....";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 20e5d1f6c..8cb418508 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -2204,7 +2204,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 1_M_02,{
mes "All I'm asking is to check out a book from Prontera Library for me. It sounds easy, doesn't it?";
mes "Well, you don't look like someone who loves reading, but I hope you at least know how to check out a book from a library.";
next;
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "[Benjamin]";
mes "If you help me, I'll show you a limited picture book edition of Mammi... Once. Hehehehe.";
mes "What do you say? You do want to help me, right?";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 5dedc1516..f605e55bb 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -3186,12 +3186,17 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{
case 3:
mes "[Landlord]";
emotion e_lv;
- mes "Oh~! You look great! Look at the "+((Sex)?"solid muscle":"fair skin")+"!";
+ mes "Oh~! You look great! Look at the "+ (Sex == SEX_MALE ? "solid muscle" : "fair skin") +"!";
mes "But you look tired. Is it because of a long journey?";
next;
mes "[Landlord]";
- mes "We've got a room available just for you. "+((Sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
- mes (Sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
+ if (Sex == SEX_MALE) {
+ mes "We've got a room available just for you. It's the best in town. How about staying the night?";
+ mes "I'll charge you at reasonable price for you, handsome guy.";
+ } else {
+ mes "We've got a room available just for you. It's like a princess' room.";
+ mes "How about staying the night? I'll mark down the price for you, beautiful lady.";
+ }
next;
mes "["+strcharinfo(0)+"]";
mes "Oh, I'm sorry but I didn't come to stay here.";
@@ -4165,7 +4170,7 @@ OnTouch:
mes "You, chicken,";
mes "I need to kick your ass more.";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Baba Yaga, the Horrible]";
mes "I will bewitch";
mes "and enslave you.";
@@ -7970,7 +7975,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
mes "["+ strcharinfo(0) +"]";
mes "Are you crazy!? Don't you know how wide the world is and how many beautiful people there are? You're pretty full of it, country girl!";
next;
- if (!Sex) {
+ if (Sex == SEX_FEMALE) {
mes "["+ strcharinfo(0) +"]";
mes "Besides, if there was a most beautiful girl in the world it would be me, me, me!";
} else {
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 2bd49ecfe..dc7a40bf3 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3598,7 +3598,7 @@ alberta,127,143,3 script Belder 4_M_03,{
next;
switch(select("I'll promote your loans!", "Uh...")) {
case 1:
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "[Belder]";
mes "You? But you're a dude!";
mes "No sweaty, stinky, sleazy";
@@ -3992,7 +3992,7 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{
close;
}
case 2:
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "[Dorian]";
mes "Ah, my apologies.";
mes "Too many have asked, so";
@@ -5248,7 +5248,7 @@ alberta,102,80,3 script Jhonnita 4_M_04,{
mes "I doubt you can afford them.";
mes "Jewels aren't cheap, you know?";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Jhonnita]";
mes "Oh, I get it now. You want";
mes "to give one as a present to";
@@ -5844,7 +5844,7 @@ payon_in03,167,149,3 script Wola 1_F_ORIENT_01,2,2,{
next;
switch(select("Will you go out with me?", "Leblo's back medicine?")) {
case 1:
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Wola]";
mes "^666666*Blush*^000000 But it's too";
mes "early for us to just go";
@@ -5933,7 +5933,7 @@ payon_in03,167,149,3 script Wola 1_F_ORIENT_01,2,2,{
next;
switch(select("Will you go out with me?", "Leblo's back medicine?")) {
case 1:
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "^666666*Blush*^000000 But it's too";
mes "early for us to just go";
mes "on a date. I'm sorry, it's...";
@@ -6949,7 +6949,7 @@ in_rogue,359,116,3 script Marybell 4_F_ROGUE,{
mes "Can't tell what";
mes "you're saying exactly.";
next;
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Marybell]";
mes "If this is some kind";
mes "of weird come-on, you'd";
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index 93ab59237..ae32f7df7 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -586,7 +586,7 @@ umbala,215,181,3 script Billik 4_M_JOB_KNIGHT1,{
niflheim,153,215,3 script Feylin 4_M_NFDEADMAN2,{
if (nif_revive == 2) {
mes "[Feylin]";
- mes "Poor "+((Sex)?"guy":"girl")+"...";
+ mes "Poor "+ (Sex == SEX_MALE ? "guy" : "girl") +"...";
mes "Dying at such a young age...";
mes "I am always sorry to see the";
mes "young pass away.";
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index c5e817700..02030dcc3 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -276,7 +276,7 @@ prontera,248,212,3 script Busy Boy#prt 4_M_KID1,3,3,{
mes ".........?";
next;
mes "[Busy-Looking Boy]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "Ack! You're that clumsy";
mes "dude who made me drop";
}
@@ -302,7 +302,7 @@ prontera,248,212,3 script Busy Boy#prt 4_M_KID1,3,3,{
next;
select("Well, I, um...");
mes "[Busy-Looking Boy]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "Yeah... A real";
mes "man wouldn't have";
mes "ditched back then";
@@ -2257,7 +2257,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{
mes "sent this adventurer here";
mes "for a favor, it probably means";
mes "she trusts this person. Besides, we need somebody to carry out";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "this task for us. Why not him?";
else
mes "this task for us. Why not her?";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index b992d1dde..92512a662 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -7335,7 +7335,7 @@ ve_in,237,131,1 script Female Customer#ve1 4_F_DESERT,{
mes "men? You know, I've been";
mes "pretty lonely lately...";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "[Bartender]";
mes "Haha, well,";
mes "I'm not so sure..";
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index df5a905dc..c04d4de54 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -609,7 +609,7 @@ prt_fild08,175,374,3 script Bard#brising 1_M_BARD,{
mes "do you not?";
next;
mes "[Nelliorde]";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "Hahahaha, forgive my rudeness,";
mes "but I fail to remember your name, although your face does seem rather familiar.";
}
@@ -2315,7 +2315,7 @@ prt_castle,84,51,5 script Librarian#2 8W_SOLDIER,{
next;
switch(select("Lowen, Sibling", "Lowen, Spouse", "Lowen, Enemy", "Lowen, a Friend")) {
case 1:
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Librarian]";
mes "How dare you";
mes "lie to the royal";
@@ -2362,7 +2362,7 @@ prt_castle,84,51,5 script Librarian#2 8W_SOLDIER,{
close;
}
case 2:
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "[Librarian]";
mes "Spouse...?";
mes "Well, I guess you look like a husband. Heh, I've got a girlfriend myself. Well, at least I think so. Anyway...";
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index ffc70f318..894ac2ab5 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -650,7 +650,7 @@ prt_in,172,109,0 script A File#megin1 HIDDEN_NPC,{
}
else if (god_eremes < 7) {
mes "[Librarian Jekan]";
- mes "I'm sorry "+((Sex)?"sir":"ma'am")+",";
+ mes "I'm sorry "+ (Sex == SEX_MALE ? "sir" : "ma'am") +",";
mes "but special authorization is required to browse that section. Otherwise, it's off limits.";
close;
}
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 01f82f5ef..0cbcae724 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -312,7 +312,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "The doctor tells me to avoid";
mes "stress and hard work, but";
mes "researching is my life.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
next;
mes "[Pisruik]";
mes "I wonder...";
@@ -373,7 +373,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "The doctor tells me to avoid";
mes "stress and hard work, but";
mes "researching is my life.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
next;
mes "[Pisruik]";
mes "I wonder...";
@@ -552,7 +552,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "The doctor tells me to avoid";
mes "stress and hard work, but";
mes "researching is my life.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
next;
mes "[Pisruik]";
mes "I wonder...";
@@ -613,7 +613,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "The doctor tells me to avoid";
mes "stress and hard work, but";
mes "researching is my life.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
next;
mes "[Pisruik]";
mes "I wonder...";
@@ -666,7 +666,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
ALCHE_SK = 6;
next;
mes "[Pisruik]";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "I... I really";
mes "appreciate your";
mes "willingness to help";
@@ -688,7 +688,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "Thanks so much for";
mes "bringing me these";
mes "Maneater Blossoms.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "You don't know how";
mes "much this means to me~";
}
@@ -715,7 +715,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "Your glasses...";
mes "They're broken...";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "^3355FFThe explosion destroyed";
mes "Pisruik's glasses, revealing";
mes "the beautiful face of a";
@@ -793,7 +793,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "Now I finally have the";
mes "exact amount of Maneater";
mes "Blossoms that I'll need.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "I'm really sorry for putting";
mes "your through all this trouble.";
}
@@ -819,7 +819,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "Your glasses...";
mes "They're broken...";
next;
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "^3355FFThe explosion destroyed";
mes "Pisruik's glasses, revealing";
mes "the beautiful face of a";
@@ -955,7 +955,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "thesis as a ready reference.";
next;
mes "[Pisruik]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Hopefully, we'll";
mes "meet again sometime";
mes "in the future. Good luck on";
@@ -978,7 +978,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "Well, if you ever change";
mes "your mind, feel free to come";
mes "back for me to teach you.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "And it's no trouble at all!";
mes "I really enjoy your company...";
}
@@ -1042,7 +1042,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "thesis as a ready reference.";
next;
mes "[Pisruik]";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "Hopefully, we'll";
mes "meet again sometime";
mes "in the future. Good luck on";
@@ -1065,7 +1065,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
mes "Well, if you ever change";
mes "your mind, feel free to come";
mes "back for me to teach you.";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "And it's no trouble at all!";
mes "I really enjoy your company...";
}
@@ -1786,7 +1786,7 @@ lhz_in01,225,122,5 script Skrajjad#qsk_al 4_M_SAGE_A,{
mes "to ask Kellasus to teach";
mes "you Alchemy. I must say";
mes "that I admire your attitude,";
- if (Sex)
+ if (Sex == SEX_MALE)
mes "young lad. Now, don't worry...";
else
mes "young lass. Now, don't worry...";
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 2f9100098..afaa6158b 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -145,7 +145,7 @@ moc_ruins,118,99,5 script Roberto 4_M_ORIENT01,{
close;
case 2:
mes "[Roberto]";
- mes "...hey "+((Sex)?"mister":"miss")+".";
+ mes "...hey "+ (Sex == SEX_MALE ? "mister" : "miss") +".";
mes "...be careful at night.";
close;
}
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 62cb2e695..e838b3702 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -397,7 +397,7 @@ comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
}
else if (BaseJob != Job_Dancer) {
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "[Canell]";
mes "Oh, what a cute";
mes "little girl~! Such";
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 66d0b6691..f8a17bee2 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -48,7 +48,7 @@ izlude_in,118,175,4 script Knight De Thomas 4W_M_02,{
mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
next;
mes "[De Thomas]";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "For these swordsmen and knights, there is a wonderful skill.";
}
else {
@@ -235,7 +235,7 @@ prt_in,75,88,5 script Leon Von Frich 4_M_03,3,3,{
next;
select("Eh, I... just...");
mes "[Leon]";
- if (Sex == 0) {
+ if (Sex == SEX_FEMALE) {
mes "No need to be surprised.";
mes "If you use a sword, of course you ought to have a good arm!";
}
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index ccd86163c..c796f5e5b 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -804,7 +804,7 @@ prt_in,228,26,5 script Steward#sign 1_M_JOBTESTER,{
close;
case 2:
mes "[Vandez]";
- mes "Very good, "+((Sex)?"sir.":"madam.");
+ mes "Very good, "+ (Sex == SEX_MALE ? "sir." : "madam.");
mes "Please wait a moment";
mes "while I consult with";
mes "the master in his study.";
@@ -997,7 +997,7 @@ prt_in,248,23,0 script Maid#sign2 HIDDEN_NPC,{
mes "Is there anything that";
mes "I can help you with?";
next;
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
switch(select("You wanna have coffee sometime?", "Tell me about Metz.")) {
case 1:
mes "[Elle]";
@@ -1754,7 +1754,7 @@ payon,154,170,3 script Hagin#sign 1_F_ORIENT_04,{
select("I'd like to meet this Daewoon.");
mes "[Hagin]";
mes "Oh, I see~";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "You plan to ask him";
mes "to show you some fighting";
mes "pointers, do you? You men";
@@ -1901,7 +1901,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
mes "Oh, a visitor?";
mes "I'm sorry, but I believe";
mes "you're an uninvited guest~";
- if (Sex) {
+ if (Sex == SEX_MALE) {
mes "You'll have to forgive me";
mes "if I wish to spend my time with maidens as opposed to men.";
}
@@ -2236,7 +2236,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
mes "[Daewoon]";
mes "Hmm. You have a truly";
mes "strong will. Then again,";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
mes "perhaps you lack a true";
mes "appreciation for beauty.";
mes "Even in Emperium form, how";
@@ -3453,8 +3453,10 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{
mes "[Jesqurienne]";
mes "Ahhhhhh~";
mes "Hm? Why hello there,";
- if (Sex) mes "you fine speciman of a man~";
- else mes "you precious, adorable girl~";
+ if (Sex == SEX_MALE)
+ mes "you fine speciman of a man~";
+ else
+ mes "you precious, adorable girl~";
mes "I'm Jesqurienne. You've heard";
mes "of me, haven't you? Aren't you surprised to see me?";
next;
@@ -4395,7 +4397,7 @@ geffen_in,61,72,7 script Aaron#sign 4_M_SAGE_A,{
mes "or you're the most gorgeous";
mes "woman I've seen in my life!";
next;
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
select("Um, I'm a dude...");
emotion e_sob;
mes "[Aaron]";
@@ -6130,7 +6132,7 @@ prt_castle,107,58,5 script Soldier#s11 8W_SOLDIER,{
mes "again for helping";
mes "out my sister, we";
mes "really appreciate it.";
- if (Sex == 1) {
+ if (Sex == SEX_MALE) {
if (rand(1,5) == 5) {
next;
mes "[Maruin]";
@@ -7077,7 +7079,7 @@ geffen_in,171,42,3 script Cute Girl 4_F_KID2,{
mes "[Liana]";
mes "Oh, this?";
mes "It's a letter for my daddy.";
- mes "Mom said that some "+((Sex)?"guy":"lady")+" is gonna try to find my dad, so I'm making this so "+((Sex)?"":"s")+"he can take it him~";
+ mes "Mom said that some "+ (Sex == SEX_MALE ? "guy" : "lady") +" is gonna try to find my dad, so I'm making this so "+ (Sex == SEX_MALE ? "he":"she")+ " can take it him~";
close;
case 2:
mes "[Liana]";
@@ -7105,7 +7107,7 @@ geffen_in,171,42,3 script Cute Girl 4_F_KID2,{
case 1:
mes "[Brenda Howard]";
mes "Liana~";
- mes "This nice "+((Sex)?"man":"lady")+" is going to look for your dad. Why don't you ask "+((Sex)?"him":"her")+" to take your letter to him for you?";
+ mes "This nice "+ (Sex == SEX_MALE ? "man" : "lady") +" is going to look for your dad. Why don't you ask "+ (Sex == SEX_MALE ? "him" : "her") +" to take your letter to him for you?";
next;
mes "[Liana]";
mes "You are...?";
@@ -9114,12 +9116,10 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
mes "You're the one I'm looking";
mes "for, the one who's been on";
mes "a long journey to prove";
- if (Sex == 1) {
+ if (Sex == SEX_MALE)
mes "his courage.";
- }
- else {
+ else
mes "her courage.";
- }
next;
mes "[Serin]";
mes "Even in the darkness of";
@@ -10850,7 +10850,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{
mes "^8C1717Yes, that's it!";
mes "I never expected a mortal";
mes "to have such an interesting";
- mes "artifact in "+((Sex)?"his":"her")+" possession.^000000";
+ mes "artifact in "+ (Sex == SEX_MALE ? "his" : "her") +" possession.^000000";
next;
mes "[Lady Hell]";
mes "^8C1717As queen of Niflheim,";