summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-1/archbishop.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs/3-1/archbishop.txt')
-rw-r--r--npc/re/jobs/3-1/archbishop.txt40
1 files changed, 20 insertions, 20 deletions
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index ee8a3872f..addcc0346 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -64,7 +64,7 @@ prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{
mes "I'm going to make them ministers worthy of serving Odin.";
close;
}
- if ((BaseLevel == 99) && (JobLevel > 49)) {
+ if ((BaseLevel >= 99) && (JobLevel > 49)) {
if (job_arch == 0) {
if (SkillPoint) {
mes "You can't change jobs without using all your skill points. Please use all of your skill points before applying to change jobs~";
@@ -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;
@@ -115,7 +115,7 @@ prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{
mes "What do you think?";
mes "Would you like to do a Holy Pilgrimage?";
next;
- switch(select("Yes I want to.:I'll think about it.")) {
+ switch(select("Yes I want to.", "I'll think about it.")) {
case 1:
mes "[Praying Minister]";
mes "That's the correct attitude.";
@@ -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]";
@@ -328,7 +328,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{
mes "This place is the holiest place in the world, Yggdrasil.";
mes "This holy ceremony will brighten your soul.";
next;
- switch(select("How should I pray?:Cancel.")) {
+ switch(select("How should I pray?", "Cancel.")) {
case 1:
mes "[Priest Dayan]";
mes "Through prayer, we can follow four paths.";
@@ -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;
@@ -442,7 +442,7 @@ OnTouch:
mes "[" + strcharinfo(0) + "]";
mes "Hmm... What is the first way?";
next;
- switch(select("The way of silence.:The way of confession.:The way of meditation.")) {
+ switch(select("The way of silence.", "The way of confession.", "The way of meditation.")) {
case 1:
mes "[" + strcharinfo(0) + "]";
mes "The way of silence...?";
@@ -589,7 +589,7 @@ hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{
if (job_arch == 4) {
mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
next;
- if(select("Talk to her.:Stay Quiet.") == 2) {
+ if(select("Talk to her.", "Stay Quiet.") == 2) {
mes "- You don't feel like disturbing her -";
close;
}
@@ -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.";
@@ -628,7 +628,7 @@ hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{
mes "Evil is always watching for our souls.";
mes "If you are indifferent to praying, it never misses an opportunity.";
next;
- if(select("A dream? What kind of dream?:Your soul should be fine.") == 2) {
+ if(select("A dream? What kind of dream?", "Your soul should be fine.") == 2) {
mes "[Vinue]";
mes "Oh but that's where you're wrong.";
mes "My soul may be the most at risk.";
@@ -686,7 +686,7 @@ hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{
mes "I don't have any way to find out.";
mes "I don't have a method, so I just pray.";
next;
- if(select("I'll investgate for you.:I'll pray with you.") == 2) {
+ if(select("I'll investgate for you.", "I'll pray with you.") == 2) {
mes "[Vinue]";
mes "Thank you.";
mes "I'll pray that the darkness stays away.";
@@ -745,7 +745,7 @@ odin_tem02,281,275,3 script Valkyrie Illusion#arch 4_F_VALKYRIE2,{
if ((job_arch > 4) && (job_arch < 100)) {
mes "You can see Valkyrie who has a despairing face.";
next;
- switch(select("Touch Valkyrie's Illusion.:Turn away.")) {
+ switch(select("Touch Valkyrie's Illusion.", "Turn away.")) {
case 1:
mes "You lose your consciousness while getting a closer view of Valkyrie's Illusion.";
close2;
@@ -775,7 +775,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{
mes "- and come for the challenge again. -";
close;
}
- if ((BaseLevel != 99) || (JobLevel < 50) || (BaseJob != Job_Priest)) {
+ if ((BaseLevel < 99) || (JobLevel < 50) || (BaseJob != Job_Priest)) {
warp "odin_tem02",282,263;
end;
}
@@ -840,7 +840,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{
mes "[Valkyrie Anguhilde]";
mes "Human, answer me. Are you here to sincerely help me?";
next;
- if(select("Yes:No") == 2) {
+ if(select("Yes", "No") == 2) {
mes "[Valkyrie Anguhilde]";
mes "I knew that I couldn't trust a human!";
close2;
@@ -1666,7 +1666,7 @@ job3_arch01,1,1,1 script control#arch CLEAR_NPC,{
mes $@archbs + ".";
mes "Do you want to change it?";
next;
- switch(select("0:1")) {
+ switch(select("0", "1")) {
case 1:
$@archbs = 0;
hideoffnpc "Valkyrie#arch";