diff options
Diffstat (limited to 'npc/merchants')
-rw-r--r-- | npc/merchants/refine.txt | 8 | ||||
-rw-r--r-- | npc/merchants/shops.txt | 164 |
2 files changed, 6 insertions, 166 deletions
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 9fb1d70c3..7f1b4d9a3 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2016 Hercules Dev Team //= Copyright (C) Euphy //= Copyright (C) Masao //= Copyright (C) Xantara @@ -50,7 +50,7 @@ //================= Description =========================================== //= Refining NPCs and Metal Salesmen. //================= Current Version ======================================= -//= 3.3 +//= 3.3.2 //========================================================================= //== Christopher: Geffen Blacksmith ======================== @@ -1101,7 +1101,7 @@ moc_ruins,107,94,4 script Repairman#moc 4W_M_03,{ end; } -payon,143,165,4 script Repairman#pay 4_M_ORIENT01,{ +payon,143,165,0 script Repairman#pay 4_M_ORIENT01,{ callfunc "repairmain","Repairman"; end; } @@ -1116,7 +1116,7 @@ yuno_in01,175,28,3 script Repairman#juno 4_M_04,{ end; } -geffen_in,34,166,3 script Repairman#gef 4W_M_03,{ +geffen_in,34,166,3 script Repairman#gef 4_M_04,{ callfunc "repairmain","Repairman"; end; } diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index d2745217d..d4b623031 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2016 Hercules Dev Team //= Copyright (C) Yommy //= Copyright (C) Streusel //= Copyright (C) Euphy @@ -46,46 +46,16 @@ //================= Description =========================================== //= Town shop NPCs. //================= Current Version ======================================= -//= 3.6 +//= 3.9 //========================================================================= //== Alberta =============================================== -alb2trea,87,65,5 trader Tool Dealer#alb 4_M_01,{ -OnInit: - sellitem Arrow; - sellitem Silver_Arrow; - sellitem Fire_Arrow; - sellitem Red_Potion; - sellitem Orange_Potion; - sellitem Yellow_Potion; - sellitem White_Potion; - sellitem Green_Potion; - sellitem Center_Potion; - sellitem Awakening_Potion; -} - alberta_in,165,96,0 trader Item Collector#alb 1_F_MERCHANT_02,{ OnInit: sellitem Scell; sellitem Monster's_Feed; } -alberta_in,182,97,0 trader Tool Dealer#alb2 1_F_MERCHANT_01,{ -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 Spinning_Eyes; -} - alberta_in,180,15,0 trader Armor Dealer#alb 4W_F_01,{ OnInit: sellitem Guard; @@ -138,21 +108,6 @@ OnInit: sellitem Cinquedea; } -alberta_in,176,81,3 trader Trading Merchant#alb 4_M_HUMERCHANT,{ -OnInit: - sellitem Bullet; - sellitem Silver_Bullet; - sellitem Shell_Of_Blood; - sellitem Branch; - sellitem Crimson_Bolt; - sellitem The_Cyclone; - sellitem Rolling_Stone; - sellitem Black_Rose; - sellitem Long_Barrel; - sellitem Jungle_Carbine; - sellitem Thunder_P; -} - //== Aldebaran ============================================= aldeba_in,20,60,0 trader Armor Dealer#alde 4W_F_01,{ OnInit: @@ -655,22 +610,6 @@ OnInit: sellitem Zargon; } -geffen_in,77,167,0 trader Tool Dealer#gef 1_F_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 Granpa_Beard; -} - geffen_in,77,173,0 trader Magical Item Seller#gef 1_M_WIZARD,{ OnInit: sellitem Blue_Gemstone; @@ -683,24 +622,6 @@ OnInit: sellitem Silver_Robe; } -geffen_in,171,123,4 trader Tool Dealer#gef2 1_M_WIZARD,{ -OnInit: - sellitem Empty_Cylinder; - sellitem Empty_Potion; -} - -geffen,193,152,4 trader Pet Groomer#gef 4_F_TELEPORTER,{ -OnInit: - sellitem Pet_Food; - sellitem Pet_Incubator; - sellitem Backpack; - sellitem Rocker_Glasses; - sellitem Mojji; - sellitem Vital_Flower_; - sellitem Flame_Gemstone; - sellitem Bun_; -} - //== Kunlun ================================================ gonryun,147,84,5 trader Tool Dealer#gon 4_M_TWOLDMAN,{ OnInit: @@ -1544,72 +1465,6 @@ OnInit: sellitem Novice_Armlet; } -payon_in01,5,49,7 trader Tool Dealer#pay 4_M_ORIENT01,{ -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; -} - -payon_in02,87,34,0 trader Tool Dealer#pay2 1_F_ORIENT_01,{ -OnInit: - sellitem Arrow; - sellitem Silver_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; -} - -payon,159,96,4 trader Tool Dealer#pay3 4_M_ORIENT01,{ -OnInit: - sellitem Arrow; - sellitem Red_Potion; - sellitem Center_Potion; - sellitem Wing_Of_Fly; - sellitem Wing_Of_Butterfly; -} - -payon,177,131,4 trader Pet Groomer#pay 4_F_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 ============================================== prontera,73,134,0 trader Vendor from Milk Ranch#p 4_F_01,{ OnInit: @@ -1938,21 +1793,6 @@ OnInit: } //== Cooking Addition ====================================== -payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{ -OnInit: - sellitem Hot_Sauce; -} - -geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{ -OnInit: - sellitem Pot; -} - -alberta,167,135,5 trader Chef Assistant#alb 4_M_05,{ -OnInit: - sellitem Delicious_Fish; -} - aldebaran,165,107,2 trader Chef Assistant#alde 4W_M_01,{ OnInit: sellitem Red_Spice; |