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

1 files changed, 13 insertions, 13 deletions

diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 2d2f76324..51304c1a0 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -22,7 +22,7 @@
 //============================================================
 
 // Entrance //
-prontera,158,193,6	script	Monster Arena	702,{
+prontera,158,193,6	script	Monster Arena	4_F_GON,{
 	mes "[Monster Arena]";
 	mes "Would you like to enter the Monster Arena?";
 	mes "Currently ^FF0000" + getmapusers("gon_test") + "^000000 players";
@@ -96,7 +96,7 @@ function	script	monstersummon	{
 }
 
 // Referee //
--	script	monsterreferee	61,{
+-	script	monsterreferee	1_M_PUBMASTER,{
 	if (@fighting == 1) end;
 	if (@battle == 1) goto L_Start;
 	end;
@@ -193,11 +193,11 @@ L_Exit:
 	mes "Alright";
 	close;
 }
-gon_test,56,91,6	duplicate(monsterreferee)	Referee#01	61
+gon_test,56,91,6	duplicate(monsterreferee)	Referee#01	1_M_PUBMASTER
 
 
 // Usher //
-gon_test,58,94,6	script	Usher	86,{
+gon_test,58,94,6	script	Usher	4_M_04,{
 	set @marena,1;
 	mes "[Usher]";
 	mes "What would you like to do?";
@@ -274,7 +274,7 @@ L_Cancel:
 }
 
 // Monster Trainer //
-gon_test,52,103,6	script	Monster Trainer	87,{
+gon_test,52,103,6	script	Monster Trainer	4_M_BARBER,{
 	mes "[Monster Trainer]";
 	if (#monster != 0) goto L_Mon;
 
@@ -731,7 +731,7 @@ function	script	illegalkill	{
 }
 
 // Healer //
-gon_test,55,103,6	script	Nurse	90,{
+gon_test,55,103,6	script	Nurse	4_F_01,{
 	if (@battle == 1 || #heal == 0) goto L_NoHeal;
 	if (#heal == 1 && @healing < 100) goto L_Heal; //Total healing required
 	set @fighting,0;
@@ -752,14 +752,14 @@ L_NoHeal:
 }
 
 // Warps players //
-gon_test,57,86,5	script	Summon Pad 1::SummonPad	111,2,2,{
+gon_test,57,86,5	script	Summon Pad 1::SummonPad	HIDDEN_NPC,2,2,{
 	end;
 OnTouch:
 	set @marena,1;
 	warp "gon_test",57,99;
 }
-gon_test,43,87,5	duplicate(SummonPad)	Summon Pad 2	111,2,2
-gon_test,72,87,5	duplicate(SummonPad)	Summon Pad 3	111,2,2
+gon_test,43,87,5	duplicate(SummonPad)	Summon Pad 2	HIDDEN_NPC,2,2
+gon_test,72,87,5	duplicate(SummonPad)	Summon Pad 3	HIDDEN_NPC,2,2
 
 
 
@@ -767,7 +767,7 @@ gon_test,72,87,5	duplicate(SummonPad)	Summon Pad 3	111,2,2
 gon_test	mapflag	noskill
 
 // Duel Arena //
-gon_test,58,103,5	script	Duel Master#01	92,{
+gon_test,58,103,5	script	Duel Master#01	4_F_03,{
 	if ($@duelist1$ == "") set @duel,0;
 	if ($@monster1 == "") set @duel,0;
 	set @marena,1;
@@ -859,7 +859,7 @@ L_NeedHeal:
 }
 
 // Duel Exit //
-gon_test,42,8,5	script	Duel Master#02	92,{
+gon_test,42,8,5	script	Duel Master#02	4_F_03,{
 	mes "[Duel Master]";
 	mes "Would you like to return?";
 	menu "Yes",L_Leave,"No",-;
@@ -891,5 +891,5 @@ L_Leave2:
 	goto L_Leave3;
 }
 
-gon_test,49,5,5	duplicate(SummonPad)	Summon Pad 4	111,2,2
-gon_test,55,8,6	duplicate(monsterreferee)	Referee#02	61
+gon_test,49,5,5	duplicate(SummonPad)	Summon Pad 4	HIDDEN_NPC,2,2
+gon_test,55,8,6	duplicate(monsterreferee)	Referee#02	1_M_PUBMASTER