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

2 files changed, 43 insertions, 43 deletions

diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt
index a5a7b1e72..0a9e4105b 100644
--- a/npc/re/guild/invest_main.txt
+++ b/npc/re/guild/invest_main.txt
@@ -224,7 +224,7 @@ function	script	F_Invest_Abyss	{
 
 // Script Core
 //============================================================
-prt_gld,1,1,0	script	#fund_master	844,{
+prt_gld,1,1,0	script	#fund_master	CLEAR_NPC,{
 	end;
 OnInit:
 	set .@invest_status, callfunc("F_Invest_Status");
@@ -386,7 +386,7 @@ OnReset:
 	end;
 }
 
-prt_gld,2,2,0	script	Investment_total#fund00	844,{
+prt_gld,2,2,0	script	Investment_total#fund00	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "Is this not working properly?";
 	next;
@@ -462,7 +462,7 @@ OnTimer3600000:
 	}
 }
 
-prt_gld,164,98,3	script	Revoting Manager#Invest1	421,{
+prt_gld,164,98,3	script	Revoting Manager#Invest1	4_M_BOSSCAT,{
 	mes "[Revoting Manager]";
 	mes "We are not accepting additional votes.";
 	mes "Please wait for our results announcement.";
@@ -552,7 +552,7 @@ OnTimer60000:
 	end;
 }
 
