From 0f1d0507eb95cf07ce7eb66d89ad9853938612e6 Mon Sep 17 00:00:00 2001 From: Asheraf Date: Mon, 29 Aug 2016 17:40:13 +0100 Subject: change *strcharinfo to use constants --- npc/quests/first_class/tu_acolyte.txt | 32 ++++++++++++++++---------------- npc/quests/first_class/tu_archer.txt | 24 ++++++++++++------------ npc/quests/first_class/tu_ma_th01.txt | 16 ++++++++-------- npc/quests/first_class/tu_magician01.txt | 2 +- npc/quests/first_class/tu_sword.txt | 28 ++++++++++++++-------------- 5 files changed, 51 insertions(+), 51 deletions(-) (limited to 'npc/quests/first_class') diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index 6a2c8f7f2..2762325cb 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -44,7 +44,7 @@ prt_church,179,15,1 script Priest Praupin 4_M_MINISTER,{ if(BaseJob != Job_Acolyte){ if(tu_acolyte01 == 25){ mes "Oh...!"; - mes "You're "+strcharinfo(0)+" !"; + mes "You're "+strcharinfo(PC_NAME)+" !"; mes "You've grown so much!"; mes "I'm truly proud of you."; } else { @@ -230,7 +230,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{ mes "the lessons?"; next; mes "[Asthe]"; - mes ""+strcharinfo(0)+","; + mes ""+strcharinfo(PC_NAME)+","; mes "have you thought about what kind of Acolyte you would like to become? It's very important that you plan for the future that you want."; next; if(select("One that supports others.", "One that punishes evil.")==1){ @@ -257,7 +257,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{ next; mes "[Asthe]"; mes "Now,"; - mes ""+strcharinfo(0)+"..."; + mes ""+strcharinfo(PC_NAME)+"..."; mes "What do you think"; mes "is the most necessary"; mes "skill for an Acolyte?"; @@ -451,7 +451,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{ tu_acolyte01 = 6; close; case 6: - mes ""+strcharinfo(0)+","; + mes ""+strcharinfo(PC_NAME)+","; mes "I just received this letter, but it seems to have been a mistake."; mes "It's actually addressed"; mes "to Priest Gardron."; @@ -893,7 +893,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{ emotion e_gasp; next; mes "[Priest Gardron]"; - mes "May I entrust you, acolyte "+strcharinfo(0)+","; + mes "May I entrust you, acolyte "+strcharinfo(PC_NAME)+","; mes "this urgent matter?"; mes "Please dispose of Hornets"; mes "which are causing trouble on ^FF0000the western field of Prontera^000000."; @@ -927,7 +927,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{ emotion e_gasp; next; mes "[Priest Gardron]"; - mes ""+strcharinfo(0)+","; + mes ""+strcharinfo(PC_NAME)+","; mes "may I ask"; mes "you to take care"; mes "of this task? Exterminate the Skeletons and Zombies in the"; @@ -1005,7 +1005,7 @@ prt_monk,235,245,5 script Dog#tu 4_DOG01,{ } } } - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "So cute~!"; close; } @@ -1080,20 +1080,20 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ mes "should take a better look"; mes "and see what's wrong.^000000"; next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Are you alright?"; mes "................"; next; specialeffect EF_CURSEATTACK; soundeffectall "_curse.wav",0; emotion e_omg; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "This is....!"; mes "A cursed spirit"; mes "is tormenting this"; mes "poor young girl!"; next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I'll cure you..."; mes "For sure."; tu_acolyte01 = 11; @@ -1113,7 +1113,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ next; switch(select("Heal!", "Blessing!", "Cure!", "Recovery!", "Signum Crucis!", "B.S Sacramenti!")){ case 1: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "H..."; mes "Heal !!"; specialeffect EF_HEAL; @@ -1125,13 +1125,13 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ break; case 2: if(getskilllv("AL_BLESSING") > 0){ - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "B..."; mes "Blessing!"; next; if(rand(100) < getskilllv("AL_BLESSING")*10){ specialeffect EF_BLESSING; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I..."; mes "I did it!!"; next; @@ -1149,7 +1149,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ next; break; } else { - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Huh...?"; mes "It's not working..."; mes "Maybe it's because"; @@ -1165,7 +1165,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ break; case 3: if(getskilllv("AL_CURE") > 0){ - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "C-Cure...!"; specialeffect EF_CURE; next; @@ -1185,7 +1185,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ close; case 5: if(getskilllv("AL_CRUCIS") > 0){ - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "S-Signum..."; mes "Signum Crucis!"; specialeffect EF_SIGNUM; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 79dc4ebbe..89af304ef 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -258,7 +258,7 @@ payon_in02,54,13,3 script Master Kavaruk 1_M_JOBTESTER,{ if(Class == Job_Archer || Class == Job_Baby_Archer || Class == Job_Archer_High){ if(tu_archer02 == 0){ mes "Oh, it's a good thing"; - mes "you're here, "+strcharinfo(0)+"."; + mes "you're here, "+strcharinfo(PC_NAME)+"."; mes "I've just received request for support from the Alchemist"; mes "Guild in Al De Baran."; next; @@ -401,7 +401,7 @@ payon_in02,54,13,3 script Master Kavaruk 1_M_JOBTESTER,{ close; } else if(tu_archer01 == 3){ - mes "So "+strcharinfo(0)+","; + mes "So "+strcharinfo(PC_NAME)+","; mes "Did you have a good experience? Learning theory alone is never too enjoyable, but it is necessary."; next; mes "[Master Kavaruk]"; @@ -855,7 +855,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ next; .@eagle = getskilllv("AC_DOUBLE"); if(.@eagle > 2){ - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I..."; mes "I already know"; mes "about Double Strafe."; @@ -915,7 +915,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ mes "Bring all of that and you pass~"; next; mes "[Reidin Corse]"; - mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~"; + mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(PC_NAME) + "~"; } else { mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!"; emotion e_no1; @@ -933,7 +933,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ mes "Bring all of that and you pass~"; next; mes "[Reidin Corse]"; - mes "It's easier to find Izlude if you pass by Prontera, so head towards the fields near Prontera. Alright, off you go, " + strcharinfo(0) + "~"; + mes "It's easier to find Izlude if you pass by Prontera, so head towards the fields near Prontera. Alright, off you go, " + strcharinfo(PC_NAME) + "~"; } tu_archer01 = 11; close; @@ -1114,7 +1114,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ emotion e_pif; next; mes "[Reidin Corse]"; - mes "Well, "+ strcharinfo(0) +","; + mes "Well, "+ strcharinfo(PC_NAME) +","; mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?"; emotion e_no1; close; @@ -1734,7 +1734,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{ mes "^3355FFArthail of the Wind"; mes "has fallen fast asleep.^000000"; next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Ah..."; mes "So peaceful~"; next; @@ -1745,7 +1745,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{ mes "..."; soundeffectall "se_littlewaves02.wav",0; next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Huh?"; mes "What was"; mes "that noise?"; @@ -1755,7 +1755,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{ emotion e_omg; soundeffectall "se_scream_w01.wav",0; next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "What the--?!"; mes "That sounds like"; mes "screams coming from"; @@ -1765,7 +1765,7 @@ prontera,126,335,5 script Arthail 1_M_BARD,{ mes "but he's deeply asleep"; mes "and won't budge at all.^000000"; next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I can't help it then."; mes "I'd better go check"; mes "this out on my own."; @@ -1866,7 +1866,7 @@ prt_castle,76,165,6 script Minister#tu 1_M_JOBTESTER,{ mes "our nation's administration."; if(tu_archer02 == 5){ next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I heard screams"; mes "from outside! Did"; mes "something happen?"; @@ -1887,7 +1887,7 @@ prt_castle,76,165,6 script Minister#tu 1_M_JOBTESTER,{ close; } else if(tu_acolyte01 == 25){ next; - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Um..."; mes "I hear that"; mes "the royal family"; diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt index dc5dd31fd..40137b74a 100644 --- a/npc/quests/first_class/tu_ma_th01.txt +++ b/npc/quests/first_class/tu_ma_th01.txt @@ -317,13 +317,13 @@ moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{ next; switch(select("Don't investigate.", "Investigate.")){ case 1: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "A piece of cloth"; mes "is nothing to be"; mes "concerned about."; close; case 2: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Hey... There's"; mes "blood on this cloth"; mes "and some writing on"; @@ -338,7 +338,7 @@ moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{ close; } case 2: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Hmm..."; mes "It'll probably be"; mes "faster if I follow this"; @@ -386,13 +386,13 @@ moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{ next; switch(select("Don't investigate.", "Investigate.")){ case 1: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "A piece of cloth"; mes "is nothing to be"; mes "concerned about."; close; case 2: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Hey... There's"; mes "blood on this cloth"; mes "and some writing on"; @@ -407,7 +407,7 @@ moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{ close; } case 2: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "Hmm..."; mes "It'll probably be"; mes "faster if I follow this"; @@ -996,7 +996,7 @@ moc_fild18,109,197,0 script Trace of Battle#15 CLEAR_NPC,{ close; } case 2: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I guess..."; mes "I'll try investigating"; mes "this area a little more?"; @@ -1150,7 +1150,7 @@ moc_fild18,109,197,0 script Trace of Battle#15 CLEAR_NPC,{ close; } case 2: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "I guess..."; mes "I'll try investigating"; mes "this area a little more?"; diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index 39298db93..73a3007f3 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/npc/quests/first_class/tu_magician01.txt @@ -781,7 +781,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{ mes "a message, saying that"; mes "you've done a great job in"; mes "completing your mission."; - mes "Very nice work, "+strcharinfo(0)+"~"; + mes "Very nice work, "+strcharinfo(PC_NAME)+"~"; next; mes "[Mana]"; mes "It seems like there are"; diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index 59e64fb89..fa4c0defb 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -2047,20 +2047,20 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ next; switch(select("Killer...", "Murderer...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "What happened"; mes "to the killer?"; next; switch(select("Who he is...", "Who is behind...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Did you find"; mes "out who he is?"; mes "If you did..."; next; switch(select("Why are we...", "What are we...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Why are sitting"; mes "around, doing nothing?!"; next; @@ -2076,7 +2076,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ mes "a response..."; close; case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "What are we"; mes "supposed to do now?"; next; @@ -2093,14 +2093,14 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ close; } case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Did you figure out"; mes "who's behind all this?"; mes "If you did..."; next; switch(select("Why are we...", "What are we...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Why are sitting"; mes "around, doing nothing?!"; next; @@ -2116,7 +2116,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ mes "a response..."; close; case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "What are we"; mes "supposed to do now?"; next; @@ -2135,20 +2135,20 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ } break; case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "What happened"; mes "to the murderer?"; next; switch(select("Who he is...", "Who is behind...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Did you find"; mes "out who he is?"; mes "If you did..."; next; switch(select("Why are we...", "What are we...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Why are sitting"; mes "around, doing nothing?!"; next; @@ -2167,7 +2167,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ mes "a response..."; close; case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "What are we"; mes "supposed to do now?"; next; @@ -2213,14 +2213,14 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ close; } case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Did you figure out"; mes "who's behind all this?"; mes "If you did..."; next; switch(select("Why are we...", "What are we...")) { case 1: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "Why are sitting"; mes "around, doing nothing?!"; next; @@ -2238,7 +2238,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ mes "a response..."; close; case 2: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "What are we"; mes "supposed to do now?"; next; -- cgit v1.2.3-60-g2f50