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

6 files changed, 55 insertions, 55 deletions

diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 2b708e1ef..bf2a17acf 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -14,7 +14,7 @@
 //= -> Juno -> Hugel -> ...
 //============================================================
 
-airplane,243,73,0	script	#AirshipWarp-1	45,1,1,{
+airplane,243,73,0	script	#AirshipWarp-1	WARPNPC,1,1,{
 	end;
 
 OnInit:
@@ -37,7 +37,7 @@ OnTouch:
 	}
 }
 
-airplane,243,29,0	duplicate(#AirshipWarp-1)	#AirshipWarp-2	45,1,1
+airplane,243,29,0	duplicate(#AirshipWarp-1)	#AirshipWarp-2	WARPNPC,1,1
 
 airplane,1,1,0	script	Domestic_Airship	-1,{
 	end;
@@ -167,14 +167,14 @@ OnTimer480000:
 	initnpctimer;
 }
 
-airplane,240,64,5	script	Exit#airplane1a::ExitAirplane	857,{
+airplane,240,64,5	script	Exit#airplane1a::ExitAirplane	4_BOARD3,{
 	end;
 }
-airplane,247,64,5	duplicate(ExitAirplane)	Exit#airplane1b	857
-airplane,240,40,1	duplicate(ExitAirplane)	Exit#airplane2a	857
-airplane,247,40,1	duplicate(ExitAirplane)	Exit#airplane2b	857
+airplane,247,64,5	duplicate(ExitAirplane)	Exit#airplane1b	4_BOARD3
+airplane,240,40,1	duplicate(ExitAirplane)	Exit#airplane2a	4_BOARD3
+airplane,247,40,1	duplicate(ExitAirplane)	Exit#airplane2b	4_BOARD3
 
-airplane,100,69,3	script	Airship Crew#ein-1	852,{
+airplane,100,69,3	script	Airship Crew#ein-1	4_M_EIN_SOLDIER,{
 	mes "[Airship Crew]";
 	mes "If we've landed at";
 	mes "your destination and";
@@ -185,7 +185,7 @@ airplane,100,69,3	script	Airship Crew#ein-1	852,{
 	close;
 }
 
-airplane,64,94,1	script	Umbala Kid#ein_p	787,{
+airplane,64,94,1	script	Umbala Kid#ein_p	4_M_UMKID,{
 	emotion e_swt2;
 	mes "[Kid]";
 	if (event_umbala >= 3) {
@@ -203,7 +203,7 @@ airplane,64,94,1	script	Umbala Kid#ein_p	787,{
 	close;
 }
 
-airplane,66,93,3	script	Umbala Lady#ein_p	783,{
+airplane,66,93,3	script	Umbala Lady#ein_p	4_F_UMWOMAN,{
 	emotion e_dots;
 	mes "[Lady]";
 	if (event_umbala >= 3) {
@@ -222,7 +222,7 @@ airplane,66,93,3	script	Umbala Lady#ein_p	783,{
 	close;
 }
 
-airplane,71,91,7	script	Umbala Man#ein_p	789,{
+airplane,71,91,7	script	Umbala Man#ein_p	4_M_UMSOLDIER,{
 	if (event_umbala >= 3) {
 		mes "[Chrmlim]";
 		mes "Hey there~";
@@ -265,7 +265,7 @@ airplane,71,91,7	script	Umbala Man#ein_p	789,{
 	close;
 }
 
-airplane,250,58,2	script	Airship Staff#airplane	67,{
+airplane,250,58,2	script	Airship Staff#airplane	1_F_02,{
 	// Hugel quest addition
 	if (hg_ma1 == 3) {
 		mes "[Airship Staff]";
@@ -329,7 +329,7 @@ airplane,250,58,2	script	Airship Staff#airplane	67,{
 	}
 }
 
-airplane,80,71,2	script	Zerta#01airplane	834,{
+airplane,80,71,2	script	Zerta#01airplane	4_M_BUDDHIST,{
 	mes "[Zerta]";
 	mes "Oh, hello adventurer.";
 	mes "I am currently on a";
@@ -339,7 +339,7 @@ airplane,80,71,2	script	Zerta#01airplane	834,{
 	close;
 }
 
-airplane,65,63,4	script	Maelin#01airplane	714,{
+airplane,65,63,4	script	Maelin#01airplane	4_F_06,{
 	mes "[Maelin]";
 	mes "Um, this Airship is";
 	mes "to Lutie, isn't it? I've";
