Merge branch 'master' of https://github.com/HerculesWS/Hercules

1 files changed, 345 insertions, 24 deletions

diff --git a/doc/sample/npc_extend_shop.txt b/doc/sample/npc_extend_shop.txt
index 1ca4ed7b8..31ed0af43 100644
--- a/doc/sample/npc_extend_shop.txt
+++ b/doc/sample/npc_extend_shop.txt
@@ -1,30 +1,351 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Sample: Extended Shops
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Hercules Dev Team
 //===== Current Version: =====================================
-//= 20121003
-//===== Description: ========================================= 
+//= 20131225
+//===== Description: =========================================
 //= An example of shop NPCs.
 //============================================================
 
-prontera,182,213,3	shop	Super Novice Shop	716,1243:-1,2112:-1,2340:-1,2352:-1,2414:-1,2510:-1,2628:-1,5055:-1
-prontera,149,139,5	shop	Whips Merchant	58,1951:-1,1953:-1,1955:-1,1957:-1,1959:-1,1961:-1,1962:-1,1963:-1,1964:-1
-prontera,162,175,3	shop	Headgears Merchant 1	73,2209:-1,2210:-1,2211:-1,2221:-1,2223:-1,2217:-1,2227:-1,2231:-1,2225:-1,2229:-1
-prontera,162,172,3	shop	Headgears Merchant 2	73,2203:-1,2212:-1,2218:-1,2239:-1,2241:-1,2242:-1,2243:-1,2263:-1,2265:-1,2276:-1,2288:-1,2291:-1,2297:-1
-prontera,162,169,3	shop	Armours Merchant	73,2311:-1,2313:-1,2315:-1,2317:-1,2318:-1,2320:-1,2322:-1,2324:-1,2326:-1,2327:-1,2329:-1,2331:-1,2334:-1,2336:-1,2337:-1,2342:-1
-prontera,162,166,3	shop	Shields Merchant	73,2102:-1,2104:-1,2106:-1,2108:-1,2109:-1,2110:-1,2111:-1
-prontera,162,163,3	shop	Boots Merchant	73,2402:-1,2404:-1,2406:-1,2407:-1,2412:-1,2413:-1
-prontera,162,160,3	shop	Robes Merchant	73,2502:-1,2504:-1,2506:-1,2507:-1,2508:-1,2509:-1
-prontera,162,157,3	shop	Accessory Merchant	73,2601:-1,2602:-1,2603:-1,2604:-1,2605:-1,2607:-1,2608:-1,2615:-1,2616:-1,2618:-1,2619:-1
-prontera,162,154,3	shop	Arrows Merchant	73,1750:-1,1751:-1,1752:-1,1753:-1,1754:-1,1755:-1,1756:-1,1757:-1,1758:-1,1759:-1,1760:-1,1761:-1,1762:-1,1763:-1,1764:-1,1765:-1,1766:-1,1767:-1,1768:-1,1769:-1
-prontera,162,151,3	shop	Alchemist Shop	73.7127:-1,7128:-1,7129:-1,7130:-1,7131:-1,7132:-1,7133:-1,7144:-1,7134:-1,1093:-1
-prontera,162,148,3	shop	Taming Merchant	73,619:-1,620:-1,621:-1,623:-1,624:-1,625:-1,626:-1,627:-1,628:-1,629:-1,630:-1,631:-1,632:-1,633:-1,634:-1,635:-1,636:-1,637:-1,638:-1,639:-1,640:-1,641:-1,642:-1,659:-1
-prontera,162,145,3	shop	Pet Equipment	73,10001:-1,10002:-1,10003:-1,10004:-1,10005:-1,10006:-1,10007:-1,10008:-1,10009:-1,10010:-1,10011:-1,10012:-1,10013:-1,10014:-1,10015:-1,10016:-1,10017:-1,10018:-1,10019:-1,10020:-1
-prontera,148,234,5	shop	Weapon Card Merchant	80,4004:100000,4018:100000,4025:100000,4026:100000,4019:100000,4029:100000,4043:100000,4017:100000,4020:100000,4024:100000,4037:100000,4055:100000,4057:100000,4076:100000,4096:100000,4104:100000,4030:100000,4049:100000,4062:100000,4069:100000,4085:100000,4007:100000,4060:100000,4063:100000,4068:100000,4080:100000,4094:100000,4111:100000,4118:100000,4082:20700,4092:100000,4126:100000,4072:100000,4115:100000,4035:100000,4086:100000,4106:100000,4117:100000,4125:100000
-prontera,148,231,5	shop	Headgear Card Merchant	80,4010:100000,4039:100000,4046:100000,4052:100000,4087:100000,4110:100000,4112:100000,4122:100000,4127:100000
-prontera,146,229,5	shop	Armor Card Merchant	80,4003:100000,4008:100000,4011:100000,4014:100000,4016:100000,4021:100000,4023:100000,4031:100000,4078:100000,4089:100000,4098:100000,4099:100000,4101:100000,4114:100000,4119:100000,4141:100000,4061:100000,4105:100000
-prontera,144,227,5	shop	Shield Card Merchant	80,4013:100000,4032:100000,4058:100000,4059:100000,4066:100000,4074:100000,4083:100000,4120:100000,4124:100000,4136:100000,4138:100000,4045:100000,4067:100000,4075:100000,4090:100000
-prontera,142,225,5	shop	Robe Card Merchant	80,4056:100000,4071:100000,4081:100000,4095:100000,4108:100000,4109:100000,4113:100000,4116:100000,4133:100000,4015:100000,4088:100000,4102:100000,4129:100000
-prontera,140,223,5	shop	Shoes Card Merchant	80,4009:100000,4038:100000,4050:100000,4070:100000,4097:100000,4100:100000,4107:100000
-prontera,138,221,5	shop	Accessory Card Merchant	80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
+prontera,182,213,3	trader	Super Novice Shop	4_M_KID2,{
+OnInit:
+	sellitem Novice_Knife;
+	sellitem Novice_Guard;
+	sellitem Novice_Breast;
+	sellitem Novice_Plate;
+	sellitem Novice_Boots;
+	sellitem Novice_Hood;
+	sellitem Novice_Armlet;
+	sellitem Novice_Egg_Cap;
+}
+prontera,149,139,5	trader	Whips Merchant	1_M_MERCHANT,{
+OnInit:
+	sellitem Rope_;
+	sellitem Line_;
+	sellitem Wire_;
+	sellitem Rante_;
+	sellitem Tail_;
+	sellitem Whip_;
+	sellitem Lariat;
+	sellitem Rapture_Rose;
+	sellitem Chemeti;
+}
+prontera,162,175,3	trader	Headgears Merchant 1	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Ribbon_;
+	sellitem Hair_Band;
+	sellitem Bandana;
+	sellitem Hat_;
+	sellitem Turban_;
+	sellitem Biretta_;
+	sellitem Cap_;
+	sellitem Gemmed_Sallet_;
+	sellitem Goggle_;
+	sellitem Helm_;
+}
+prontera,162,172,3	trader	Headgears Merchant 2	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Glasses;
+	sellitem Eye_Bandage;
+	sellitem Flu_Mask;
+	sellitem One_Eyed_Glass;
+	sellitem Granpa_Beard;
+	sellitem Luxury_Sunglasses;
+	sellitem Spinning_Eyes;
+	sellitem Gangster_Patch;
+	sellitem Ganster_Mask;
+	sellitem Eagle_Eyes;
+	sellitem Mr_Scream;
+	sellitem Masquerade;
+	sellitem Goblini_Mask;
+}
+prontera,162,169,3	trader	Armours Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Mink_Coat;
+	sellitem Padded_Armor_;
+	sellitem Chain_Mail_;
+	sellitem Plate_Armor_;
+	sellitem Clothes_Of_The_Lord;
+	sellitem Formal_Suit;
+	sellitem Silk_Robe_;
+	sellitem Scapulare_;
+	sellitem Saint_Robe_;
+	sellitem Holy_Robe;
+	sellitem Wooden_Mail_;
+	sellitem Tights_;
+	sellitem Mage_Coat;
+	sellitem Thief_Clothes_;
+	sellitem Ninja_Suit;
+	sellitem Full_Plate_Armor_;
+}
+prontera,162,166,3	trader	Shields Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Guard_;
+	sellitem Buckler_;
+	sellitem Shield_;
+	sellitem Mirror_Shield_;
+	sellitem Memorize_Book;
+	sellitem Holy_Guard;
+	sellitem Herald_Of_GOD;
+}
+prontera,162,163,3	trader	Boots Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Sandals_;
+	sellitem Shoes_;
+	sellitem Boots_;
+	sellitem Chrystal_Pumps;
+	sellitem Grave_;
+	sellitem Safty_Boots;
+}
+prontera,162,160,3	trader	Robes Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Hood_;
+	sellitem Muffler_;
+	sellitem Manteau_;
+	sellitem Cape_Of_Ancient_Lord;
+	sellitem Ragamuffin_Cape;
+	sellitem Clack_Of_Servival;
+}
+prontera,162,157,3	trader	Accessory Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Ring;
+	sellitem Earring;
+	sellitem Necklace;
+	sellitem Glove;
+	sellitem Brooch;
+	sellitem Clip;
+	sellitem Rosary;
+	sellitem Safety_Ring;
+	sellitem Critical_Ring;
+	sellitem Matyr's_Flea_Guard;
+	sellitem Thimble_Of_Archer;
+}
+prontera,162,154,3	trader	Arrows Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Arrow;
+	sellitem Silver_Arrow;
+	sellitem Fire_Arrow;
+	sellitem Steel_Arrow;
+	sellitem Crystal_Arrow;
+	sellitem Arrow_Of_Wind;
+	sellitem Stone_Arrow;
+	sellitem Immatrial_Arrow;
+	sellitem Stun_Arrow;
+	sellitem Freezing_Arrow;
+	sellitem Flash_Arrow;
+	sellitem Curse_Arrow;
+	sellitem Rusty_Arrow;
+	sellitem Poison_Arrow;
+	sellitem Incisive_Arrow;
+	sellitem Oridecon_Arrow;
+	sellitem Arrow_Of_Counter_Evil;
+	sellitem Arrow_Of_Shadow;
+	sellitem Sleep_Arrow;
+	sellitem Silence_Arrow;
+}
+prontera,162,151,3	trader	Alchemist Shop	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Alcol_Create_Book;
+	sellitem FireBottle_Create_Book;
+	sellitem Acid_Create_Book;
+	sellitem Plant_Create_Book;
+	sellitem Mine_Create_Book;
+	sellitem Coating_Create_Book;
+	sellitem Slim_Potion_Create_Book;
+	sellitem Normal_Potion_Book;
+	sellitem Medicine_Bowl;
+	sellitem Empty_Potion;
+}
+prontera,162,148,3	trader	Taming Merchant	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Unripe_Apple;
+	sellitem Orange_Juice;
+	sellitem Bitter_Herb;
+	sellitem Rainbow_Carrot;
+	sellitem Earthworm_The_Dude;
+	sellitem Rotten_Fish;
+	sellitem Lusty_Iron;
+	sellitem Monster_Juice;
+	sellitem Sweet_Milk;
+	sellitem Well_Dried_Bone;
+	sellitem Singing_Flower;
+	sellitem Dew_Laden_Moss;
+	sellitem Deadly_Noxious_Herb;
+	sellitem Fatty_Chubby_Earthworm;
+	sellitem Baked_Yam;
+	sellitem Tropical_Banana;
+	sellitem Horror_Of_Tribe;
+	sellitem No_Recipient;
+	sellitem Old_Broom;
+	sellitem Silver_Knife_Of_Chaste;
+	sellitem Armlet_Of_Obedience;
+	sellitem Shining_Stone;
+	sellitem Contracts_In_Shadow;
+	sellitem Book_Of_Devil;
+	sellitem Heart_Of_Her;
+}
+prontera,162,145,3	trader	Pet Equipment	1_F_MERCHANT_01,{
+OnInit:
+	sellitem Skull_Helm;
+	sellitem Monster_Oxygen_Mask;
+	sellitem Transparent_Headgear;
+	sellitem Pacifier;
+	sellitem Wig;
+	sellitem Queen's_Hair_Ornament;
+	sellitem Silk_Ribbon;
+	sellitem Punisher;
+	sellitem Wild_Flower;
+	sellitem Battered_Pot;
+	sellitem Stellar_Hairpin;
+	sellitem Tiny_Egg_Shell;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Green_Lace;
+	sellitem Golden_Bell;
+	sellitem Bark_Shorts;
+	sellitem Monkey_Circlet;
+	sellitem Red_Muffler;
+	sellitem Sword_Of_Grave_Keeper;
+}
+prontera,148,234,5	trader	Weapon Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Drops_Card,            100000;
+	sellitem Andre_Larva_Card,      100000;
+	sellitem Skeleton_Card,         100000;
+	sellitem Thief_Bug_Female_Card, 100000;
+	sellitem Hornet_Card,           100000;
+	sellitem Wolf_Card,             100000;
+	sellitem Andre_Card,            100000;
+	sellitem Savage_Babe_Card,      100000;
+	sellitem Farmiliar_Card,        100000;
+	sellitem Plankton_Card,         100000;
+	sellitem Snake_Card,            100000;
+	sellitem Marina_Card,           100000;
+	sellitem Metaller_Card,         100000;
+	sellitem Magnolia_Card,         100000;
+	sellitem Zenorc_Card,           100000;
+	sellitem Requiem_Card,          100000;
+	sellitem Mandragora_Card,       100000;
+	sellitem Vadon_Card,            100000;
+	sellitem Anacondaq_Card,        100000;
+	sellitem Drainliar_Card,        100000;
+	sellitem Orc_Skeleton_Card,     100000;
+	sellitem Pecopeco_Egg_Card,     100000;
+	sellitem Goblin_Card,           100000;
+	sellitem Caramel_Card,          100000;
+	sellitem Scorpion_Card,         100000;
+	sellitem Flora_Card,            100000;
+	sellitem Archer_Skeleton_Card,  100000;
+	sellitem Strouf_Card,           100000;
+	sellitem Petit_Card,            100000;
+	sellitem Desert_Wolf_Card,       20700;
+	sellitem Skel_Worker_Card,      100000;
+	sellitem Minorous_Card,         100000;
+	sellitem Golem_Card,            100000;
+	sellitem Hunter_Fly_Card,       100000;
+	sellitem Hydra_Card,            100000;
+	sellitem Soldier_Skeleton_Card, 100000;
+	sellitem Mummy_Card,            100000;
+	sellitem Side_Winder_Card,      100000;
+	sellitem Deviace_Card,          100000;
+}
+prontera,148,231,5	trader	Headgear Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Wilow_Card,       100000;
+	sellitem Stainer_Card,     100000;
+	sellitem Martin_Card,      100000;
+	sellitem Elder_Wilow_Card, 100000;
+	sellitem Giearth_Card,     100000;
+	sellitem Ghoul_Card,       100000;
+	sellitem Marduk_Card,      100000;
+	sellitem Deviruchi_Card,   100000;
+	sellitem Nightmare_Card,   100000;
+}
+prontera,146,229,5	trader	Armor Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Pupa_Card,             100000;
+	sellitem Picky_Card,            100000;
+	sellitem Picky__Card,           100000;
+	sellitem Roda_Frog_Card,        100000;
+	sellitem Thief_Bug_Card,        100000;
+	sellitem Rocker_Card,           100000;
+	sellitem Desert_Wolf_Babe_Card, 100000;
+	sellitem Pecopeco_Card,         100000;
+	sellitem Savage_Card,           100000;
+	sellitem Sword_Fish_Card,       100000;
+	sellitem Dokebi_Card,           100000;
+	sellitem Pasana_Card,           100000;
+	sellitem Sand_Man_Card,         100000;
+	sellitem Argiope_Card,          100000;
+	sellitem Bathory_Card,          100000;
+	sellitem Evil_Druid_Card,       100000;
+	sellitem Cornutus_Card,         100000;
+	sellitem Marc_Card,             100000;
+}
+prontera,144,227,5	trader	Shield Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Andre_Egg_Card,     100000;
+	sellitem Ambernite_Card,     100000;
+	sellitem Thara_Frog_Card,    100000;
+	sellitem Soldier_Andre_Card, 100000;
+	sellitem Orc_Warrior_Card,   100000;
+	sellitem BigFoot_Card,       100000;
+	sellitem Rafflesia_Card,     100000;
+	sellitem Petit__Card,        100000;
+	sellitem Medusa_Card,        100000;
+	sellitem Khalitzburg_Card,   100000;
+	sellitem Anubis_Card,        100000;
+	sellitem Horn_Card,          100000;
+	sellitem Megalodon_Card,     100000;
+	sellitem Argos_Card,         100000;
+	sellitem Munak_Card,         100000;
+}
+prontera,142,225,5	trader	Robe Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Dustiness_Card,  100000;
+	sellitem Orc_Zombie_Card, 100000;
+	sellitem Hode_Card,       100000;
+	sellitem Marse_Card,      100000;
+	sellitem Myst_Card,       100000;
+	sellitem Jakk_Card,       100000;
+	sellitem Marionette_Card, 100000;
+	sellitem Isis_Card,       100000;
+	sellitem Daydric_Card,    100000;
+	sellitem Condor_Card,     100000;
+	sellitem Frilldora_Card,  100000;
+	sellitem Whisper_Card,    100000;
+	sellitem Baphomet__Card,  100000;
+}
+prontera,140,223,5	trader	Shoes Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Chonchon_Card,       100000;
+	sellitem Zombie_Card,         100000;
+	sellitem Thief_Bug_Male_Card, 100000;
+	sellitem Eggyra_Card,         100000;
+	sellitem Matyr_Card,          100000;
+	sellitem Sohee_Card,          100000;
+	sellitem Verit_Card,          100000;
+}
+prontera,138,221,5	trader	Accessory Card Merchant	1_F_PUBGIRL,{
+OnInit:
+	sellitem Spore_Card,         100500;
+	sellitem Kukre_Card,         100500;
+	sellitem Tarou_Card,         100500;
+	sellitem Worm_Tail_Card,     100500;
+	sellitem Yoyo_Card,          100500;
+	sellitem Zerom_Card,         100500;
+	sellitem Kobold_Card,        100500;
+	sellitem Mantis_Card,        100500;
+	sellitem Poporing_Card,      100500;
+	sellitem Creamy_Card,        100500;
+	sellitem Smokie_Card,        100500;
+	sellitem Poison_Spore_Card,  100500;
+	sellitem Vitata_Card,        100500;
+	sellitem Pirate_Skel_Card,   100500;
+	sellitem Phen_Card,          100500;
+	sellitem Marine_Sphere_Card, 100500;
+	sellitem Obeaune_Card,       100500;
+	sellitem Horong_Card,        100500;
+	sellitem Joker_Card,         100500;
+}