summaryrefslogtreecommitdiff
path: root/npc/re/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/quests')
-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
6 files changed, 33 insertions, 27 deletions
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-12-26 03:16:33 +0000