summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs/3-1')
-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
3 files changed, 19 insertions, 17 deletions
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;