@@ -349,7 +349,7 @@ airplane,65,63,4	script	Maelin#01airplane	714,{
 	close;
 }
 
-airplane,72,34,6	script	Aanos#01airplane	702,{
+airplane,72,34,6	script	Aanos#01airplane	4_F_GON,{
 	mes "[Aanos]";
 	mes "Oh wooow~";
 	mes "The sky looks";
@@ -358,7 +358,7 @@ airplane,72,34,6	script	Aanos#01airplane	702,{
 	close;
 }
 
-airplane,221,158,2	script	Pilot#airplane	852,{
+airplane,221,158,2	script	Pilot#airplane	4_M_EIN_SOLDIER,{
 	// Hugel quest addition
 	if (hg_ma1 == 3) {
 		mes "[Pilot]";
@@ -457,7 +457,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 	}
 }
 
-airplane,50,66,5	script	Apple Merchant#airplane	86,{
+airplane,50,66,5	script	Apple Merchant#airplane	4_M_04,{
 	mes "[Fruitz]";
 	mes "Welcome to Fruitz's";
 	mes "Shop where you can";
@@ -648,7 +648,7 @@ airplane,50,66,5	script	Apple Merchant#airplane	86,{
 //= ... -> Izlude -> Juno -> Rachel -> ...
 //============================================================
 
-airplane_01,243,73,0	script	#AirshipWarp-3	45,1,1,{
+airplane_01,243,73,0	script	#AirshipWarp-3	WARPNPC,1,1,{
 	end;
 	
 OnTouch:
@@ -675,7 +675,7 @@ OnUnhide:
 	end;
 }
 
-airplane_01,243,29,0	duplicate(#AirshipWarp-3)	#AirshipWarp-4	45,1,1
+airplane_01,243,29,0	duplicate(#AirshipWarp-3)	#AirshipWarp-4	WARPNPC,1,1
 
 airplane_01,1,1,0	script	International_Airship	-1,{
 	end;
@@ -755,14 +755,14 @@ OnTimer240000:
 	end;
 }
 
-airplane_01,240,64,5	script	Exit#airplane_011a::ExitAirplane01	857,{
+airplane_01,240,64,5	script	Exit#airplane_011a::ExitAirplane01	4_BOARD3,{
 	end;
 }
-airplane_01,247,64,5	duplicate(ExitAirplane01)	Exit#airplane_011b	857
-airplane_01,240,40,1	duplicate(ExitAirplane01)	Exit#airplane_012a	857
-airplane_01,247,40,1	duplicate(ExitAirplane01)	Exit#airplane_012b	857
+airplane_01,247,64,5	duplicate(ExitAirplane01)	Exit#airplane_011b	4_BOARD3
+airplane_01,240,40,1	duplicate(ExitAirplane01)	Exit#airplane_012a	4_BOARD3
+airplane_01,247,40,1	duplicate(ExitAirplane01)	Exit#airplane_012b	4_BOARD3
 
-airplane_01,250,58,2	script	Airship Staff#airplane01	67,{
+airplane_01,250,58,2	script	Airship Staff#airplane01	1_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome";
 	mes "to the Airship.";
@@ -813,7 +813,7 @@ airplane_01,250,58,2	script	Airship Staff#airplane01	67,{
 	}
 }
 
-airplane_01,50,66,5	script	Apple Merchant#air01	86,{
+airplane_01,50,66,5	script	Apple Merchant#air01	4_M_04,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -957,7 +957,7 @@ airplane_01,50,66,5	script	Apple Merchant#air01	86,{
 	}
 }
 
-airplane_01,221,158,2	script	Pilot#airplane_01	852,{
+airplane_01,221,158,2	script	Pilot#airplane_01	4_M_EIN_SOLDIER,{
 	switch (rand(1,4)) {
 	case 1:
 		mes "[Pilot]";
@@ -1013,7 +1013,7 @@ airplane_01,221,158,2	script	Pilot#airplane_01	852,{
 	}
 }
 
-airplane_01,83,61,2	script	Dianne#01airplane_01	72,2,2,{
+airplane_01,83,61,2	script	Dianne#01airplane_01	1_F_MARIA,2,2,{
 	mes "[Dianne]";
 	mes "It's so weird!";
 	mes "I went to visit the";
@@ -1028,7 +1028,7 @@ OnTouch:
 	end;
 }
 
