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

1 files changed, 36 insertions, 36 deletions

diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 9b26e5138..d06db682e 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -40,7 +40,7 @@
 
 // Entrance
 //============================================================
-gef_fild10,242,202,0	script	Dimensional Gorge Piece	406,{
+gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 
 	set .@party_id,getcharid(1);
 	set .@p_name$,getpartyname(.@party_id);
@@ -116,7 +116,7 @@ L_Enter:
 	}
 }
 
-gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
+gef_fild10,238,202,6	script	Mad Scientist#orc	4_LGTSCIENCE,{
 	if (BaseLevel < 50) {
 		mes "The Mad Scientist doesn't seem to notice you and keeps mumbling to himself...";
 		close;
@@ -177,7 +177,7 @@ gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
 
 // Orc's Memory Floor 1
 //============================================================
-1@orcs,180,30,0	script	#Resurrect Monsters1	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -238,7 +238,7 @@ OnTimer4010:
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters2	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters2	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -270,7 +270,7 @@ OnMyMobDead:
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters3	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -311,7 +311,7 @@ OnMyMobDead:
 	end;
 }
 
-1@orcs,180,30,0	script	#Resurrect Monsters4	844,{
+1@orcs,180,30,0	script	#Resurrect Monsters4	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -332,12 +332,12 @@ OnDisable:
 	end;
 }
 
-1@orcs,180,29,4	script	Kruger#1-1	433,{
+1@orcs,180,29,4	script	Kruger#1-1	4_ORCWARRIOR,{
 	donpcevent instance_npcname("Kruger#1-2")+"::OnEnable";
 	end;
 }
 
-1@orcs,180,29,4	script	Kruger#1-2	433,{
+1@orcs,180,29,4	script	Kruger#1-2	4_ORCWARRIOR,{
 	end;
 
 OnInstanceInit:
@@ -397,7 +397,7 @@ OnTimer60000:
 
 }
 
-1@orcs,168,125,0	script	B1 Area 1	45,3,3,{
+1@orcs,168,125,0	script	B1 Area 1	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 1");
 	end;
@@ -426,7 +426,7 @@ OnTimer18700:
 	end;
 }
 
-1@orcs,89,94,0	script	B1 Area 2	45,3,3,{
+1@orcs,89,94,0	script	B1 Area 2	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 2");
 	end;
@@ -455,7 +455,7 @@ OnTimer37600:
 	end;
 }
 
-1@orcs,38,105,0	script	B1 Area 3	45,3,3,{
+1@orcs,38,105,0	script	B1 Area 3	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 3");
 	end;
@@ -484,7 +484,7 @@ OnTimer32700:
 	end;
 }
 
-1@orcs,21,189,0	script	B1 Area 4	45,3,3,{
+1@orcs,21,189,0	script	B1 Area 4	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("B1 Area 4");
 	end;
@@ -524,7 +524,7 @@ OnMyMobDead3:
 
 // Orc's Memory Floor 2
 //============================================================
-2@orcs,36,171,0	script	#2Resurrect Monsters1	844,{
+2@orcs,36,171,0	script	#2Resurrect Monsters1	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -582,7 +582,7 @@ OnTimer4010:
 	end;
 }
 
-2@orcs,36,171,0	script	#2Resurrect Monsters3	844,{
+2@orcs,36,171,0	script	#2Resurrect Monsters3	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -623,7 +623,7 @@ OnDisable:
 	end;
 }
 
-2@orcs,180,30,0	script	#2Resurrect Monsters4	844,{
+2@orcs,180,30,0	script	#2Resurrect Monsters4	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -640,12 +640,12 @@ OnMyMobDead:
 	end;
 }
 
-2@orcs,35,169,4	script	Kruger#2-1	433,{
+2@orcs,35,169,4	script	Kruger#2-1	4_ORCWARRIOR,{
 	donpcevent instance_npcname("Kruger#2-2")+"::OnEnable";
 	end;
 }
 
-2@orcs,35,169,4	script	Kruger#2-2	433,{
+2@orcs,35,169,4	script	Kruger#2-2	4_ORCWARRIOR,{
 	end;
 
 OnInstanceInit:
@@ -687,7 +687,7 @@ OnTimer23910:
 	end;
 }
 
-2@orcs,26,164,0	script	Torch#1-1	844,{
+2@orcs,26,164,0	script	Torch#1-1	CLEAR_NPC,{
 	if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
 	progressbar "ffff00",5;
 	setarray .@id[0], atoi(charat(strnpcinfo(2),0)), atoi(charat(strnpcinfo(2),2));
