summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/2-2')
-rw-r--r--npc/jobs/2-2/alchemist.txt2
-rw-r--r--npc/jobs/2-2/bard.txt10
-rw-r--r--npc/jobs/2-2/crusader.txt18
-rw-r--r--npc/jobs/2-2/dancer.txt5
-rw-r--r--npc/jobs/2-2/monk.txt10
-rw-r--r--npc/jobs/2-2/rogue.txt2
6 files changed, 27 insertions, 20 deletions
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";
}