From 0d99c3487f4efa10407879112ad0db24be86d5ff Mon Sep 17 00:00:00 2001
From: AnnieRuru <jeankofannie2@gmail.com>
Date: Sat, 2 Mar 2019 07:33:51 +0800
Subject: Add MERC_ Constants to npc scripts

---
 npc/re/jobs/3-1/archbishop.txt       | 12 ++++++------
 npc/re/jobs/3-1/ranger.txt           |  4 ++--
 npc/re/quests/eden/eden_tutorial.txt |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index e59492ce5..e37087857 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -779,7 +779,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 		warp "odin_tem02",282,263;
 		end;
 	}
-	if (getmercinfo(1)) {
+	if (getmercinfo(MERCINFO_CLASS)) {
 		mes "[Valkyrie]";
 		mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
 		close;
@@ -1006,7 +1006,7 @@ OnTouch:
 	if (countitem(ValkyrieA_Scroll)) {
 		delitem ValkyrieA_Scroll,1;
 		// fall through
-	} else if (getmercinfo(1) == 2037) {
+	} else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) {
 		if (strnpcinfo(NPC_NAME) == "#arch_1_10")
 			viewpoint 1,113,327,1,0xFF9900;
 		.@randht = rand(1,10);
@@ -1038,7 +1038,7 @@ OnTouch:
 	if (countitem(ValkyrieA_Scroll)) {
 		delitem ValkyrieA_Scroll,1;
 		// fall through
-	} else if (getmercinfo(1) == 2037) {
+	} else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) {
 		mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000";
 		donpcevent "mob#arch_1::OnKill";
 		end;
@@ -1113,7 +1113,7 @@ OnKill:
 }
 
 job3_arch02,113,327,5	script	Valkyrie#arch_01	4_F_VALKYRIE2,{
-	if (getmercinfo(1)) {
+	if (getmercinfo(MERCINFO_CLASS)) {
 		mes "[Valkyrie]";
 		mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
 		close;
@@ -1355,7 +1355,7 @@ OnTouch:
 	if (countitem(ValkyrieB_Scroll)) {
 		delitem ValkyrieB_Scroll,1;
 		// fall through
-	} else if (getmercinfo(1) == 2038) {
+	} else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) {
 		.@randht = rand(1,10);
 		if (.@randht < 8)
 			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00";
@@ -1400,7 +1400,7 @@ OnTouch:
 	if (countitem(ValkyrieB_Scroll)) {
 		delitem ValkyrieB_Scroll,1;
 		// fall through
-	} else if (getmercinfo(1) == 2038) {
+	} else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) {
 		mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000";
 		end;
 	}
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 41e5b476f..166a1d42e 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -613,7 +613,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 	mes "Don't hang around here doing nothing. This is my area!";
 	close;
 L_Start:
-	if (getmercinfo(1)) {
+	if (getmercinfo(MERCINFO_CLASS)) {
 		mes "[Test Instructor, Teardrop]";
 		mes "Stop!";
 		next;
@@ -1491,7 +1491,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			setquest 8261;
 			close;
 		}
-		if (getmercinfo(1) == 2034) {
+		if (getmercinfo(MERCINFO_CLASS) == M_DESERT_WOLF_B) {
 			erasequest 8261;
 			mes "Good! Then I'll start the test right now!";
 			next;
diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt
index 902db7945..188bc514a 100644
--- a/npc/re/quests/eden/eden_tutorial.txt
+++ b/npc/re/quests/eden/eden_tutorial.txt
@@ -228,7 +228,7 @@ moc_para01,34,178,3	script	Tutorial Instructor	4_M_KHMAN,{
 			close;
 		}
 	} else if (questprogress(9167) == 1) {
-		if (!getmercinfo(1)) {
+		if (!getmercinfo(MERCINFO_CLASS)) {
 			mes "[Tutorial Instructor]";
 			mes "You haven't gotten a mercenary yet.";
 			next;
-- 
cgit v1.2.3-60-g2f50