@@ -717,11 +717,11 @@ OnTimer2000:
 	stopnpctimer;
 	end;
 }
-2@orcs,55,155,0	duplicate(Torch#1-1)	Torch#1-2	844
-2@orcs,108,146,0	duplicate(Torch#1-1)	Torch#1-3	844
-2@orcs,98,171,0	duplicate(Torch#1-1)	Torch#1-4	844
+2@orcs,55,155,0	duplicate(Torch#1-1)	Torch#1-2	CLEAR_NPC
+2@orcs,108,146,0	duplicate(Torch#1-1)	Torch#1-3	CLEAR_NPC
+2@orcs,98,171,0	duplicate(Torch#1-1)	Torch#1-4	CLEAR_NPC
 
-2@orcs,48,100,0	script	#Warp2-1	45,3,3,{
+2@orcs,48,100,0	script	#Warp2-1	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp2-1");
 	end;
@@ -747,12 +747,12 @@ OnTouch:
 	end;
 }
 
-2@orcs,35,92,0	duplicate(Torch#1-1)	Torch#2-1	844
-2@orcs,32,70,0	duplicate(Torch#1-1)	Torch#2-2	844
-2@orcs,70,31,0	duplicate(Torch#1-1)	Torch#2-3	844
-2@orcs,84,51,0	duplicate(Torch#1-1)	Torch#2-4	844
+2@orcs,35,92,0	duplicate(Torch#1-1)	Torch#2-1	CLEAR_NPC
+2@orcs,32,70,0	duplicate(Torch#1-1)	Torch#2-2	CLEAR_NPC
+2@orcs,70,31,0	duplicate(Torch#1-1)	Torch#2-3	CLEAR_NPC
+2@orcs,84,51,0	duplicate(Torch#1-1)	Torch#2-4	CLEAR_NPC
 
-2@orcs,101,55,0	script	#Warp2-2	45,3,3,{
+2@orcs,101,55,0	script	#Warp2-2	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp2-2");
 	end;
@@ -778,12 +778,12 @@ OnTouch:
 	end;
 }
 
-2@orcs,142,145,0	duplicate(Torch#1-1)	Torch#3-1	844
-2@orcs,162,134,0	duplicate(Torch#1-1)	Torch#3-2	844
-2@orcs,144,117,0	duplicate(Torch#1-1)	Torch#3-3	844
-2@orcs,136,98,0	duplicate(Torch#1-1)	Torch#3-4	844
+2@orcs,142,145,0	duplicate(Torch#1-1)	Torch#3-1	CLEAR_NPC
+2@orcs,162,134,0	duplicate(Torch#1-1)	Torch#3-2	CLEAR_NPC
+2@orcs,144,117,0	duplicate(Torch#1-1)	Torch#3-3	CLEAR_NPC
+2@orcs,136,98,0	duplicate(Torch#1-1)	Torch#3-4	CLEAR_NPC
 
-2@orcs,167,104,0	script	#Warp2-3	45,3,3,{
+2@orcs,167,104,0	script	#Warp2-3	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp2-3");
 	end;
@@ -823,7 +823,7 @@ OnTouch:
 	end;
 }
 
-2@orcs,36,171,0	script	#Boss Control	844,{
+2@orcs,36,171,0	script	#Boss Control	CLEAR_NPC,{
 	end;
 
 OnInstanceInit:
@@ -862,7 +862,7 @@ OnMyMobDead:
 	end;
 }
 
-2@orcs,182,8,0	script	#Warp Outside Orc Dun	45,3,3,{
+2@orcs,182,8,0	script	#Warp Outside Orc Dun	WARPNPC,3,3,{
 OnInstanceInit:
 	disablenpc instance_npcname("#Warp Outside Orc Dun");
 	end;
@@ -876,7 +876,7 @@ OnTouch:
 	end;
 }
 
-2@orcs,172,13,0	script	Kruger#	434,{
+2@orcs,172,13,0	script	Kruger#	4_ORCWARRIOR2,{
 	if (yong_odun < 2) {
 		mes "[Kruger]";
 		mes "*Coughing*";
@@ -917,7 +917,7 @@ OnEnable:
 	end;
 }
 
-2@orcs,36,171,0	script	#Mobs Control	844,{
+2@orcs,36,171,0	script	#Mobs Control	CLEAR_NPC,{
 	end;
 
 OnMyMobDead1: