summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/coin_exchange.txt2
-rw-r--r--npc/merchants/hd_refine.txt4
-rw-r--r--npc/merchants/icecream.txt2
-rw-r--r--npc/merchants/shops.txt122
-rw-r--r--npc/merchants/socket_enchant.txt4
-rw-r--r--npc/merchants/socket_enchant2.txt2
6 files changed, 8 insertions, 128 deletions
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 57b0c4afb..392a18c0b 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -36,7 +36,7 @@
//=========================================================================
//== Manuk & Splendide =====================================
-- script ::merchant_13_2 -1,{
+- script ::merchant_13_2 FAKE_NPC,{
.@n$ = "["+strnpcinfo(1)+"]";
mes .@n$;
if (isequipped(2782) && ep13_2_rhea == 100) {
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index 2200f85be..e1a9bae7e 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -38,7 +38,7 @@
//=========================================================================
//== Blacksmith Mighty Hammer (+7~9) =======================
-- script ::MightyHammer -1,{
+- script ::MightyHammer FAKE_NPC,{
disable_items;
mes "[Blacksmith Mighty Hammer]";
mes "Unlike others, I am a blacksmith who refines a very limited number of items.";
@@ -178,7 +178,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF
//payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF
//== Basta (+10 and up) ====================================
-- script ::Basta -1,{
+- script ::Basta FAKE_NPC,{
disable_items;
mes "[Basta]";
mes "I'm the best Blacksmith in the whole world, Basta.";
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index ba05d4f94..f1ad519d9 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -35,7 +35,7 @@
//= 1.5
//=========================================================================
-- script Ice Cream Maker::IceCreamer -1,{
+- script Ice Cream Maker::IceCreamer FAKE_NPC,{
mes "[Ice Cream Maker]";
mes "Fresh Ice Cream made with snow from Lutie!";
mes "Enjoy it now, it won't be on sale for long!";
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index d93baa57c..d2745217d 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -46,7 +46,7 @@
//================= Description ===========================================
//= Town shop NPCs.
//================= Current Version =======================================
-//= 3.5.1
+//= 3.6
//=========================================================================
//== Alberta ===============================================
@@ -1292,39 +1292,6 @@ OnInit:
sellitem Venom_Knife;
}
-moc_ruins,91,128,4 trader Tool Dealer#moc1 4_F_04,{
-OnInit:
- sellitem Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Booby_Trap;
-}
-
-moc_ruins,114,63,6 trader Tool Dealer#moc2 4W_M_03,{
-OnInit:
- sellitem Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Booby_Trap;
- sellitem Luxury_Sunglasses;
-}
-
moc_ruins,93,53,2 trader Item Collector#moc1 4_M_03,{
OnInit:
sellitem Scell;
@@ -1386,23 +1353,6 @@ OnInit:
moc_ruins,90,149,6 trader Trader#moc5 4W_M_03,{
OnInit:
sellitem Banana;
- sellitem Banana;
- sellitem Banana;
- sellitem Banana;
- sellitem Banana;
- sellitem Banana;
-}
-
-moc_ruins,118,170,4 trader Pet Groomer#moc 4_M_TELEPORTER,{
-OnInit:
- sellitem Pet_Food;
- sellitem Pet_Incubator;
- sellitem Backpack;
- sellitem Rocker_Glasses;
- sellitem Mojji;
- sellitem Vital_Flower_;
- sellitem Flame_Gemstone;
- sellitem Bun_;
}
morocc_in,141,67,0 trader Weapon Dealer#moc1 1_M_MERCHANT,{
@@ -1699,30 +1649,6 @@ OnInit:
sellitem Glass_Bead;
}
-prontera,218,211,4 trader Pet Groomer#prt 4_M_TELEPORTER,{
-OnInit:
- sellitem Pet_Food;
- sellitem Pet_Incubator;
- sellitem Backpack;
- sellitem Rocker_Glasses;
- sellitem Mojji;
- sellitem Flame_Gemstone;
- sellitem Vital_Flower_;
- sellitem Vital_Flower;
- sellitem Bun_;
- sellitem Damp_Darkness;
- sellitem Small_Snow_Flower;
- sellitem Fresh_Plant;
- sellitem Big_Cell;
- sellitem Apple_Pudding;
- sellitem Mystic_Stone;
- sellitem Flavored_Alcohol;
- sellitem Grilled_Rice_Cake;
- sellitem Fish_With_Blue_Back;
- sellitem Pumpkin_Pie_;
- sellitem Traditional_Cookie;
-}
-
prontera,248,153,0 trader Doll Supplier#prt 4_M_03,{
OnInit:
sellitem Stuffed_Doll;
@@ -1752,18 +1678,6 @@ OnInit:
sellitem Chain;
}
-prt_fild05,290,221,2 trader Tool Dealer#prt 4_M_01,{
-OnInit:
- sellitem Arrow;
- sellitem Spectacles;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
-}
-
prt_in,211,169,0 trader Wedding Shop Dealer#prt 1_F_LIBRARYGIRL,{
OnInit:
sellitem Bunch_Of_Flowers;
@@ -1773,23 +1687,6 @@ OnInit:
sellitem Tuxedo;
}
-prt_in,126,76,0 trader Tool Dealer#prt1 1_M_INNKEEPER,{
-OnInit:
- sellitem Spectacles;
- sellitem Arrow;
- sellitem Red_Potion;
- sellitem Orange_Potion;
- sellitem Yellow_Potion;
- sellitem White_Potion;
- sellitem Green_Potion;
- sellitem Center_Potion;
- sellitem Awakening_Potion;
- sellitem Wing_Of_Fly;
- sellitem Wing_Of_Butterfly;
- sellitem Booby_Trap;
- sellitem One_Eyed_Glass;
-}
-
prt_in,172,130,0 trader Weapon Dealer#prt 1_M_JOBGUIDER,{
OnInit:
sellitem Arrow;
@@ -2041,28 +1938,11 @@ OnInit:
}
//== Cooking Addition ======================================
-prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{
-OnInit:
- sellitem Plain_Sauce;
- sellitem Red_Spice;
- sellitem Pot;
- sellitem Bread;
-}
-
payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{
OnInit:
sellitem Hot_Sauce;
}
-moc_ruins,115,123,5 trader Chef Assistant#moc 4_M_04,{
-OnInit:
- sellitem Hot_Sauce;
- sellitem Sweet_Sauce;
- sellitem Plain_Sauce;
- sellitem Red_Spice;
- sellitem Yellow_Spice;
-}
-
geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
OnInit:
sellitem Pot;
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index aa43e2a9b..8b2a3275b 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -43,7 +43,7 @@
//= 2.0a
//=========================================================================
-- script Seiyablem#dummy::SocketEnchant -1,{
+- script Seiyablem#dummy::SocketEnchant FAKE_NPC,{
if (checkweight(Knife,1) == 0)
{
mes "- Wait a minute !! -";
@@ -354,7 +354,7 @@ lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 4_M_02
prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 4_M_02
morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 4_M_02
-- script Young Man#dummy::SocketMan -1,{
+- script Young Man#dummy::SocketMan FAKE_NPC,{
mes "[Young Man]";
mes "I'm considering becoming a Slotting Engineer.";
mes "It's a new field where you can add Slots to equipment, and it'd be cool if I can work in such a lucrative career.";
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 42f910477..fc2c2d636 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -34,7 +34,7 @@
//= 1.1a
//=========================================================================
-- script Leablem#dummy::SocketEnchant2 -1,{
+- script Leablem#dummy::SocketEnchant2 FAKE_NPC,{
if (checkweight(Knife,1) == 0)
{
mes "- Wait a minute !! -";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-10 09:07:37 +0000