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

1 files changed, 25 insertions, 25 deletions

diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt
index 134a3422d..b63fca71c 100644
--- a/npc/re/merchants/3rd_trader.txt
+++ b/npc/re/merchants/3rd_trader.txt
@@ -79,9 +79,9 @@
 	mes "Thank you. Come back again~!";
 	close;
 }
-job3_guil01,79,96,3	duplicate(phs)	Poison Herb Merchant	877
-morocc,191,94,4	duplicate(phs)	Poison Herb Merchant#moc	877	//Official: (190,96) -> in a wall
-lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	877
+job3_guil01,79,96,3	duplicate(phs)	Poison Herb Merchant	4_F_YUNYANG
+morocc,191,94,4	duplicate(phs)	Poison Herb Merchant#moc	4_F_YUNYANG	//Official: (190,96) -> in a wall
+lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	4_F_YUNYANG
 
 // Rune Stone Merchants (Rune Knight)
 //============================================================
@@ -148,12 +148,12 @@ lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	877
 	mes "Please come back again~!";
 	close;
 }
-job3_rune01,90,62,3	duplicate(runesale)	Rune Merchant#job3	853
-prontera,168,228,3	duplicate(runesale)	Rune Merchant#prt	853
+job3_rune01,90,62,3	duplicate(runesale)	Rune Merchant#job3	4_M_YURI
+prontera,168,228,3	duplicate(runesale)	Rune Merchant#prt	4_M_YURI
 
 // Rare Herb Merchants (Guillotine Cross)
 //============================================================
-job3_guil01,91,93,3	script	Rare Herb Collector	49,{
+job3_guil01,91,93,3	script	Rare Herb Collector	1_M_03,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -259,22 +259,22 @@ job3_guil01,91,93,3	script	Rare Herb Collector	49,{
 	mes "Thank you very much. See you~!";
 	close;
 }
-gef_tower,105,172,5	duplicate(pss)	Point Merchant#Sorcerer	700
-prt_in,131,66,0	duplicate(pss)	Point Merchant#Prontera	700
-alberta,105,52,7	duplicate(pss)	Point Merchant#Alberta	700
-aldebaran,133,114,5	duplicate(pss)	Point Merchant#Aldebaran	700
-comodo,193,159,5	duplicate(pss)	Point Merchant#Comodo	700
-geffen,129,49,5	duplicate(pss)	Point Merchant#Geffen	700
-izlude,138,163,5	duplicate(pss)	Point Merchant#Izlude	700	// Old coordinates: izlude (135,121)
-izlude_a,138,163,5	duplicate(pss)	Point Merchant#Izlude_a	700
-izlude_b,138,163,5	duplicate(pss)	Point Merchant#Izlude_b	700
-izlude_c,138,163,5	duplicate(pss)	Point Merchant#Izlude_c	700
-izlude_d,138,163,5	duplicate(pss)	Point Merchant#Izlude_d	700
-malangdo,214,163,5	duplicate(pss)	Point Merchant#Malangdo	700
-mora,115,118,3	duplicate(pss)	Point Merchant#Mora	700
-ra_in01,256,273,3	duplicate(pss)	Point Merchant#Rachel	700
-veins,202,128,5	duplicate(pss)	Point Merchant#Veins	700
-dicastes01,207,200,5	duplicate(pss)	Point Merchant#Dicastes	700
-manuk,261,206,3	duplicate(pss)	Point Merchant#Manuk	700
-splendide,207,160,5	duplicate(pss)	Point Merchant#Splendide	700
-mid_camp,224,237,3	duplicate(pss)	Point Merchant#Midgard	700
+gef_tower,105,172,5	duplicate(pss)	Point Merchant#Sorcerer	8_F_GIRL
+prt_in,131,66,0	duplicate(pss)	Point Merchant#Prontera	8_F_GIRL
+alberta,105,52,7	duplicate(pss)	Point Merchant#Alberta	8_F_GIRL
+aldebaran,133,114,5	duplicate(pss)	Point Merchant#Aldebaran	8_F_GIRL
+comodo,193,159,5	duplicate(pss)	Point Merchant#Comodo	8_F_GIRL
+geffen,129,49,5	duplicate(pss)	Point Merchant#Geffen	8_F_GIRL
+izlude,138,163,5	duplicate(pss)	Point Merchant#Izlude	8_F_GIRL	// Old coordinates: izlude (135,121)
+izlude_a,138,163,5	duplicate(pss)	Point Merchant#Izlude_a	8_F_GIRL
+izlude_b,138,163,5	duplicate(pss)	Point Merchant#Izlude_b	8_F_GIRL
+izlude_c,138,163,5	duplicate(pss)	Point Merchant#Izlude_c	8_F_GIRL
+izlude_d,138,163,5	duplicate(pss)	Point Merchant#Izlude_d	8_F_GIRL
+malangdo,214,163,5	duplicate(pss)	Point Merchant#Malangdo	8_F_GIRL
+mora,115,118,3	duplicate(pss)	Point Merchant#Mora	8_F_GIRL
+ra_in01,256,273,3	duplicate(pss)	Point Merchant#Rachel	8_F_GIRL
+veins,202,128,5	duplicate(pss)	Point Merchant#Veins	8_F_GIRL
+dicastes01,207,200,5	duplicate(pss)	Point Merchant#Dicastes	8_F_GIRL
+manuk,261,206,3	duplicate(pss)	Point Merchant#Manuk	8_F_GIRL
+splendide,207,160,5	duplicate(pss)	Point Merchant#Splendide	8_F_GIRL
+mid_camp,224,237,3	duplicate(pss)	Point Merchant#Midgard	8_F_GIRL