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

1 files changed, 74 insertions, 74 deletions

diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index f1de9e6d9..e0098bf9b 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -13,7 +13,7 @@
 //= 1.2 Added GM management function. [Euphy]
 //============================================================
 
-arug_dun01,1,1,1	script	Monster Controler#aru_gd	81,{
+arug_dun01,1,1,1	script	Monster Controler#aru_gd	4_DOG01,{
 OnInit:
 	donpcevent "Monster Controler1#aru::OnKill";
 	initnpctimer;
@@ -27,7 +27,7 @@ OnTimer3600000:
 	end;
 }
 
-arug_dun01,1,2,1	script	Monster Controler1#aru	81,{
+arug_dun01,1,2,1	script	Monster Controler1#aru	4_DOG01,{
 OnEnable:
 	set .@callwhere,rand(1,4);
 	if (.@callwhere == 1) {
@@ -57,7 +57,7 @@ OnMyMobDead:
 	end;
 }
 
-arug_dun01,199,195,5	script	Dwarf#aru_gd	826,{
+arug_dun01,199,195,5	script	Dwarf#aru_gd	4_M_DWARF,{
 	if (getcharid(2) == 0) {
 		mes "[Dwarf]";
 		mes "Hey did you see an ugly Goblin come by? He stole something from me!";
@@ -476,7 +476,7 @@ OnEnable:
 	end;
 }
 
-arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
+arug_que01,100,81,3	script	Pierrot Pier#aru_gd	4_M_PIERROT,{
 	specialeffect EF_POISONHIT;
 	set .@sprchg_gd,rand(1,5);
 	if (.@sprchg_gd == 1) {
@@ -1019,7 +1019,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 	}
 }
 
-arug_que01,10,10,3	script	Controller#gdevent_a	81,{
+arug_que01,10,10,3	script	Controller#gdevent_a	4_DOG01,{
 OnInit:
 	set $@gdeventv_a2,0;
 	end;
@@ -1089,7 +1089,7 @@ OnTimer63000:
 	end;
 }
 
