Merge pull request #1412 from Asheraf/strcharinfo

change *strcharinfo to use constants
Closes #1412 as merged

1 files changed, 20 insertions, 20 deletions

diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index f1353e282..3eae13edf 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -112,7 +112,7 @@ ve_in,237,125,0	script	King Crab#job_shu	1_M_PAY_ELDER,{
 		mes "Huh! The boss is really mad!";
 		mes "I can beat you up with one blow...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hey! How dare you use violence against a lady!?";
 		next;
 		mes "[???]";
@@ -236,7 +236,7 @@ OnTimer600000:
 ve_in,97,149,0	script	#Suraryokan	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_shu == 1) {
-		.@n$ = "["+strcharinfo(0)+"]";
+		.@n$ = "["+strcharinfo(PC_NAME)+"]";
 		mes "[???]";
 		mes "Who is it?!";
 		next;
@@ -298,7 +298,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "Training is so tough and I have a long way to go!";
 		close;
 	} else if (job_shu == 2) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I want to know about the skill you used a while ago.";
 		next;
 		mes "[???]";
@@ -307,7 +307,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes ".........";
 		mes "............ A rookie like you doesn't need to know.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Rookie?!";
 		mes "I have steadily practiced martial arts.";
 		mes "I am confident that I will never lose.";
@@ -315,35 +315,35 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "[???]";
 		mes "So you can beat me, too?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "No...";
 		mes "I guess that's too much...";
 		mes "Frankly speaking, I was quite amazed by you.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I had thought that I was strong enough but after seeing you fight, I realized that I was full of conceit.";
 		next;
 		mes "[???]";
 		mes "Huuuh~ No matter how strong you are,";
 		mes "you cannot avoid reaching for your true limit.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "You are just the person that I expected.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I think you would know";
 		mes "how to overcome this limitation.";
 		next;
 		mes "[???]";
 		mes "Stop it.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What? Why?";
 		next;
 		mes "[???]";
 		mes "Are you a human?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What?";
 		mes "Of course, I am a human.";
 		next;
@@ -351,7 +351,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "To become stronger is too hard for a mere human.";
 		mes "If you want to, just buy better equipment.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Then, what are you?";
 		mes "You mean you're not a human being?";
 		next;
@@ -360,7 +360,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "is impossible for a human.";
 		mes "It's a ghost's way...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ghost?";
 		next;
 		mes "[???]";
@@ -380,7 +380,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 			mes "[???]";
 			mes "You'll regret it, so just be satisfied with your present life.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Well, now that I've met you, I won't live my life this way anymore!";
 			next;
 			mes "[???]";
@@ -468,14 +468,14 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 		mes "[Buddy]";
 		mes "I don't know why you're here but please don't stand behind me unless you want to die.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "'Bruno' sent me here.";
 		next;
 		mes "[Buddy]";
 		mes "Ah! My colleague introduced me to you!";
 		mes "Anyway, why are you here to see me?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I asked Bruno about her strength, and she recommended me to you.";
 		next;
 		mes "[Buddy]";
@@ -497,7 +497,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 		end;
 	} else if (job_shu == 100) {
 		mes "[Buddy]";
-		mes "Ah, long time no see, "+strcharinfo(0)+".";
+		mes "Ah, long time no see, "+strcharinfo(PC_NAME)+".";
 		mes "Are you here to meet my master?";
 		next;
 		switch(select("Yes", "No")) {
@@ -515,7 +515,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 		}
 	}
 	mes "[Buddy]";
-	mes strcharinfo(0)+", didn't you meet the master yet?";
+	mes strcharinfo(PC_NAME)+", didn't you meet the master yet?";
 	next;
 	mes "[Buddy]";
 	mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
@@ -702,7 +702,7 @@ OnEnable:
 sword_1-1,222,169,5	script	Bruno#job_shu	4_F_SURA,{
 	if (job_shu > 4) {
 		mes "[Bruno]";
-		mes "Hey~ "+strcharinfo(0)+", what's up?";
+		mes "Hey~ "+strcharinfo(PC_NAME)+", what's up?";
 		next;
 		switch(select("Let's have conversation.", "Go outside.")) {
 		case 1:
@@ -794,14 +794,14 @@ sword_1-1,223,167,2	script	Master#job_shu	4_M_SURA,{
 		mes "Master! This is a wolf fur coat.";
 		mes "Put it on when it's cold.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ahhk! That is the wolf I... caught... Uhh.";
 		next;
 		mes "- Whack -";
 		next;
 		mes "[Bruno]";
 		mes "Ho ho ho~";
-		mes "Do you have something to say, "+strcharinfo(0)+"?";
+		mes "Do you have something to say, "+strcharinfo(PC_NAME)+"?";
 		mes "You became a member of our family, let's get along together ~";
 		next;
 		mes "[Master]";