-airplane_01,69,63,2	script	Mendel#01airplane_01	55,{
+airplane_01,69,63,2	script	Mendel#01airplane_01	1_M_JOBTESTER,{
 	mes "[Mendel]";
 	mes "As I expected, the";
 	mes "in-flight meals are";
@@ -1039,7 +1039,7 @@ airplane_01,69,63,2	script	Mendel#01airplane_01	55,{
 	close;
 }
 
-airplane_01,71,31,2	script	Swordsman Shimizu#air_01	106,{
+airplane_01,71,31,2	script	Swordsman Shimizu#air_01	1_M_MOC_LORD,{
 	mes "[Swordsman Shimizu]";
 	mes "Finally, after five";
 	mes "years of waiting...";
@@ -1057,7 +1057,7 @@ airplane_01,71,31,2	script	Swordsman Shimizu#air_01	106,{
 //============================================================
 //= Typing Challenge
 //============================================================
-airplane_01,32,61,4	script	Nils#ein	49,1,1,{
+airplane_01,32,61,4	script	Nils#ein	1_M_03,1,1,{
 	mes "[Nils]";
 	mes "Welcome to the";
 	mes "^ff0000RO Typing Challenge^000000.";
@@ -1232,7 +1232,7 @@ airplane_01,32,61,4	script	Nils#ein	49,1,1,{
 //============================================================
 //= Apple Gambling
 //============================================================
-airplane_01,33,68,4	script	Clarice	74,{
+airplane_01,33,68,4	script	Clarice	1_F_MERCHANT_02,{
 	mes "[Clarice]";
 	mes "Hi, I'm Clarice~";
 	mes "How would you like";
diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt
index 4ad8749a7..bd6b72fcc 100644
--- a/npc/airports/einbroch.txt
+++ b/npc/airports/einbroch.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-airport,143,43,5	script	Airport Staff#airport1a::airport1	90,{
+airport,143,43,5	script	Airport Staff#airport1a::airport1	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to the";
 	mes "Einbroch Airport,";
@@ -51,10 +51,10 @@ airport,143,43,5	script	Airport Staff#airport1a::airport1	90,{
 	close;
 }
 
-airport,158,43,5	duplicate(airport1)	Airport Staff#airport1b	90
-airport,126,43,5	duplicate(airport1)	Airport Staff#airport1c	90
+airport,158,43,5	duplicate(airport1)	Airport Staff#airport1b	4_F_01
+airport,126,43,5	duplicate(airport1)	Airport Staff#airport1c	4_F_01
 
-airport,143,49,3	script	Arrival Staff#airport2a::airport2	90,{
+airport,143,49,3	script	Arrival Staff#airport2a::airport2	4_F_01,{
 	mes "[Arrival Staff]";
 	mes "Welcome to Einbroch Airport.";
 	mes "If you are arriving from your";
@@ -83,10 +83,10 @@ airport,143,49,3	script	Arrival Staff#airport2a::airport2	90,{
 	close;
 }
 
-airport,126,51,3	duplicate(airport2)	Arrival Staff#airport2b	90
-airport,158,50,3	duplicate(airport2)	Arrival Staff#airport2c	90
+airport,126,51,3	duplicate(airport2)	Arrival Staff#airport2b	4_F_01
+airport,158,50,3	duplicate(airport2)	Arrival Staff#airport2c	4_F_01
 
-einbroch,94,267,3	script	Airship Staff#ein01	91,{
+einbroch,94,267,3	script	Airship Staff#ein01	4_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome to the";
 	mes "Einbroch Airport.";
diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt
index 2d65fdc30..015bf8efd 100644
--- a/npc/airports/hugel.txt
+++ b/npc/airports/hugel.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-hugel,178,142,0	script	toairplane#hugel	45,1,1,{
+hugel,178,142,0	script	toairplane#hugel	WARPNPC,1,1,{
 	end;
 OnTouch:
 	mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket.";
diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt
index 7fbe8ae6d..e2c5f67b4 100644
--- a/npc/airports/lighthalzen.txt
+++ b/npc/airports/lighthalzen.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	90,{
+lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to the";
 	mes "Lighthalzen Airport,";
@@ -47,10 +47,10 @@ lhz_airport,143,43,5	script	Airport Staff#lhz_air1a::lhz_airport1	90,{
 	close;
 }
 