-arug_que01,87,93,0	script	paper_sp_1_a	139,{
+arug_que01,87,93,0	script	paper_sp_1_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1114,7 +1114,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,102,93,0	script	paper_sp_2_a	139,{
+arug_que01,102,93,0	script	paper_sp_2_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1139,7 +1139,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,117,93,0	script	paper_sp_3_a	139,{
+arug_que01,117,93,0	script	paper_sp_3_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1164,7 +1164,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,87,80,0	script	paper_sp_4_a	139,{
+arug_que01,87,80,0	script	paper_sp_4_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1189,7 +1189,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,102,80,0	script	paper_sp_5_a	139,{
+arug_que01,102,80,0	script	paper_sp_5_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1214,7 +1214,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,117,80,0	script	paper_sp_6_a	139,{
+arug_que01,117,80,0	script	paper_sp_6_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1239,7 +1239,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,87,65,0	script	paper_sp_7_a	139,{
+arug_que01,87,65,0	script	paper_sp_7_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1264,7 +1264,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,102,65,0	script	paper_sp_8_a	139,{
+arug_que01,102,65,0	script	paper_sp_8_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1289,7 +1289,7 @@ OnBingo:
 	end;
 }
 
-arug_que01,117,65,0	script	paper_sp_9_a	139,{
+arug_que01,117,65,0	script	paper_sp_9_a	HIDDEN_WARP_NPC,{
 	end;
 
 OnEnable:
@@ -1331,7 +1331,7 @@ OnTouch2:
 	end;
 }
 
-arug_que01,6,6,1	script	eff_mvp#aru_gd	844,{
+arug_que01,6,6,1	script	eff_mvp#aru_gd	CLEAR_NPC,{
 	end;
 
 Onmvp:
@@ -1370,7 +1370,7 @@ OnTimer4000:
 	end;
 }
 
-arug_que01,100,75,5	script	Gergath#aru_gd	412,{
+arug_que01,100,75,5	script	Gergath#aru_gd	4_M_OLDFRIAR,{
 	end;
 
 OnInit:
@@ -1429,7 +1429,7 @@ OnTimer50000:
 arug_que01,104,140,0	warp	back#aru_gd	1,1,arug_dun01,199,192
 
 /*
-arug_que01,104,140,1	script	treg#aru_gd	844,{
+arug_que01,104,140,1	script	treg#aru_gd	CLEAR_NPC,{
 	end;
 
 OnEnable:
@@ -1453,66 +1453,66 @@ OnMyMobDead:
 }
 */
 
-arug_que01,98,105,3	script	#aru_flower_01::GD_Ev_Flower	978,{
+arug_que01,98,105,3	script	#aru_flower_01::GD_Ev_Flower	4_YELL_FLOWER,{
 	end;
 }
 
-arug_que01,94,105,3	duplicate(GD_Ev_Flower)	#aru_flower_02	977
-arug_que01,90,105,3	duplicate(GD_Ev_Flower)	#aru_flower_03	978
-arug_que01,86,105,3	duplicate(GD_Ev_Flower)	#aru_flower_04	977
-arug_que01,82,105,3	duplicate(GD_Ev_Flower)	#aru_flower_05	978
-arug_que01,79,103,3	duplicate(GD_Ev_Flower)	#aru_flower_06	977
-arug_que01,79,100,3	duplicate(GD_Ev_Flower)	#aru_flower_07	978
-arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_08	977
-arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_09	978
-arug_que01,79,94,3	duplicate(GD_Ev_Flower)	#aru_flower_10	977
-arug_que01,79,91,3	duplicate(GD_Ev_Flower)	#aru_flower_11	978
-arug_que01,79,88,3	duplicate(GD_Ev_Flower)	#aru_flower_12	977
-arug_que01,79,85,3	duplicate(GD_Ev_Flower)	#aru_flower_13	978
-arug_que01,79,82,3	duplicate(GD_Ev_Flower)	#aru_flower_14	977
-arug_que01,79,79,3	duplicate(GD_Ev_Flower)	#aru_flower_15	978
-arug_que01,79,76,3	duplicate(GD_Ev_Flower)	#aru_flower_16	977
-arug_que01,79,73,3	duplicate(GD_Ev_Flower)	#aru_flower_17	978
-arug_que01,79,70,3	duplicate(GD_Ev_Flower)	#aru_flower_18	977
-arug_que01,79,67,3	duplicate(GD_Ev_Flower)	#aru_flower_19	978
-arug_que01,79,64,3	duplicate(GD_Ev_Flower)	#aru_flower_20	977
-arug_que01,79,61,3	duplicate(GD_Ev_Flower)	#aru_flower_21	978
-arug_que01,79,58,3	duplicate(GD_Ev_Flower)	#aru_flower_22	977
-arug_que01,84,58,3	duplicate(GD_Ev_Flower)	#aru_flower_23	978
-arug_que01,89,58,3	duplicate(GD_Ev_Flower)	#aru_flower_24	977
-arug_que01,94,58,3	duplicate(GD_Ev_Flower)	#aru_flower_25	978
-arug_que01,99,58,3	duplicate(GD_Ev_Flower)	#aru_flower_26	977
-arug_que01,104,58,3	duplicate(GD_Ev_Flower)	#aru_flower_27	978
-arug_que01,109,58,3	duplicate(GD_Ev_Flower)	#aru_flower_28	977
-arug_que01,114,58,3	duplicate(GD_Ev_Flower)	#aru_flower_29	978
-arug_que01,119,58,3	duplicate(GD_Ev_Flower)	#aru_flower_30	977
-arug_que01,124,58,3	duplicate(GD_Ev_Flower)	#aru_flower_31	978
-arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_32	977
-arug_que01,129,105,3	duplicate(GD_Ev_Flower)	#aru_flower_33	978
-arug_que01,129,103,3	duplicate(GD_Ev_Flower)	#aru_flower_34	977
-arug_que01,129,100,3	duplicate(GD_Ev_Flower)	#aru_flower_35	978
-arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_36	977
-arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_37	978
-arug_que01,129,94,3	duplicate(GD_Ev_Flower)	#aru_flower_38	977
-arug_que01,129,91,3	duplicate(GD_Ev_Flower)	#aru_flower_39	978
-arug_que01,129,88,3	duplicate(GD_Ev_Flower)	#aru_flower_40	977
-arug_que01,129,85,3	duplicate(GD_Ev_Flower)	#aru_flower_41	978
-arug_que01,129,82,3	duplicate(GD_Ev_Flower)	#aru_flower_42	977
-arug_que01,129,79,3	duplicate(GD_Ev_Flower)	#aru_flower_43	978
-arug_que01,129,76,3	duplicate(GD_Ev_Flower)	#aru_flower_44	977
-arug_que01,129,73,3	duplicate(GD_Ev_Flower)	#aru_flower_45	978
-arug_que01,129,70,3	duplicate(GD_Ev_Flower)	#aru_flower_46	977
-arug_que01,129,67,3	duplicate(GD_Ev_Flower)	#aru_flower_47	978
-arug_que01,129,64,3	duplicate(GD_Ev_Flower)	#aru_flower_48	977
-arug_que01,129,61,3	duplicate(GD_Ev_Flower)	#aru_flower_49	978
-arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_50	977
-arug_que01,124,105,3	duplicate(GD_Ev_Flower)	#aru_flower_51	978
-arug_que01,119,105,3	duplicate(GD_Ev_Flower)	#aru_flower_52	977
-arug_que01,114,105,3	duplicate(GD_Ev_Flower)	#aru_flower_53	978
-arug_que01,109,105,3	duplicate(GD_Ev_Flower)	#aru_flower_54	977
-arug_que01,104,105,3	duplicate(GD_Ev_Flower)	#aru_flower_55	976
-
-arug_dun01,5,5,1	script	Event controller#aru_gd	81,{
+arug_que01,94,105,3	duplicate(GD_Ev_Flower)	#aru_flower_02	4_RED_FLOWER
+arug_que01,90,105,3	duplicate(GD_Ev_Flower)	#aru_flower_03	4_YELL_FLOWER
+arug_que01,86,105,3	duplicate(GD_Ev_Flower)	#aru_flower_04	4_RED_FLOWER
+arug_que01,82,105,3	duplicate(GD_Ev_Flower)	#aru_flower_05	4_YELL_FLOWER
+arug_que01,79,103,3	duplicate(GD_Ev_Flower)	#aru_flower_06	4_RED_FLOWER
+arug_que01,79,100,3	duplicate(GD_Ev_Flower)	#aru_flower_07	4_YELL_FLOWER
+arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_08	4_RED_FLOWER
+arug_que01,79,97,3	duplicate(GD_Ev_Flower)	#aru_flower_09	4_YELL_FLOWER
+arug_que01,79,94,3	duplicate(GD_Ev_Flower)	#aru_flower_10	4_RED_FLOWER
+arug_que01,79,91,3	duplicate(GD_Ev_Flower)	#aru_flower_11	4_YELL_FLOWER
+arug_que01,79,88,3	duplicate(GD_Ev_Flower)	#aru_flower_12	4_RED_FLOWER
+arug_que01,79,85,3	duplicate(GD_Ev_Flower)	#aru_flower_13	4_YELL_FLOWER
+arug_que01,79,82,3	duplicate(GD_Ev_Flower)	#aru_flower_14	4_RED_FLOWER
+arug_que01,79,79,3	duplicate(GD_Ev_Flower)	#aru_flower_15	4_YELL_FLOWER
+arug_que01,79,76,3	duplicate(GD_Ev_Flower)	#aru_flower_16	4_RED_FLOWER
+arug_que01,79,73,3	duplicate(GD_Ev_Flower)	#aru_flower_17	4_YELL_FLOWER
+arug_que01,79,70,3	duplicate(GD_Ev_Flower)	#aru_flower_18	4_RED_FLOWER
+arug_que01,79,67,3	duplicate(GD_Ev_Flower)	#aru_flower_19	4_YELL_FLOWER
+arug_que01,79,64,3	duplicate(GD_Ev_Flower)	#aru_flower_20	4_RED_FLOWER
+arug_que01,79,61,3	duplicate(GD_Ev_Flower)	#aru_flower_21	4_YELL_FLOWER
+arug_que01,79,58,3	duplicate(GD_Ev_Flower)	#aru_flower_22	4_RED_FLOWER
+arug_que01,84,58,3	duplicate(GD_Ev_Flower)	#aru_flower_23	4_YELL_FLOWER
+arug_que01,89,58,3	duplicate(GD_Ev_Flower)	#aru_flower_24	4_RED_FLOWER
+arug_que01,94,58,3	duplicate(GD_Ev_Flower)	#aru_flower_25	4_YELL_FLOWER
+arug_que01,99,58,3	duplicate(GD_Ev_Flower)	#aru_flower_26	4_RED_FLOWER
+arug_que01,104,58,3	duplicate(GD_Ev_Flower)	#aru_flower_27	4_YELL_FLOWER
+arug_que01,109,58,3	duplicate(GD_Ev_Flower)	#aru_flower_28	4_RED_FLOWER
+arug_que01,114,58,3	duplicate(GD_Ev_Flower)	#aru_flower_29	4_YELL_FLOWER
+arug_que01,119,58,3	duplicate(GD_Ev_Flower)	#aru_flower_30	4_RED_FLOWER
+arug_que01,124,58,3	duplicate(GD_Ev_Flower)	#aru_flower_31	4_YELL_FLOWER
+arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_32	4_RED_FLOWER
+arug_que01,129,105,3	duplicate(GD_Ev_Flower)	#aru_flower_33	4_YELL_FLOWER
+arug_que01,129,103,3	duplicate(GD_Ev_Flower)	#aru_flower_34	4_RED_FLOWER
+arug_que01,129,100,3	duplicate(GD_Ev_Flower)	#aru_flower_35	4_YELL_FLOWER
+arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_36	4_RED_FLOWER
+arug_que01,129,97,3	duplicate(GD_Ev_Flower)	#aru_flower_37	4_YELL_FLOWER
+arug_que01,129,94,3	duplicate(GD_Ev_Flower)	#aru_flower_38	4_RED_FLOWER
+arug_que01,129,91,3	duplicate(GD_Ev_Flower)	#aru_flower_39	4_YELL_FLOWER
+arug_que01,129,88,3	duplicate(GD_Ev_Flower)	#aru_flower_40	4_RED_FLOWER
+arug_que01,129,85,3	duplicate(GD_Ev_Flower)	#aru_flower_41	4_YELL_FLOWER
+arug_que01,129,82,3	duplicate(GD_Ev_Flower)	#aru_flower_42	4_RED_FLOWER
+arug_que01,129,79,3	duplicate(GD_Ev_Flower)	#aru_flower_43	4_YELL_FLOWER
+arug_que01,129,76,3	duplicate(GD_Ev_Flower)	#aru_flower_44	4_RED_FLOWER
+arug_que01,129,73,3	duplicate(GD_Ev_Flower)	#aru_flower_45	4_YELL_FLOWER
+arug_que01,129,70,3	duplicate(GD_Ev_Flower)	#aru_flower_46	4_RED_FLOWER
+arug_que01,129,67,3	duplicate(GD_Ev_Flower)	#aru_flower_47	4_YELL_FLOWER
+arug_que01,129,64,3	duplicate(GD_Ev_Flower)	#aru_flower_48	4_RED_FLOWER
+arug_que01,129,61,3	duplicate(GD_Ev_Flower)	#aru_flower_49	4_YELL_FLOWER
+arug_que01,129,58,3	duplicate(GD_Ev_Flower)	#aru_flower_50	4_RED_FLOWER
+arug_que01,124,105,3	duplicate(GD_Ev_Flower)	#aru_flower_51	4_YELL_FLOWER
+arug_que01,119,105,3	duplicate(GD_Ev_Flower)	#aru_flower_52	4_RED_FLOWER
+arug_que01,114,105,3	duplicate(GD_Ev_Flower)	#aru_flower_53	4_YELL_FLOWER
+arug_que01,109,105,3	duplicate(GD_Ev_Flower)	#aru_flower_54	4_RED_FLOWER
+arug_que01,104,105,3	duplicate(GD_Ev_Flower)	#aru_flower_55	4_BLUE_FLOWER
+
+arug_dun01,5,5,1	script	Event controller#aru_gd	4_DOG01,{
 	if (callfunc("F_GM_NPC",1854,0) < 1) {
 		mes "Incorrect password.";
 		close;