change *strcharinfo to use constants

1 files changed, 43 insertions, 43 deletions

diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 9caa1f538..1a03af44c 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -212,7 +212,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "hahahahaha.";
 		mes "huhuhuhu. humhum.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Hello. are you... Priest Dayan?";
 		next;
 		mes "[Priest]";
@@ -220,13 +220,13 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		next;
 		mes "He turns his head towards you.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Aren't you Priest Dayan?";
 		next;
 		mes "[Priest]";
 		mes "muttering...";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Priest! Da~yan! Right!?";
 		next;
 		mes "[Priest Dayan]";
@@ -240,11 +240,11 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "I forgot to wear my hearing aid. hehe.";
 		mes "Anyway, why have you come here?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Hmm, I wanted to tell you...";
 		next;
 		input .@inputstr$;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "" + .@inputstr$ + "";
 		next;
 		if (.@inputstr$ != "I'm here for the Holy Pilgrimage") {
@@ -259,7 +259,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		next;
 		mes "He cups his ears towards you.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "^FF0000I'm here for the Holy Pilgrimage!^000000";
 		mes "^FF0000I'm here for the Holy Pilgrimage!^000000";
 		mes "^FF0000I'm here for the Holy Pilgrimage!^000000";
@@ -383,7 +383,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "I can feel that you have a fresh energy.";
 		mes "Maybe you did pray truthfully.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I feel light-hearted. Like I was just reborn...";
 		next;
 		mes "[Priest Dayan]";
@@ -391,7 +391,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "A smile from a peaceful mind will easily rid people of their wariness.";
 		mes "Please, inspire people with love and energy.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Thanks for your kind words.";
 		next;
 		mes "[Priest Dayan]";
@@ -409,7 +409,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "I think she is exhausted due to praying too much.";
 		mes "I hope the air of Yggdrasil will be helpful to her.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Don't worry.";
 		mes "I'll go and meet her.";
 		next;
@@ -429,32 +429,32 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 yggdrasil01,220,47,0	script	#arch_pilgrimage	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (job_arch == 2) {
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Is it the spring of Hvergelmir.";
 		mes "This place is a very vivid and peaceful place.";
 		mes "It's proper to pray.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Time to genuflect...";
 		mes "Time to start...";
 		mes "Hmm, what did that priest say to me?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Hmm... What is the first way?";
 		next;
 		switch(select("The way of silence.", "The way of confession.", "The way of meditation.")) {
 		case 1:
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "The way of silence...?";
 			mes "I don't think so.";
 			close;
 		case 2:
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "The way of confession...?";
 			mes "I don't think so.";
 			close;
 		case 3:
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "The way of meditation...?";
 			mes "Yes, it's the way of meditation.";
 			next;
@@ -481,17 +481,17 @@ OnTouch:
 		mes "^3131FF[Priest Dayan]^000000";
 		mes "^3131FFDon't be afraid of pain. That is a necessity and will be a first step to enter a way to liquidate past wounds.^000000";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Pain... What kind of faults have I had?";
 		input .@inputstr$;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I confess my guilt to the Almighty God Odin.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "^3131FF" + .@inputstr$ + ".^000000";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Oh benevolent Odin, Take mercy on me and pity me because I'm remiss in the discharge of my duties as a minister.";
 		mes "Please, lead the way and save a foolish minister with your wisdom.";
 		next;
@@ -518,7 +518,7 @@ OnTouch:
 		mes "^3131FFYou're drinking the Holy Water.^000000";
 		next;
 		if (countitem(Holy_Water) == 0) {
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Oh no! I forgot to bring a Holy Water!";
 			close;
 		}
@@ -548,19 +548,19 @@ OnTouch:
 		mes "A chord crashes out in the spring of Hvergelmir and a waterfall sound gives you a refreshing feeling. -";
 		specialeffect2 EF_GLORIA;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~Descendants of Heimdal gather under the Ash tree Yggdrasil.~";
 		mes "~The Curdan bird which sits on a branch brings me the wisdom of whole world.~";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The Curdan wolf protects me from all threats in the world.~";
 		specialeffect2 EF_GLORIA;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The host of ballascalf, rise up from your seat. The whole world shouts for joy.~";
 		mes "~The father of light, the poet of wisdom, sing for me.~";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The host of a glittering glass, give me a holy prediction.~";
 		specialeffect2 EF_GLORIA;
 		next;
@@ -568,7 +568,7 @@ OnTouch:
 		specialeffect2 EF_BLESSING;
 		specialeffect2 EF_RESURRECTION;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "That was refreshing.";
 		mes "I guess I should go back to Priest Dayan.";
 		job_arch = 3;
@@ -576,7 +576,7 @@ OnTouch:
 		warp "umbala",138,219;
 		end;
 	} else if (job_arch == 3) {
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "The song is over. It's time to go back to Priest Dayan.";
 		close2;
 		warp "umbala",138,219;
@@ -593,7 +593,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 			mes "- You don't feel like disturbing her -";
 			close;
 		}
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Umm, hello sister?";
 		next;
 		mes "[Vinue]";
@@ -601,7 +601,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "It's not time to have a service yet...";
 		mes "Are you here to pray, "+ (Sex == SEX_MALE ? "brother" : "sister") +"?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I came here to say hello from Priest Dayan from Prontera.";
 		next;
 		mes "[Vinue]";
@@ -609,11 +609,11 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "Is he good?";
 		mes "He is so cute even though he's old.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "He told me that he was worried because when he saw you last time, you seemed sad.";
 		mes "He asks you to go on a Holy Pilgrimage.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Umbala has the vital power of nature!";
 		next;
 		mes "[Vinue]";
@@ -643,7 +643,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "At first, it was a dream that Valkyrie was sad and in darkness.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Valkyrie?";
 		next;
 		mes "[Vinue]";
@@ -657,7 +657,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "What a cruel performance! I suddenly can't breathe properly and then I wake up.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "To have to see the death of Valkyrie, must be a tormenting dream.";
 		next;
 		mes "[Vinue]";
@@ -667,7 +667,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "I've been wanting to pray at Odin's shrine to make the dream go away. But that shrine became a den of evil a long time ago.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "The shrine?";
 		mes "Nobody tried to subdue the evil?";
 		next;
@@ -678,7 +678,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "These days, there are a lot of people because of the development of the Odin shrine, but their situation is not so good.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Is the dream related with the evil in the Odin shrine?";
 		next;
 		mes "[Vinue]";
@@ -698,7 +698,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "But, it'll be scary inside!";
 		mes "There are lots of devils inside!";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "But I can't pretend to ignore a Sister who is in trouble?";
 		mes "I'm a minister who copes with lots of asceticism!";
 		mes "Entrust me.";
@@ -707,13 +707,13 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "Ah... I'm so worried....";
 		mes "I'll never forget your warm heart.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "How do I get to Odin shrine?";
 		next;
 		mes "[Vinue]";
 		mes "There is a ferry on the right side of the church.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Ok, wait for good news!";
 		next;
 		mes "[Vinue]";
@@ -806,7 +806,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "You are a descendant of Heimdal living in pain as a mortal, why are you in here?";
 			mes "Are you here to ridicule my grim fate?";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "No way!";
 			mes "But it's true that I'm here for you.";
 			next;
@@ -822,7 +822,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "I was already expelled from Asgard.";
 			mes "My duty is protecting this small island from humans trying to take it from the Gods and even I don't have any energy to do so.";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "It's not that kind of problem.";
 			mes "But someone who perceives your painful situation has sent me here.";
 			next;
@@ -875,11 +875,11 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "[Valkyrie Anguhilde]";
 			mes "Mortal one, what is your name?";
 			next;
-			mes "[" + strcharinfo(0) + "]";
-			mes "My name is " + strcharinfo(0) + ".";
+			mes "[" + strcharinfo(PC_NAME) + "]";
+			mes "My name is " + strcharinfo(PC_NAME) + ".";
 			next;
 			mes "[Valkyrie Anguhilde]";
-			mes "" + strcharinfo(0) + ",";
+			mes "" + strcharinfo(PC_NAME) + ",";
 			mes "You told me that you want to help me, right? Even though it disgraces me, I am asking for your help.";
 			next;
 			mes "[Valkyrie Anguhilde]";
@@ -919,7 +919,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			if ($@archbs == 0) {
 				$@archbs = 1;
 				mes "[Valkyrie Anguhilde]";
-				mes "" + strcharinfo(0) + " Did you finish preparing for your way of asceticism?";
+				mes "" + strcharinfo(PC_NAME) + " Did you finish preparing for your way of asceticism?";
 				next;
 				if (getmapusers("job3_arch02") > 0) {
 					mes "[Valkyrie Anguhilde]";