diff options
| author | Emistry <Equinox1991@gmail.com> | 2016-01-25 23:00:26 +0800 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-02-29 01:52:22 +0100 |
| commit | 05a2538114972de94352e66586f6f2a5affea9c6 (patch) | |
| tree | f39d3e659d9b3801cc42a7b14e41aeec16c93ddf /npc | |
| parent | 75ba7024fe3b68718d0f0a289a68ea0719054d3b (diff) | |
| download | hercules-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')
91 files changed, 467 insertions, 427 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."; diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index 138755f6b..99260f455 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -252,8 +252,10 @@ L_Nope: Notime: mes "^FF0000[Porter]^000000"; - if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; - if(Sex==1) mes "Sorry, sir, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; + if (Sex == SEX_FEMALE) + mes "Sorry, ma'am, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; + else + mes "Sorry, sir, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; next; menu "Yes, please.",Itin,"No thanks.",L_Nope; close; @@ -363,8 +365,10 @@ Lnope: Notime: mes "^FF0000[Airplane Attendant]^000000"; - if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't docked. Please wait."; - if(Sex==1) mes "Sorry, sir, but the plane currently isn't docked. Please wait."; + if (Sex == SEX_FEMALE) + mes "Sorry, ma'am, but the plane currently isn't docked. Please wait."; + else + mes "Sorry, sir, but the plane currently isn't docked. Please wait."; close; Nowhere: diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index 1d6d21c2a..2af343023 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -267,10 +267,10 @@ function SF_RetrieveRingM { mes "What happened to your "+getitemname($@wed_ring)+"? You didn't lose it... did you? We need it to continue with the ceremony!"; close; } - if ($wed_bride_sex) - set @item, 2634; //Groom's wedding ring + if ($wed_bride_sex == SEX_MALE) + @item = 2634; //Groom's wedding ring else - set @item, 2635; //Bride's wedding ring + @item = 2635; //Bride's wedding ring if (getnameditem(@item,$wed_groom$) == 0) { mes "You don't seem to have enough space to carry the ring... go free up some space and come back to reclaim your partner's ring."; close; @@ -293,10 +293,10 @@ function SF_RetrieveRingF { mes "What happened to your "+getitemname($@wed_ring)+"? You didn't lose it... did you? We need it to continue with the ceremony!"; close; } - if ($wed_groom_sex) - set @item, 2634; //Groom's wedding ring + if ($wed_groom_sex == SEX_MALE) + @item = 2634; //Groom's wedding ring else - set @item, 2635; //Bride's wedding ring + @item = 2635; //Bride's wedding ring if (getnameditem(@item,$wed_bride$) == 0) { mes "You don't seem to have enough space to carry the ring... go free up some space and come back to reclaim your partner's ring."; @@ -392,19 +392,19 @@ OnTimer55000: //Subfunction: Checks that the groom/bride is still wearing their stuff. function SF_equip_check { - if (Sex && getequipid(2) != 7170) { + if (Sex == SEX_MALE && getequipid(2) != 7170) { mes "["+@name$+"]"; mes "Child, what did you do with your "+getitemname(7170)+"?"; emotion e_dots; return 0; } - if (Sex == 0 && getequipid(2) != 2338) { + if (Sex == SEX_FEMALE && getequipid(2) != 2338) { mes "["+@name$+"]"; mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony..."; emotion e_dots; return 0; } - if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) { + if (Sex == SEX_FEMALE && $@wed_veil && getequipid(1) != 2206) { mes "["+@name$+"]"; mes "Child, you can't take off your "+getitemname(2206)+" yet...."; emotion e_dots; @@ -416,9 +416,9 @@ function SF_equip_check { //Subfunction: Resets wedding variables. function SF_wed_end { set $wed_groom$,""; - set $wed_groom_sex, 0; + $wed_groom_sex = -1; set $wed_bride$,""; - set $wed_bride_sex, 0; + $wed_bride_sex = -1; set $wed_groom_progress,0; set $wed_bride_progress,0; set $wed_progress,0; @@ -487,7 +487,7 @@ function SF_Register { mes "Very well, whom would you like to register as?"; next; set @submenu, select("Groom","Bride","Cancel"); - } else if (Sex) { //Groom + } else if (Sex == SEX_MALE) { //Groom mes "["+@name$+"]"; mes "Very well, will you register as the Groom?"; next; @@ -547,7 +547,7 @@ function SF_WedProgress { mes "Tell your groom to register, what is taking so long? Time is running out."; close; } - if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) { + if ($wed_groom_progress == 0 && (Sex == SEX_MALE || $@wed_allow == 1)) { mes "["+@name$+"]"; mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?"; next; @@ -569,7 +569,7 @@ function SF_WedProgress { } } - if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) { + if ($wed_bride_progress == 0 && (Sex == SEX_FEMALE || $@wed_allow == 1)) { mes "["+@name$+"]"; mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?"; next; @@ -660,9 +660,9 @@ OnTimer60000: emotion e_hmm; set $wed_groom$,""; - set $wed_groom_sex, 0; + $wed_groom_sex = -1; set $wed_bride$,""; - set $wed_bride_sex, 0; + $wed_bride_sex = -1; set $wed_groom_progress,0; set $wed_bride_progress,0; set $wed_progress,0; @@ -685,7 +685,7 @@ function SF_TryRegister { emotion e_gasp; close; } - if (Sex) + if (Sex == SEX_MALE) set @item, 7170; else set @item, 2338; @@ -695,7 +695,7 @@ function SF_TryRegister { mes "You should be wearing a "+getitemname(@item)+" if you want to get married."; close; } - if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) { + if (Sex == SEX_FEMALE && $@wed_veil && getequipid(1) != 2206) { mes "["+@name$+"]"; mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress."; close; @@ -721,13 +721,13 @@ function SF_TryRegister { if (@bride) { set $wed_bride_progress,1; set $wed_bride$,strcharinfo(0); - set $wed_bride_sex, Sex; + $wed_bride_sex = Sex; if ($@wedding_effect == 1) //Store account id for effect. set $wedding_effect_id, getcharid(3); } else { set $wed_groom_progress,1; set $wed_groom$,strcharinfo(0); - set $wed_groom_sex, Sex; + $wed_groom_sex = Sex; if ($@wedding_effect == 2) //Store account id for effect. set $wedding_effect_id, getcharid(3); } diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index 8566fb871..5d1067d05 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -17,11 +17,10 @@ sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{ mes "[Saddeus]"; emotion 1; - if(Sex) { + if (Sex == SEX_MALE) mes "Mr. Prisoner #"+BaseLevel+JobLevel+","; - } else { + else mes "Ms. Prisoner #"+BaseLevel+JobLevel+","; - } mes "what's the noise over there?"; next; menu "Let me free, I'll pay!",-, "Let me to work off my freedom!",M_Q1, "Nothing",M_NO_THANKS; diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt index 6b1351eb4..99c1f21cb 100644 --- a/npc/custom/events/uneasy_cemetery.txt +++ b/npc/custom/events/uneasy_cemetery.txt @@ -45,8 +45,10 @@ OnZombieDead: if ($@UNEASY_MOB>0) end; set $UNEASY_DL,0; set $UNEASY_H$,strcharinfo(0); - if (Sex==1) mapannounce "prontera","[Mother Mathana]: Brave "+$UNEASY_H$+" has just killed the last undead in Prontera!",0; - if (Sex==0) mapannounce "prontera","[Mother Mathana]: Lady "+$UNEASY_H$+" has just killed the last undead in Prontera!",0; + if (Sex == SEX_MALE) + mapannounce "prontera","[Mother Mathana]: Brave "+$UNEASY_H$+" has just killed the last undead in Prontera!",0; + else + mapannounce "prontera","[Mother Mathana]: Lady "+$UNEASY_H$+" has just killed the last undead in Prontera!",0; set JobExp,JobExp+100; set BaseExp,BaseExp+50; end; @@ -103,8 +105,10 @@ L_Undead_Walk: mes "[Mother Mathana]"; mes "Our Church is going to thank you personally..."; next; - if (Sex==1) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0; - if (Sex==0) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0; + if (Sex == SEX_MALE) + mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0; + else + mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0; mes "[Mother Mathana]"; mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar."; getitem Blue_Potion,1; diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index a39fe5851..db2423e8f 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -953,7 +953,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "The Lord has come."; specialeffect EF_GLORIA; next; - if (Sex) { + if (Sex == SEX_MALE) { mes "[Oholy]"; mes "Merry Christmas!"; mes "Dear brother, what comes in"; diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index c575cb9c6..64f3efa93 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -65,7 +65,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ next; mes "[Caroller]"; mes "Merry Christmas!"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Hey, boy! What comes to mind when"; } else { mes "Hey, girl! What comes to mind when"; @@ -476,7 +476,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ case 2: mes "[Santa Claus]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Ho ho ho! What a good boy!"; } else { mes "Ho ho ho! What a good girl!"; @@ -709,7 +709,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ next; mes "[Santa Claus]"; mes "........................"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Oh! Poor boy..."; } else { mes "Oh! Poor girl..."; @@ -717,7 +717,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ next; mes "[Santa Claus]"; mes "........................"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Oh! Poor boy..."; } else { mes "Oh! Poor girl..."; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 690ab6697..6b964d42c 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -396,7 +396,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{ delitem 7948,1; Zeny -= 1000; iROval09ring = 1; - if (Sex) { + if (Sex == SEX_MALE) { getnameditem 12742,strcharinfo(0); } else { getnameditem 12743,strcharinfo(0); @@ -453,7 +453,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ break; } - if (Sex) { + if (Sex == SEX_MALE) { if (countitem(Valentine_Silver_Ring) > .@input) { mes "[Valentine Vote Manager]"; mes "Seems like the value you entered is too small."; @@ -536,7 +536,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ //== Charles Orleans (Makes Home-Made Chocolates) ========== prt_castle,42,35,3 script Dessert Manager#Val09 1_M_01,{ - if (Sex) { + if (Sex == SEX_MALE) { mes "[Charles Orleans]"; mes "Monsieur~! What brings you to my beautiful atelier?"; mes "What is it that you want?"; diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt index 60853001f..382f45a9a 100644 --- a/npc/jobs/1-1e/taekwon.txt +++ b/npc/jobs/1-1e/taekwon.txt @@ -400,11 +400,10 @@ mes "You are still young, so"; mes "I assume you'll want a job"; mes "title. Mm. In that case, you"; - if(Sex == 0) { + if (Sex == SEX_FEMALE) mes "are now a ^FF0000Taekwon Girl^000000."; - } else { + else mes "are now a ^FF0000Taekwon Boy^000000."; - } mes "Yes, that sounds good. "; next; mes "[Phoenix]"; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 969990051..10bbb6534 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -377,7 +377,7 @@ OnTouch: close; case 2: mes "[Assassin 'Khai']"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Huh. You must have a lot of self confidence to be a Thief nowadays."; next; mes "[Assassin 'Khai']"; @@ -1877,7 +1877,7 @@ OnTouch: mes "Haha, the needs of the body are sometimes hard to ignore. It's best to accept that part of human nature."; next; mes "[Guildmaster]"; - if (Sex) + if (Sex == SEX_MALE) mes "But you must never reveal to her the Assassin side of your life. No matter what it takes."; else mes "But you must never reveal to him the Assassin side of your life, no matter what it takes."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 4e09d5ed9..5531c87ae 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -84,7 +84,7 @@ ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{ close; } if (BaseClass == Job_Novice) { - if (Sex == 0) { + if (Sex == SEX_FEMALE) { mes "[Altiregen]"; mes "Oh~"; mes "what a very"; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 2680fa6f7..20ab68dbe 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -425,7 +425,7 @@ hu_in01,386,373,4 script Hunter Guildsman#hnt 4_F_JOB_HUNTER,{ mes "Just give the item to the Demon Hunter, the guy who's all the way to the left in this area~"; next; mes "[Hunter Sherin]"; - if (Sex) + if (Sex == SEX_MALE) mes "If you decide to become a Hunter, promise to come visit me. I want to see you as a Hunter. You would look great!!"; else mes "If you decide to become a Hunter, come and visit me, okay? You're pretty, but... You'd be even prettier as a Hunter. Hehe~"; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index b3caa8cf9..6914065dc 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -67,7 +67,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{ mes "[Captain Herman]"; mes "A-ha~"; mes "A Swordman, you say?"; - mes "I'm sorry, "+((Sex)?"lad":"lass")+", but you've"; + mes "I'm sorry, "+ (Sex == SEX_MALE ? "lad" : "lass") +", but you've"; mes "come to the wrong place!"; next; mes "[Captain Herman]"; @@ -101,7 +101,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{ if (select("I want to change my job to a Knight.", "Just visiting.") == 1) { mes "[Captain Herman]"; mes "Ohh..."; - mes "A young "+((Sex)?"man":"lady")+" who wishes"; + mes "A young "+ (Sex == SEX_MALE ? "man" : "lady") +" who wishes"; mes "to become a Knight!"; mes "Our Prontera Chivalry"; mes "will assist you."; @@ -335,7 +335,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{ mes "gathered items"; mes "that are troublesome"; mes "to obtain. I approve!"; - mes "I believe "+((Sex)?"":"s")+"he will continue to be loyal after becoming a Knight."; + mes "I believe "+ (Sex == SEX_MALE ? "he" : "she") +" will continue to be loyal after becoming a Knight."; } next; mes "[Captain Herman]"; @@ -372,7 +372,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{ mes "to Amy's opinion."; next; mes "[Lady Amy]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Mmm~ He's so polite!"; mes "He'll grow to be a wonderful Knight. And he's got such cute widdle cheeeeks~ Hee hee!"; } @@ -391,7 +391,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{ mes "your mind."; next; mes "[Sir Edmond]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "He seems a little rough, but something bright shines within him. With polish and refinement, his true value will shine forth"; mes "as the sun."; } @@ -406,7 +406,7 @@ prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{ mes "to hear your thoughts."; next; mes "[Gray]"; - mes "A young "+((Sex)?"gentleman":"lady")+" coming here with the determination to become a Knight is enough..."; + mes "A young "+ (Sex == SEX_MALE ? "gentleman" : "lady") +" coming here with the determination to become a Knight is enough..."; next; mes "[Captain Herman]"; mes "Everyone"; @@ -749,7 +749,7 @@ prt_in,71,91,0 script Sir Siracuse#knt 1_M_YOUNGKNIGHT,{ mes "Oh, to become"; mes "a Knight? Come to"; mes "think of it, aren't"; - mes "you the "+((Sex)?"guy":"girl")+" that"; + mes "you the "+ (Sex == SEX_MALE ? "guy" : "girl") +" that"; mes "just applied?"; next; mes "[Sir Siracuse]"; @@ -2350,7 +2350,7 @@ prt_in,87,92,4 script Sir Gray#knt 2_M_SWORDMASTER,{ mes "Oh, youth!"; mes "Becoming a Knight"; mes "for your beloved!"; - mes "Always protect "+((Sex)?"her":"him")+"..."; + mes "Always protect "+ (Sex == SEX_MALE ? "her" : "him") +"..."; mes "Even at the sacrifice"; mes "of your own life!"; next; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index 0f5d811f2..b3cd7167b 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -62,7 +62,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ if (BaseJob == Job_Priest) { mes "[Bishop Paul]"; mes "Ah..."; - if (Sex) + if (Sex == SEX_MALE) mes "It is good to see you again, Brother " + strcharinfo(0) + ". Once again, God's grace has caused our paths to cross."; else mes "It is good to see you once again, Sister " + strcharinfo(0) + ". The grace of God has brought you once more before me."; @@ -129,7 +129,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ else if (BaseClass == Job_Novice) { mes "[Bishop Paul]"; mes "May God be"; - if (Sex) + if (Sex == SEX_MALE) mes "with you, brother."; else mes "with you, sister."; @@ -162,7 +162,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ else { mes "[Bishop Paul]"; mes "May God be"; - if (Sex) + if (Sex == SEX_MALE) mes "with you, brother."; else mes "with you, sister."; @@ -217,7 +217,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ if (PRIEST_Q == 0) { mes "[Bishop Paul]"; mes "May God bless"; - if (Sex) + if (Sex == SEX_MALE) mes "you, Brother."; else mes "you, Sister."; @@ -257,7 +257,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ PRIEST_Q = 1; setquest 8009; mes "[Bishop Paul]"; - if (Sex) + if (Sex == SEX_MALE) mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Brother " + strcharinfo(0) + "."; else mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Sister " + strcharinfo(0) + "."; @@ -342,7 +342,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ mes "Thank you for asking."; next; mes "[Bishop Paul]"; - if (Sex) + if (Sex == SEX_MALE) mes "I hope you will continue to go on your mission as God's servant, brother."; else mes "I hope you will continue to go on your mission as God's servant, sister."; @@ -514,7 +514,7 @@ prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{ mes "[Bishop Paul]"; mes "God, grant your power to your servant standing before you."; changequest 8015,8016; - if (Sex) + if (Sex == SEX_MALE) mes "Let him send your message throughout the ends of the earth."; else mes "Let her send your message throughout the ends of the earth."; @@ -549,9 +549,9 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ mes "[Sister Cecilia]"; if (BaseJob != Job_Acolyte) { if (BaseJob == Job_Priest) { - mes "May god bless you, "+ (Sex ? "brother":"sister") +". It brings my heart joy to see that you working hard to carry out the will of God."; + mes "May god bless you, "+ (Sex == SEX_MALE ? "brother":"sister") +". It brings my heart joy to see that you working hard to carry out the will of God."; } else if (Class == Job_Novice) { - mes "May god bless you, "+ (Sex ? "brother":"sister") +"."; + mes "May god bless you, "+ (Sex == SEX_MALE ? "brother":"sister") +"."; mes "Prontera parish welcomes you."; next; mes "[Sister Cecilia]"; @@ -570,7 +570,7 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ mes "But please..."; mes "Take your time, and decide what job will be the best for you."; } else { - mes "May god bless you, "+ (Sex ? "brother":"sister") +"."; + mes "May god bless you, "+ (Sex == SEX_MALE ? "brother":"sister") +"."; mes "Welcome to Prontera parish. How may I help you?"; next; if (select("Tell me more about Priests.", "Nothing.") == 1) { @@ -590,7 +590,7 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ close; } if (PRIEST_Q == 0) { - if (Sex) + if (Sex == SEX_MALE) mes "May God bless you, brother."; else mes "May God bless you, sister."; @@ -671,7 +671,7 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ mes "Welcome. You demonstrated great effort to accomplish your first trial. Now, speak to Bishop Paul so that you can begin your next trial on your path to Priesthood."; next; mes "[Sister Cecilia]"; - if (Sex) + if (Sex == SEX_MALE) mes "Brother "+ strcharinfo(0) +"..."; else mes "Sister "+ strcharinfo(0) +"..."; @@ -717,14 +717,14 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ } next; mes "[Sister Cecilia]"; - if (Sex) + if (Sex == SEX_MALE) mes "Brother "+ strcharinfo(0) +"..."; else mes "Sister "+ strcharinfo(0) +"..."; mes "We will now begin your formal oath for the Priesthood. Make yourself comfortable, and just answer with your heart."; next; mes "[Sister Cecilia]"; - if (Sex) + if (Sex == SEX_MALE) mes "Brother "+ strcharinfo(0) +","; else mes "Sister "+ strcharinfo(0) +","; @@ -815,7 +815,7 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ close; } mes "[Sister Cecilia]"; - if (Sex) + if (Sex == SEX_MALE) mes "Brother "+ strcharinfo(0) +"..."; else mes "Sister "+ strcharinfo(0) +"..."; @@ -860,7 +860,7 @@ job_prist,24,187,4 script Peter S. Alberto 4_M_MINISTER,{ mes "[Father Peter]"; if (BaseJob == Job_Priest) { mes "Welcome!"; - if (Sex) + if (Sex == SEX_MALE) mes "Brother "+ strcharinfo(0) +"!"; else mes "Sister "+ strcharinfo(0) +"!"; @@ -1048,7 +1048,7 @@ job_prist,23,187,1 script Peter S. Alberto#2 4_M_MINISTER,{ mes "[Father Peter]"; if (BaseJob == Job_Priest) { mes "Welcome!"; - if (Sex) + if (Sex == SEX_MALE) mes "Brother "+ strcharinfo(0) +"!"; else mes "Sister "+ strcharinfo(0) +"!"; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index e81b7a4b0..fdbbcef25 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -61,7 +61,7 @@ gef_tower,111,37,4 script Wizard Guildsman 1_F_GYPSY,{ mes "Now, excuse me."; next; mes "[Catherine]"; - if (Sex) + if (Sex == SEX_MALE) mes "Well, If you intended to ask me on a date... I appreciate it...hohoho."; else mes "Well, if you fix me up with a cute guy... I'd appreciate it...hohoho!."; @@ -389,7 +389,7 @@ gef_tower,111,37,4 script Wizard Guildsman 1_F_GYPSY,{ mes "You...*sigh*...I didn't think you would do such a dishonorable thing."; next; mes "[Catherine]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Granted you're a mage, but how could a guy be so weak?!"; mes "Well, at least your alive still. Go back and try harder this time. ~tehehehe"; } @@ -471,7 +471,7 @@ gef_tower,102,24,2 script Gloomy Wizard 4_M_JOB_WIZARD,{ next; mes "[Raulel]"; mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!"; - if (Sex) { + if (Sex == SEX_MALE) { mes "If you don't want that to happen, then learn how to use spells properly!"; next; mes "[Raulel]"; diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt index 311acb6a6..b48011dad 100644 --- a/npc/jobs/2-1e/StarGladiator.txt +++ b/npc/jobs/2-1e/StarGladiator.txt @@ -40,7 +40,7 @@ payon,215,102,3 script Moohyun#job_star 4_M_ROGUE,3,3,{ if (Class == Job_Taekwon) { if (STGL_Q == 0) { mes "[Moohyun]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, Taekwon Boy!"; else mes "Hey, Taekwon Girl!"; @@ -315,7 +315,7 @@ payon,215,102,3 script Moohyun#job_star 4_M_ROGUE,3,3,{ mes "[Moohyun]"; mes "Dude..."; mes "Whaddya want?"; - if (Sex) { + if (Sex == SEX_MALE) { mes "You wanna join up"; mes "with my martial arts"; mes "school? It's too late"; @@ -396,7 +396,7 @@ comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{ mes "Hm? You still have Skill"; mes "Points that you haven't yet"; mes "allocated. Use them, learn"; - if (Sex == 0) + if (Sex == SEX_FEMALE) mes "and improve your Taekwon Girl"; else mes "and improve your Taekwon Boy"; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 51a307e4f..c3d1f9479 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -461,7 +461,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ mes "Wait..."; mes "Maybe I've"; mes "misjudged you."; - if (Sex) { + if (Sex == SEX_MALE) { mes "You might be a pretty boy,"; mes "but I can tell you're smart"; mes "from your eyes."; diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index 0def0ce9d..e44299193 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -93,7 +93,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Always full of happy moments~"; next; mes "[Lalo]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Forget about your worries~"; mes "And enjoy everything~"; } @@ -107,8 +107,10 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ else if(BARD_Q == 0) { cutin "job_bard_aiolo01",2; mes "[Lalo]"; - if (Sex) mes "Hi! Delightful Archer."; - else mes "Hello! Beautiful Archer Lady."; + if (Sex == SEX_MALE) + mes "Hi! Delightful Archer."; + else + mes "Hello! Beautiful Archer Lady."; mes "How can a wanderer like me help you?"; next; switch(select("You have a nice voice.", "Could you sing for me, please?", "Nothing.")) { @@ -160,7 +162,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "[Lalo]"; mes "Thanks! if you enjoyed my song, it makes me happy, too."; next; - if (Sex == 1 && JobLevel > 39) { + if (Sex == SEX_MALE && JobLevel > 39) { mes "[Lalo]"; mes "It would be nice if more people went around and sang..."; mes "Well, it's quite ok as it is now... hmmhmm."; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index 77f85a8fd..d3afbd9d1 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -214,8 +214,10 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ close; } mes "[Michael Halig]"; - if (Sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin."; - else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming."; + if (Sex == SEX_MALE) + mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin."; + else + mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming."; close; } else if(CRUS_Q >= 1 && CRUS_Q <= 3) { @@ -302,8 +304,10 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "[Michael Halig]"; mes "Now you are"; mes "one of us!"; - if (Sex) mes "...Brother."; - else mes "...Comrade."; + if (Sex == SEX_MALE) + mes "...Brother."; + else + mes "...Comrade."; next; if(.@Joblevel != 50) getitem 504, 6; else getitem 504, 12; @@ -353,8 +357,10 @@ prt_castle,164,32,1 script Man in Anguish 4_M_JOB_KNIGHT1,{ else if(CRUS_Q == 4) { mes "What is it...?"; mes "Do you have business"; - if (Sex) mes "with me, man of the sword?"; - else mes "with me, woman of the sword?"; + if (Sex == SEX_MALE) + mes "with me, man of the sword?"; + else + mes "with me, woman of the sword?"; next; if (select("I'd like to take the Crusader test.", "Nothing.") == 1) { mes "[Murnak Mijoul]"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index b2c38dfd9..9aa3f3d5f 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -153,7 +153,7 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{ cutin "",255; end; } - if (DANC_Q == 0 && Sex == 0 && BaseJob == Job_Archer) { + if (DANC_Q == 0 && Sex == SEX_FEMALE && BaseJob == Job_Archer) { cutin "job_dancer_eir01",2; mes "[Aile]"; mes "Welcome~!"; @@ -228,8 +228,7 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{ close2; cutin "",255; end; - } - else if (Sex == 1) { + } else if (Sex == SEX_MALE) { cutin "job_dancer_eir03",2; mes "[Aile]"; mes "Welco--Mmm?"; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 99f008834..95360f295 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -370,7 +370,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ } mes "[Sensei Moohae]"; mes "There are still those who wish to follow the old ways."; - if (Sex) + if (Sex == SEX_MALE) mes "A strong young man. I am pleased of your will to join us."; else mes "Such a delicate flower. I am pleased to see your will to join us."; @@ -796,7 +796,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ next; mes "[Sensei Moohae]"; mes "Then your training isn't completed."; - if (Sex) + if (Sex == SEX_MALE) mes "You will not be accepted as a monk my boy."; else mes "You will not be accepted as a monk little girl."; @@ -808,7 +808,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ mes "Come back later when you're ready..."; next; mes "[Sensei Moohae]"; - if (Sex) + if (Sex == SEX_MALE) mes "I hope that you are able to realize what you are to become soon my boy..."; else mes "I hope that you are able to realize what you are to become soon my girl..."; @@ -817,13 +817,13 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ mes "[Sensei Moohae]"; mes "Then your training is complete..."; mes "Please come closer."; - if (Sex) + if (Sex == SEX_MALE) mes "We welcome you brother, in our holy battle against evil!"; else mes "We welcome you sister, in our holy battle against evil!"; next; mes "[Sensei Moohae]"; - if (Sex) + if (Sex == SEX_MALE) mes "My brother, your oath has been heard by all around us."; else mes "My sister, your oath has been heard by all around us."; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index ac5a96919..dc600a837 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -101,7 +101,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 4_F_ROGUE,{ mes "[Rogue Guildsman]"; mes "So what's a kid"; mes "like you doin' here?"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Oh, I get it now..."; mes "The widdle boy wants"; } diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index 3bd026a32..f08015193 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -52,7 +52,7 @@ morocc_in,174,30,6 script Kid#link1 4_M_KID2,{ } if (Class == Job_Star_Gladiator) { mes "[Kid]"; - if (Sex == 1) { + if (Sex == SEX_MALE) { mes "Aren't you a warrior"; mes "of the sun? I'm familiar"; } diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index 654138e10..ebe4ef8e2 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -406,7 +406,7 @@ aldeba_in,216,169,5 script Esseray#sn 4_M_04,{ aldebaran,54,238,5 script Kafra Employee#sn 4_F_KAFRA1,{ if (BaseJob == Job_SuperNovice) { mes "[Kafra Employee]"; - if (Sex ) + if (Sex == SEX_MALE) mes "Hello, Mister Super Novice~"; else mes "Hello, Super Novice, Ma'am."; diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index 6d0d1f3d5..eecdc985b 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -41,7 +41,7 @@ itemmall,19,74,5 script Stylist#cash 4_F_02,{ mes "Give me a ^FF0000New Style Coupon^000000,"; mes "and I'll change your hair~"; next; - if (Sex == 1) { + if (Sex == SEX_MALE) { mes "[Kaniki]"; mes "I have two special"; mes "hairstyles for men, the"; @@ -101,7 +101,7 @@ itemmall,19,74,5 script Stylist#cash 4_F_02,{ mes "Alright, which hairstyle"; mes "did you want to have?"; next; - if (Sex == 1) { + if (Sex == SEX_MALE) { if(select("Emergency Heal Perm", "Aura Blade Cut") == 1) { delitem New_Style_Coupon,1; // New_Style_Coupon setlook 1,24; diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index f0b20256f..431a51cab 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -89,40 +89,40 @@ function Dyes; // Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow switch(BaseJob) { case Job_Novice: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4); case Job_Swordman: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4); case Job_Mage: - if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4); + if (Sex == SEX_MALE) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4); case Job_Archer: - if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4); case Job_Acolyte: - if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4); + if (Sex == SEX_MALE) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4); case Job_Merchant: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4); case Job_Thief: - if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4); + if (Sex == SEX_MALE) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4); case Job_Knight: case Job_Crusader: - if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4); + if (Sex == SEX_MALE) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4); case Job_Priest: case Job_Monk: - if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4); + if (Sex == SEX_MALE) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4); case Job_Wizard: case Job_Sage: - if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4); + if (Sex == SEX_MALE) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4); case Job_Blacksmith: case Job_Alchemist: - if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4); + if (Sex == SEX_MALE) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4); case Job_Hunter: case Job_Bard: case Job_Dancer: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4); case Job_Assassin: case Job_Rogue: - if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3); + if (Sex == SEX_MALE) Dyes(6,1); else Dyes(4,1,8,2,7,3); case Job_SuperNovice: - if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4); + if (Sex == SEX_MALE) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4); default: mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it."; close; diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index 62916ac28..bd07727fb 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -41,15 +41,15 @@ prt_in,243,168,4 script Jovovich 4_F_02,{ mes "How may I help you?"; next; mes "[Hairdresser Jovovich]"; - if (Sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come."; - else { - if (rand(20) > 11) { - mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this."; - next; - mes "[Hairdresser Jovovich]"; - mes "Would you let me treat your hair? Please?"; - } - else mes "Wow! Your hair would be perfect once it's dyed~ How about dying your hair for a change?"; + if (Sex == SEX_MALE) { + mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come."; + } else if (rand(20) > 11) { + mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this."; + next; + mes "[Hairdresser Jovovich]"; + mes "Would you let me treat your hair? Please?"; + } else { + mes "Wow! Your hair would be perfect once it's dyed~ How about dying your hair for a change?"; } next; while(1) { @@ -176,7 +176,7 @@ S_NoDye: //== Lighthalzen =========================================== lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ mes "[Rossa]"; - if (Sex == 1) { + if (Sex == SEX_MALE) { mes "Welcome, come in~"; mes "Oh, I see that you take"; mes "much better care of your"; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index 83db489ae..f940a5982 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -73,7 +73,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "[Veronica]"; switch(.@style) { case 1: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Play Dead' style!"; mes "It's a nice, basic haircut."; mes "I notice that usually the"; @@ -89,7 +89,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "choice for Novices."; close2; cutin "",255; end; case 2: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's the 'Two Handed Sword"; mes "Mastery' style! It's perfect for"; mes "for Swordmen who might muss their"; @@ -105,7 +105,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "while wildly flailing a sword."; close2; cutin "",255; end; case 3: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Napalm Beat' style!"; mes "It's a unique look with a hint"; mes "of eccentricity that's offset"; @@ -119,7 +119,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "off the boys with their spells."; close2; cutin "",255; end; case 4: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's the 'Double Strafe'"; mes "style! The arrangement of the"; mes "hair conducts ambient static"; @@ -136,7 +136,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "granny-style hairbuns."; close2; cutin "",255; end; case 5: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Angelus' style!"; mes "It's for calm and devout people,"; mes "as well as those bashful,"; @@ -151,7 +151,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "is also practical in battle."; close2; cutin "",255; end; case 6: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Push Cart' style!"; mes "It was based on the design of a"; mes "cart...at least, that's what"; @@ -164,7 +164,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "it's also economical."; close2; cutin "",255; end; case 7: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Ooh, that's 'Envenom' style!"; mes "It looks great on Thieves and"; mes "and Assassins when they're"; @@ -180,7 +180,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "some cute guy."; close2; cutin "",255; end; case 8: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Bowling Bash' style!"; mes "A popular style for Knights, its"; mes "manly, rugged look tends to"; @@ -197,7 +197,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "to fighting with their hands."; close2; cutin "",255; end; case 9: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Venom Dust' style!"; mes "Definitely a look for rebels,"; mes "the sweeping, yet decidedly"; @@ -213,7 +213,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "...Although, it acutally doesn't."; close2; cutin "",255; end; case 10: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Turn Undead' style!"; mes "This is popular among Priests"; mes "that want a serious, yet a bit"; @@ -229,7 +229,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "make their hair to stick out anyway."; close2; cutin "",255; end; case 11: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Dragonology' style!"; mes "It's neat and clean cut, perfect"; mes "for studious people and looks"; @@ -246,7 +246,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "religious services."; close2; cutin "",255; end; case 12: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Mace Mastery' style!"; mes "A lot of care goes into making"; mes "that tussled hair say, 'I don't"; @@ -261,7 +261,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "stockings..."; close2; cutin "",255; end; case 13: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Thunder Storm' style!"; mes "This hot, flamboyant hairstyle"; mes "flares out wildly like thunder."; @@ -276,7 +276,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "that it can't be cute."; close2; cutin "",255; end; case 14: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Encore' style!"; mes "The elegant, flowing locks"; mes "fit well with Bards, or men who"; @@ -291,7 +291,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "with glasses."; close2; cutin "",255; end; case 15: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Grimtooth' style!"; mes "Spiky and unkempt, this style"; mes "is a popular counterculture"; @@ -308,7 +308,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "foreheads and cheekbones."; close2; cutin "",255; end; case 16: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Blitz Beat' style!"; mes "A funky and lively fashion,"; mes "this style was developed for a"; @@ -325,7 +325,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "lets their hair get trapped?"; close2; cutin "",255; end; case 17: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Find Ore' style!"; mes "It's a practical, economical look"; mes "that is popular among Blacksmiths."; @@ -342,7 +342,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "Blacksmith favorite."; close2; cutin "",255; end; case 18: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Fire Pillar' style!"; mes "It's a trendy look, in which"; mes "you cover one eye for that"; @@ -359,7 +359,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "looks great with Mage Hats."; close2; cutin "",255; end; case 19: - if(Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh, that's 'Guillotine Fist'"; mes "style! The smooth, slicked back"; mes "pompadour shows that you're"; @@ -529,7 +529,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ } L_cutin: - if(Sex == 1) { + if (Sex == SEX_MALE) { if(getarg(0) < 10) cutin "hair_m_0"+getarg(0),4; else @@ -725,7 +725,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ next; switch(select("Old Hairstyles", "New Hairstyles")) { case 1: - if (Sex == 1) { + if (Sex == SEX_MALE) { switch(select("Petite Style", "Executioner Style", "Prince Style", "Deviace Style", "Cancel")) { case 1: cutin "hair_m_20",4; @@ -830,7 +830,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ } break; case 2: - if (Sex == 1) { + if (Sex == SEX_MALE) { switch(select("Emergency Heal Perm", "Aura Blade Cut", "Power Swing", "Renovatio Cut", "Cancel")) { case 1: cutin "hair_m_24",4; @@ -955,7 +955,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "Here's a list of the style names just in case you need them~"; next; mes "[Prince Shammi]"; - if (Sex == 1) { + if (Sex == SEX_MALE) { mes "No. 20: Petite Style"; mes "No. 21: Executioner Style"; mes "No. 22: Prince Style"; @@ -1006,7 +1006,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ close; } else { - if (Sex == 1) + if (Sex == SEX_MALE) cutin "hair_m_"+.@input+".BMP",4; else cutin "hair_f_"+.@input+".BMP",4; @@ -1079,7 +1079,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "And my, oh my, you look even"; mes "more fabulous that I thought"; mes "you would! Oh, I can't believe"; - if (Sex == 1) { + if (Sex == SEX_MALE) { mes "how tough and elegant you are~"; mes "So ruggedly manly and handsome!"; } @@ -1221,7 +1221,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "So this is the"; mes "style you want me"; mes "to try to do for you?"; - if (Sex == 1) { + if (Sex == SEX_MALE) { if (.@input < 10) cutin "hair_m_0"+.@input+".BMP",4; else diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index 8f7899555..1e431b7d8 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -160,7 +160,10 @@ function script F_Rand { // Returns 1st argument if female, 2nd argument otherwise // Example: mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!"); function script F_SexMes { - return getarg(Sex); + if (Sex == SEX_MALE) + return getarg(0); + else + return getarg(1); } //== Function F_Hi ========================================= diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index e0535e250..dd4bad6b6 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -58,7 +58,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ if (!getpartnerid()) { mes "Bwah hah hah~!"; mes "That look in your eyes~!"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Those are definitely the eyes"; mes "of a lonely male bachelor."; mes "I'm almost 100 percent sure"; @@ -90,7 +90,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "I sense that you carry a"; mes "tiresome burden..."; mes "If I'm not wrong, you're"; - if (Sex) + if (Sex == SEX_MALE) mes "a married man, aren't you?"; else mes "a married woman, aren't you?"; @@ -113,7 +113,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "At the end of the day, you and"; mes "your partner fight, and you feel"; mes "totally totally miserable."; - if (Sex) + if (Sex == SEX_MALE) mes "...all because of HER."; else mes "...all because of HIM."; @@ -137,7 +137,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "[Deviruchi]"; mes "*whispers*"; mes "^555555It's not like you're breaking^000000"; - if (Sex) { + if (Sex == SEX_MALE) { mes "^555555any promises, and it's not"; mes "like your wife will care if she"; mes "doesn't know... Don't you"; @@ -185,7 +185,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "[Deviruchi]"; mes "I understand. But if you think"; mes "about anything, think about"; - if (Sex) { + if (Sex == SEX_MALE) { mes "your wife's nagging, and"; mes "how great it would be to"; mes "finally free yourself of the"; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 0795e2606..7522c4242 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -199,7 +199,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ case 3: cutin "wedding_marry02",2; - if (Sex) { + if (Sex == SEX_MALE) { mes "[Marry Happy]"; mes "So you'd like to get married?"; mes "As a groom, you need to prepare"; @@ -273,8 +273,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "Look for it carefully and come"; mes "back after you find it, okay?"; goto L_End; - } - else if (Sex) { + } else if (Sex == SEX_MALE) { if (Zeny < 1300000) { mes "[Marry Happy]"; mes "I'm sorry, but you don't"; @@ -294,8 +293,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "begin the wedding, okay?"; goto L_End; } - } - else if (Sex == 0) { + } else if (Sex == SEX_FEMALE) { if (Zeny < 1200000) { mes "[Marry Happy]"; mes "I'm sorry, but all brides"; @@ -359,7 +357,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ emotion e_lv; next; mes "[Marry Happy]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Since you're the groom,"; mes "you need to speak to the"; mes "Bishop first. When you're"; @@ -582,7 +580,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ getpartymember(getcharid(1)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { - if (Sex) { + if (Sex == SEX_MALE) { $@wedding = 1; initnpctimer; mes "[Vomars]"; @@ -653,7 +651,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ getpartymember(getcharid(1)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { - if (Sex == 0) { + if (Sex == SEX_FEMALE) { if (strcharinfo(0) == $@wed_bride$) { mes "[Vomars]"; mes "Young lovers, please"; @@ -893,7 +891,7 @@ prt_church,20,179,4 script Divorce Staff 1_F_LIBRARYGIRL,{ next; switch(select("Drop 1 Wedding Ring.", "Keep it.")) { case 1: - .@ring = (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring + .@ring = (Sex == SEX_MALE) ? 2634 : 2635; //Bridegroom_Ring, Bride_Ring if (countitem(.@ring)) { delitem .@ring,1; mes "[Bad Ending]"; @@ -948,7 +946,7 @@ prt_church,22,179,4 script Remarry Staff 1_F_LIBRARYGIRL,{ next; switch(select("Make new Wedding Ring.", "Cancel.")) { case 1: - .@ring = (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring + .@ring = (Sex == SEX_MALE) ? 2634 : 2635; //Bridegroom_Ring, Bride_Ring if (countitem(.@ring) || isequipped(.@ring)) { mes "[Wedding Again]"; mes "Wait, wait..."; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 86ce6daaa..4d41a22fd 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -100,7 +100,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ } if (job_magician_q == 0) { mes "Wanna be a Mage, eh...?"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, look at you! You're kinda cute~! Not my type though..."; else { mes "Oooh, you're such a hot babe~!"; @@ -245,7 +245,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ case 2: mes "[Mage Guildsman]"; mes "Wanna be a Mage, eh?"; - if (Sex) + if (Sex == SEX_MALE) mes "For a cutie like you, I'd be happy to explain the requirements!"; else mes "I'd be happy to explain the requirements for a pretty girl like you!"; diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index 8bed74c11..c36c0eeda 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -66,7 +66,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ } else { mes "[Thief Guide]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, dude."; else mes "Hey, baby~"; @@ -75,7 +75,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ } else { mes "[Thief Guide]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, dude."; else mes "Hey, baby."; 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,"; diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 8c2551a2b..7817db3b8 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -548,7 +548,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ next; } else if (.@stat & 128) { mes "- The shrine envelops you in a loving aura. -"; - if ((Sex == 0 && compare(.@wish$,.@wishes$[26])) || (Sex == 1 && compare(.@wish$,.@wishes$[27]))) + if ((Sex == SEX_FEMALE && compare(.@wish$,.@wishes$[26])) || (Sex == SEX_MALE && compare(.@wish$,.@wishes$[27]))) specialeffect2 EF_LIGHTSPHERE; next; } @@ -749,7 +749,7 @@ OnTouch: dewata,269,208,4 script Little Kid in Town#dew 4_M_DEWBOY,2,3,{ OnTouch: mes "[Kid]"; - mes "Hey "+((Sex)?"bro":"sis")+", look at that man!"; + mes "Hey "+ (Sex == SEX_MALE ? "bro" : "sis") +", look at that man!"; next; mes "[Kid]"; mes "He's been lying there for a week doin' nothin'..."; diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt index caed3f488..65afecedc 100644 --- a/npc/re/events/halloween_2014.txt +++ b/npc/re/events/halloween_2014.txt @@ -68,7 +68,7 @@ } else { if (questprogress(14450) == 2) { mes "[Mighty Priest]"; - mes ""+(Sex ? "Brother" : "Sister")+", it's good to see you again!"; + mes (Sex == SEX_MALE ? "Brother" : "Sister") +", it's good to see you again!"; mes "came here to see me because of that?"; next; mes "[Mighty Priest]"; @@ -181,13 +181,13 @@ next; mes "[Mighty Priest]"; mes "I feel much better now!"; - mes ""+(Sex ? "Brother" : "Sister")+", thank you so much for waking me up."; + mes (Sex == SEX_MALE ? "Brother" : "Sister") +", thank you so much for waking me up."; next; mes "["+strcharinfo(0)+"]"; mes "What made you so tired?"; next; mes "[Mighty Priest]"; - mes ""+(Sex ? "Brother" : "Sister")+", you didn't have any damage yet?"; + mes (Sex == SEX_MALE ? "Brother" : "Sister") +", you didn't have any damage yet?"; next; mes "["+strcharinfo(0)+"]"; mes "What happened to you?"; @@ -213,7 +213,7 @@ mes "Could you maybe help me out?"; next; mes "[Mighty Priest]"; - mes "They would not damage you at all, "+(Sex ? "brother" : "sister")+"."; + mes "They would not damage you at all, "+ (Sex == SEX_MALE ? "brother" : "sister") +"."; mes "I would also give you a reward for the trouble."; next; mes "[Mighty Priest]"; @@ -1426,7 +1426,7 @@ prt_church,96,91,4 script Spiritual Sister#14hal 1_F_PRIEST,5,5,{ } else if (questprogress(14455) == 1) { mes "[Sister Haley]"; mes "I hope all is well with everyone visiting here~"; - mes "Oh! Is it you, "+(Sex ? "brother" : "sister")+"? How is it going with the thing you need to do?"; + mes "Oh! Is it you, "+ (Sex == SEX_MALE ? "brother" : "sister") +"? How is it going with the thing you need to do?"; next; mes "["+strcharinfo(0)+"]"; mes "Well.. I could identify the live ones."; @@ -1598,7 +1598,7 @@ prt_church,96,91,4 script Spiritual Sister#14hal 1_F_PRIEST,5,5,{ } else if (questprogress(14451) == 1) { mes "[Sister Haley]"; mes "I hope all is well with everyone visiting here~"; - mes "What makes you come here, "+(Sex ? "brother" : "sister")+"?"; + mes "What makes you come here, "+ (Sex == SEX_MALE? "brother" : "sister") +"?"; next; mes "[I told her what happened in Nifflheim.]"; next; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index e9ae1c0af..3b0b1c510 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -49,7 +49,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ } if (lhz_boss > 30) { if (!lght_duk01) { - if (Sex) { + if (Sex == SEX_MALE) { emotion e_pif, "Giacomo Girolamo#kiup2"; mes "[Giacomo Girolamo]"; mes "....a guy....?"; @@ -192,7 +192,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ close; } else { mes "[Giacomo Girolamo]"; - if (Sex) { + if (Sex == SEX_MALE) { emotion e_paper, "Giacomo Girolamo#kiup2"; mes "Take care yourself and don't disappear!"; } else { @@ -202,7 +202,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ close; } } else { - if (Sex) { + if (Sex == SEX_MALE) { emotion e_ho, "Giacomo Girolamo#kiup2"; mes "[Giacomo Girolamo]"; mes "Only those beautiful ladies are the reason of my life~!"; @@ -314,7 +314,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ OnTouch: if (!lght_duk01) - emotion (Sex ? e_pif : e_lv2), "Giacomo Girolamo#kiup2"; + emotion (Sex == SEX_MALE? e_pif : e_lv2), "Giacomo Girolamo#kiup2"; end; } diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index 28bf9e3c3..55107fd00 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -93,7 +93,7 @@ geffen_in,164,124,4 script Mage Guildsman#mage 2_F_MAGICMASTER,{ mes "Wanna be a Mage? Eh..."; next; mes "[Mage Guildsman]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Hey, look at you! You're kinda cute~! Not my type though..."; }else{ mes "Oooh, you're such a hot babe~!"; diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index 61533f380..5e2da345c 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -63,7 +63,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ close; }else{ mes "[Thief Guide]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, dude."; else mes "Hey, baby~"; @@ -71,7 +71,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ } }else{ mes "[Thief Guide]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, dude."; else mes "Hey, baby."; @@ -81,7 +81,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ } if(q_job_thief == 1) { mes "[Thief Guildsman]"; - mes "Ehh... Seems like a beloved "+(Sex?"son":"daughter")+" of a rich family, but why are you here in this dirty place?"; + mes "Ehh... Seems like a beloved "+ (Sex == SEX_MALE ? "son" : "daughter") +" of a rich family, but why are you here in this dirty place?"; next; mes "[Thief Guildsman]"; mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?"; @@ -96,7 +96,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ }else{ mes "[Thief Guildsman]"; mes "What the heck...?"; - if(Sex) { + if (Sex == SEX_MALE) { mes "Huh.. you are a "+jobname(Class)+" you blockhead...!"; next; mes "[Thief Guildsman]"; @@ -111,7 +111,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ } } mes "[Thief Guildsman]"; - mes "Ehh... Seems like a beloved "+(Sex?"son":"daughter")+" of a rich family, but why are you here in this dirty place?"; + mes "Ehh... Seems like a beloved "+ (Sex == SEX_MALE ? "son" : "daughter") +" of a rich family, but why are you here in this dirty place?"; next; if(select("I want to be a Thief.", "Nothing.") == 2) { mes "[Thief Guildsman]"; diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index f8b7803e5..7d166b75a 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -279,7 +279,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "Sorry I am not a teacher. But!"; next; mes "[Guide Gion]"; - mes "I can help you on the path you've chosen, the ^33CC71"+((Sex)?"Kagerou":"Oboro")+"^000000 path."; + mes "I can help you on the path you've chosen, the ^33CC71"+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^000000 path."; next; mes "^1A95E6You hear Guide Gion's voice faintly as you slip away.^1A95E6"; next; @@ -287,14 +287,14 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ setquest 5134; set job_kagero,4; mes "[Guide Gion]"; - mes "If you are prepared to follow me, Guide Gion, on the "+((Sex)?"Kagerou":"Oboro")+" path, we will meet again."; + mes "If you are prepared to follow me, Guide Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; close2; warp "amatsu",147,136; end; } else if (job_kagero == 4) { cutin "job_ko02",2; mes "[Guide Gion]"; - mes "I thought you were afraid of the ^33CC71path of the "+((Sex)?"Kagerou":"Oboro")+"^33CC71 and wouldn't come back."; + mes "I thought you were afraid of the ^33CC71path of the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^33CC71 and wouldn't come back."; next; mes "[Guide Gion]"; mes "But from the look of your eyes, I guess I misjudged you."; @@ -684,7 +684,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "And if you are lucky, there will be others targeting the monster."; next; mes "[Guide Gion]"; - mes "May the blessings of '" + ((Sex)?"Kagerou, dancing sun":"Oboro, misty moonlight") + "' be with you."; + mes "May the blessings of '" + (Sex == SEX_MALE ? "Kagerou, dancing sun" : "Oboro, misty moonlight") + "' be with you."; next; setquest 5146; set job_kagero,7; @@ -2555,9 +2555,9 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ mes "[Guide Gion]"; mes "The Test of Battle will be put off for a while. Don't worry because this does not have affect to other tests."; next; - mapannounce "job_ko","[Gion] My Friend " + strcharinfo(0) + " made it to " + ((Sex)?"Kagerou":"Oboro") + " Path. Congratulations!!",bc_map; + mapannounce "job_ko","[Gion] My Friend " + strcharinfo(0) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!",bc_map; mes "[Guide Gion]"; - mes "My friend " + strcharinfo(0) + " made it to " + ((Sex)?"Kagerou":"Oboro") + " Path. Congratulations!!"; + mes "My friend " + strcharinfo(0) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!"; next; cutin "job_ko02",2; mes "[Guide Gion]"; @@ -2621,7 +2621,7 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ if (questprogress(.@i)) erasequest .@i; set job_kagero,9; getnameditem .@item,strcharinfo(0); - jobchange (Sex)?Job_Kagerou:Job_Oboro; + jobchange(Sex == SEX_MALE ? Job_Kagerou : Job_Oboro); donpcevent "Summon Target#ko::OnEnable"; mes "[Guide Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 03dc40319..addcc0346 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -79,7 +79,7 @@ prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{ mes "All ministers of Odin should be diligent. They should never be too lazy to serve Odin."; next; mes "[Praying Minister]"; - mes (Sex?"Brother":"Sister")+", how has your life been? Have you lived it to its fullest?"; + mes (Sex == SEX_MALE ? "Brother" : "Sister") +", how has your life been? Have you lived it to its fullest?"; mes "Have you served your life in the light of Odin?"; next; mes "[Praying Minister]"; @@ -91,7 +91,7 @@ prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{ mes "We should not fall prey to lies and deceit."; next; mes "[Praying Minister]"; - mes (Sex?"Brother":"Sister")+"..."; + mes (Sex == SEX_MALE ? "Brother" : "Sister") +"..."; mes "Even though we serve Odin, we are normal people."; mes "We can be degraded in spite of ourselves and we must realize that."; next; @@ -232,7 +232,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "[Priest Dayan]"; mes "Ah~, yes."; mes "Yes, I am."; - mes "I'm Dayan. Nice to meet you "+(Sex?"Brother.":"Sister."); + mes "I'm Dayan. Nice to meet you "+ (Sex == SEX_MALE ? "Brother." : "Sister."); next; mes "The old priest gives you an ear to ear grin. "; next; @@ -269,7 +269,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "Eh... are you?"; mes "A pilgrimage to the Holy Land..."; mes "It has been a long time since I've seen such a devout minister."; - mes "Welcome. "+(Sex?"Brother.":"Sister."); + mes "Welcome. "+ (Sex == SEX_MALE ? "Brother." : "Sister."); next; mes "The old priest gives you a gracious smile."; next; @@ -293,7 +293,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "Mimir's spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring."; next; mes "[Priest Dayan]"; - mes Sex?"Brother.":"Sister."; + mes Sex == SEX_MALE ? "Brother." : "Sister."; mes "Through the Holy Pilgrimage, we can make ourselves pious by cleansing our bodies and souls."; next; mes "[Priest Dayan]"; @@ -395,7 +395,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "Thanks for your kind words."; next; mes "[Priest Dayan]"; - mes Sex?"Brother.":"Sister."; + mes Sex == SEX_MALE ? "Brother." : "Sister."; mes "Now, there is a place you should go to."; next; mes "[Priest Dayan]"; @@ -415,7 +415,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ next; mes "[Priest Dayan]"; mes "Thank you very much."; - mes "Feel free to visit here when you want to pray, "+(Sex?"brother.":"sister."); + mes "Feel free to visit here when you want to pray, "+ (Sex == SEX_MALE ? "brother." : "sister."); mes "A visit from a friend always makes me happy."; job_arch = 4; changequest 2188,2189; @@ -599,7 +599,7 @@ hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{ mes "[Vinue]"; mes "Ah, Welcome."; mes "It's not time to have a service yet..."; - mes "Are you here to pray, "+(Sex?"brother":"sister")+"?"; + mes "Are you here to pray, "+ (Sex == SEX_MALE ? "brother" : "sister") +"?"; next; mes "[" + strcharinfo(0) + "]"; mes "I came here to say hello from Priest Dayan from Prontera."; @@ -618,7 +618,7 @@ hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{ next; mes "[Vinue]"; mes "Ah..."; - mes "He's very kind. As are you "+(Sex?"brother":"sister")+"."; + mes "He's very kind. As are you "+ (Sex == SEX_MALE ? "brother" : "sister") +"."; next; mes "[Vinue]"; mes "But don't worry."; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index c2796526b..a29961eca 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -257,7 +257,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "[Daora]"; if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) { if (job_3rd_gc < 4) { - if (Sex) { + if (Sex == SEX_MALE) { mes "Oh~ you're good-looking!"; mes "So, what do you want?"; } else { @@ -755,7 +755,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) { - if (Sex) { + if (Sex == SEX_MALE) { mes "Oh~ you're good-looking~!"; mes "It's worthwhile to open a pub~"; mes "I can feel fruitful labors whenever I see a guy like you~"; @@ -788,7 +788,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; case 3: mes "[Daora]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Uh... Umm..."; mes "It's complicated order. but I don't have any choice since you want it."; next; @@ -813,7 +813,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ } } } else { - if (Sex == 1) { + if (Sex == SEX_MALE) { mes "Oh~ you're good-looking!"; mes "So, what do you want?"; } @@ -1218,8 +1218,10 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ mes "What? My name?"; mes "Are you hitting on me?"; mes "Don't do that."; - if (Sex) mes "You are not my type."; - else mes "I don't swing that way."; + if (Sex == SEX_MALE) + mes "You are not my type."; + else + mes "I don't swing that way."; close; case 3: mes "[Waitress]"; @@ -2025,7 +2027,7 @@ veins,223,180,3 script Girl#3rdgc09 4_F_DST_CHILD,{ } next; mes "[Melissa]"; - mes "Hi, "+((Sex)?"brother":"sister")+"~ Let me collect all of the information you've provided..."; + mes "Hi, "+ (Sex == SEX_MALE ? "brother" : "sister")+ "~ Let me collect all of the information you've provided..."; next; mes "- She begins to murmur and gestures toward the sky. Her hair springs up as she says... -"; next; diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 10495572e..4dcc98448 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -95,7 +95,7 @@ yuno,129,156,3 script Chainheart 4_M_DOCTOR,{ next; job__mechanic = 12; completequest 10101; - if (Sex) + if (Sex == SEX_MALE) getitem Driver_Band,1; else getitem Driver_Band_,1; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 758eeb110..949e6973d 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -5751,7 +5751,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes "[Otter Samssoon]"; switch(.@style) { case 1: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Play Dead' cut?"; mes "This looks neat and relaxed.. So popular style."; } else { @@ -5761,7 +5761,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 2: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Two Handed Sword Mastery' cut?"; mes "You... You know the famous D..? He has exactly the same style!"; } else { @@ -5770,7 +5770,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 3: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Napalm Beat' cut?"; mes "It has well arranges hair line that makes feel charisma."; } else { @@ -5779,7 +5779,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 4: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Double Strafe' cut?"; mes "Natural hair is shaking by wind.. Clean and good feeling."; } else { @@ -5788,7 +5788,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 5: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Angelus' cut?"; mes "Calm and piety feeling.. Not boring style."; } else { @@ -5797,7 +5797,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 6: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Push Cart' cut?"; mes "Big Kar is motivated for this style with a romance of a man."; } else { @@ -5806,7 +5806,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 7: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Envenom' cut?"; mes "Tough style makes addicted."; } else { @@ -5816,7 +5816,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 8: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Bowling Bash' cut?"; mes "This style makes a nice guy to challenge."; mes "Just a giving a glance can steal the heart."; @@ -5826,7 +5826,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 9: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Venom Dust' cut?"; mes "This style has special ending line that looks fatal."; } else { @@ -5835,7 +5835,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 10: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Turn Undead' cut?"; mes "This style is like a cold city man who is strong enough to kill a monster."; } else { @@ -5844,7 +5844,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 11: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Dragonology' cut?"; mes "This style is intelligent style of mysterious dragon."; } else { @@ -5853,7 +5853,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 12: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Mace Mastery' cut?"; mes "Look fresh and look neat with wax treatment."; } else { @@ -5862,7 +5862,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 13: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Thunder Storm' cut?"; mes "This style has natural attractive perm which is like hitting by thunder storm."; } else { @@ -5871,7 +5871,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 14: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Encore' cut?"; mes "Rocker's favorite style.. Even the name itself.."; } else { @@ -5880,7 +5880,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 15: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Grimtooth' cut?"; mes "The style with edge."; } else { @@ -5890,7 +5890,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 16: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Blitz Beat' cut?"; mes "It is the style my senior invented after he broke up with his girlfriends 5 times."; } else { @@ -5899,7 +5899,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 17: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Find Ore' cut?"; mes "This style seems to bring encounter or find unexpected things while walking on the street."; } else { @@ -5908,7 +5908,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 18: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Fire Pillar' cut?"; mes "Everyone used to have this hair style.. Which means that was a trend of an era."; } else { @@ -5917,7 +5917,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } break; case 19: - if(Sex) { + if (Sex == SEX_MALE) { mes "Oh my!!? 'Guillotine Fist'"; mes "It is like one-shot style.. Like a real man. Right?"; } else { @@ -6056,7 +6056,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } L_cutin: - if(Sex) { + if (Sex == SEX_MALE) { if(getarg(0) < 10) cutin "hair_m_0"+getarg(0),4; else @@ -7144,7 +7144,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{ mes "You're so cute! A ^ff0000Gunslinger^000000 who has true grit wield his weapons bringing justice in these wild times."; next; mes "[Lusa]"; - if (Sex == 1) + if (Sex == SEX_MALE) mes "Ya, know you remind me of my little brother, that varmint couldn't shoot the broadside of a barn.. at least not until I taught him."; else mes "Ya, know you remind me of my little sister, that scamp couldn't shoot the broadside of barn.. At least not until I taught her."; @@ -8186,7 +8186,7 @@ iz_ac02,70,85,5 script Arang#ac 4_F_TAEKWON,{ if (JobLevel >= 10) { cutin "arang01.bmp", 0; mes "[Arang]"; - mes "It's time to choose your job? How about Taekwon "+(Sex ? "boy" : "girl")+"? You may be a nice adult like me."; + mes "It's time to choose your job? How about Taekwon "+ (Sex == SEX_MALE ? "boy" : "girl") +"? You may be a nice adult like me."; next; } while (1) { diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 5ee7cb695..56d70a140 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -681,8 +681,10 @@ airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ } next; mes "[Nudor]"; - if (Sex) mes "Did you know? You're really handsome~"; - else mes "I need to tell you, you are really... really~ beautiful."; + if (Sex == SEX_MALE) + mes "Did you know? You're really handsome~"; + else + mes "I need to tell you, you are really... really~ beautiful."; next; mes "[Nudor]"; mes "- You feel like you're being -"; diff --git a/npc/re/quests/eden/100-110.txt b/npc/re/quests/eden/100-110.txt index 6f606b728..0cbcb610b 100644 --- a/npc/re/quests/eden/100-110.txt +++ b/npc/re/quests/eden/100-110.txt @@ -720,7 +720,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ emotion e_heh; break; case 2: - if (Sex == 1) + if (Sex == SEX_MALE) mes "I'm not sure if I'm cut out for that job. Besides..."; else mes "I am sorry to say this but I am the only pupil of master now and forever... He said ^FF0000I don't need an ugly female pupil^000000 but I still stick to him."; diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index 460666f12..a78427f12 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -1696,7 +1696,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ } if (dew_weapon == 0) { mes "[Gatti]"; - mes "Hey there, young "+((Sex)?"man":"lady")+"~ Are you from around here?"; + mes "Hey there, young "+ (Sex == SEX_MALE ? "man" : "lady") +"~ Are you from around here?"; next; select("No, I'm not."); mes "[Gatti]"; @@ -1812,7 +1812,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ end; } mes "[Gatti]"; - if(Sex == 0) + if (Sex == SEX_FEMALE) mes "Lady, you possess a strong energy."; else mes "You possess a strong energy."; @@ -1857,7 +1857,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ next; mes "[Gatti]"; mes "Oh yes! Finally."; - if (Sex == 0) + if (Sex == SEX_FEMALE) mes "Lady, you also possess a strong energy."; else mes "You also possess a strong energy."; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 3b3ad4ee1..562d205d3 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -1335,7 +1335,7 @@ OnTouch: mes "Hold up your head and come closer."; mes "Conversations are meant to have with eye contact."; next; - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),1; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),1; mes "You hold up your head at the sound of Ahat's voice"; mes "But you see a human in high-ranking Sapha clothing in front of you."; sc_end SC_BLIND; @@ -1375,7 +1375,7 @@ dic_in01,294,276,5 script Secret Adjutant#ep133_2 4_M_CATMAN2,{ mes ".. Hey, what are you talking about?"; mes "What do you want to say?"; next; - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "" + strcharinfo(0) + "...."; mes "All you need to do is follow Cheshire's orders."; @@ -1540,7 +1540,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ mes "Hold up your head and come closer."; mes "Conversations are meant to have with eye contact."; next; - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "You hold up your head at the sound of Ahat's voice"; mes "But you see a human in high-ranking Sapha clothing in front of you."; sc_end SC_BLIND; @@ -1550,7 +1550,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ close2; } else if (ep13_3_secret == 14) { - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "Surprised?"; mes "Because I look like a human just like you?"; @@ -1689,7 +1689,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ close2; } else if (ep13_3_secret == 15) { - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "My loyal evil servant."; mes "Come closer."; @@ -1740,7 +1740,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ close2; } else if (ep13_3_secret == 16) { - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "You must follow Cheshire's orders from now on."; mes "Go now."; @@ -1750,7 +1750,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ close2; } else if (ep13_3_secret == 17) { - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "Cheshire's orders are important for future plans."; mes "Make no mistakes and never leave traces that may lead to me."; @@ -1758,7 +1758,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ close2; } else if (ep13_3_secret == 18) { - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "Do you have something to say?"; mes "You've done well in the crack area."; @@ -1787,7 +1787,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ close2; } else { - cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; + cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2; mes "[Ahat]"; mes "Follow Cheshire's orders for the time being and clear the area nearby the crack."; next; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 313e30595..79fbcd4b0 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -5128,10 +5128,10 @@ OnTouch: mes "who robbed our house."; next; mes "[Mother Rosa]"; - mes "How can you believe what "+((!Sex)?"s":"")+"he's saying?"; - mes "How do you know "+((!Sex)?"s":"")+"he's not lying"; - mes "after robbing our stuff "+((!Sex)?"her":"him")+"self?"; - mes "Search "+((!Sex)?"her":"his")+" possessions immediately!!"; + mes "How can you believe what "+ (Sex == SEX_FEMALE ? "she's" : "he's")+ " saying?"; + mes "How do you know "+ (Sex == SEX_FEMALE ? "she's" : "he's") +" not lying"; + mes "after robbing our stuff "+ (Sex == SEX_FEMALE ? "herself" : "himself") +"?"; + mes "Search "+ (Sex == SEX_FEMALE ? "her" : "his") +" possessions immediately!!"; next; mes "[Father Dames]"; mes "No, how could you say such things?"; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index e37336619..54b2a00c0 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -6635,7 +6635,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "I should remember it and"; mes "tell it to my kids. Heh~"; next; - if (Sex == 0) + if (Sex == SEX_FEMALE) setarray .@sex$[0],"Mr.","boy"; else setarray .@sex$[0],"Miss","girl"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 00fe70246..fa19f3be9 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -3174,7 +3174,7 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ next; mes "[Little Kid]"; mes "Why~ Do I always go in circles here?"; - mes "Do you why, " + ((Sex) ? "mister" : "ma'am") + "?"; + mes "Do you why, " + (Sex == SEX_MALE ? "mister" : "ma'am") + "?"; mes "What's with this road?"; mes "Is somebody trying to trick me?"; close; @@ -4223,11 +4223,11 @@ ma_in01,47,101,3 script Totoy#buwaya 4_M_BARYO_BOY,7,7,{ mes "[Totoy]"; mes "Um... hey!"; next; - select("You are a " + ((Sex) ? "boy" : "girl") + ", aren't you?"); + select("You are a " + (Sex == SEX_MALE ? "boy" : "girl") + ", aren't you?"); emotion e_omg,1; mes "[Totoy]"; mes "Huh?"; - if (!Sex) { + if (Sex == SEX_FEMALE) { mes "Totoy is a girl, and you are a boy."; mes "You're not a boy?"; } else { @@ -4377,7 +4377,10 @@ malaya,290,152,5 script Master of Hunting#buwaya 4_M_BARYO_MAN,{ mes "Try collecting 10 Animal Samples from where the kid saw the monster. I will look for traces of that monster from the samples."; next; mes "[Master of Hunting]"; - mes (Sex) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!"; + if (Sex == SEX_MALE) + mes "It won't be pleasant but any brave man could easily do it, don't you agree?"; + else + mes "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!"; malaya_buwaya = 7; erasequest 2273; setquest 2274; @@ -4401,7 +4404,10 @@ malaya,290,152,5 script Master of Hunting#buwaya 4_M_BARYO_MAN,{ mes "Try collecting 10 Animal Samples from where the kid saw the monster. I will look for traces of that monster from the samples."; next; mes "[Master of Hunting]"; - mes (Sex) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!"; + if (Sex == SEX_MALE) + mes "It won't be pleasant but any brave man could easily do it, don't you agree?"; + else + mes "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!"; malaya_buwaya = 7; erasequest 2273; setquest 2274; @@ -7271,7 +7277,7 @@ malaya,55,72,4 script Nurse#ma_n1 4_F_NURSE,{ emotion e_what; next; mes "[???]"; - mes "Hey "+((Sex)?"dude":"missy")+","; + mes "Hey "+ (Sex == SEX_MALE ? "dude" : "missy") +","; mes "You're not getting in the hospital."; next; mes "["+strcharinfo(0)+"]"; @@ -7816,7 +7822,7 @@ malaya,53,68,4 script Bushes#ma CLEAR_NPC,{ if (malaya_bang == 13) { mes "[???]"; mes "Don't come any closer!"; - mes "Old "+((Sex)?"man":"lady")+"!"; + mes "Old "+ (Sex == SEX_MALE ? "man" : "lady") +"!"; mes "How'd you know I was here?"; emotion e_omg; next; @@ -7900,7 +7906,7 @@ malaya,53,68,4 script Bushes#ma CLEAR_NPC,{ } else if (malaya_bang == 15) { mes "[???]"; mes "Don't come any closer!"; - mes "Old "+((Sex)?"man":"lady")+"!"; + mes "Old "+ (Sex == SEX_MALE ? "man" : "lady") +"!"; mes "How'd you know I was here?"; emotion e_omg; next; @@ -8520,7 +8526,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 4_M_BARYO_BOY,{ mes "Sigh... We are still short of materials to start the '^7A96E0Pintados Festival^000000'."; close; case 3: - .@str$ = (Sex)?"Bro":"Sis"; + .@str$ = (Sex == SEX_MALE ? "Bro" : "Sis"); break; } emotion e_lv; |