summaryrefslogtreecommitdiff
path: root/npc/re/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/merchants')
-rw-r--r--npc/re/merchants/3rd_trader.txt50
-rw-r--r--npc/re/merchants/advanced_refiner.txt2
-rw-r--r--npc/re/merchants/alchemist.txt2
-rw-r--r--npc/re/merchants/ammo_boxes.txt12
-rw-r--r--npc/re/merchants/ammo_dealer.txt12
-rw-r--r--npc/re/merchants/blessed_refiner.txt12
-rw-r--r--npc/re/merchants/card_separation.txt4
-rw-r--r--npc/re/merchants/catalog.txt2
-rw-r--r--npc/re/merchants/coin_exchange.txt24
-rw-r--r--npc/re/merchants/diamond.txt16
-rw-r--r--npc/re/merchants/enchan_mal.txt2
-rw-r--r--npc/re/merchants/enchan_mora.txt20
-rw-r--r--npc/re/merchants/enchan_upg.txt2
-rw-r--r--npc/re/merchants/flute.txt6
-rw-r--r--npc/re/merchants/hd_refiner.txt32
-rw-r--r--npc/re/merchants/inn.txt2
-rw-r--r--npc/re/merchants/quivers.txt2
-rw-r--r--npc/re/merchants/refine.txt14
-rw-r--r--npc/re/merchants/renters.txt26
-rw-r--r--npc/re/merchants/shops.txt96
-rw-r--r--npc/re/merchants/ticket_refiner.txt2
21 files changed, 170 insertions, 170 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
diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt
index c6aa75124..fd6602eda 100644
--- a/npc/re/merchants/advanced_refiner.txt
+++ b/npc/re/merchants/advanced_refiner.txt
@@ -16,7 +16,7 @@
//= 1.0 Added Malangdo Refiner "Holink". [Euphy]
//============================================================
-malangdo,221,174,6 script Holink#mal_cash 559,{
+malangdo,221,174,6 script Holink#mal_cash 4_CAT_ADV1,{
disable_items;
mes "[Holink]";
mes "I am the meow~ Blacksmith Holink~";
diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt
index 8687cb946..7569fe0b3 100644
--- a/npc/re/merchants/alchemist.txt
+++ b/npc/re/merchants/alchemist.txt
@@ -12,7 +12,7 @@
//= Updated dialogue to match the official script.
//============================================================
-alde_alche,31,186,3 script Craft Book Merchant#alde 883,{
+alde_alche,31,186,3 script Craft Book Merchant#alde 4_M_ALCHE_D,{
mes "[Craft Book Merchant]";
mes "Welcome.";
mes "I'm here to sell";
diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt
index ba9e4fd96..432e0c8a4 100644
--- a/npc/re/merchants/ammo_boxes.txt
+++ b/npc/re/merchants/ammo_boxes.txt
@@ -11,9 +11,9 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 83
-izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 83
-izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 83
-izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 83
-izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 83
-izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 83
+que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 4_M_01
+izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
+izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 4_M_01
+izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 4_M_01
+izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 4_M_01
+izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 4_M_01
diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt
index 9925d809c..7abb58421 100644
--- a/npc/re/merchants/ammo_dealer.txt
+++ b/npc/re/merchants/ammo_dealer.txt
@@ -11,9 +11,9 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 86
-izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 86 //Official: (74,106) -> in the water
-izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 86
-izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 86
-izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 86
-izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 86
+que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 4_M_04
+izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 //Official: (74,106) -> in the water
+izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 4_M_04
+izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 4_M_04
+izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 4_M_04
+izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 4_M_04
diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt
index fc62cd216..c5d198457 100644
--- a/npc/re/merchants/blessed_refiner.txt
+++ b/npc/re/merchants/blessed_refiner.txt
@@ -163,9 +163,9 @@
mes "My mood is worse when I fail!!";
close;
}
-prt_in,52,56,3 duplicate(BlacksmithDister) Blacksmith Dister#prt 826
-payon,148,172,3 duplicate(BlacksmithDister) Blacksmith Dister#pay 826
-alberta_in,20,56,3 duplicate(BlacksmithDister) Blacksmith Dister#alb 826
-yuno_in01,175,18,3 duplicate(BlacksmithDister) Blacksmith Dister#yuno 826
-ein_in01,26,82,3 duplicate(BlacksmithDister) Blacksmith Dister#ein 826
-lhz_in02,280,15,3 duplicate(BlacksmithDister) Blacksmith Dister#lhz 826
+prt_in,52,56,3 duplicate(BlacksmithDister) Blacksmith Dister#prt 4_M_DWARF
+payon,148,172,3 duplicate(BlacksmithDister) Blacksmith Dister#pay 4_M_DWARF
+alberta_in,20,56,3 duplicate(BlacksmithDister) Blacksmith Dister#alb 4_M_DWARF
+yuno_in01,175,18,3 duplicate(BlacksmithDister) Blacksmith Dister#yuno 4_M_DWARF
+ein_in01,26,82,3 duplicate(BlacksmithDister) Blacksmith Dister#ein 4_M_DWARF
+lhz_in02,280,15,3 duplicate(BlacksmithDister) Blacksmith Dister#lhz 4_M_DWARF
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index 8187d4fe7..933839bec 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -354,5 +354,5 @@
mes "That is all for the results of the card separation. Please come again.";
close;
}
-malangdo,215,166,4 duplicate(CardSeparation_mal) Jeremy#pa0829 553
-malangdo,208,166,6 duplicate(CardSeparation_mal) Richard#pa0829 559
+malangdo,215,166,4 duplicate(CardSeparation_mal) Jeremy#pa0829 4_CAT_DOWN
+malangdo,208,166,6 duplicate(CardSeparation_mal) Richard#pa0829 4_CAT_ADV1
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt
index 8d4d47cdc..91936bd35 100644
--- a/npc/re/merchants/catalog.txt
+++ b/npc/re/merchants/catalog.txt
@@ -13,7 +13,7 @@
//= 1.1 Updated dialogue. [Euphy]
//============================================================
-moc_para01,22,16,5 script Catalog Magician#catal01 704,{
+moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{
if (!checkweight(1301,3)) {
mes "- You have too many items. Please make space. -";
close;
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index 2796a4a70..fb20726a3 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -15,7 +15,7 @@
// Malangdo
//============================================================
-malangdo,220,167,5 script Coin Exchanger CX-1 564,{
+malangdo,220,167,5 script Coin Exchanger CX-1 2_VENDING_MACHINE1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
close;
@@ -106,7 +106,7 @@ malangdo,220,167,5 script Coin Exchanger CX-1 564,{
close;
}
-malangdo,218,165,5 script Special Vending Machine 562,{
+malangdo,218,165,5 script Special Vending Machine 2_DROP_MACHINE,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
close;
@@ -176,7 +176,7 @@ L_AddItem:
}
}
-malangdo,236,179,5 script Dark Merchant K 554,{
+malangdo,236,179,5 script Dark Merchant K 4_CAT_REST,{
if (checkweight(1201,1) == 0) {
mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
close;
@@ -221,7 +221,7 @@ malangdo,236,179,5 script Dark Merchant K 554,{
}
}
-malangdo,233,180,3 script Dark MachineTX100 564,{
+malangdo,233,180,3 script Dark MachineTX100 2_VENDING_MACHINE1,{
if (checkweight(1201,1) == 0) {
mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
close;
@@ -342,7 +342,7 @@ malangdo,233,180,3 script Dark MachineTX100 564,{
close;
}
-malangdo,175,145,4 script Can Agency Guard 549,{
+malangdo,175,145,4 script Can Agency Guard 4_CAT_MERMASTER,{
if (checkweight(1201,1) == 0) {
mes "You seem to have too many items. Give it a try after sorting out the item kinds.";
close;
@@ -567,7 +567,7 @@ function script F_mal_coin {
}
}
}
-malangdo,162,146,5 script Wandering Merchant#mal 495,{
+malangdo,162,146,5 script Wandering Merchant#mal 4_M_MERCAT1,{
callfunc "F_mal_coin",0,"[Wandering Merchant]",1;
setarray .@items[1],
16743,16747,16741,16745,16749,16751, // 1 hour items.
@@ -698,7 +698,7 @@ malangdo,162,146,5 script Wandering Merchant#mal 495,{
}
}
-malangdo,173,145,4 script Stinky Merchant 496,{
+malangdo,173,145,4 script Stinky Merchant 4_M_MERCAT2,{
callfunc "F_mal_coin",0,"[Stinky Merchant]",2;
setarray .@items[1],2873,16015;
setarray .@names$[1],"Cat Hand Glove","Cat Club";
@@ -749,7 +749,7 @@ malangdo,173,145,4 script Stinky Merchant 496,{
}
}
-malangdo,150,135,5 script Roving Merchant 495,{
+malangdo,150,135,5 script Roving Merchant 4_M_MERCAT1,{
callfunc "F_mal_coin",0,"[Roving Merchant]",3;
setarray .@items[1],12639,12637,12638,12640;
setarray .@names$[1],"Flying Fish","Sow Bug","Dried Squid","Starfish";
@@ -827,7 +827,7 @@ malangdo,150,135,5 script Roving Merchant 495,{
// Eclage
//============================================================
-ecl_in01,66,95,2 script Armor Merchant Naphara 436,{
+ecl_in01,66,95,2 script Armor Merchant Naphara 4_F_FAIRYKID,{
mes "[Armor Merchant]";
mes "Hello, this is Naphara's store, a place of high class goods.";
mes "What would you need?";
@@ -901,7 +901,7 @@ ecl_in01,66,95,2 script Armor Merchant Naphara 436,{
close;
}
-ecl_in01,64,97,4 script Slot Expert Nattuer#ecl 436,{
+ecl_in01,64,97,4 script Slot Expert Nattuer#ecl 4_F_FAIRYKID,{
mes "[Slot Expert]";
mes "I am Slot Expert Nattuer.";
mes "If you bring me an item from my little brother Naphara along with 5 Splendide Coins, I will open up one Slot for you.";
@@ -956,7 +956,7 @@ ecl_in01,64,97,4 script Slot Expert Nattuer#ecl 436,{
close;
}
-ecl_in01,67,39,4 script Replication Expert Palt 445,{
+ecl_in01,67,39,4 script Replication Expert Palt 4_M_FAIRYKID4,{
emotion e_lv;
mes "[Paltu]";
mes "Woohoo- Greetings. What are you looking for? Lots of goods here.";
@@ -1107,7 +1107,7 @@ ecl_in01,67,39,4 script Replication Expert Palt 445,{
close;
}
-ecl_in01,33,98,4 script Herb Merchant Plafina#e 443,{
+ecl_in01,33,98,4 script Herb Merchant Plafina#e 4_M_FAIRYKID2,{
mes "[Herb Merchant]";
mes "Welcome, this is Plafina's Herb Store where only the freshest herbs are provided~!";
next;
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index 43d565188..e3efa5247 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -16,7 +16,7 @@
//= 1.5 Added This Version History (#15429)
//============================================================
-- script RareDiamondMerchant 58,{
+- script RareDiamondMerchant 1_M_MERCHANT,{
set .@npc$, "[Rare Diamond Merchant]";
@@ -233,10 +233,10 @@
}
}
-prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 58
-geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 58
-morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 58
-alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 58
-lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 58
-rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 58
-payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 58
+prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 1_M_MERCHANT
+geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 1_M_MERCHANT
+morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 1_M_MERCHANT
+alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 1_M_MERCHANT
+lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 1_M_MERCHANT
+rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 1_M_MERCHANT
+payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 1_M_MERCHANT
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 98a8fbf37..24ed71c04 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -13,7 +13,7 @@
//= 1.0a Added 'delequip' command. [Euphy]
//============================================================
-malangdo,213,167,4 script Mayomayo#mal 555,{
+malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index 5c0ecdc7a..d986b047f 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -17,7 +17,7 @@
// Arch Bishop Enchants :: coin_arc
//============================================================
-mora,88,89,5 script Keeper of Secrets#pa082 495,{
+mora,88,89,5 script Keeper of Secrets#pa082 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -138,7 +138,7 @@ mora,88,89,5 script Keeper of Secrets#pa082 495,{
}
}
-mora,96,74,5 script Master of Relics#pa0829 495,{
+mora,96,74,5 script Master of Relics#pa0829 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -317,7 +317,7 @@ mora,96,74,5 script Master of Relics#pa0829 495,{
// Warlock Enchants :: coin_warrock
//============================================================
-mora,104,76,4 script Guardian of Artifacts#p 495,{
+mora,104,76,4 script Guardian of Artifacts#p 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -390,7 +390,7 @@ mora,104,76,4 script Guardian of Artifacts#p 495,{
close;
}
-mora,99,93,5 script Artifact Crafter#pa0829 495,{
+mora,99,93,5 script Artifact Crafter#pa0829 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -522,7 +522,7 @@ mora,99,93,5 script Artifact Crafter#pa0829 495,{
// Rune Knight, Guillotine Cross, & Ranger Enchants :: new_artifact
//============================================================
-mora,152,97,5 script Guardian of Power#pa082 515,{
+mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{
if (checkweight(1201,1) == 0) {
mes "Reduce the amount of items that you have in your inventory before continuing.";
close;
@@ -593,7 +593,7 @@ mora,152,97,5 script Guardian of Power#pa082 515,{
close;
}
-mora,148,98,3 script Artifact Researcher#new 521,{
+mora,148,98,3 script Artifact Researcher#new 4_F_MORAFINE2,{
if (checkweight(1201,1) == 0) {
mes "Reduce the amount of items that you have in your inventory before continuing.";
close;
@@ -1151,7 +1151,7 @@ L_Socket:
// Arch Bishop & Warlock Empowering :: relic_change
//============================================================
-mora,124,82,4 script Artifact Collector#blan 522,{
+mora,124,82,4 script Artifact Collector#blan 4_M_RAFLE_OR,{
if (checkweight(1201,1) == 0) {
mes "Reduce the amount of items that you have in your inventory before continuing.";
close;
@@ -1504,7 +1504,7 @@ function script F_Mora_Enchant {
getitem2 getarg(0),1,1,0,0,0,.@enchants[1],.@enchants[2],.@enchants[3];
return 1;
}
-mora,105,176,4 script Master Tailor#pa0829 509,{
+mora,105,176,4 script Master Tailor#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -1596,7 +1596,7 @@ mora,105,176,4 script Master Tailor#pa0829 509,{
}
}
-mora,123,177,6 script Pendant Crafter#pa0829 509,{
+mora,123,177,6 script Pendant Crafter#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -1666,7 +1666,7 @@ mora,123,177,6 script Pendant Crafter#pa0829 509,{
}
}
-mora,134,166,4 script Bulberry Westhood#pa0829 509,{
+mora,134,166,4 script Bulberry Westhood#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt
index 6e5728aa2..c72479f38 100644
--- a/npc/re/merchants/enchan_upg.txt
+++ b/npc/re/merchants/enchan_upg.txt
@@ -12,7 +12,7 @@
//= 1.1 Standardizing, grammar and bug fixes. [Euphy]
//============================================================
-prt_in,28,73,3 script Devil Enchant Master#prq 63,{
+prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You are carrying too many items, please reduce it and come back again!";
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index b882c490f..03ef82559 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -84,10 +84,10 @@
mes "Isn't it a beautiful day today?";
close;
}
-hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 51
-pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 51
+hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 1_M_BARD
+pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD
-tur_dun01,89,170,5 script Expert Flute Crafter 59,{
+tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
if (countitem(6124)) {
mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt
index fed923af9..c55917f4f 100644
--- a/npc/re/merchants/hd_refiner.txt
+++ b/npc/re/merchants/hd_refiner.txt
@@ -140,17 +140,17 @@
mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm.";
close;
}
-prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 826
-morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 826
-payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 826
-alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 826
-yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 826
-ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 826
-lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
+prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 4_M_DWARF
+morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 4_M_DWARF
+payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 4_M_DWARF
+alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 4_M_DWARF
+yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 4_M_DWARF
+ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 4_M_DWARF
+lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF
// iRO NPC locations:
-// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 826
-// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 826
+// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF
+// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF
// Basta (+10 and up)
//============================================================
@@ -297,10 +297,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
mes "I'll do better next time! Don't worry!";
close;
}
-prt_in,57,54,3 duplicate(Basta) Basta#prt 826
-morocc_in,68,30,3 duplicate(Basta) Basta#morocc 826
-payon,148,174,3 duplicate(Basta) Basta#payon 826
-alberta_in,18,56,3 duplicate(Basta) Basta#alberta 826
-yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 826
-ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 826
-lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826
+prt_in,57,54,3 duplicate(Basta) Basta#prt 4_M_DWARF
+morocc_in,68,30,3 duplicate(Basta) Basta#morocc 4_M_DWARF
+payon,148,174,3 duplicate(Basta) Basta#payon 4_M_DWARF
+alberta_in,18,56,3 duplicate(Basta) Basta#alberta 4_M_DWARF
+yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 4_M_DWARF
+ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 4_M_DWARF
+lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 4_M_DWARF
diff --git a/npc/re/merchants/inn.txt b/npc/re/merchants/inn.txt
index 7f86a7d2d..dcd08ae5e 100644
--- a/npc/re/merchants/inn.txt
+++ b/npc/re/merchants/inn.txt
@@ -13,7 +13,7 @@
// Brasilis
//============================================================
-bra_in01,27,24,3 script Hotel Keeper#bra1 478,{
+bra_in01,27,24,3 script Hotel Keeper#bra1 4_F_BRZ_WOMAN,{
mes "[Hotel Keeper]";
mes "Welcome to the beautiful Brasilis Hotel.";
next;
diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt
index ff95ae7a4..1e4c226fb 100644
--- a/npc/re/merchants/quivers.txt
+++ b/npc/re/merchants/quivers.txt
@@ -17,7 +17,7 @@
//= 1.1 Updated to match the official scripts. [Euphy]
//============================================================
-mora,106,117,3 script Quiver Maker#mora 516,{
+mora,106,117,3 script Quiver Maker#mora 4_M_RAFLE_GR,{
if (checkweight(1201,1) == 0) {
mes "[Quiver Maker]";
mes "You have too many things with you.";
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index 923e862e6..fa1853520 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -17,15 +17,15 @@
// +11 and above Refiners
//============================================================
-prt_in,90,72,5 script Vestri#prt 826,{
+prt_in,90,72,5 script Vestri#prt 4_M_DWARF,{
callfunc "refinenew","Vestri",0;
end;
}
-morocc_in,64,41,5 script Vestri#moc 826,{
+morocc_in,64,41,5 script Vestri#moc 4_M_DWARF,{
callfunc "refinenew","Vestri",0;
end;
}
-payon_in01,18,132,3 script Vestri#pay 826,{
+payon_in01,18,132,3 script Vestri#pay 4_M_DWARF,{
callfunc "refinenew","Vestri",0;
end;
}
@@ -387,13 +387,13 @@ function script refinenew {
mes "or "+getitemname(.@i[0])+".";
close;
}
-prt_in,85,71,5 duplicate(Austri#ref) Austri#prt 826
-payon_in01,14,125,5 duplicate(Austri#ref) Austri#pay 826
-morocc_in,60,38,5 duplicate(Austri#ref) Austri#moc 826
+prt_in,85,71,5 duplicate(Austri#ref) Austri#prt 4_M_DWARF
+payon_in01,14,125,5 duplicate(Austri#ref) Austri#pay 4_M_DWARF
+morocc_in,60,38,5 duplicate(Austri#ref) Austri#moc 4_M_DWARF
// Malangdo Refiner
//============================================================
-malangdo,224,172,6 script Clink#mal_normal 544,{
+malangdo,224,172,6 script Clink#mal_normal 4_CAT_SAILOR1,{
disable_items;
mes "[Clink]";
mes "My cool dad Holink said I have the world's greatest refine hammer!!";
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index c721af536..59894c678 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -14,7 +14,7 @@
// Dragon Breeder
//============================================================
-job3_rune01,88,62,5 script Dragon Breeder 105,{
+job3_rune01,88,62,5 script Dragon Breeder 8W_SOLDIER,{
mes "[Dragon Breeder]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome. Would you like to rent a Dragon?";
@@ -52,7 +52,7 @@ job3_rune01,88,62,5 script Dragon Breeder 105,{
// Dragon/Gryphon Master
//============================================================
-prontera,130,213,5 script Riding Creature Master 105,{
+prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{
mes "[Riding Creature Master]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome. Would you like to rent a Dragon?";
@@ -117,7 +117,7 @@ prontera,130,213,5 script Riding Creature Master 105,{
// Peco removing NPC
//============================================================
-prontera,125,208,5 script Peco Peco Remover 105,{
+prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{
mes "[Soldier]";
mes "If you're unable to dismount from a Peco Peco";
mes "for some unknown reason,";
@@ -196,13 +196,13 @@ prontera,125,208,5 script Peco Peco Remover 105,{
mes "Magic Gears are only available for Mechanics.";
close;
}
-prontera,163,178,3 duplicate(mgm) Magic Gear Master#prt 105
-geffen,103,55,5 duplicate(mgm) Magic Gear Master#gef 105
-payon,166,106,5 duplicate(mgm) Magic Gear Master#pay 105
-aldebaran,133,112,5 duplicate(mgm) Magic Gear Master#alde 105
-yuno,167,187,3 duplicate(mgm) Magic Gear Master#yuno 105
-rachel,106,134,5 duplicate(mgm) Magic Gear Master#ra 105
-dicastes01,187,207,3 duplicate(mgm) Magic Gear Master#dic 105
-manuk,273,212,5 duplicate(mgm) Magic Gear Master#man 105
-splendide,180,174,5 duplicate(mgm) Magic Gear Master#spl 105
-mid_camp,242,243,3 duplicate(mgm) Magic Gear Master#mid 105
+prontera,163,178,3 duplicate(mgm) Magic Gear Master#prt 8W_SOLDIER
+geffen,103,55,5 duplicate(mgm) Magic Gear Master#gef 8W_SOLDIER
+payon,166,106,5 duplicate(mgm) Magic Gear Master#pay 8W_SOLDIER
+aldebaran,133,112,5 duplicate(mgm) Magic Gear Master#alde 8W_SOLDIER
+yuno,167,187,3 duplicate(mgm) Magic Gear Master#yuno 8W_SOLDIER
+rachel,106,134,5 duplicate(mgm) Magic Gear Master#ra 8W_SOLDIER
+dicastes01,187,207,3 duplicate(mgm) Magic Gear Master#dic 8W_SOLDIER
+manuk,273,212,5 duplicate(mgm) Magic Gear Master#man 8W_SOLDIER
+splendide,180,174,5 duplicate(mgm) Magic Gear Master#spl 8W_SOLDIER
+mid_camp,242,243,3 duplicate(mgm) Magic Gear Master#mid 8W_SOLDIER
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 42fc5bd03..dcd445361 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -20,103 +20,103 @@
//=======================================================
// Comodo
//=======================================================
-comodo,106,213,5 shop Tropic Fruit Dealer 724,6258:-1
-comodo,196,162,3 shop Harive#candy 479,11513:-1,6144:-1
+comodo,106,213,5 shop Tropic Fruit Dealer 4_F_07,6258:-1
+comodo,196,162,3 shop Harive#candy 4_M_MINSTREL,11513:-1,6144:-1
//=======================================================
// Dewata
//=======================================================
-dewata,218,164,4 shop Weapon Dealer 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-dewata,182,164,6 shop Tool Dealer 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
-dewata,145,267,6 shop Fruit Gardener 535,512:-1,513:-1,515:-1,516:-1,535:-1
-dewata,158,182,6 shop Armor Dealer 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+dewata,218,164,4 shop Weapon Dealer 4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+dewata,182,164,6 shop Tool Dealer 4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
+dewata,145,267,6 shop Fruit Gardener 4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
+dewata,158,182,6 shop Armor Dealer 4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
//=======================================================
// Einbroch
//=======================================================
-einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+einbroch,122,250,4 shop Black Marketeer#ein 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
//=======================================================
// El Dicastes
//=======================================================
-dic_in01,238,107,5 shop Peddler#dic 900,601:-1,602:-1,611:-1,610:-1
-dicastes01,207,200,6 shop Points Merchant#dic 66,6360:-1,6361:-1,6362:-1,6363:-1
+dic_in01,238,107,5 shop Peddler#dic 4_M_HUMERCHANT,601:-1,602:-1,611:-1,610:-1
+dicastes01,207,200,6 shop Points Merchant#dic 1_F_01,6360:-1,6361:-1,6362:-1,6363:-1
//=======================================================
// Izlude
//=======================================================
-izlude,124,165,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1
-izlude_a,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_a 53
-izlude_b,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_b 53
-izlude_c,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_c 53
-izlude_d,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_d 53
-izlude,160,186,0 shop Butcher#iz 54,517:-1
-izlude_a,160,186,0 duplicate(Butcher#iz) Butcher#iz_a 54
-izlude_b,160,186,0 duplicate(Butcher#iz) Butcher#iz_b 54
-izlude_c,160,186,0 duplicate(Butcher#iz) Butcher#iz_c 54
-izlude_d,160,186,0 duplicate(Butcher#iz) Butcher#iz_d 54
-izlude,128,158,7 shop Vendor from Milk Ranch#i 90,519:-1
-izlude_a,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#a 90
-izlude_b,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#b 90
-izlude_c,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#c 90
-izlude_d,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#d 90
-izlude_in,72,98,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,57,110,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,72,110,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+izlude,124,165,4 shop Fruit Gardener#iz 1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
+izlude_a,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_a 1_M_INNKEEPER
+izlude_b,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_b 1_M_INNKEEPER
+izlude_c,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_c 1_M_INNKEEPER
+izlude_d,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_d 1_M_INNKEEPER
+izlude,160,186,0 shop Butcher#iz 1_M_JOBGUIDER,517:-1
+izlude_a,160,186,0 duplicate(Butcher#iz) Butcher#iz_a 1_M_JOBGUIDER
+izlude_b,160,186,0 duplicate(Butcher#iz) Butcher#iz_b 1_M_JOBGUIDER
+izlude_c,160,186,0 duplicate(Butcher#iz) Butcher#iz_c 1_M_JOBGUIDER
+izlude_d,160,186,0 duplicate(Butcher#iz) Butcher#iz_d 1_M_JOBGUIDER
+izlude,128,158,7 shop Vendor from Milk Ranch#i 4_F_01,519:-1
+izlude_a,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#a 4_F_01
+izlude_b,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#b 4_F_01
+izlude_c,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#c 4_F_01
+izlude_d,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#d 4_F_01
+izlude_in,72,98,4 shop Pet Groomer#iz 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,110,0 shop Tool Dealer#iz 1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,72,110,3 shop Trading Merchant#iz 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
// Juno
//=======================================================
-s_atelier,114,117,1 shop Part-Timer#sc_yuno 92,6123:-1,6120:-1
+s_atelier,114,117,1 shop Part-Timer#sc_yuno 4_F_03,6123:-1,6120:-1
//=======================================================
// Lighthalzen
//=======================================================
-lighthalzen,337,240,4 shop Trap Specialist#lhz 66,7940:-1,12341:-1
-lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1
+lighthalzen,337,240,4 shop Trap Specialist#lhz 1_F_01,7940:-1,12341:-1
+lhz_in03,181,17,4 shop Black Marketeer#lhz 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,15,65,5 shop Part-Timer#sc_lgt 4_M_ORIENT02,6123:-1,6120:-1
//=======================================================
// Malangdo
//=======================================================
-malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
+malangdo,232,163,5 shop Tool Dealer Myo 4_CAT_ADV2,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
//=======================================================
// Mora
//=======================================================
-mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
-mora,138,110,4 shop Mora Chef 518,11519:-1
+mora,100,118,4 shop Tool Dealer#mora 4_M_RAFLE_OLD,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
+mora,138,110,4 shop Mora Chef 4_F_RAFLE_PK,11519:-1
//=======================================================
// Mid Camp
//=======================================================
-mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1
-mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+mid_camp,129,284,4 shop Trap Specialist#mid 1_F_01,7940:-1,12341:-1
+mid_camp,184,263,4 shop Black Marketeer#mid 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
//=======================================================
// Payon
//=======================================================
-payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1
+payon,123,109,4 shop Trap Specialist#pay 1_F_01,7940:-1,12341:-1
//=======================================================
// Port Malaya
//=======================================================
-ma_in01,73,22,3 shop Weapon Dealer#ma 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ma_in01,22,23,3 shop Tool Dealer#ma 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
-malaya,150,261,3 shop Fruit Gardener#ma 535,512:-1,513:-1,515:-1,516:-1,535:-1
-ma_in01,67,13,5 shop Armor Dealer#ma 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ma_in01,73,22,3 shop Weapon Dealer#ma 4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ma_in01,22,23,3 shop Tool Dealer#ma 4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
+malaya,150,261,3 shop Fruit Gardener#ma 4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
+ma_in01,67,13,5 shop Armor Dealer#ma 4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
//=======================================================
// Prontera
//=======================================================
-//prontera,104,88,5 shop Stuff Gimme 880,616:-1
-prt_in,109,68,4 shop Trap Specialist#prt 66,7940:-1,12341:-1
-prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1
+//prontera,104,88,5 shop Stuff Gimme 4_M_MASKMAN,616:-1
+prt_in,109,68,4 shop Trap Specialist#prt 1_F_01,7940:-1,12341:-1
+prt_in,175,137,4 shop Black Marketeer#prt 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,17,110,1 shop Part-Timer#sc_prt 1_F_02,6123:-1,6120:-1
//=======================================================
// Rachel
//=======================================================
-ra_in01,263,281,4 shop Trap Specialist#ra 66,7940:-1,12341:-1
-ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1
+ra_in01,263,281,4 shop Trap Specialist#ra 1_F_01,7940:-1,12341:-1
+ra_in01,257,266,4 shop Black Marketeer#ra 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,137,60,3 shop Part-Timer#sc_ra 1_F_GYPSY,6123:-1,6120:-1
diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt
index ef8b29135..d5d4dd59f 100644
--- a/npc/re/merchants/ticket_refiner.txt
+++ b/npc/re/merchants/ticket_refiner.txt
@@ -13,7 +13,7 @@
//= 1.0 First version. [Euphy]
//============================================================
-prontera,184,177,6 script Refine Master 851,{
+prontera,184,177,6 script Refine Master 4_M_REPAIR,{
disable_items;
if (countitem(6238) || countitem(6228) || countitem(6229) || countitem(6230) || countitem(6231) || countitem(6456))
set .@bWeaponUp,1;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 14:26:26 +0000