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

1 files changed, 21 insertions, 21 deletions

diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index 7edd069e0..48ee8e47e 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -19,7 +19,7 @@
 //============================================================
 
 //Warps you into race way
-morocc,166,105,6	script	Race Girl#01	116,{
+morocc,166,105,6	script	Race Girl#01	4_F_KAFRA2,{
 	mes "[Race Girl]";
 	mes "Would you like to visit ^0000FFMorroc Raceway^000000?";
 	next;
@@ -33,7 +33,7 @@ L_Warp:
 }
 
 //Warps you out of raceway
-pvp_y_1-5,169,265,5	script	Race Girl#02	116,{
+pvp_y_1-5,169,265,5	script	Race Girl#02	4_F_KAFRA2,{
 	mes "[Race Girl]";
 	mes "Welcome to Morroc Raceway!";
 	next;
@@ -56,7 +56,7 @@ L_Cancel:
 }
 
 //Counts down and starts race
-pvp_y_1-5,145,269,5	script	Starter	733,{
+pvp_y_1-5,145,269,5	script	Starter	4_M_JOB_KNIGHT1,{
 	if ($@race != 0) goto L_Started;
 	if ($@counting != 0) goto L_Started;
 	if ($@racecount == 1) goto L_Started;
@@ -110,7 +110,7 @@ OnInit:
 }
 
 //Checkpoint 1
-pvp_y_1-5,144,262,5	script	Check Point 1	111,0,5,{
+pvp_y_1-5,144,262,5	script	Check Point 1	HIDDEN_NPC,0,5,{
 	end;
 OnTouch:
 	if (@raceid != $@raceid) goto L_Started;
@@ -128,7 +128,7 @@ L_Finished:
 }
 
 //Checkpoint 2
-pvp_y_1-5,73,247,5	script	Check Point 2	111,6,6,{
+pvp_y_1-5,73,247,5	script	Check Point 2	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 1) goto L_Miss;
@@ -141,7 +141,7 @@ L_Miss:
 }
 
 //Checkpoint 3
-pvp_y_1-5,77,44,5	script	Check Point 3	111,6,6,{
+pvp_y_1-5,77,44,5	script	Check Point 3	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 2) goto L_Miss;
@@ -154,7 +154,7 @@ L_Miss:
 }
 
 //Checkpoint 3
-pvp_y_1-5,249,60,5	script	Check Point 4	111,6,6,{
+pvp_y_1-5,249,60,5	script	Check Point 4	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 3) goto L_Miss;
@@ -167,7 +167,7 @@ L_Miss:
 }
 
 //Checkpoint 4
-pvp_y_1-5,255,256,5	script	Check Point 5	111,6,6,{
+pvp_y_1-5,255,256,5	script	Check Point 5	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@race != 4) goto L_Miss;
@@ -180,7 +180,7 @@ L_Miss:
 }
 
 //Finish Line
-pvp_y_1-5,174,244,5	script	Finish Line	111,6,6,{
+pvp_y_1-5,174,244,5	script	Finish Line	HIDDEN_NPC,6,6,{
 	end;
 OnTouch:
 	if (@raceid != $@raceid) goto L_WrongRace;
@@ -198,39 +198,39 @@ L_WrongRace:
 }
 
 //Check Point Marker Flags
-pvp_y_1-5,144,267,4	script	Check Point 1#01	722,{
+pvp_y_1-5,144,267,4	script	Check Point 1#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,144,257,4	script	Check Point 1#02	722,{
+pvp_y_1-5,144,257,4	script	Check Point 1#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,70,252,3	script	Check Point 2#01	722,{
+pvp_y_1-5,70,252,3	script	Check Point 2#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,77,243,3	script	Check Point 2#02	722,{
+pvp_y_1-5,77,243,3	script	Check Point 2#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,81,48,1	script	Check Point 3#01	722,{
+pvp_y_1-5,81,48,1	script	Check Point 3#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,72,40,1	script	Check Point 3#02	722,{
+pvp_y_1-5,72,40,1	script	Check Point 3#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,244,65,7	script	Check Point 4#01	722,{
+pvp_y_1-5,244,65,7	script	Check Point 4#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,252,57,7	script	Check Point 4#02	722,{
+pvp_y_1-5,252,57,7	script	Check Point 4#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,259,260,5	script	Check Point 5#01	722,{
+pvp_y_1-5,259,260,5	script	Check Point 5#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,251,252,5	script	Check Point 5#02	722,{
+pvp_y_1-5,251,252,5	script	Check Point 5#02	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,174,249,4	script	Finish Line#01	722,{
+pvp_y_1-5,174,249,4	script	Finish Line#01	GUILD_FLAG,{
 	end;
 }
-pvp_y_1-5,174,238,4	script	Finish Line#02	722,{
+pvp_y_1-5,174,238,4	script	Finish Line#02	GUILD_FLAG,{
 	end;
 }