-lhz_airport,158,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1b	90
-lhz_airport,126,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1c	90
+lhz_airport,158,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1b	4_F_01
+lhz_airport,126,43,5	duplicate(lhz_airport1)	Airship Staff#lhz_air1c	4_F_01
 
-lhz_airport,143,49,3	script	Arrival Staff#lhz_air2a::lhz_airport2	90,{
+lhz_airport,143,49,3	script	Arrival Staff#lhz_air2a::lhz_airport2	4_F_01,{
 	mes "[Arrival Staff]";
 	mes "Welcome to Lighthalzen Airport.";
 	mes "Please let me guide you to the";
@@ -77,5 +77,5 @@ lhz_airport,143,49,3	script	Arrival Staff#lhz_air2a::lhz_airport2	90,{
 	close;
 }
 
-lhz_airport,126,51,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2b	90
-lhz_airport,158,50,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2c	90
+lhz_airport,126,51,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2b	4_F_01
+lhz_airport,158,50,3	duplicate(lhz_airport2)	Arrival Staff#lhz_air2c	4_F_01
diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt
index 88c48cd16..f157f5f6b 100644
--- a/npc/airports/rachel.txt
+++ b/npc/airports/rachel.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-ra_fild12,295,208,0	script	toairplane#rachel	45,1,1,{
+ra_fild12,295,208,0	script	toairplane#rachel	WARPNPC,1,1,{
 	end;
 OnTouch:
 	mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket.";
diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt
index 0d2ba73a8..4e697918b 100644
--- a/npc/airports/yuno.txt
+++ b/npc/airports/yuno.txt
@@ -8,7 +8,7 @@
 //= Official NPCs.
 //============================================================
 
-y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{
+y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to Juno Airport where we offer domestic flights to Einbroch, Lighthalzen and Hugel,";
 	mes "and international flights to Izlude and Rachel.";
@@ -45,10 +45,10 @@ y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{
 	close;
 }
 
-y_airport,158,43,5	duplicate(y_airport1)	Airport Staff#y_air1b	90
-y_airport,126,43,5	duplicate(y_airport1)	Airport Staff#y_air1c	90
+y_airport,158,43,5	duplicate(y_airport1)	Airport Staff#y_air1b	4_F_01
+y_airport,126,43,5	duplicate(y_airport1)	Airport Staff#y_air1c	4_F_01
 
-y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	90,{
+y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	4_F_01,{
 	mes "[Airport Staff]";
 	mes "Welcome to Juno Airport. If you've just arrived from your";
 	mes "flight, let me guide you to the main terminal. Otherwise, please";
@@ -74,10 +74,10 @@ y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	90,{
 	close;
 }
 
-y_airport,126,51,3	duplicate(y_airport2)	Arrival Staff#y_air2b	90
-y_airport,158,50,3	duplicate(y_airport2)	Arrival Staff#y_air2c	90
+y_airport,126,51,3	duplicate(y_airport2)	Arrival Staff#y_air2b	4_F_01
+y_airport,158,50,3	duplicate(y_airport2)	Arrival Staff#y_air2c	4_F_01
 
-y_airport,145,63,5	script	Domestic Boarding	91,{
+y_airport,145,63,5	script	Domestic Boarding	4_F_02,{
 	mes "[Boarding Staff]";
 	mes "Would you like to board the";
 	mes "Airship that flies to Einbroch,";
@@ -97,7 +97,7 @@ y_airport,145,63,5	script	Domestic Boarding	91,{
 	close;
 }
 
-y_airport,140,63,5	script	International Boarding	91,{
+y_airport,140,63,5	script	International Boarding	4_F_02,{
 	mes "[Boarding Staff]";
 	mes "Would you like to board";
 	mes "the Airship which flies to";
@@ -118,7 +118,7 @@ y_airport,140,63,5	script	International Boarding	91,{
 	close;
 }
 
-yuno,14,262,5	script	Airship Staff#yuno01	91,{
+yuno,14,262,5	script	Airship Staff#yuno01	4_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome to Juno Airport.";
 	mes "Please use this door to";
@@ -138,7 +138,7 @@ yuno,14,262,5	script	Airship Staff#yuno01	91,{
 	close;
 }
 
-yuno,88,263,3	script	Airship Staff#yuno02	91,{
+yuno,88,263,3	script	Airship Staff#yuno02	4_F_02,{
 	mes "[Airship Staff]";
 	mes "Welcome to Juno Airport.";
 	mes "Please use this door to";