Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

5 files changed, 65 insertions, 65 deletions

diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index 01119b97e..4fb84ddc3 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -19,7 +19,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,169,226,5	script	KVM Waiting Room#a::KvM01R_Guillaume	418,{
+bat_room,169,226,5	script	KVM Waiting Room#a::KvM01R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -33,7 +33,7 @@ OnEnterBG:
 
 bat_room,169,220,0	warp	#kvm801	2,2,bat_room,154,150
 
-bat_room,169,205,3	script	KVM Waiting Room#b::KvM01R_Croix	414,{
+bat_room,169,205,3	script	KVM Waiting Room#b::KvM01R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -61,23 +61,23 @@ OnKvM01Two:
 	end;
 }
 
-bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	139
-bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	139
-bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	139
-bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	139
-bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	139
-bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	139
-bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	139
+bat_c01,54,124,3	duplicate(CellEffect)	#RedcellA1-1	HIDDEN_WARP_NPC
+bat_c01,55,124,3	duplicate(CellEffect)	#RedcellA2-1	HIDDEN_WARP_NPC
+bat_c01,56,124,3	duplicate(CellEffect)	#RedcellA3-1	HIDDEN_WARP_NPC
+bat_c01,57,124,3	duplicate(CellEffect)	#RedcellA4-1	HIDDEN_WARP_NPC
+bat_c01,57,125,3	duplicate(CellEffect)	#RedcellA5-1	HIDDEN_WARP_NPC
+bat_c01,57,126,3	duplicate(CellEffect)	#RedcellA6-1	HIDDEN_WARP_NPC
+bat_c01,57,127,3	duplicate(CellEffect)	#RedcellA7-1	HIDDEN_WARP_NPC
 
-bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	139
-bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	139
-bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	139
-bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	139
-bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	139
-bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	139
-bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	139
+bat_c01,145,59,3	duplicate(CellEffect)	#RedcellB1-1	HIDDEN_WARP_NPC
+bat_c01,144,59,3	duplicate(CellEffect)	#RedcellB2-1	HIDDEN_WARP_NPC
+bat_c01,143,59,3	duplicate(CellEffect)	#RedcellB3-1	HIDDEN_WARP_NPC
+bat_c01,142,59,3	duplicate(CellEffect)	#RedcellB4-1	HIDDEN_WARP_NPC
+bat_c01,142,56,3	duplicate(CellEffect)	#RedcellB5-1	HIDDEN_WARP_NPC
+bat_c01,142,57,3	duplicate(CellEffect)	#RedcellB6-1	HIDDEN_WARP_NPC
+bat_c01,142,58,3	duplicate(CellEffect)	#RedcellB7-1	HIDDEN_WARP_NPC
 
-bat_c01,54,128,3	script	#A_camp_start01	139,4,4,{
+bat_c01,54,128,3	script	#A_camp_start01	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -98,7 +98,7 @@ OnTouch:
 	end;
 }
 
-bat_c01,146,56,3	script	#B_camp_start01	139,4,4,{
+bat_c01,146,56,3	script	#B_camp_start01	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -369,7 +369,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
+bat_c01,51,130,5	script	KVM Officer#KVM01A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
@@ -398,7 +398,7 @@ bat_c01,51,130,5	script	KVM Officer#KVM01A	419,{
 	end;
 }
 
-bat_c01,148,53,1	script	KVM Officer#KVM01B	415,{
+bat_c01,148,53,1	script	KVM Officer#KVM01B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM01BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index bb5991b1c..33982a2c5 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -21,7 +21,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	418,{
+bat_room,197,226,5	script	KVM Waiting Room#a2::KvM02R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -35,7 +35,7 @@ OnEnterBG:
 
 bat_room,197,220,0	warp	#kvm601	2,2,bat_room,154,150
 
-bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	414,{
+bat_room,197,205,3	script	KVM Waiting Room#b2::KvM02R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -63,23 +63,23 @@ OnKvM02Two:
 	end;
 }
 
-bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	139
-bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	139
-bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	139
-bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	139
-bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	139
-bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	139
-bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	139
+bat_c02,54,124,3	duplicate(CellEffect2)	#RedcellA1-2	HIDDEN_WARP_NPC
+bat_c02,55,124,3	duplicate(CellEffect2)	#RedcellA2-2	HIDDEN_WARP_NPC
+bat_c02,56,124,3	duplicate(CellEffect2)	#RedcellA3-2	HIDDEN_WARP_NPC
+bat_c02,57,124,3	duplicate(CellEffect2)	#RedcellA4-2	HIDDEN_WARP_NPC
+bat_c02,57,125,3	duplicate(CellEffect2)	#RedcellA5-2	HIDDEN_WARP_NPC
+bat_c02,57,126,3	duplicate(CellEffect2)	#RedcellA6-2	HIDDEN_WARP_NPC
+bat_c02,57,127,3	duplicate(CellEffect2)	#RedcellA7-2	HIDDEN_WARP_NPC
 
-bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	139
-bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	139
-bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	139
-bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	139
-bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	139
-bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	139
-bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	139
+bat_c02,145,59,3	duplicate(CellEffect2)	#RedcellB1-2	HIDDEN_WARP_NPC
+bat_c02,144,59,3	duplicate(CellEffect2)	#RedcellB2-2	HIDDEN_WARP_NPC
+bat_c02,143,59,3	duplicate(CellEffect2)	#RedcellB3-2	HIDDEN_WARP_NPC
+bat_c02,142,59,3	duplicate(CellEffect2)	#RedcellB4-2	HIDDEN_WARP_NPC
+bat_c02,142,56,3	duplicate(CellEffect2)	#RedcellB5-2	HIDDEN_WARP_NPC
+bat_c02,142,57,3	duplicate(CellEffect2)	#RedcellB6-2	HIDDEN_WARP_NPC
+bat_c02,142,58,3	duplicate(CellEffect2)	#RedcellB7-2	HIDDEN_WARP_NPC
 
-bat_c02,54,128,3	script	#A_camp_start02	139,4,4,{
+bat_c02,54,128,3	script	#A_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -100,7 +100,7 @@ OnTouch:
 	end;
 }
 
-bat_c02,146,56,3	script	#B_camp_start02	139,4,4,{
+bat_c02,146,56,3	script	#B_camp_start02	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -371,7 +371,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
+bat_c02,51,130,5	script	KVM Officer#KVM02A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c02,51,130,5	script	KVM Officer#KVM02A	419,{
 	end;
 }
 
-bat_c02,148,53,1	script	KVM Officer#KVM02B	415,{
+bat_c02,148,53,1	script	KVM Officer#KVM02B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM02BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 20abbdeb6..6866a7147 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -20,7 +20,7 @@
 
 // Waiting Room NPCs
 //============================================================
-bat_room,225,226,5	script	KVM Waiting Room#a3::KvM03R_Guillaume	418,{
+bat_room,225,226,5	script	KVM Waiting Room#a3::KvM03R_Guillaume	4_M_KY_KNT,{
 	end;
 
 OnInit:
@@ -34,7 +34,7 @@ OnEnterBG:
 
 bat_room,225,220,0	warp	#kvm701	2,2,bat_room,154,150
 
-bat_room,225,205,3	script	KVM Waiting Room#b3::KvM03R_Croix	414,{
+bat_room,225,205,3	script	KVM Waiting Room#b3::KvM03R_Croix	4_M_CRU_KNT,{
 	end;
 
 OnInit:
@@ -62,23 +62,23 @@ OnKvM03Two:
 	end;
 }
 
-bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	139
-bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	139
-bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	139
-bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	139
-bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	139
-bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	139
-bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	139
+bat_c03,54,124,3	duplicate(CellEffect3)	#RedcellA1-3	HIDDEN_WARP_NPC
+bat_c03,55,124,3	duplicate(CellEffect3)	#RedcellA2-3	HIDDEN_WARP_NPC
+bat_c03,56,124,3	duplicate(CellEffect3)	#RedcellA3-3	HIDDEN_WARP_NPC
+bat_c03,57,124,3	duplicate(CellEffect3)	#RedcellA4-3	HIDDEN_WARP_NPC
+bat_c03,57,125,3	duplicate(CellEffect3)	#RedcellA5-3	HIDDEN_WARP_NPC
+bat_c03,57,126,3	duplicate(CellEffect3)	#RedcellA6-3	HIDDEN_WARP_NPC
+bat_c03,57,127,3	duplicate(CellEffect3)	#RedcellA7-3	HIDDEN_WARP_NPC
 
-bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	139
-bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	139
-bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	139
-bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	139
-bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	139
-bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	139
-bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	139
+bat_c03,145,59,3	duplicate(CellEffect3)	#RedcellB1-3	HIDDEN_WARP_NPC
+bat_c03,144,59,3	duplicate(CellEffect3)	#RedcellB2-3	HIDDEN_WARP_NPC
+bat_c03,143,59,3	duplicate(CellEffect3)	#RedcellB3-3	HIDDEN_WARP_NPC
+bat_c03,142,59,3	duplicate(CellEffect3)	#RedcellB4-3	HIDDEN_WARP_NPC
+bat_c03,142,56,3	duplicate(CellEffect3)	#RedcellB5-3	HIDDEN_WARP_NPC
+bat_c03,142,57,3	duplicate(CellEffect3)	#RedcellB6-3	HIDDEN_WARP_NPC
+bat_c03,142,58,3	duplicate(CellEffect3)	#RedcellB7-3	HIDDEN_WARP_NPC
 
-bat_c03,54,128,3	script	#A_camp_start03	139,4,4,{
+bat_c03,54,128,3	script	#A_camp_start03	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -99,7 +99,7 @@ OnTouch:
 	end;
 }
 
-bat_c03,146,56,3	script	#B_camp_start03	139,4,4,{
+bat_c03,146,56,3	script	#B_camp_start03	HIDDEN_WARP_NPC,4,4,{
 	end;
 
 OnInit:
@@ -370,7 +370,7 @@ OnTimer60000:
 
 // Battleground rewards
 //============================================================
-bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
+bat_c03,51,130,5	script	KVM Officer#KVM03A	4_M_KY_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c03,51,130,5	script	KVM Officer#KVM03A	419,{
 	end;
 }
 
-bat_c03,148,53,1	script	KVM Officer#KVM03B	415,{
+bat_c03,148,53,1	script	KVM Officer#KVM03B	4_M_CRU_HEAD,{
 	if( $@KvM01BG_Victory )
 	{
 		if( $@KvM03BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index f1d3128a3..1b5e9062c 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -17,7 +17,7 @@
 
 // KvM Officer - Guillaume
 //============================================================
-bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
+bat_room,164,178,5	script	KVM Mercenary Officer#1	4_M_KY_KNT,{
 	/*
 	set .@kvm,checkquest(6026,PLAYTIME);
 	if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -57,7 +57,7 @@ bat_room,164,178,5	script	KVM Mercenary Officer#1	418,{
 
 // Guillaume Knight - KvM
 //============================================================
-bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
+bat_room,167,178,5	script	Guillaume Knight#kvm	4_M_KY_SOLD,{
 	mes "[Guillaume Knight]";
 	mes "Hello.";
 	mes "What do you want to know?";
@@ -117,7 +117,7 @@ bat_room,167,178,5	script	Guillaume Knight#kvm	417,{
 
 // KvM Officer - Croix
 //============================================================
-bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
+bat_room,164,121,1	script	KVM Mercenary Officer#2	4_M_CRU_KNT,{
 	/*
 	set .@kvm,checkquest(6025,PLAYTIME);
 	if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -157,7 +157,7 @@ bat_room,164,121,1	script	KVM Mercenary Officer#2	414,{
 
 // Croix Knight - KvM
 //============================================================
-bat_room,167,121,1	script	Croix Knight#kvm	413,{
+bat_room,167,121,1	script	Croix Knight#kvm	4_M_CRU_SOLD,{
 	mes "[Croix Knight]";
 	mes "Hello.";
 	mes "What do you want to know?";
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 6ddb5b3f8..92d3032e5 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -16,7 +16,7 @@
 //= 1.0 First Version.
 //============================================================
 
-bat_room,151,144,3	script	KVM Logistic Officer#a	734,{
+bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 	if (countitem(7773)) {
 		set .@pointstoadd,countitem(7773);
 		delitem 7773,.@pointstoadd;