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/other/Global_Functions.txt | 2 +- npc/other/arena/arena_aco.txt | 26 ++++----- npc/other/arena/arena_lvl50.txt | 8 +-- npc/other/arena/arena_lvl60.txt | 8 +-- npc/other/arena/arena_lvl70.txt | 8 +-- npc/other/arena/arena_lvl80.txt | 8 +-- npc/other/arena/arena_party.txt | 4 +- npc/other/arena/arena_point.txt | 10 ++-- npc/other/arena/arena_room.txt | 8 +-- npc/other/fortune.txt | 4 +- npc/other/gm_npcs.txt | 2 +- npc/other/hugel_bingo.txt | 4 +- npc/other/marriage.txt | 14 ++--- npc/other/monster_race.txt | 14 ++--- npc/other/poring_war.txt | 6 +- npc/other/pvp.txt | 2 +- npc/other/turbo_track.txt | 118 ++++++++++++++++++++-------------------- 17 files changed, 123 insertions(+), 123 deletions(-) (limited to 'npc/other') diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index 1e431b7d8..f6068d598 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -144,7 +144,7 @@ function script F_ClearGarbage { // Used in REBIRTH scripts function script Job_Change { jobchange getarg(0),Upper; //Jobchange based on Upper - logmes "CLASS CHANGE: " +strcharinfo(0)+ " become a "+jobname(Class); + logmes "CLASS CHANGE: " +strcharinfo(PC_NAME)+ " become a "+jobname(Class); return; } diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt index a700ee1bb..0c46eea21 100644 --- a/npc/other/arena/arena_aco.txt +++ b/npc/other/arena/arena_aco.txt @@ -1135,7 +1135,7 @@ prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{ mes "this, especially if you"; mes "broke some record, but"; mes "all I can do is restore your"; - mes "HP and SP for you, "+strcharinfo(0)+"."; + mes "HP and SP for you, "+strcharinfo(PC_NAME)+"."; percentheal 100,100; next; mes "[Staff]"; @@ -1184,7 +1184,7 @@ prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{ .@topchoaco = .@acotop_t % 60; .@gapaco = .@acotop_t - .@record_timeaco; mes "[Staff]"; - mes "^3131FF"+strcharinfo(0)+"^000000, right?"; + mes "^3131FF"+strcharinfo(PC_NAME)+"^000000, right?"; mes "Hey, you did great! You"; mes "completed this Arena Battle"; mes "in "+.@record_minaco+" min and "+.@record_secaco+" seconds!"; @@ -1216,25 +1216,25 @@ prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{ mes "Arena - Acolyte Class Record!"; if (BaseJob == Job_Acolyte) { $arn_acotop = .@record_timeaco; - $arn_acotopn$ = strcharinfo(0); + $arn_acotopn$ = strcharinfo(PC_NAME); donpcevent "Vendigos::OnLineRec_aco"; } else { if (BaseLevel < 70) { $arn_pritop60 = .@record_timeaco; - $arn_pritopn60$ = strcharinfo(0); + $arn_pritopn60$ = strcharinfo(PC_NAME); } else if (BaseLevel < 80) { $arn_pritop70 = .@record_timeaco; - $arn_pritopn70$ = strcharinfo(0); + $arn_pritopn70$ = strcharinfo(PC_NAME); } else if (BaseLevel < 90) { $arn_pritop80 = .@record_timeaco; - $arn_pritopn80$ = strcharinfo(0); + $arn_pritopn80$ = strcharinfo(PC_NAME); } else { $arn_pritop90 = .@record_timeaco; - $arn_pritopn90$ = strcharinfo(0); + $arn_pritopn90$ = strcharinfo(PC_NAME); } donpcevent "Vendigos::OnLineRec_pri"; } @@ -1368,35 +1368,35 @@ prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{ next; mes "[Staff]"; mes "Oooh... A brand new"; - mes "record. ^3131FF"+ strcharinfo(0)+"^000000, your"; + mes "record. ^3131FF"+ strcharinfo(PC_NAME)+"^000000, your"; mes "name will now be listed in"; mes "the Time Force Battle Arena"; mes "Acolyte Class Records."; mes "Congratulations~"; if (BaseJob == Job_Acolyte) { $arn_acotop = .@record_timeaco; - $arn_acotopn$ = strcharinfo(0); + $arn_acotopn$ = strcharinfo(PC_NAME); donpcevent "#Vendigos::OnLineRec_aco"; } else { if (BaseLevel < 70) { $arn_pritop60 = .@record_timeaco; - $arn_pritopn60$ = strcharinfo(0); + $arn_pritopn60$ = strcharinfo(PC_NAME); donpcevent "#Vendigos::OnLineRec_pri60"; } else if (BaseLevel < 80) { $arn_pritop70 = .@record_timeaco; - $arn_pritopn70$ = strcharinfo(0); + $arn_pritopn70$ = strcharinfo(PC_NAME); donpcevent "#Vendigos::OnLineRec_pri70"; } else if (BaseLevel < 90) { $arn_pritop80 = .@record_timeaco; - $arn_pritopn80$ = strcharinfo(0); + $arn_pritopn80$ = strcharinfo(PC_NAME); donpcevent "#Vendigos::OnLineRec_pri80"; } else { $arn_pritop90 = .@record_timeaco; - $arn_pritopn90$ = strcharinfo(0); + $arn_pritopn90$ = strcharinfo(PC_NAME); donpcevent "#Vendigos::OnLineRec_pri90"; } } diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 482e3fd58..fbd2ba193 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -844,8 +844,8 @@ prt_are_in,25,188,3 script Staff#50-2 1_F_02,{ @gap50 = (60 * $top_50min + $top_50sec) - (60 * @record_min50 + @record_sec50); mes "[Staff]"; mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "Your name is...^3131FF" + strcharinfo(PC_NAME) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(PC_NAME) +"^000000, total time you spent to pass the battle.."; next; mes "[Staff]"; mes "is "+@record_min50+"minutes "+@record_sec50+"seconds."; @@ -898,10 +898,10 @@ prt_are_in,25,188,3 script Staff#50-2 1_F_02,{ mes "What a great job!"; next; mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 50s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 50s^000000, ^3131FF"+strcharinfo(PC_NAME)+"^000000."; $top_50min = @record_min50; $top_50sec = @record_sec50; - $arena_50topn$ = strcharinfo(0); + $arena_50topn$ = strcharinfo(PC_NAME); donpcevent "Vendigos::OnLineRec_50"; next; if (arena_point > 29950) { diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 41c444388..b81831345 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -854,8 +854,8 @@ prt_are_in,25,135,3 script Staff#60-2 1_F_02,{ @gap60 = (60 * $top_60min + $top_60sec) - (60 * @record_min60 + @record_sec60); mes "[Staff]"; mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "Your name is...^3131FF" + strcharinfo(PC_NAME) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(PC_NAME) +"^000000, total time you spent to pass the battle.."; next; mes "[Staff]"; mes "is "+@record_min60+"minutes "+@record_sec60+"seconds."; @@ -908,10 +908,10 @@ prt_are_in,25,135,3 script Staff#60-2 1_F_02,{ mes "What a great job!"; next; mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 60s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 60s^000000, ^3131FF"+strcharinfo(PC_NAME)+"^000000."; $top_60min = @record_min60; $top_60sec = @record_sec60; - $arena_60topn$ = strcharinfo(0); + $arena_60topn$ = strcharinfo(PC_NAME); donpcevent "Vendigos::OnLineRec_60"; next; if (arena_point > 29950) { diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index 90bc1aa69..c862585aa 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -819,8 +819,8 @@ prt_are_in,25,84,3 script Staff#70-2 1_F_02,{ @gap70 = (60 * $top_70min + $top_70sec) - (60 * @record_min70 + @record_sec70); mes "[Staff]"; mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "Your name is...^3131FF" + strcharinfo(PC_NAME) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(PC_NAME) +"^000000, total time you spent to pass the battle.."; next; mes "[Staff]"; mes "is "+@record_min70+"minutes "+@record_sec70+"seconds."; @@ -873,10 +873,10 @@ prt_are_in,25,84,3 script Staff#70-2 1_F_02,{ mes "What a great job!"; next; mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 70s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 70s^000000, ^3131FF"+strcharinfo(PC_NAME)+"^000000."; $top_70min = @record_min70; $top_70sec = @record_sec70; - $arena_70topn$ = strcharinfo(0); + $arena_70topn$ = strcharinfo(PC_NAME); donpcevent "Vendigos::OnLineRec_70"; next; if (arena_point > 29970) { diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index 7bab16f4a..044b1eb31 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -800,8 +800,8 @@ prt_are_in,77,187,3 script Staff#80-2 1_F_02,{ @gap80 = (60 * $top_80min + $top_80sec) - (60 * @record_min80 + @record_sec80); mes "[Staff]"; mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "Your name is...^3131FF" + strcharinfo(PC_NAME) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(PC_NAME) +"^000000, total time you spent to pass the battle.."; next; mes "[Staff]"; mes "is "+@record_min80+"minutes "+@record_sec80+"seconds."; @@ -854,10 +854,10 @@ prt_are_in,77,187,3 script Staff#80-2 1_F_02,{ mes "What a great job!"; next; mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 80s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 80s^000000, ^3131FF"+strcharinfo(PC_NAME)+"^000000."; $top_80min = @record_min80; $top_80sec = @record_sec80; - $arena_80topn$ = strcharinfo(0); + $arena_80topn$ = strcharinfo(PC_NAME); donpcevent "Vendigos::OnLineRec_80"; next; if (arena_point > 29980) { diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index b3fb751e6..ad341e8a9 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -1012,8 +1012,8 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ @gappt = (60 * $top_ptmin + $top_ptsec) - (60 * @record_minpt + @record_secpt); mes "[Staff]"; mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "Your name is...^3131FF" + strcharinfo(PC_NAME) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(PC_NAME) +"^000000, total time you spent to pass the battle.."; next; mes "[Staff]"; mes "is "+@record_minpt+"minutes "+@record_secpt+"seconds."; diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt index 40af36d46..5292ebab3 100644 --- a/npc/other/arena/arena_point.txt +++ b/npc/other/arena/arena_point.txt @@ -43,14 +43,14 @@ prt_are_in,103,11,3 script Arena Point Manager 4_M_JOB_HUNTER,{ switch(select("Point Check", "Convert Points", "^660000Conversion Info^000000")) { case 1: mes "[Arena Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you currently have"; mes "" + arena_point + " Arena Points"; mes "and " + tt_point + " Turbo Track Points."; close; case 2: mes "[Arena Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you currently have"; mes "" + arena_point + " Arena Points"; mes "and " + tt_point + " Turbo Track Points."; @@ -136,7 +136,7 @@ prt_are_in,103,11,3 script Arena Point Manager 4_M_JOB_HUNTER,{ arena_point += .@want_point; next; mes "[Arena Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you now have"; mes "^4682B4" + arena_point + "^000000 Arena Points"; mes "and ^00688B" + tt_point + "^000000 Turbo Track Points."; @@ -176,14 +176,14 @@ S_ExchangePoints: } if (tt_point >= getarg(1)) { mes "[Arena Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you've converted "+getarg(1)+" Track"; mes "Points into "+getarg(2)+" Arena Point."; tt_point -= getarg(1); arena_point += getarg(2); next; mes "[Arena Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you now have"; mes "^4682B4" + arena_point + "^000000 Arena Points"; mes "and ^00688B" + tt_point + "^000000 Turbo Track Points."; diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index 83a8b4de9..b8806e112 100644 --- a/npc/other/arena/arena_room.txt +++ b/npc/other/arena/arena_room.txt @@ -73,10 +73,10 @@ arena_room,94,93,5 script Vendigos 4W_M_01,{ break; case 3: mes "[Vendigos]"; - mes "Let me check "+strcharinfo(0)+"'s current arena points."; + mes "Let me check "+strcharinfo(PC_NAME)+"'s current arena points."; next; mes "[Vendigos]"; - mes ""+strcharinfo(0)+" has total ^3131FF"+arena_point+"^000000 points."; + mes ""+strcharinfo(PC_NAME)+" has total ^3131FF"+arena_point+"^000000 points."; next; mes "[Vendigos]"; mes "If you wish to know how to use arena points, please refer to the 2nd menu ^3131FF'About Arena Points'^000000."; @@ -728,10 +728,10 @@ prt_are_in,98,14,3 script Givu#arena 4_F_JOB_KNIGHT,{ } case 4: mes "[Givu]"; - mes "Let me check "+strcharinfo(0)+"'s current arena points."; + mes "Let me check "+strcharinfo(PC_NAME)+"'s current arena points."; next; mes "[Givu]"; - mes ""+strcharinfo(0)+" has total ^3131FF"+arena_point+"^000000 points."; + mes ""+strcharinfo(PC_NAME)+" has total ^3131FF"+arena_point+"^000000 points."; close; } } diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index 661772c02..23d65e88f 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -40,7 +40,7 @@ payon_in03,117,128,5 script Fortune Teller 4_M_BIBI,{ mes "[Lhimetorra]"; - mes "You're an adventurer of this world... " +strcharinfo(0)+ ", right? So, what can an old person like me do for you?"; + mes "You're an adventurer of this world... " +strcharinfo(PC_NAME)+ ", right? So, what can an old person like me do for you?"; next; switch(select("I would like a tarot card reading.", "What's a tarot card reading?")) { case 1: @@ -2760,7 +2760,7 @@ payon_in03,117,128,5 script Fortune Teller 4_M_BIBI,{ payon_in03,75,129,5 script Poring Fortune Teller 4_M_BIBI,{ mes "[Chocarle]"; - mes " Welcome, welcome~!! " +strcharinfo(0)+ "~!"; + mes " Welcome, welcome~!! " +strcharinfo(PC_NAME)+ "~!"; mes " What brings you here today!? "; next; switch(select(" I would like a Poring card reading. ", " What is a Poring card reading? ")) { diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt index 9dfaa81a8..d86535104 100644 --- a/npc/other/gm_npcs.txt +++ b/npc/other/gm_npcs.txt @@ -42,7 +42,7 @@ function script F_GM_NPC { if (getgmlevel() < 99) {/* TODO: perhaps better to just add a group permission? [Ind] */ // Log the event. getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC); - logmes strcharinfo(0)+" attempted to access GM NPC "+strnpcinfo(NPC_NAME)+" ("+.@map$+","+.@x+","+.@y+")."; + logmes strcharinfo(PC_NAME)+" attempted to access GM NPC "+strnpcinfo(NPC_NAME)+" ("+.@map$+","+.@x+","+.@y+")."; end; } diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 50a9374f6..965405807 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -487,7 +487,7 @@ OnTouch: if ($@hu_bingoa == 5) { $@hu_bingoa = 6; donpcevent "start2#bingo::OnStop"; - $@bingowinner$ = strcharinfo(0); + $@bingowinner$ = strcharinfo(PC_NAME); donpcevent "win1a#bingo::OnWin"; close; @@ -669,7 +669,7 @@ OnInit: end; OnTouch: - if ($@bingowinner$ != strcharinfo(0)) end; + if ($@bingowinner$ != strcharinfo(PC_NAME)) end; specialeffect EF_SUI_EXPLOSION; soundeffect "tming_success.wav",1; if ($@bingoresult == 16) getitem 7515,50; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index eca8001a6..ea43b347f 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -330,7 +330,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ next; while(1) { input .@name$; - if (.@name$ == strcharinfo(0)) + if (.@name$ == strcharinfo(PC_NAME)) break; mes "[Marry Happy]"; mes "Hmmm, you have to write"; @@ -590,7 +590,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "and joy. May the love you share"; mes "grow with each passing day."; next; - mapannounce "prt_church","It's the marriage proposal from the groom, Mr. " + strcharinfo(0) + "...",bc_map; + mapannounce "prt_church","It's the marriage proposal from the groom, Mr. " + strcharinfo(PC_NAME) + "...",bc_map; mes "[Vomars]"; mes "Until the end of the"; mes "world, may you stand"; @@ -601,21 +601,21 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ next; input $@wed_bride$; mes "[Vomars]"; - mes "Mr. " + strcharinfo(0) + "..."; + mes "Mr. " + strcharinfo(PC_NAME) + "..."; mes "Do you swear on your life"; mes "that you will forever cherish"; mes "and care for your bride,"; mes "Miss " + $@wed_bride$ + "?"; next; select("I do."); - $@wed_groom$ = strcharinfo(0); + $@wed_groom$ = strcharinfo(PC_NAME); mes "[Vomars]"; mes "Now, it is time for"; mes "your bride to make"; mes "her wedding vows."; mes "If she will come forward..."; close2; - mapannounce "prt_church","The groom, Mr. " + strcharinfo(0) + ", has made his vows to Miss " + $@wed_bride$ + "...",bc_map; + mapannounce "prt_church","The groom, Mr. " + strcharinfo(PC_NAME) + ", has made his vows to Miss " + $@wed_bride$ + "...",bc_map; cutin "",255; end; } @@ -652,7 +652,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { if (Sex == SEX_FEMALE) { - if (strcharinfo(0) == $@wed_bride$) { + if (strcharinfo(PC_NAME) == $@wed_bride$) { mes "[Vomars]"; mes "Young lovers, please"; mes "remember this moment for"; @@ -761,7 +761,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ } callsub S_Busy; } - if (strcharinfo(0) == $@wed_bride$) { + if (strcharinfo(PC_NAME) == $@wed_bride$) { mes "[Vomars]"; mes "Hm? It appears that"; mes "Happy Marry still hasn't"; diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 7baf3da94..9ddafeef5 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -349,10 +349,10 @@ p_track01,67,45,5 script Medal Distributor#single 4_F_RACING,{ mes "won! May I have your name?"; next; input .@input$; - if (.@input$ == strcharinfo(0)) { + if (.@input$ == strcharinfo(PC_NAME)) { .@insa = rand(1,1000); mes "[Medal Distributor]"; - mes "Ah, "+strcharinfo(0)+"."; + mes "Ah, "+strcharinfo(PC_NAME)+"."; mes "You can exchange this"; mes "ticket for a Prize Medal by"; mes "entering your ticket exchange"; @@ -2023,7 +2023,7 @@ ein_in01,85,208,5 script Ei'felle#repay01 4_M_EINMAN2,{ mes "been able to get any medals..."; next; if (countitem(Marvelous_Medal)) { - mes "["+ strcharinfo(0) +"]"; + mes "["+ strcharinfo(PC_NAME) +"]"; mes "Oh! Are you talking"; mes "about the medals that"; mes "they give as rewards in"; @@ -2489,7 +2489,7 @@ S_Reward: mes "you anything in return, so..."; mes "Think of something. Quick."; next; - mes "["+ strcharinfo(0) +"]"; + mes "["+ strcharinfo(PC_NAME) +"]"; mes "Er, just use the medals"; mes "to further your manufacturing"; mes "research, and then you can"; @@ -2628,7 +2628,7 @@ S_BonusReward: } next; if (select("Decline", "Accept") == 1) { - mes "["+ strcharinfo(0) +"]"; + mes "["+ strcharinfo(PC_NAME) +"]"; mes "W-wait, I changed my"; mes "mind. Would it be fine"; mes "if I asked you to give"; @@ -2873,7 +2873,7 @@ p_track02,32,45,5 script Eccentric Scholar#double 4_M_SAGE_C,{ mes "Ah, right, 7, to account for x,"; mes "a value representing--"; next; - mes "["+ strcharinfo(0) +"]"; + mes "["+ strcharinfo(PC_NAME) +"]"; mes "Excuse me, but"; mes "what are you doing?"; next; @@ -2949,7 +2949,7 @@ p_track01,27,47,5 script Drunkard#single 4_M_YURI,{ mes "Hey, you! Which number is"; mes "your lucky number? Huh?"; next; - mes "["+ strcharinfo(0) +"]"; + mes "["+ strcharinfo(PC_NAME) +"]"; mes "I, er..."; next; mes "[Familiar Drunkard]"; diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index c840ab3c5..7d58569ef 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -165,11 +165,11 @@ poring_w01,100,97,3 script Poring Vending Machine#w 4_PORING,{ close; } } - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "... Maybe next time..."; close; case 9: - mes "["+strcharinfo(0)+"]"; + mes "["+strcharinfo(PC_NAME)+"]"; mes "... Maybe next time..."; close; } @@ -299,7 +299,7 @@ poring_w01,96,97,3 script Sweet Devi#wop 4_DEVIRUCHI,{ mes "And you need to make sure you know who's in which party."; close; case 3: - mes "[" + strcharinfo(0) + "]"; + mes "[" + strcharinfo(PC_NAME) + "]"; mes "hmm, I see."; close; case 4: diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 28a925d14..6978d49d2 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -347,7 +347,7 @@ pvp_room,54,85,4 script Registration Staff#1 8W_SOLDIER,{ } if (select("Combat Square one", "Cancel") == 1) { mes "[PVP Combat Square Register Staff]"; - mes "'"+ strcharinfo(0) +"'"; + mes "'"+ strcharinfo(PC_NAME) +"'"; mes "Are you ready?!"; next; if (select("Yes!", "No!") == 1) { diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index bd6d4df8a..f70c97427 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -1741,18 +1741,18 @@ OnTouch: .@n = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1); switch (.@n) { case 1: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Log Bridge course!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Log Bridge course!",bc_map,"0x70DBDB"; switch (rand(1,3)) { case 1: warp strnpcinfo(NPC_MAP),210,369; end; case 2: warp strnpcinfo(NPC_MAP),210,361; end; case 3: warp strnpcinfo(NPC_MAP),210,354; end; } case 2: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Cube Hills course!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Cube Hills course!",bc_map,"0x70DBDB"; warp strnpcinfo(NPC_MAP),316,365; end; case 3: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Cursed Desert!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Cursed Desert!",bc_map,"0x70DBDB"; switch (rand(1,4)) { case 1: warp strnpcinfo(NPC_MAP),46,254; end; case 2: warp strnpcinfo(NPC_MAP),76,227; end; @@ -1760,15 +1760,15 @@ OnTouch: case 4: warp strnpcinfo(NPC_MAP),86,220; end; } case 5: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Single Snail course!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Single Snail course!",bc_map,"0x70DBDB"; warp strnpcinfo(NPC_MAP),268,275; end; case 6: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Snake Dice course!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Snake Dice course!",bc_map,"0x70DBDB"; warp strnpcinfo(NPC_MAP),5,91; end; case 7: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Small Cave course! Hurry, you're almost at the finish!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Small Cave course! Hurry, you're almost at the finish!",bc_map,"0x70DBDB"; switch(rand(1,3)) { case 1: warp strnpcinfo(NPC_MAP),307,52; end; case 2: warp strnpcinfo(NPC_MAP),307,46; end; @@ -1943,9 +1943,9 @@ turbo_n_1,222,65,0 duplicate(TurboHint_4#tt_main) #n1NoWayOut7 FAKE_NPC,1,1 OnTouch: .@w$ = callfunc("F_tt"); if (.@w$ == "n1") $@end_time = gettimetick(0); - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just arrived at the Finish Line! Congratulations!",bc_map,"0xFFFF00"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just arrived at the Finish Line! Congratulations!",bc_map,"0xFFFF00"; if (.@w$ != "n1") { - setd "$ttnames$["+GetNumber(.@w$)+"]",strcharinfo(0); + setd "$ttnames$["+GetNumber(.@w$)+"]",strcharinfo(PC_NAME); donpcevent "Turbo Track Guide::OnWin_"+.@w$; } warp strnpcinfo(NPC_MAP),384,161; @@ -1992,7 +1992,7 @@ turbo_n_1,371,47,0 duplicate(cos_end#tt_main) #cos_n1_end WARPNPC,1,1 - script cos_end2#tt_main WARPNPC,1,1,{ OnTouch: .@w$ = callfunc("F_tt"); - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" is second to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" is second to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00"; if (.@w$ == "e8" || .@w$ == "n8") setarray .@pts, 28961,40; if (.@w$ == "e16" || .@w$ == "n16") setarray .@pts, 28951,50; if (tt_points < .@pts[0]) tt_point += .@pts[1]; @@ -2014,7 +2014,7 @@ turbo_n_16,371,51,0 duplicate(cos_end2#tt_main) #cos_n16_end2 WARPNPC,1,1 - script cos_end3#tt_main FAKE_NPC,{ OnTouch: .@w$ = callfunc("F_tt"); - mapannounce strnpcinfo(NPC_MAP),"" + strcharinfo(0) +" is third to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00"; + mapannounce strnpcinfo(NPC_MAP),"" + strcharinfo(PC_NAME) +" is third to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00"; if (.@w$ == "e8" || .@w$ == "n8") setarray .@pts, 28971,30; if (.@w$ == "e16" || .@w$ == "n16") setarray .@pts, 28951,50; if (tt_point < .@pts[0]) tt_point += .@pts[1]; @@ -2055,7 +2055,7 @@ turbo_n_1,316,365,0 duplicate(DSwitch#tt_main) Disposable_Switch#n1 FAKE_NPC,1,1 - script Flasher#tt_main FAKE_NPC,{ OnTouch: - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" has just passed the Flasher Maze!",bc_map,"0x70DBDB"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" has just passed the Flasher Maze!",bc_map,"0x70DBDB"; warp strnpcinfo(NPC_MAP),185,227; end; @@ -2093,17 +2093,17 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 my_point = tt_point; mes "You now have a total of"; mes tt_point + " Turbo Track points,"; - mes strcharinfo(0) +"."; + mes strcharinfo(PC_NAME) +"."; } mes "Unfortunately, I can't give"; mes "you any Turbo Track Points"; mes "since you would exceed the"; mes "maximum limit. Sorry,"; - mes strcharinfo(0) +"..."; + mes strcharinfo(PC_NAME) +"..."; } else { mes "As the winner, your reward"; mes "is "+((compare(.@w$,"8"))?"50":"40")+" Turbo Track Points,"; - mes strcharinfo(0) +"~"; + mes strcharinfo(PC_NAME) +"~"; next; mes "[Guide]"; mes "However, you cannot receive"; @@ -2114,7 +2114,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 next; if (tt_rank > $ttranks[1]) { setarray $ttranks[0],$ttranks[0],tt_rank,$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4]; - setarray $ttnames$[9],strcharinfo(0); + setarray $ttnames$[9],strcharinfo(PC_NAME); mes "[Guide]"; mes "Congratulations!"; mes "You are ranked as"; @@ -2123,22 +2123,22 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 donpcevent "Turbo Track Guide::OnNew_Top1"; if (tt_rank == 29999) { if ($ttnames$[7] == "Breezy Havana") { - $ttnames$[7] = strcharinfo(0); + $ttnames$[7] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } else if ($ttnames$[8] == "RS125") { - $ttnames$[8] = strcharinfo(0); + $ttnames$[8] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - if (compare(.@w$,"4")) announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + if (compare(.@w$,"4")) announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } } } else if (tt_rank > $ttranks[2]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],tt_rank,$ttranks[3],$ttranks[4],$ttranks[5]; - setarray $ttnames$[10],strcharinfo(0); + setarray $ttnames$[10],strcharinfo(PC_NAME); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Second"; @@ -2147,22 +2147,22 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 donpcevent "Turbo Track Guide::OnNew_Top2"; if (tt_rank == 29999) { if ($ttnames$[7] == "Breezy Havana") { - $ttnames$[7] = strcharinfo(0); + $ttnames$[7] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } else if ($ttnames$[8] == "RS125") { - $ttnames$[8] = strcharinfo(0); + $ttnames$[8] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } } } else if (tt_rank > $ttranks[3]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],tt_rank,$ttranks[4],$ttranks[5]; - setarray $ttnames$[11],strcharinfo(0); + setarray $ttnames$[11],strcharinfo(PC_NAME); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Third"; @@ -2171,22 +2171,22 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 donpcevent "Turbo Track Guide::OnNew_Top3"; if (tt_rank == 29999) { if ($ttnames$[7] == "Breezy Havana") { - $ttnames$[7] = strcharinfo(0); + $ttnames$[7] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } else if ($ttnames$[8] == "RS125") { - $ttnames$[8] = strcharinfo(0); + $ttnames$[8] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } } } else if (tt_rank > $ttranks[4]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],tt_rank,$ttranks[5]; - setarray $ttnames$[12],strcharinfo(0); + setarray $ttnames$[12],strcharinfo(PC_NAME); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fourth"; @@ -2195,22 +2195,22 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 donpcevent "Turbo Track Guide::OnNew_Top4"; if (tt_rank == 29999) { if ($ttnames$[7] == "Breezy Havana") { - $ttnames$[7] = strcharinfo(0); + $ttnames$[7] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } else if ($ttnames$[8] == "RS125") { - $ttnames$[8] = strcharinfo(0); + $ttnames$[8] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } } } else if (tt_rank > $ttranks[5]) { setarray $ttranks[0],$ttranks[0],$ttranks[1],$ttranks[2],$ttranks[3],$ttranks[4],tt_rank; - setarray $ttnames$[13],strcharinfo(0); + setarray $ttnames$[13],strcharinfo(PC_NAME); mes "[Guide]"; mes "Congratulations!"; mes "You've ranked Fifth"; @@ -2219,16 +2219,16 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 donpcevent "Turbo Track Guide::OnNew_Top5"; if (tt_rank == 29999) { if ($ttnames$[7] == "Breezy Havana") { - $ttnames$[7] = strcharinfo(0); + $ttnames$[7] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce "" + strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce "" + strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } else if ($ttnames$[8] == "RS125") { - $ttnames$[8] = strcharinfo(0); + $ttnames$[8] = strcharinfo(PC_NAME); mes "You've secured your place in"; mes "the Turbo Track Hall of Honor!"; - announce strcharinfo(0) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; + announce strcharinfo(PC_NAME) + " has joined the Turbo Track Hall of Honor!",bc_all,"FF0000"; } } } @@ -2241,7 +2241,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 next; mes "[Guide]"; mes "What do you"; - mes "think, " + strcharinfo(0) +"?"; + mes "think, " + strcharinfo(PC_NAME) +"?"; mes "Glory can be yours if"; mes "you can achieve victory!"; } @@ -2257,7 +2257,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 end; } else { - if ($ttnames$[7] == strcharinfo(0)) { + if ($ttnames$[7] == strcharinfo(PC_NAME)) { if (compare(.@w$,"4")) { mes "[Guide]"; mes "Oh wow!"; @@ -2279,14 +2279,14 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 mes "you any Turbo Track Points"; mes "since you would exceed the"; mes "maximum limit. Sorry,"; - mes strcharinfo(0) +"..."; + mes strcharinfo(PC_NAME) +"..."; } } else { mes "Oh, I'm sorry! You're"; mes "here so that I can tell you"; mes "how many Turbo Track Points"; my_point = tt_point; - mes "you have, right? You've got a total of " + my_point + " Turbo Track Points, "+ strcharinfo(0) +"."; + mes "you have, right? You've got a total of " + my_point + " Turbo Track Points, "+ strcharinfo(PC_NAME) +"."; } next; mes "[Guide]"; @@ -2298,7 +2298,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 warp "turbo_room",72,89; end; } - else if ($ttnames$[8] == strcharinfo(0)) { + else if ($ttnames$[8] == strcharinfo(PC_NAME)) { mes "[Guide]"; mes "Hey, aren't you"; mes "in our Hall of Honor?"; @@ -2327,7 +2327,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 mes "Turbo Track Point total!"; mes "You've got a total of"; mes my_point + " Turbo Track points,"; - mes strcharinfo(0) + "."; + mes strcharinfo(PC_NAME) + "."; } next; mes "[Guide]"; @@ -2600,7 +2600,7 @@ turbo_n_1,384,167,1 script Guide#TBT_n1 1_M_01,{ mes "you any Turbo Track Points"; mes "since you would exceed the"; mes "maximum limit. Sorry,"; - mes strcharinfo(0) +"..."; + mes strcharinfo(PC_NAME) +"..."; } next; mes "[Guide]"; @@ -2639,7 +2639,7 @@ turbo_n_1,384,167,1 script Guide#TBT_n1 1_M_01,{ mes "you any Turbo Track Points"; mes "since you would exceed the"; mes "maximum limit. Sorry,"; - mes strcharinfo(0) +"..."; + mes strcharinfo(PC_NAME) +"..."; } next; mes "[Guide]"; @@ -2658,9 +2658,9 @@ turbo_n_1,384,167,1 script Guide#TBT_n1 1_M_01,{ mes "You ranked as the"; mes "top player in Solo Mode!"; mes "Your name will be entered"; - mes "into our records, "+ strcharinfo(0) +"~"; + mes "into our records, "+ strcharinfo(PC_NAME) +"~"; setarray $ttranks[0],.@record_time; - setarray $ttnames$[0],strcharinfo(0); + setarray $ttnames$[0],strcharinfo(PC_NAME); next; if (tt_point < 28961) { mes "[Guide]"; @@ -2678,7 +2678,7 @@ turbo_n_1,384,167,1 script Guide#TBT_n1 1_M_01,{ mes "you any Turbo Track Points"; mes "since you would exceed the"; mes "maximum limit. Sorry,"; - mes strcharinfo(0) +"..."; + mes strcharinfo(PC_NAME) +"..."; } next; mes "[Guide]"; @@ -2782,7 +2782,7 @@ OnInit: - script NMaker1#tt_main FAKE_NPC,{ OnTouch: .@w$ = callfunc("F_tt"); - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" is now entering the Small Cave! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" is now entering the Small Cave! " + strcharinfo(PC_NAME) +" is now in the lead!",bc_map,"0xFFFF00"; donpcevent "Turbo Track Guide::OnEnd_"+.@w$; disablenpc "Notice_Maker1#TBT_"+.@w$; end; @@ -2803,7 +2803,7 @@ turbo_n_1,11,91,0 duplicate(NMaker1#tt_main) Notice_Maker1#TBT_n1 FAKE_NPC,3,3 - script NMaker3#tt_main FAKE_NPC,{ OnTouch: .@w$ = callfunc("F_tt"); - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" is now entering the Single Snail! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" is now entering the Single Snail! " + strcharinfo(PC_NAME) +" is now in the lead!",bc_map,"0xFFFF00"; disablenpc "Notice_Maker3#TBT_"+.@w$; end; @@ -2823,7 +2823,7 @@ turbo_n_1,234,223,0 duplicate(NMaker3#tt_main) Notice_Maker3#TBT_n1 FAKE_NPC,3,3 - script NMaker4#tt_main FAKE_NPC,{ OnTouch: .@w$ = callfunc("F_tt"); - mapannounce strnpcinfo(NPC_MAP),strcharinfo(0) +" is currently in First Place!",bc_map,"0xFFFF00"; + mapannounce strnpcinfo(NPC_MAP),strcharinfo(PC_NAME) +" is currently in First Place!",bc_map,"0xFFFF00"; disablenpc "Notice_Maker4#TBT_"+.@w$; end; @@ -4063,7 +4063,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ if (tt_point < 10) { mes "[Item Exchange Helper]"; mes "Good day,"; - mes "" + strcharinfo(0) + "."; + mes "" + strcharinfo(PC_NAME) + "."; mes "You've got a total of"; mes "" + tt_point + " Turbo Track Points."; next; @@ -4103,7 +4103,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ else { mes "[Item Exchange Helper]"; mes "Good day,"; - mes "" + strcharinfo(0) + "."; + mes "" + strcharinfo(PC_NAME) + "."; mes "You've got a total of"; mes "" + tt_point + " Turbo Track Points."; mes "Would you like to exchange"; @@ -4474,14 +4474,14 @@ turbo_room,106,117,3 script Point Manager#tt 4_M_ZONDAOYAJI,{ switch(select("Check Points", "Convert Points", "^660000Conversion Info^000000")) { case 1: mes "[Turbo Track Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you currently have"; mes "" + tt_point + " Turbo Track Points"; mes "and " + arena_point + " Arena Points."; close; case 2: mes "[Turbo Track Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you currently have"; mes "" + tt_point + " Turbo Track Points"; mes "and " + arena_point + " Arena Points."; @@ -4552,7 +4552,7 @@ turbo_room,106,117,3 script Point Manager#tt 4_M_ZONDAOYAJI,{ tt_point = .@my_turbo_all; next; mes "[Turbo Track Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you now have"; mes "^00688B" + tt_point + "^000000 Turbo Track Points"; mes "and ^4682B4" + arena_point + "^000000 Arena Points."; @@ -4592,7 +4592,7 @@ S_ExchangePoints: tt_point += getarg(2); next; mes "[Turbo Track Point Manager]"; - mes "" + strcharinfo(0) + ","; + mes "" + strcharinfo(PC_NAME) + ","; mes "you now have"; mes "^00688B" + tt_point + "^000000 Turbo Track Points"; mes "and ^4682B4" + arena_point + "^000000 Arena Points."; -- cgit v1.2.3-70-g09d2