summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/cities/dewata.txt4
-rw-r--r--npc/re/events/halloween_2014.txt12
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt8
-rw-r--r--npc/re/jobs/1-1/mage.txt2
-rw-r--r--npc/re/jobs/1-1/thief.txt10
-rw-r--r--npc/re/jobs/2e/kagerou_oboro.txt14
-rw-r--r--npc/re/jobs/3-1/archbishop.txt18
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt16
-rw-r--r--npc/re/jobs/3-1/mechanic.txt2
-rw-r--r--npc/re/jobs/novice/academy.txt44
-rw-r--r--npc/re/jobs/novice/supernovice_ex.txt6
-rw-r--r--npc/re/quests/eden/100-110.txt2
-rw-r--r--npc/re/quests/quests_dewata.txt6
-rw-r--r--npc/re/quests/quests_dicastes.txt18
-rw-r--r--npc/re/quests/quests_eclage.txt8
-rw-r--r--npc/re/quests/quests_malangdo.txt2
-rw-r--r--npc/re/quests/quests_malaya.txt24
17 files changed, 103 insertions, 93 deletions
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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 13:29:44 +0000