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

1 files changed, 10 insertions, 10 deletions

diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index 5c0ecdc7a..d986b047f 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -17,7 +17,7 @@
 
 // Arch Bishop Enchants :: coin_arc
 //============================================================
-mora,88,89,5	script	Keeper of Secrets#pa082	495,{
+mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -138,7 +138,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	495,{
 	}
 }
 
-mora,96,74,5	script	Master of Relics#pa0829	495,{
+mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -317,7 +317,7 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 
 // Warlock Enchants :: coin_warrock
 //============================================================
-mora,104,76,4	script	Guardian of Artifacts#p	495,{
+mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -390,7 +390,7 @@ mora,104,76,4	script	Guardian of Artifacts#p	495,{
 	close;
 }
 
-mora,99,93,5	script	Artifact Crafter#pa0829	495,{
+mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -522,7 +522,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	495,{
 
 // Rune Knight, Guillotine Cross, & Ranger Enchants :: new_artifact
 //============================================================
-mora,152,97,5	script	Guardian of Power#pa082	515,{
+mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 	if (checkweight(1201,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
@@ -593,7 +593,7 @@ mora,152,97,5	script	Guardian of Power#pa082	515,{
 	close;
 }
 
-mora,148,98,3	script	Artifact Researcher#new	521,{
+mora,148,98,3	script	Artifact Researcher#new	4_F_MORAFINE2,{
 	if (checkweight(1201,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
@@ -1151,7 +1151,7 @@ L_Socket:
 
 // Arch Bishop & Warlock Empowering :: relic_change
 //============================================================
-mora,124,82,4	script	Artifact Collector#blan	522,{
+mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
 	if (checkweight(1201,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
@@ -1504,7 +1504,7 @@ function	script	F_Mora_Enchant	{
 	getitem2 getarg(0),1,1,0,0,0,.@enchants[1],.@enchants[2],.@enchants[3];
 	return 1;
 }
-mora,105,176,4	script	Master Tailor#pa0829	509,{
+mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -1596,7 +1596,7 @@ mora,105,176,4	script	Master Tailor#pa0829	509,{
 	}
 }
 
-mora,123,177,6	script	Pendant Crafter#pa0829	509,{
+mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
@@ -1666,7 +1666,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	509,{
 	}
 }
 
-mora,134,166,4	script	Bulberry Westhood#pa0829	509,{
+mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 	if (checkweight(1201,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;