change *strcharinfo to use constants

1 files changed, 33 insertions, 33 deletions

diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 81e38b299..55717e9ce 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -86,7 +86,7 @@
 		close;
 	}
 	if (getcharid(2) == .@GID) {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			if (guildrelay_q == 100) {
 				if (guildtime > 22) {
 					if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
@@ -732,7 +732,7 @@
 			if (countitem(Soul_Of_Guild) > 0) {
 				if (BaseJob == Job_Knight) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "So you were the one chosen";
 					mes "by your guild master? I see.";
 					mes "You should deliver that Spirit";
@@ -753,7 +753,7 @@
 			else if (countitem(Soul_Of_Courage) > 0) {
 				if ((guildrelay_q == 88) && (BaseJob == Job_Knight)) {
 					mes "[" + .@name$ + "]";
-					mes "Ah," + strcharinfo(0) + "";
+					mes "Ah," + strcharinfo(PC_NAME) + "";
 					mes "Congratulations. It looks";
 					mes "like you did a good job.";
 					mes "Please give the Spirit of";
@@ -769,7 +769,7 @@
 				}
 				else if (BaseJob == Job_Blacksmith) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "Ah, I see that you have";
 					mes "the Spirit of Charge.";
 					mes "Heh heh, it's always exciting";
@@ -791,7 +791,7 @@
 			else if (countitem(Soul_Of_Partnership) > 0) {
 				if ((guildrelay_q == 87) && (BaseJob == Job_Blacksmith)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -806,7 +806,7 @@
 				}
 				else if (BaseJob == Job_Alchemist) {
 					mes "[" + .@name$ + "]";
-					mes "Hello, " + strcharinfo(0) + ".";
+					mes "Hello, " + strcharinfo(PC_NAME) + ".";
 					mes "I see that you posess";
 					mes "the Spirit of Association.";
 					mes "Good luck with your test.";
@@ -826,7 +826,7 @@
 			else if (countitem(Soul_Of_Correspondence) > 0) {
 				if ((guildrelay_q == 86) && (BaseJob == Job_Alchemist)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -841,7 +841,7 @@
 				}
 				else if (BaseJob == Job_Hunter) {
 					mes "[" + .@name$ + "]";
-					mes "Hello, " + strcharinfo(0) + ".";
+					mes "Hello, " + strcharinfo(PC_NAME) + ".";
 					mes "I see that you posess";
 					mes "the Spirit of Coordination.";
 					mes "Good luck on your test.";
@@ -861,7 +861,7 @@
 			else if (countitem(Soul_Of_Proceeding) > 0) {
 				if ((guildrelay_q == 85) && (BaseJob == Job_Hunter)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello, " + strcharinfo(0) + ".";
+					mes "Hello, " + strcharinfo(PC_NAME) + ".";
 					mes "Congratulations, it looks";
 					mes "like you finished the test.";
 					mes "You may now give the Spirit of";
@@ -882,7 +882,7 @@
 			else if (countitem(Soul_Of_Confidence) > 0) {
 				if (BaseJob == Job_Sage) {
 					mes "[" + .@name$ + "]";
-					mes "Hello, " + strcharinfo(0) + ".";
+					mes "Hello, " + strcharinfo(PC_NAME) + ".";
 					mes "I see that you possess";
 					mes "the Spirit of Trust.";
 					mes "Good luck, and do not";
@@ -904,7 +904,7 @@
 			else if (countitem(Soul_Of_Agreement) > 0) {
 				if ((guildrelay_q == 71) && (BaseJob == Job_Sage)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -920,7 +920,7 @@
 				}
 				else if ((BaseJob == Job_Bard) || (BaseJob == Job_Dancer)) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "I see that you have the";
 					mes "Spirit of Union. Always keep";
 					mes "in mind that the strength of";
@@ -942,7 +942,7 @@
 			else if (countitem(Soul_Of_Harmony) > 0) {
 				if ((guildrelay_q == 72) && ((BaseJob == Job_Bard) || (BaseJob == Job_Dancer))) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -958,7 +958,7 @@
 				}
 				else if (BaseJob == Job_Assassin) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "I see that you have the Spirit";
 					mes "of Combination. Remember that";
 					mes "working in tandem, combining";
@@ -980,7 +980,7 @@
 			else if (countitem(Soul_Of_Unity) > 0) {
 				if ((guildrelay_q == 74) && (BaseJob == Job_Assassin)) {
 					mes "[" + .@name$ + "]";
-					mes "Greetings, " + strcharinfo(0) + ",";
+					mes "Greetings, " + strcharinfo(PC_NAME) + ",";
 					mes "did you rest well? Please";
 					mes "give that spirit to the next";
 					mes "person so that the testing";
@@ -996,7 +996,7 @@
 				}
 				else if (BaseJob == Job_Wizard) {
 					mes "[" + .@name$ + "]";
-					mes "Hello, " + strcharinfo(0) + ",";
+					mes "Hello, " + strcharinfo(PC_NAME) + ",";
 					mes "I see that you've been";
 					mes "entrusted with the Spirit";
 					mes "of Solidarity. Do your best";
@@ -1018,7 +1018,7 @@
 			else if (countitem(Soul_Of_Friendship) > 0) {
 				if ((guildrelay_q == 75) && (BaseJob == Job_Wizard)) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "congratulations on a job";
 					mes "well done. Please give the";
 					mes "Spirit of Friendship to your";
@@ -1040,7 +1040,7 @@
 			else if (countitem(Soul_Of_Peace) > 0) {
 				if (BaseJob == Job_Rogue) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "I see that you have the";
 					mes "Spirit of Peace. Please";
 					mes "do your best for the sake";
@@ -1062,7 +1062,7 @@
 			else if (countitem(Soul_Of_Spirit) > 0) {
 				if ((guildrelay_q == 95) && (BaseJob == Job_Priest)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -1078,7 +1078,7 @@
 				}
 				else if (BaseJob == Job_Priest) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "please take good care of";
 					mes "that Spirit of Determination.";
 					close;
@@ -1097,7 +1097,7 @@
 			else if (countitem(Soul_Of_Service) > 0) {
 				if ((guildrelay_q == 98) && (BaseJob == Job_Priest)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -1113,7 +1113,7 @@
 				}
 				else if (BaseJob == Job_Crusader) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "please take good care";
 					mes "of that Spirit of Service.";
 					close;
@@ -1132,7 +1132,7 @@
 			else if (countitem(Soul_Of_Glory) > 0) {
 				if ((guildrelay_q == 96) && (BaseJob == Job_Crusader)) {
 					mes "[" + .@name$ + "]";
-					mes "Hello," + strcharinfo(0) + ".";
+					mes "Hello," + strcharinfo(PC_NAME) + ".";
 					mes "I commend you on your work.";
 					mes "Please give that spirit to";
 					mes "the next person so that the";
@@ -1148,7 +1148,7 @@
 				}
 				else if (BaseJob == Job_Monk) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "please take good care";
 					mes "of that Spirit of Glory.";
 					close;
@@ -1167,7 +1167,7 @@
 			else if (countitem(Soul_Of_Victory) > 0) {
 				if ((guildrelay_q == 97) && (Class == Job_Monk)) {
 					mes "[" + .@name$ + "]";
-					mes "Ah, " + strcharinfo(0) + ",";
+					mes "Ah, " + strcharinfo(PC_NAME) + ",";
 					mes "congratulations on a job";
 					mes "well done. Please give";
 					mes "the Spirit of Victory to your";
@@ -1229,7 +1229,7 @@
 			case 2:
 				mes "[" + .@name$ + "]";
 				mes "Oh, really? Ah, now";
-				mes "I recognize you, ^4d4dff" + strcharinfo(0) + "^000000.";
+				mes "I recognize you, ^4d4dff" + strcharinfo(PC_NAME) + "^000000.";
 				mes "Please come in, and make";
 				mes "yourself comfortable.";
 				close;
@@ -1265,7 +1265,7 @@
 		close;
 	}
 	if (getcharid(2) == .@GID) {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			if (countitem(Soul_Of_Guild) > 0) {
 				mes "[" + .@name$ + "]";
 				mes "Hm. You can't just keep";
@@ -1728,7 +1728,7 @@
 		}
 	}
 	else {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			mes "[" + .@name$ + "]";
 			mes "Hm? What brings you";
 			mes "here? Feel free to take";
@@ -1769,7 +1769,7 @@
 		close;
 	}
 	if (getcharid(2) == .@GID) {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			if (countitem(Soul_Of_Confidence) > 0) {
 				mes "[" + .@name$ + "]";
 				mes "Hm? What are you doing?";
@@ -2132,7 +2132,7 @@
 				mes "and defeat. Remember that.";
 				next;
 				mes "[" + .@name$ + "]";
-				mes "Hey," + strcharinfo(0) + ",";
+				mes "Hey," + strcharinfo(PC_NAME) + ",";
 				mes "if you really want to become";
 				mes "strong enough to protect your";
 				mes "guild, then you must level up.";
@@ -2283,7 +2283,7 @@
 		}
 	}
 	else {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			mes "[" + .@name$ + "]";
 			mes "Hm. You're the master";
 			mes "of another guild, aren't";
@@ -2453,7 +2453,7 @@
 		close;
 	}
 	if (getcharid(2) == .@GID) {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			if (countitem(Soul_Of_Peace) > 0) {
 				mes "[" + .@name$ + "]";
 				mes "Hm? That spirit that";
@@ -3076,7 +3076,7 @@
 		}
 	}
 	else {
-		if (strcharinfo(0) == getguildmaster(.@GID)) {
+		if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
 			mes "[" + .@name$ + "]";
 			mes "You might be the master";
 			mes "of a guild, but you and I";