-prt_gld,164,98,3	script	Revoting Manager#Invest2	421,{
+prt_gld,164,98,3	script	Revoting Manager#Invest2	4_M_BOSSCAT,{
 	set .@invest, $2011_agit_invest;
 	if (.@invest < 11) {
 		mes "[Revoting Manager]";
@@ -666,7 +666,7 @@ OnTimer20000:
 }
 
 /*
-prtg_cas01,2,2,0	script	Abrai	55,{
+prtg_cas01,2,2,0	script	Abrai	1_M_JOBTESTER,{
 	mes "I should quit my steward job.";
 	close;
 OnAgitInvest:
@@ -1259,7 +1259,7 @@ L_Enter:
 
 // Item Investments
 //============================================================
-malangdo,218,126,4	script	Cat Paw Merchants Notice	857,{
+malangdo,218,126,4	script	Cat Paw Merchants Notice	4_BOARD3,{
 	mes "<< Cat Paw Merchants Notice >>";
 	mes "'^C379CEInvest Unused Items for Prizes!^000000'";
 	next;
@@ -1325,7 +1325,7 @@ malangdo,218,126,4	script	Cat Paw Merchants Notice	857,{
 	}
 }
 
-malangdo,218,123,1	script	Namis#invest	545,4,4,{
+malangdo,218,123,1	script	Namis#invest	4_CAT_SAILOR2,4,4,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -1465,7 +1465,7 @@ OnTouch:
 
 // Investment Rewards
 //============================================================
-malangdo,215,119,4	script	Thanks Ticket Machine	564,{
+malangdo,215,119,4	script	Thanks Ticket Machine	2_VENDING_MACHINE1,{
 	if (MaxWeight - Weight < 4500 || checkweight(1201,1) == 0) {
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
diff --git a/npc/re/guild/invest_npc.txt b/npc/re/guild/invest_npc.txt
index edc8eeacf..a1d564e00 100644
--- a/npc/re/guild/invest_npc.txt
+++ b/npc/re/guild/invest_npc.txt
@@ -16,50 +16,50 @@
 
 // Realms - Merchant Guilds, Gate Managers, Status Boards
 //============================================================
-alde_gld,186,157,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Megrez	549
-alde_gld,191,164,3	duplicate(Gate Manager#realm)	Gate Manager#alde_f00	421
-alde_gld,188,158,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Alde	857
+alde_gld,186,157,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Megrez	4_CAT_MERMASTER
+alde_gld,191,164,3	duplicate(Gate Manager#realm)	Gate Manager#alde_f00	4_M_BOSSCAT
+alde_gld,188,158,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Alde	4_BOARD3
 
-gef_fild13,187,208,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Meraq	549
-gef_fild13,189,206,3	duplicate(Gate Manager#realm)	Gate Manager#gef_f00	421
-gef_fild13,190,209,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Gef	857
+gef_fild13,187,208,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Meraq	4_CAT_MERMASTER
+gef_fild13,189,206,3	duplicate(Gate Manager#realm)	Gate Manager#gef_f00	4_M_BOSSCAT
+gef_fild13,190,209,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Gef	4_BOARD3
 
-pay_gld,203,189,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Phecda	549
-pay_gld,206,189,3	duplicate(Gate Manager#realm)	Gate Manager#pay_f00	421
-pay_gld,200,189,5	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Pay	857
+pay_gld,203,189,3	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Phecda	4_CAT_MERMASTER
+pay_gld,206,189,3	duplicate(Gate Manager#realm)	Gate Manager#pay_f00	4_M_BOSSCAT
+pay_gld,200,189,5	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Pay	4_BOARD3
 
-prt_gld,158,96,5	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Dubae	549
-prt_gld,161,96,3	duplicate(Gate Manager#realm)	Gate Manager#prt_f00	421
-prt_gld,163,99,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Prt	857
+prt_gld,158,96,5	duplicate(Cat Paw Merchant Guild)	Cat Paw Merchant Dubae	4_CAT_MERMASTER
+prt_gld,161,96,3	duplicate(Gate Manager#realm)	Gate Manager#prt_f00	4_M_BOSSCAT
+prt_gld,163,99,3	duplicate(Investment Status Board)	Investment Status Board::InvestStatus_Prt	4_BOARD3
 
 // Inside Castles - Gate Managers
 //============================================================
-aldeg_cas01,85,105,4	duplicate(Gate Manager#castle)	Gate Manager#alde_f01	421
-aldeg_cas02,124,49,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f02	421
-aldeg_cas03,121,75,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f03	421
-aldeg_cas04,25,67,7	duplicate(Gate Manager#castle)	Gate Manager#alde_f04	421
-aldeg_cas05,54,200,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f05	421
+aldeg_cas01,85,105,4	duplicate(Gate Manager#castle)	Gate Manager#alde_f01	4_M_BOSSCAT
+aldeg_cas02,124,49,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f02	4_M_BOSSCAT
+aldeg_cas03,121,75,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f03	4_M_BOSSCAT
+aldeg_cas04,25,67,7	duplicate(Gate Manager#castle)	Gate Manager#alde_f04	4_M_BOSSCAT
+aldeg_cas05,54,200,3	duplicate(Gate Manager#castle)	Gate Manager#alde_f05	4_M_BOSSCAT
 
-gefg_cas01,39,49,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f01	421
-gefg_cas02,10,65,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f02	421
-gefg_cas03,100,87,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f03	421
-gefg_cas04,35,44,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f04	421
-gefg_cas05,84,46,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f05	421
+gefg_cas01,39,49,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f01	4_M_BOSSCAT
+gefg_cas02,10,65,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f02	4_M_BOSSCAT
+gefg_cas03,100,87,4	duplicate(Gate Manager#castle)	Gate Manager#gef_f03	4_M_BOSSCAT
+gefg_cas04,35,44,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f04	4_M_BOSSCAT
+gefg_cas05,84,46,3	duplicate(Gate Manager#castle)	Gate Manager#gef_f05	4_M_BOSSCAT
 
-payg_cas01,129,59,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f01	421
-payg_cas02,27,277,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f02	421
-payg_cas03,51,266,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f03	421
-payg_cas04,39,264,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f04	421
-payg_cas05,272,252,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f05	421
+payg_cas01,129,59,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f01	4_M_BOSSCAT
+payg_cas02,27,277,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f02	4_M_BOSSCAT
+payg_cas03,51,266,3	duplicate(Gate Manager#castle)	Gate Manager#pay_f03	4_M_BOSSCAT
+payg_cas04,39,264,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f04	4_M_BOSSCAT
+payg_cas05,272,252,4	duplicate(Gate Manager#castle)	Gate Manager#pay_f05	4_M_BOSSCAT
 
-prtg_cas01,114,178,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f01	421
-prtg_cas02,89,63,5	duplicate(Gate Manager#castle)	Gate Manager#prt_f02	421
-prtg_cas03,72,109,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f03	421
-prtg_cas04,29,263,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f04	421
-prtg_cas05,24,23,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f05	421
+prtg_cas01,114,178,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f01	4_M_BOSSCAT
+prtg_cas02,89,63,5	duplicate(Gate Manager#castle)	Gate Manager#prt_f02	4_M_BOSSCAT
+prtg_cas03,72,109,3	duplicate(Gate Manager#castle)	Gate Manager#prt_f03	4_M_BOSSCAT
+prtg_cas04,29,263,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f04	4_M_BOSSCAT
+prtg_cas05,24,23,4	duplicate(Gate Manager#castle)	Gate Manager#prt_f05	4_M_BOSSCAT
 
 // iRO NPC Locations
 //============================================================
-//prt_gld,148,253,4	duplicate(Cat Paw Merchants Notice)	Cat Paw Merchants Notice::CatPawNotice_iRO	857
-//prt_gld,145,255,6	duplicate(Namis#invest)	Namis::Namis_iRO	545,4,4
-//prt_gld,165,50,4	duplicate(Thanks Ticket Machine)	Thanks Ticket Machine::ThanksMachine_iRO	564
+//prt_gld,148,253,4	duplicate(Cat Paw Merchants Notice)	Cat Paw Merchants Notice::CatPawNotice_iRO	4_BOARD3
+//prt_gld,145,255,6	duplicate(Namis#invest)	Namis::Namis_iRO	4_CAT_SAILOR2,4,4
+//prt_gld,165,50,4	duplicate(Thanks Ticket Machine)	Thanks Ticket Machine::ThanksMachine_iRO	2_VENDING_MACHINE1