diff options
Diffstat (limited to 'npc/pre-re/jobs/1-1')
-rw-r--r-- | npc/pre-re/jobs/1-1/acolyte.txt | 18 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/archer.txt | 2 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/mage.txt | 4 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/merchant.txt | 10 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/swordman.txt | 10 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/thief.txt | 10 |
6 files changed, 27 insertions, 27 deletions
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 60726edb5..e6ad187e5 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -106,7 +106,7 @@ prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ next; if (select("Yes Father, I do.", "Nope, I lied.") == 1) { mes "[Father Mareusis]"; - mes "Good. I accept " + strcharinfo(0) + "'s will to become an Acolyte. You understand that you must do penance before you can become a servant of God, right?"; + mes "Good. I accept " + strcharinfo(PC_NAME) + "'s will to become an Acolyte. You understand that you must do penance before you can become a servant of God, right?"; next; mes "[Father Mareusis]"; mes "Well, I will"; @@ -269,7 +269,7 @@ prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{ mes "Oh...? You must be the one who aspires to become an Acolyte. I've already received news from the Sanctuary that you might be coming."; next; mes "[Father Rubalkabara]"; - mes "Now, your name was " + strcharinfo(0) + ", right? Excellent, thank you for visiting me."; + mes "Now, your name was " + strcharinfo(PC_NAME) + ", right? Excellent, thank you for visiting me."; next; mes "[Father Rubalkabara]"; mes "I believe you've been told much about Acolytes from Friar Mareusis. Plus, there's plenty of helpful people in the Prontera Sanctuary."; @@ -297,7 +297,7 @@ prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{ mes "Let's see..."; next; mes "[Father Rubalkabara]"; - mes "Your name is " + strcharinfo(0) + "?"; + mes "Your name is " + strcharinfo(PC_NAME) + "?"; mes "I don't think your name"; mes "is on my list. Hmmm..."; next; @@ -346,10 +346,10 @@ moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{ mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you."; next; mes "[Mother Mathilda]"; - mes "What is your name? " + strcharinfo(0) + "? Let's see... Ah, you're on my list."; + mes "What is your name? " + strcharinfo(PC_NAME) + "? Let's see... Ah, you're on my list."; next; mes "[Mother Mathilda]"; - mes "I will send a message to the Sanctuary confirming that you, " + strcharinfo(0) + " visited me and completed your penance."; + mes "I will send a message to the Sanctuary confirming that you, " + strcharinfo(PC_NAME) + " visited me and completed your penance."; next; mes "[Mother Mathilda]"; mes "Please return to the Prontera Sanctuary and speak to the Priest in charge."; @@ -366,7 +366,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{ next; mes "[Mother Mathilda]"; mes "Now, what is your name?"; - mes "" + strcharinfo(0) + "? Let's see..."; + mes "" + strcharinfo(PC_NAME) + "? Let's see..."; next; mes "[Mother Mathilda]"; mes "Hmm..."; @@ -423,10 +423,10 @@ prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{ mes "So what's your name?"; next; mes "[Father Yosuke]"; - mes "" + strcharinfo(0) + ", huh?"; + mes "" + strcharinfo(PC_NAME) + ", huh?"; next; mes "[Father Yosuke]"; - mes "Okay. I'll send a message to the Sanctuary that you, " + strcharinfo(0) + ", came to visit me."; + mes "Okay. I'll send a message to the Sanctuary that you, " + strcharinfo(PC_NAME) + ", came to visit me."; next; mes "[Father Yosuke]"; mes "Now go back to the Santuary and finish becoming an Acolyte, kid."; @@ -443,7 +443,7 @@ prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{ mes "Not bad at all, you've made it all the way here from Prontera. So what's your name, kid?"; next; mes "[Father Yosuke]"; - mes "" + strcharinfo(0) + ", huh? Why isn't your name on my list?"; + mes "" + strcharinfo(PC_NAME) + ", huh? Why isn't your name on my list?"; next; mes "[Father Yosuke]"; mes "You probably made a mistake. Go back to the Santuary, and check with the Bishop."; diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 49616260a..fc8bf42c4 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -134,7 +134,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ close; } mes "[Archer Guildsman]"; - mes "Are you..." + strcharinfo(0) + "?"; + mes "Are you..." + strcharinfo(PC_NAME) + "?"; next; if (getskilllv("NV_BASIC") < 9) { mes "[Archer Guildsman]"; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 4d41a22fd..3d1bfe4fc 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -112,7 +112,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ next; if (select("Sign Up.", "Quit.") == 1) { mes "[Mage Guildsman]"; - mes "Okay. Sign right there. Oh, you're very good at spelling. Alright. So your name is... " + strcharinfo(0) + "."; + mes "Okay. Sign right there. Oh, you're very good at spelling. Alright. So your name is... " + strcharinfo(PC_NAME) + "."; next; mes "[Mage Guildsman]"; mes "Now it's time for"; @@ -159,7 +159,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ mes "Go back and reach Novice Job level 9 first. Don't forget that you also have to learn all of the Basic Skills before you come back."; close; } - mes "" + strcharinfo(0) + "'s test was..."; + mes "" + strcharinfo(PC_NAME) + "'s test was..."; if (job_magician_q == 1) mes "Making Mixed Solution No. 1."; else if (job_magician_q == 2) diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 8319e6e30..1acad9ea3 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -106,7 +106,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ else if (job_merchant_q == 9) { mes "[Chief Mahnsoo]"; mes "Hello there,"; - mes ""+ strcharinfo(0) +"."; + mes ""+ strcharinfo(PC_NAME) +"."; job_merchant_q = 0; job_merchant_q2 = 0; quest_alb_01 = 0; @@ -119,7 +119,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ else if (job_merchant_q == 8 || job_merchant_q == 7) { mes "[Chief Mahnsoo]"; mes "Hello there,"; - mes ""+ strcharinfo(0) +"."; + mes ""+ strcharinfo(PC_NAME) +"."; mes "I'm pleased to tell you"; mes "that I have good news!"; next; @@ -335,7 +335,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ next; mes "[Chief Mahnsoo]"; mes "Hmm... "; - mes "" + strcharinfo(0) + "..."; + mes "" + strcharinfo(PC_NAME) + "..."; mes "That's a nice name."; next; mes "[Chief Mahnsoo]"; @@ -543,7 +543,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ } else if (job_merchant_q == 6 || job_merchant_q == 5) { mes " [Union Staff Kay] "; - mes "Oh, yeah? Okay, lemme check. Your name is " + strcharinfo(0) + "? Alright, your destination was..."; + mes "Oh, yeah? Okay, lemme check. Your name is " + strcharinfo(PC_NAME) + "? Alright, your destination was..."; next; mes "[Union Staff Kay]"; if (job_merchant_q2 == 1 || job_merchant_q2 == 2) @@ -680,7 +680,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "Alright."; mes "So what's"; mes "your name?"; - mes "" + strcharinfo(0) + "...?"; + mes "" + strcharinfo(PC_NAME) + "...?"; next; if (job_merchant_q == 0) { mes "[Union Staff Kay]"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index d3f230921..bedd7b622 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -319,7 +319,7 @@ job_sword1,230,204,2 script Test Hall Staff#2swd_3 8W_SOLDIER,{ callfunc "F_JobSwdStaff",1; } job_sword1,223,167,2 script Mae#swd_1_success 4_F_03,{ - mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map; + mapannounce "job_sword1","Applicant " + strcharinfo(PC_NAME) + ". You successfully passed the test.",bc_map; job_sword_q = 4; mes "[Mae]"; mes "I sencerely congratulate you for passing the test!"; @@ -342,7 +342,7 @@ function script F_JobSwdStaff { mes "Do you surrender?"; next; if (select("Yes.", "No.") == 1) { - mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test.",bc_map; + mapannounce "job_sword1","Applicant " + strcharinfo(PC_NAME) + " quit the test.",bc_map; warp "izlude_in",65,165; end; } @@ -354,10 +354,10 @@ function script F_JobSwdStaff { function script F_JobSwdTestStaff { OnTouch: mes "[Test Hall Staff]"; - mes "Applicant " + strcharinfo(0) + ". Do you surrender??"; + mes "Applicant " + strcharinfo(PC_NAME) + ". Do you surrender??"; next; if (select("Yes.", "No.") == 1) { - mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test..",bc_map; + mapannounce "job_sword1","Applicant " + strcharinfo(PC_NAME) + " quit the test..",bc_map; warp "izlude_in",65,165; end; } @@ -367,7 +367,7 @@ OnTouch: function script F_JobSwdTestStaff2 { OnTouch: - mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". Pass the "+getarg(0)+" course.",bc_map; + mapannounce "job_sword1","Applicant " + strcharinfo(PC_NAME) + ". Pass the "+getarg(0)+" course.",bc_map; warp "job_sword1",getarg(1),getarg(2); end; } diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index c36c0eeda..a99c4700f 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -265,8 +265,8 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "me your name."; next; mes "[Thief Guide]"; - mes "" + strcharinfo(0) + "?"; - mes "What kind of name is " + strcharinfo(0) + "? Anyway, give me a second."; + mes "" + strcharinfo(PC_NAME) + "?"; + mes "What kind of name is " + strcharinfo(PC_NAME) + "? Anyway, give me a second."; job_thief_q = 1; next; mes "[Thief Guide]"; @@ -301,7 +301,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ } mes "[Thief Guide]"; mes "Your name is..."; - mes strcharinfo(0) + "? Um, where is it? Ah, here it is. Let's see..."; + mes strcharinfo(PC_NAME) + "? Um, where is it? Ah, here it is. Let's see..."; next; mes "[Thief Guide]"; if (getskilllv("NV_BASIC") < 9) { @@ -440,7 +440,7 @@ moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ } next; mes "[Comrade]"; - mes strcharinfo(0) + "..."; + mes strcharinfo(PC_NAME) + "..."; mes "You have passed the official Thief Test. You are now one of us."; if (countitem(Mushroom_Of_Thief_1) != 0) delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1); if (countitem(Mushroom_Of_Thief_2) != 0) delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2); @@ -517,7 +517,7 @@ moc_ruins,141,125,3 script Mr. Irrelevant 4_M_01,{ mes "You've come to take the test, right? I can see in your eyes that you know something."; next; mes "[Mr. Irrelevant]"; - mes "Your name is " + strcharinfo(0) + "? Ah, it's on the list. Alright, I'll let you into the Mushroom Farm , but I can't guarantee your safety..."; + mes "Your name is " + strcharinfo(PC_NAME) + "? Ah, it's on the list. Alright, I'll let you into the Mushroom Farm , but I can't guarantee your safety..."; close2; job_thief_q = 3; switch(rand(5)) { |