summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/item_db.txt249
-rw-r--r--db/mob_db.txt72
-rw-r--r--db/mob_skill_db.txt93
-rw-r--r--db/skill_db.txt43
4 files changed, 457 insertions, 0 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index 71a6e5a6..02d4e7f9 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1,3 +1,251 @@
+<<<<<<< HEAD
+#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
+0, DEFAULT, Default, 0, 20, 10, 10, , , , , , 2, , , , , {}, {}
+501, CactusDrink, Cactus Drink, 0, 50, 25, 4, , , , , , 2, , , 0, , { itemheal 15, 0; }, {}
+502, CactusPotion, Cactus Potion, 0, 70, 35, 7, , , , , , 2, , , 0, , { itemheal 25, 0; }, {}
+503, CasinoCoins, Casino Coins, 3, 20, 10, 1, , , , , , , , , , , {}, {}
+504, DecorCandy, Decor Candy, 3, 25, 10, 1, , , , , , , , , , , {}, {}
+505, MaggotSlime, Maggot Slime, 3, 8, 4, 1, , , , , , , , , , , {}, {}
+506, CandyCane, Candy Cane, 0, 20, 10, 1, , , , , , 2, , , 0, , { itemheal 5, 0; }, {}
+507, ScorpionStinger, Scorpion Stinger, 3, 50, 25, 1, , , , , , , , , , , {}, {}
+508, XmasCake, Xmas Cake, 0, 70, 10, 1, , , , , , 2, , , 0, , { itemheal 10, 0; }, {}
+509, ChocolateBar, Chocolate Bar, 0, 60, 20, 1, , , , , , 2, , , 0, , { itemheal 20, 0; }, {}
+510, Candy, Candy, 0, 20, 10, 1, , , , , , 2, , , 0, , { itemheal 5, 0; }, {}
+511, SantaHat, Santa Hat, 5, 400, 200, 20, , 2, , -2, 0, 2, 256, , 0, 0, {}, {}
+512, GingerBreadMan, Ginger Bread Man, 0, 50, 25, 1, , , , , , 2, , , 0, , { itemheal 25, 0; }, {}
+513, Cake, Cake, 0, 30, 15, 1, , , , , , 2, , , 0, , { itemheal 15, 0; }, {}
+514, XmasCandyCane, Xmas Candy Cane, 0, 30, 15, 1, , , , , , 2, , , 0, , { itemheal 10, 0; }, {}
+515, PurplePresentBox, Purple Present Box, 3, 50, 25, 10, , , , , , , , , , , {}, {}
+516, BluePresentBox, Blue Present Box, 3, 60, 30, 10, , , , , , , , , , , {}, {}
+517, RedScorpionStinger, Red Scorpion Stinger, 3, 170, 85, 1, , , , , , , , , , , {}, {}
+518, BugLeg, Bug Leg, 3, 60, 20, 1, , , , , , , , , , , {}, {}
+519, CherryCake, Cherry Cake, 0, 100, 50, 1, , , , , , 2, , , 0, , { itemheal 35, 0; }, {}
+520, EasterEgg, Easter Egg, 0, 200, 100, 1, , , , , , 2, , , 0, , { itemheal 100, 0; }, {}
+521, Dagger, Dagger, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, {}
+522, SharpKnife, Sharp Knife, 4, 100, 50, 150, 10, , 1, , 0, 2, 2, 1, 1, 1, {}, {}
+523, LeatherShirt, Leather Shirt, 5, 2000, 1000, 20, , 4, , -12, 0, 2, 512, , 0, 0, {}, {}
+524, FancyHat, Fancy Hat, 5, 1600, 800, 20, , 5, , 0, 0, 2, 256, , 0, 0, {}, {}
+525, MinersHat, Miners Hat, 5, 800, 400, 40, , 4, , -8, 0, 2, 256, , 0, 0, {}, {}
+526, CoinBag, Coin Bag, 3, 100, 50, 5, , , , , , , , , , , {}, {}
+527, Milk, Milk, 0, 300, 150, 5, , , , , , 2, , , 0, , { itemheal 150, 0; }, {}
+528, Boots, Boots, 5, 8000, 500, 80, , 2, , -2, 0, 2, 64, , 0, 0, {}, {}
+529, IronArrow, Iron Arrow, 10, 5, 2, 1, 50, , , , , 2, 32768, , , , {}, {}
+530, ShortBow, Short Bow, 4, 3000, 500, 600, 50, , 5, , 0, 2, 34, 1, 4, 11, {}, {}
+531, MinerGloves, Miner Gloves, 5, 3000, 1000, 30, , 2, , -10, 0, 2, 4, , 0, 0, {}, {}
+532, LeatherGloves, Leather Gloves, 5, 6000, 2000, 20, , 4, , -20, 0, 2, 4, , 0, 0, {}, {}
+533, RoastedMaggot, Roasted Maggot, 0, 110, 55, 5, , , , , , 2, , , 0, , { itemheal 150, 0; }, {}
+534, OrangeCupcake, Orange Cupcake, 0, 90, 45, 5, , , , , , 2, , , 0, , { itemheal 100, 0; }, {}
+535, RedApple, Red Apple, 0, 10, 5, 5, , , , , , 2, , , 0, , { itemheal 50, 0; }, {}
+536, ShortSword, Short Sword, 4, 8000, 4000, 2000, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, {}
+537, TreasureKey, Treasure Key, 3, 100, 50, 2, , , , , , , , , , , {}, {}
+538, GreenPresentBox, Green Present Box, 3, 20, 10, 10, , , , , , 2, , , 0, , {}, {}
+539, Beer, Beer, 0, 175, 87, 10, , , , , , 2, , , 0, , { itemheal 200, 5; }, {}
+540, EmptyBottle, Empty Bottle, 3, 20, 10, 1, , , , , , , , , , , {}, {}
+541, BottleOfWater, Bottle of Water, 0, 200, 100, 10, , , , , , 2, , , 0, , { itemheal 250, 0; getitem 540, 1; }, {}
+542, BottleOfSand, Bottle of Sand, 3, 70, 35, 10, , , , , , , , , , , {}, {}
+543, StandardHeadband, Standard Headband, 5, 800, 400, 10, , 3, , -3, 0, 2, 256, , 0, 0, {}, {}
+544, SilkHeadband, Silk Headband, 5, 5000, 2000, 10, , 10, , -10, 0, 2, 256, , 0, 0, {}, {}
+545, ForestBow, Forest Bow, 4, 5000, 2500, 1200, 70, , 5, , 0, 2, 34, 1, 0, 11, {}, {}
+546, DesertShirt, Desert Shirt, 5, 2000, 1000, 20, , 6, , -18, 0, 2, 512, , 0, 0, {}, {}
+547, Bardiche, Bardiche, 5, 20, 10, 10, , 100, 1, -200, 0, 2, 2, , 0, 0, {}, { callfunc "UnreleasedItem"; }
+548, Halberd, Halberd, 4, 20, 10, 1400, 100, , 1, , 0, 2, 2, 1, 0, 0, {}, { callfunc "UnreleasedItem"; }
+549, Axe, Axe, 4, 20, 10, 1200, 100, , 1, , 0, 2, 2, 1, 0, 0, {}, { callfunc "UnreleasedItem"; }
+550, BlacksmithsAxe, Blacksmith's Axe, 4, 20, 10, 1200, 100, , 1, , 0, 2, 2, 1, 0, 0, {}, { callfunc "UnreleasedItem"; }
+551, AquaHint, Aqua Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+552, MagentaHint, Magenta Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+553, YellowHint, Yellow Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+554, GreenHint, Green Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+555, TealHint, Teal Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+556, PurpleHint, Purple Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+557, RedHint, Red Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+558, BlueHint, Blue Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+559, OrangeHint, Orange Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+560, GrayHint, Gray Hint, 3, 20, 0, 10, , , , , , , , , , , {}, {}
+561, Sabre, Sabre, 4, 10000, 5000, 300, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, {}
+562, ChickenLeg, Chicken Leg, 0, 250, 125, 10, , , , , , 2, , , 0, , { itemheal 500, 0; }, {}
+563, WinterGloves, Winter Gloves, 5, 6000, 3000, 20, , 3, , -15, 0, 2, 4, , 0, 0, {}, {}
+564, TurtleneckSweater, Turtleneck Sweater, 5, 2000, 1000, 30, , 6, , -18, 0, 2, 512, , 0, 0, {}, {}
+565, PinkPetal, Pink Petal, 0, 10, 25, 10, , , , , , 2, , , 0, , { itemheal 50, 0; }, {}
+566, SmallMushroom, Small Mushroom, 0, 50, 25, 10, , , , , , 2, , , 0, , { itemheal 50, 0; }, {}
+567, IronPotion, Iron Potion, 0, 500, 250, 10, , , , , , 2, , , 0, , { sc_start sc_raiseattackstrength, 60, 60; }, {}
+568, ConcentrationPotion, Concentration Potion, 0, 500, 250, 10, , , , , , 2, , , 0, , { sc_start sc_raiseattackspeed0, 60, 30; }, {}
+569, RawLog, Raw Log, 3, 20, 10, 10, , , , , , , , , , , {}, {}
+570, BoneKnife, Bone Knife, 4, 10000, 6000, 450, 115, , 1, , 0, 2, 2, 1, 1, 1, {}, {}
+571, Setzer, Setzer, 4, 20000, 8000, 900, 110, , 1, , 0, 2, 2, 1, 1, 3, {}, {}
+572, Scimitar, Scimitar, 4, 8000, 4000, 200, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+573, Falchion, Falchion, 4, 8000, 4000, 300, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+574, Scorpion, Scorpion, 4, 8000, 4000, 600, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+575, DesertBow, Desert Bow, 4, 8000, 4000, 1200, 100, , 1, , 0, 2, 34, 1, 1, 11, {}, { callfunc "UnreleasedItem"; }
+576, Beheader, Beheader, 4, 8000, 4000, 2000, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+577, BoneDarts, Bone Darts, 4, 8000, 4000, 300, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+578, SandCutter, Sand Cutter, 4, 8000, 4000, 1500, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+579, RockKnife, Rock Knife, 4, 15000, 7500, 5000, 300, , 1, , 0, 2, 34, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+580, StaffOfLife, Staff of Life, 4, 8000, 4000, 1500, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+581, CrescentRod, Crescent Rod, 4, 8000, 4000, 1500, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+582, StaffOfFire, Staff of Fire, 4, 8000, 4000, 1500, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+583, StaffOfIce, Staff of Ice, 4, 8000, 4000, 1500, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+584, Jackal, Jackal, 4, 8000, 4000, 100, 100, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+585, ScarabArmlet, Scarab Armlet, 5, 8000, 4000, 200, , 0, , 5, 0, 2, 32, , 1, 1, {}, {}
+586, CottonShorts, Cotton Shorts, 5, 1000, 500, 15, , 2, , -4, 0, 2, 1, , 1, 0, {}, {}
+587, Sword, Sword, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+//588, RESERVED, Bastard Sword, , , , , , , , , , , , , , , {}, {}
+//589, RESERVED, Broad Sword, , , , , , , , , , , , , , , {}, {}
+//590, RESERVED, Baselard, , , , , , , , , , , , , , , {}, {}
+//591, RESERVED, Long Sword, , , , , , , , , , , , , , , {}, {}
+//592, RESERVED, Stiletto, , , , , , , , , , , , , , , {}, {}
+//593, RESERVED, Rapier, , , , , , , , , , , , , , , {}, {}
+594, Spear, Spear, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, { callfunc "UnreleasedItem"; }
+//595, RESERVED, Heavy Spear, , , , , , , , , , , , , , , {}, {}
+//596, RESERVED, Pike, , , , , , , , , , , , , , , {}, {}
+//597, RESERVED, Heavy Pike, , , , , , , , , , , , , , , {}, {}
+//598, RESERVED, Dual Spear, , , , , , , , , , , , , , , {}, {}
+//599, RESERVED, Fire Sword, , , , , , , , , , , , , , , {}, {}
+//600, RESERVED, Brit Shield, , , , , , , , , , , , , , , {}, {}
+601, SteelShield, Steel Shield, 5, 40000, 3000, 2500, , 20, , -200, 0, 2, 32, , , 0, {}, {}
+602, WoodenShield, Wooden Shield, 5, 10000, 2000, 1500, , 14, , -70, 0, 2, 32, , , 0, {}, {}
+603, LeatherShield, Leather Shield, 5, 2000, 1000, 1300, , 7, , -35, 0, 2, 32, , , 0, {}, {}
+//604, RESERVED, Knight Shield, , , , , , , , , , , , , , , {}, {}
+//605, RESERVED, Meat Cleaver, , , , , , , , , , , , , , , {}, {}
+//606, RESERVED, Hatchet, , , , , , , , , , , , , , , {}, {}
+//607, RESERVED, Trident, , , , , , , , , , , , , , , {}, {}
+//608, RESERVED, Blade Shield, , , , , , , , , , , , , , , {}, {}
+//609, RESERVED, Club, , , , , , , , , , , , , , , {}, {}
+610, JeansShorts, Jeans Shorts, 5, 2000, 1000, 25, , 4, , -8, 0, 2, 1, , 0, 0, {}, {}
+611, WhiteFur, White Fur, 3, 8, 4, 8, , , , , , , , , , , {}, {}
+612, CaveSnakeLamp, Cave Snake Lamp, 3, 80, 40, 10, , , , , , , , , , , {}, {}
+613, HardSpike, Hard Spike, 3, 8, 4, 10, , , , , , , , , , , {}, {}
+614, PinkAntenna, Pink Antenna, 3, 10, 5, 10, , , , , , , , , , , {}, {}
+615, PumpkinHelmet, Pumpkin Helmet, 5, 2000, 1000, 60, , 4, , -4, 0, 2, 256, , 0, 0, {}, {}
+616, AxeHat, Axe Hat, 5, 2000, 1000, 50, , 4, , -4, 0, 2, 256, , 0, 0, {}, {}
+617, PirateHat, Pirate Hat, 5, 2000, 1000, 40, , 4, , -8, 0, 2, 256, , 0, 0, {}, {}
+618, Goggles, Goggles, 5, 500, 100, 20, , 2, , 0, 0, 2, 256, , 0, 0, {}, {}
+619, LeatherGoggles, Leather Goggles, 5, 1000, 500, 20, , 3, , 0, 0, 2, 256, , 0, 0, {}, {}
+620, Circlet, Circlet, 5, 2000, 1000, 25, , 4, , 5, 0, 2, 256, , 0, 0, {}, {}
+621, Eyepatch, Eyepatch, 5, 1000, 500, 5, , 3, , 0, 0, 2, 256, , 0, 0, {}, {}
+622, Bandana, Bandana, 5, 1000, 500, 20, , 3, , 0, 0, 2, 256, , 0, 0, {}, {}
+623, Scythe, Scythe, 4, 100, 50, 1200, 75, , 1, , 0, 2, 2, 1, 1, 3, {}, {}
+624, VNeckSweater, V-Neck Sweater, 5, 6000, 3000, 35, , 8, , -24, 0, 2, 512, , 0, 0, {}, {}
+625, ChainmailShirt, Chainmail Shirt, 5, 15000, 1500, 800, , 20, , -120, 0, 2, 512, , 0, 0, {}, {}
+626, LightPlatemail, Light Platemail, 5, 50000, 2500, 1200, , 25, , -150, 0, 2, 512, , 0, 0, {}, {}
+627, TopHat, Top Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {}
+628, FunkyHat, Funky Hat, 5, 3000, 1500, 20, , 13, , 2, 0, 2, 256, , 0, 0, {}, {}
+629, MushHat, Mush Hat, 5, 2500, 1250, 30, , 10, , 0, 0, 2, 256, , 0, 0, {}, {}
+630, ShroomHat, Shroom Hat, 5, 3000, 1500, 30, , 13, , 0, 0, 2, 256, , 0, 0, {}, {}
+631, DarkCrystal, Dark Crystal, 3, 100, 50, 10, , , , , , , , , , , {}, {}
+632, CottonSkirt, Cotton Skirt, 5, 1000, 500, 10, , 4, , -8, 0, 2, 1, , 1, 0, {}, {}
+633, ChristmasElfHat, Christmas Elf Hat, 5, 3000, 1500, 30, , 13, , 2, 0, 2, 256, , 0, 0, {}, {}
+634, FaceMask, Face Mask, 5, 2500, 1250, 50, , 10, , 0, 0, 2, 256, , 0, 0, {}, {}
+635, SantaCookie, Santa Cookie, 3, 1, 1, 1, , , , , , , , , , , {}, {}
+636, WarlordHelmet, Warlord Helmet, 5, 30000, 3000, 900, , 18, , -36, 0, 2, 256, , 0, 0, {}, {}
+637, KnightsHelmet, Knight's Helmet, 5, 20000, 2000, 600, , 15, , -30, 0, 2, 256, , 0, 0, {}, {}
+638, InfantryHelmet, Infantry Helmet, 5, 15000, 1500, 400, , 15, , -30, 0, 2, 256, , 0, 0, {}, {}
+639, CrusadeHelmet, Crusade Helmet, 5, 25000, 2500, 1300, , 18, , -36, 0, 2, 256, , 0, 0, {}, {}
+640, IronOre, Iron Ore, 3, 250, 100, 40, , , , , , , , , , , {}, {}
+641, SnakeSkin, Snake Skin, 3, 250, 100, 15, , , , , , , , , , , {}, {}
+642, JeansChaps, Jeans Chaps, 5, 2000, 1000, 60, , 6, , -12, 0, 2, 1, , 0, 0, {}, {}
+643, WhiteCowboyHat, White Cowboy Hat, 5, 1800, 900, 30, , 6, , -12, 0, 2, 256, , 0, 0, {}, {}
+644, BlackCowboyHat, Black Cowboy Hat, 5, 1800, 900, 30, , 6, , -12, 0, 2, 256, , 0, 0, {}, {}
+645, GoldenPlatemail, Golden Platemail, 5, 9999000,3000, 4500, , 25, , -100, 0, 2, 512, , 0, 0, {}, {}
+646, Crown, Crown, 5, 5000, 1000, 240, , 4, , 0, 0, 2, 256, , 0, 0, {}, {}
+647, DevelopersCap, Developer's Cap, 5, 2000, 500, 20, , 5, , 5, 0, 2, 256, , 0, 0, {}, {}
+//648, RESERVED, Rough Strength Ring, , , , , , , , , , , , , , , {}, {}
+//649, RESERVED, Rough Agility Ring, , , , , , , , , , , , , , , {}, {}
+//650, RESERVED, Rough Dexterity Ring, , , , , , , , , , , , , , , {}, {}
+//651, RESERVED, Rough Vitality Ring, , , , , , , , , , , , , , , {}, {}
+//652, RESERVED, Rough Intelligence Ring, , , , , , , , , , , , , , , {}, {}
+//653, RESERVED, Rough Willpower Ring, , , , , , , , , , , , , , , {}, {}
+654, Cap, Cap, 5, 2000, 500, 20, , 5, , 0, 0, 2, 256, , 0, 0, {}, {}
+655, FurBoots, Fur Boots, 5, 5000, 600, 50, , 3, , -3, 0, 2, 64, , 0, 0, {}, {}
+656, SerfHat, Serf Hat, 5, 500, 100, 20, , 2, , 0, 0, 2, 256, , 0, 0, {}, {}
+657, Orange, Orange, 0, 12, 6, 7, , , , , , 2, , , 0, , { itemheal 60, 0; }, {}
+658, WarlordPlate, Warlord Plate, 5, 100000, 3000, 2600, , 27, , -170, 0, 2, 512, , 0, 0, {}, {}
+659, GoldenWarlordPlate, Golden Warlord Plate, 5, 500000, 4000, 7600, , 27, , -110, 0, 2, 512, , 0, 0, {}, {}
+660, CottonCloth, Cotton Cloth, 3, 1000, 500, 10, , , , , , , , , , , {}, {}
+661, RedRose, Red Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+662, WhiteRose, White Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+663, DarkRedRose, Dark Red Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+664, PinkRose, Pink Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+665, YellowRose, Yellow Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+666, BlackRose, Black Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+667, OrangeRose, Orange Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+668, BlueRose, Blue Rose, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+669, YellowTulip, Yellow Tulip, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+670, PurpleTulip, Purple Tulip, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+671, RedTulip, Red Tulip, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+672, WhiteTulip, White Tulip, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+673, PinkTulip, Pink Tulip, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+674, OrangeTulip, Orange Tulip, 3, 40, 20, 1, , , , , , , , , , , {}, {}
+675, GraduationCap, Graduation Cap, 5, 1000, 250, 20, , 2, , 0, 0, 2, 256, , 0, 0, {}, {}
+676, Steak, Steak, 0, 275, 100, 10, , , , , , 2, , , 0, , { itemheal 250, 0; }, {}
+677, HeartNecklace, Heart Necklace, 3, 2500, 1000, 10, , , , , , , , , 0, , {}, {}
+678, NohMask, Noh Mask, 5, 7000, 1000, 18, , 3, , 1, 0, 2, 256, , 0, 0, {}, {}
+679, DemonMask, Demon Mask, 5, 10000, 5000, 23, , 3, , 5, 0, 2, 256, , 0, 0, {}, {}
+680, MauveHerb, Mauve Herb, 3, 2, 1, 1, , , , , , , , , , , {}, {}
+681, CobaltHerb, Cobalt Herb, 3, 2, 1, 1, , , , , , , , , , , {}, {}
+682, GambogeHerb, Gamboge Herb, 3, 2, 1, 1, , , , , , , , , , , {}, {}
+683, AlizarinHerb, Alizarin Herb, 3, 2, 1, 1, , , , , , , , , , , {}, {}
+684, TinyHealingPotion, Tiny Healing Potion, 0, 25, 12, 5, , , , , , 2, , , 0, , { itemheal 100, 0; }, {}
+685, SmallHealingPotion, Small Healing Potion, 0, 50, 25, 10, , , , , , 2, , , 0, , { itemheal 200, 0; }, {}
+686, MediumHealingPotion, Medium Healing Potion, 0, 100, 50, 15, , , , , , 2, , , 0, , { itemheal 400, 0; }, {}
+687, LargeHealingPotion, Large Healing Potion, 0, 200, 100, 25, , , , , , 2, , , 0, , { itemheal 800, 0; }, {}
+688, TankTop, Tank Top, 5, 10, 5, 10, , 2, , -4, 0, 2, 512, , 0, 0, {}, {}
+689, ShortTankTop, Short Tank Top, 5, 10, 5, 8, , 2, , -4, 0, 2, 512, , 0, 0, {}, {}
+690, RedDye, Red Dye, 3, 100, 20, 10, , , , , , 2, , , 0, , {}, {}
+691, GreenDye, Green Dye, 3, 2500, 1000, 10, , , , , , 2, , , 0, , {}, {}
+692, DarkBlueDye, Dark Blue Dye, 3, 40000, 15000, 10, , , , , , 2, , , 0, , {}, {}
+693, YellowDye, Yellow Dye, 3, 100, 20, 10, , , , , , 2, , , 0, , {}, {}
+694, LightBlueDye, Light Blue Dye, 3, 100, 20, 10, , , , , , 2, , , 0, , {}, {}
+695, PinkDye, Pink Dye, 3, 2500, 1000, 10, , , , , , 2, , , 0, , {}, {}
+696, BlackDye, Black Dye, 3, 30000, 25000, 10, , , , , , 2, , , 0, , {}, {}
+697, OrangeDye, Orange Dye, 3, 2500, 1000, 10, , , , , , 2, , , 0, , {}, {}
+698, PurpleDye, Purple Dye, 3, 70000, 50000, 10, , , , , , 2, , , 0, , {}, {}
+699, DarkGreenDye, Dark Green Dye, 3, 2000, 1000, 10, , , , , , 2, , , 0, , {}, {}
+700, Pearl, Pearl, 3, 5000, 3000, 5, , , , , , 2, , , 0, , {}, {}
+701, PileOfAsh, Pile of Ash, 3, 3000, 100, 5, , , , , , 2, , , 0, , {}, {}
+702, WeddingRing, Wedding Ring, 5, 1000, 1, 1, , 0, , 0, 0, 2, 128, , 0, 0, {}, {}
+703, SulphurPowder, Sulphur Powder, 3, 1000, 25, 2, , , , , , 2, , , 0, , {}, {}
+704, IronPowder, Iron Powder, 3, 800, 80, 3, , , , , , 2, , , 0, , {}, {}
+705, ManaPotion, Mana Potion, 0, 2000, 300, 50, , , , , , 2, , , 0, , { itemheal 0, 10; callfunc "MagicGainBasic"; }, {}
+706, GoldenScorpionStinger, Golden Scorpion Stinger, 3, 2000, 500, 2, , , , , , , , , , , {}, {}
+707, MonsterOilPotion, Monster Oil Potion, 3, 10000, 2000, 50, , , , , , , , , , , {}, {}
+708, LeatherPatch, Leather Patch, 3, 300, 150, 18, , , , , , , , , , , {}, {}
+709, BlackScorpionStinger, Black Scorpion Stinger, 3, 250, 100, 1, , , , , , , , , , , {}, {}
+710, SnakeTongue, Snake Tongue, 3, 60, 30, 1, , , , , , , , , , , {}, {}
+711, MountainSnakeTongue, Mountain Snake Tongue, 3, 80, 40, 1, , , , , , , , , , , {}, {}
+712, GrassSnakeTongue, Grass Snake Tongue, 3, 160, 80, 1, , , , , , , , , , , {}, {}
+713, CaveSnakeTongue, Cave Snake Tongue, 3, 120, 60, 1, , , , , , , , , , , {}, {}
+714, SnakeEgg, Snake Egg, 0, 50, 25, 4, , , , , , 2, , , 0, , { itemheal 30, 0; }, {}
+715, MountainSnakeEgg, Mountain Snake Egg, 0, 80, 40, 4, , , , , , 2, , , 0, , { itemheal 40, 0; }, {}
+716, GrassSnakeEgg, Grass Snake Egg, 0, 100, 50, 4, , , , , , 2, , , 0, , { itemheal 50, 0; }, {}
+717, CaveSnakeEgg, Cave Snake Egg, 0, 60, 30, 4, , , , , , 2, , , 0, , { itemheal 20, 0; }, {}
+718, SilkCocoon, Silk Cocoon, 3, 200, 3, 1, , , , , , , , , , , {}, {}
+719, GreenApple, Green Apple, 0, 10, 4, 5, , , , , , 2, , , 0, , { itemheal 45, 0; }, {}
+720, SilkRobe, Silk Robe, 5, 8000, 4000, 5, , 5, , 0, 0, 2, 512, , 0, 0, {}, {}
+721, HighPriestCrown, High Priest Crown, 5, 20000, 5000, 400, , 4, , 20, 0, 2, 256, , 0, 0, {}, { bonus bMaxSP, 20; }
+722, MonsterSkullHelmet, Monster Skull Helmet, 5, 15000, 3000, 250, , 7, , 10, 0, 2, 256, , 0, 0, {}, { bonus bMdef, 20; }
+723, DesertHat, Desert Hat, 5, 5000, 1000, 20, , 3, , -1, 0, 2, 256, , 0, 0, {}, {}
+724, CottonHeadband, Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 2, 256, , 0, 0, {}, {}
+725, GMCap, GM Cap, 5, 2000, 500, 20, , 5, , 5, 0, 2, 256, , 0, 0, {}, { callfunc "RestrictedItem"; }
+726, GMRobe, GM Robe, 5, 8000, 4000, 40, , 5, , 0, 0, 2, 512, , 0, 0, {}, { callfunc "RestrictedItem"; }
+727, Iten, Iten, 3, 0, 0, 8000, , , , , , , , , , , {}, {}
+728, MoubooFigurine, Mouboo Figurine, 3, 0, 0, 9, , , , , , , , , , , {}, {}
+729, WarpedLog, Warped Log, 3, 0, 0, 8, , , , , , , , , , , {}, {}
+730, Lifestone, Lifestone, 3, 0, 0, 5, , , , , , , , , , , {}, {}
+731, AssassinPants, Assassin Pants, 5, 10000, 3000, 20, , 5, , -5, 0, 2, 1, , 0, 0, {}, { callfunc "UnreleasedItem"; bonus bAgi,8; }
+732, DruidTreeBranch, Druid Tree Branch, 3, 0, 0, 2, , , , , , , , , , , {}, {}
+733, PurificationPotion, Purification Potion, 0, 0, 0, 15, , , , , , 2, , , , , { callfunc "usePurificationPotion"; }, {}
+734, BlackBoots, Black Boots, 5, 20000, 3000, 35, , 4, , -10, 0, 2, 64, , 0, 0, {}, {}
+735, CottonBoots, Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 2, 64, , 0, 0, {}, {}
+736, WhiteCake, White Cake, 0, 500, 100, 10, , , , , , 2, , , 0, , { itemheal 10, 0; }, {}
+737, ChocolateCake, Chocolate Cake, 0, 550, 125, 10, , , , , , 2, , , 0, , { itemheal 11, 0; }, {}
+738, OrangeCake, Orange Cake, 0, 600, 150, 10, , , , , , 2, , , 0, , { itemheal 12, 0; }, {}
+739, AppleCake, Apple Cake, 0, 600, 150, 10, , , , , , 2, , , 0, , { itemheal 12, 0; }, {}
+740, Root, Root, 3, 500, 200, 5, , , , , , , , , , , {}, {}
+741, CottonGloves, Cotton Gloves, 5, 2000, 500, 10, , 1, , -10, 0, 2, 4, , 0, 0, {}, {}
+742, FourLeafClover, Four-Leaf Clover, 5, 10000, 5000, 1, , , , 5, 0, 2, 8, , 0, 0, {}, { bonus bLuk, 1; }
+743, Acorn, Acorn, 0, 50, 10, 1, , , , , , 2, , , 0, , { itemheal 3, 0; }, {}
+744, DilutedConcentrationPotion, Diluted Concentration Potion, 0, 250, 100, 10, , , , , , 2, , , 0, , { sc_start sc_raiseattackspeed0, 30, 20; }, {}
+=======
#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
0, DEFAULT, Default, 0, 20, 10, 10, , , , , , 2, , , , , {}, {}
501, CactusDrink, Cactus Drink, 0, 50, 25, 4, , , , , , 2, , , 0, , { itemheal 15, 0; }, {}
@@ -244,6 +492,7 @@
742, FourLeafClover, Four-Leaf Clover, 5, 10000, 5000, 1, , , , 5, 0, 2, 8, , 0, 0, {}, { bonus bLuk, 1; }
743, Acorn, Acorn, 0, 50, 10, 1, , , , , , 2, , , 0, , { itemheal 3, 0; }, {}
744, DilutedConcentrationPotion, Diluted Concentration Potion, 0, 250, 100, 10, , , , , , 2, , , 0, , { sc_start sc_raiseattackspeed0, 30, 20; }, {}
+>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b
745, DarkConcentrationPotion, Dark Concentration Potion, 0, 50, 25, 10, , , , , , 2, , , 0, , { sc_start sc_raiseattackspeed0, 10, 40; sc_start sc_poison, 1, 50;}, {}
746, MopoxCurePotion, Mopox Cure Potion, 3, 0, 0, 5, , , , , , 2, , , , , {}, {}
747, LacedChocolateCake, Laced Chocolate Cake, 0, 550, 125, 10, , , , , , 2, , , 0, , { itemheal 11, 0; }, {}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 1dd2b46e..f01def20 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1,3 +1,74 @@
+<<<<<<< HEAD
+# ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per, Drop2id,Drop2per, Drop3id,Drop3per, Drop4id,Drop4per, Drop5id,Drop5per, Drop6id,Drop6per, Drop7id,Drop7per, Drop8id,Drop8per, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutation count,mutation strength
+1002, Maggot, Maggot, 5, 50, 0, 0, 2, 1, 5, 10, 0, 5, 1, 1, 1, 0, 6, 5, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1003, Scorpion, Scorpion, 10, 100, 0, 0, 4, 1, 10, 15, 0, 5, 1, 1, 1, 0, 15, 5, 1, 1, 1, 3, 20, 129, 2000, 1872, 672, 480, 507, 700, 510, 100, 509, 50, 518, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1004, RedScorpion, Red Scorpion, 90, 550, 0, 0, 145, 1, 50, 55, 4, 6, 8, 8, 10, 10, 30, 10, 1, 1, 1, 0, 20, 129, 1000, 1872, 672, 480, 517, 2000, 509, 100, 518, 500, 1200, 10, 1199, 760, 1201, 540, 524, 25, 0, 0, 0, 0, 0, 0, , , , , , , 1, 50
+1005, GreenSlime, Green Slime, 40, 300, 0, 0, 8, 1, 25, 30, 2, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 131, 1500, 1872, 672, 480, 502, 200, 513, 100, 501, 100, 521, 100, 522, 190, 526, 10, 503, 500, 535, 750, 0, 0, 0, 0, , , , , , , 1, 20
+1006, GiantMaggot, Giant Maggot, 80, 500, 0, 0, 16, 2, 45, 75, 2, 7, 8, 6, 2, 1, 22, 1, 2, 2, 1, 0, 41, 129, 2000, 1872, 672, 480, 1199, 900, 519, 100, 518, 750, 501, 5000, 502, 3000, 503, 11, 526, 20, 0, 0, 0, 0, 0, 0, , , , , , , 1, 25
+1007, YellowSlime, Yellow Slime, 60, 400, 0, 0, 2, 1, 35, 40, 2, 7, 9, 6, 2, 1, 34, 1, 1, 1, 1, 0, 21, 131, 1400, 1800, 672, 480, 534, 200, 519, 100, 501, 350, 502, 250, 522, 10, 640, 450, 4006, 20, 0, 0, 0, 0, 0, 0, , , , , , , 1, 20
+1008, RedSlime, Red Slime, 70, 450, 0, 0, 56, 1, 40, 45, 2, 7, 12, 8, 2, 1, 25, 1, 1, 1, 1, 0, 21, 135, 1300, 1500, 672, 480, 1201, 300, 509, 110, 521, 200, 4003, 20, 525, 80, 535, 750, 528, 250, 531, 150, 0, 0, 0, 0, , , , , , , 2, 20
+1009, BlackScorpion, Black Scorpion, 100, 600, 0, 0, 70, 1, 60, 100, 4, 6, 16, 30, 10, 10, 35, 10, 1, 1, 1, 0, 20, 133, 1000, 1500, 672, 480, 523, 150, 509, 100, 518, 800, 709, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 50
+1010, Snake, Snake, 115, 850, 0, 0, 100, 1, 75, 90, 4, 6, 20, 11, 10, 10, 35, 10, 1, 1, 1, 0, 20, 133, 900, 1300, 672, 480, 524, 300, 0, 0, 714, 400, 714, 400, 710, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1011, FireGoblin, Fire Goblin, 20, 220, 0, 0, 2, 1, 15, 20, 0, 5, 1, 1, 1, 0, 6, 30, 1, 1, 1, 3, 23, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1012, Spider, Spider, 125, 800, 0, 0, 280, 1, 70, 85, 4, 6, 14, 13, 10, 10, 35, 10, 1, 1, 1, 0, 25, 175, 1000, 1500, 672, 480, 537, 500, 535, 100, 638, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
+1013, EvilMushroom, Evil Mushroom, 110, 650, 0, 0, 110, 1, 65, 80, 4, 6, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 137, 800, 1800, 672, 480, 535, 500, 540, 10, 534, 100, 566, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 60
+1014, PinkFlower, Pink Flower, 115, 700, 0, 0, 110, 2, 70, 75, 0, 5, 16, 12, 20, 20, 20, 50, 2, 2, 1, 3, 22, 128, 800, 800, 672, 480, 535, 100, 540, 10, 1199, 100, 526, 400, 565, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 50
+1015, SantaSlime, Santa Slime, 120, 750, 0, 0, 0, 1, 75, 80, 2, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 161, 1500, 1872, 672, 480, 512, 800, 513, 700, 514, 600, 519, 500, 527, 400, 538, 500, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 10
+1016, RudolphSlime, Rudolph Slime, 50, 350, 0, 0, 16, 1, 30, 35, 10, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 131, 1000, 1872, 672, 480, 504, 800, 506, 500, 508, 200, 509, 300, 510, 600, 515, 800, 516, 500, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1017, Bat, Bat, 20, 150, 0, 0, 2, 1, 5, 25, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 24, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 753, 3000, 754, 2000, 0, 0, 0, 0, , , , , , , 2, 40
+1018, Pinkie, Pinkie, 30, 500, 0, 0, 3, 2, 7, 15, 0, 5, 1, 1, 1, 0, 20, 25, 2, 2, 1, 3, 20, 129, 800, 1872, 672, 480, 614, 800, 751, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 50
+1019, SpikyMushroom, Spiky Mushroom, 30, 300, 0, 0, 4, 1, 10, 13, 0, 5, 1, 1, 1, 0, 10, 10, 1, 1, 1, 3, 20, 129, 800, 1872, 672, 480, 567, 800, 501, 150, 518, 50, 613, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 40
+1020, Fluffy, Fluffy, 30, 500, 0, 0, 3, 1, 6, 10, 1, 5, 1, 2, 1, 0, 20, 25, 1, 1, 1, 3, 20, 129, 800, 1600, 672, 480, 611, 800, 527, 150, 535, 400, 752, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 40
+1021, CaveSnake, Cave Snake, 30, 1000, 0, 0, 5, 1, 20, 15, 1, 5, 10, 1, 1, 0, 5, 20, 1, 1, 1, 3, 20, 129, 800, 1872, 672, 480, 612, 800, 610, 40, 713, 500, 717, 400, 717, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 50
+1022, JackO, Jack O, 250, 10000, 0, 0, 5000, 2, 100, 500, 40, 20, 35, 40, 25, 25, 35, 50, 1, 1, 1, 0, 20, 133, 250, 1500, 672, 480, 617, 300, 622, 400, 624, 400, 620, 400, 615, 300, 1203, 400, 1198, 10000, 616, 600, 0, 0, 0, 0, , , , , , , 2, 30
+1023, FireSkull, Fire Skull, 180, 5000, 0, 0, 100, 2, 75, 175, 35, 15, 30, 30, 20, 20, 25, 60, 1, 1, 1, 3, 23, 175, 600, 1600, 672, 480, 631, 1000, 701, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1024, PoisonSkull, Poison Skull, 180, 5000, 0, 0, 100, 2, 75, 175, 35, 15, 30, 30, 20, 20, 25, 60, 1, 1, 1, 3, 25, 175, 600, 1600, 672, 480, 631, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 4, 20
+1025, LogHead, Log Head, 30, 500, 0, 0, 30, 1, 7, 20, 50, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 22, 129, 800, 1872, 672, 480, 569, 2000, 740, 2500, 743, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 50
+1026, MountainSnake, Mountain Snake, 130, 900, 0, 0, 100, 1, 80, 125, 4, 6, 20, 40, 10, 10, 35, 45, 1, 1, 1, 0, 20, 133, 1000, 1500, 672, 480, 532, 20, 641, 150, 715, 400, 715, 400, 711, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 30
+1027, EasterFluffy, Easter Fluffy, 30, 500, 0, 0, 3, 1, 10, 12, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 20, 129, 800, 1872, 672, 480, 1208, 2000, 1209, 2000, 1210, 2000, 1211, 1000, 1212, 1000, 1213, 200, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 40
+1028, Mouboo, Mouboo, 85, 1200, 0, 0, 40, 2, 30, 75, 65, 5, 15, 5, 15, 0, 40, 10, 2, 2, 1, 3, 20, 129, 600, 1872, 672, 480, 660, 200, 660, 100, 541, 750, 660, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 30
+1029, MauvePlant, Mauve Plant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 680, 3000, 680, 3000, 680, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 60
+1030, CobaltPlant, Cobalt Plant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 681, 3000, 681, 3000, 681, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1031, GambogePlant, Gamboge Plant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 682, 3000, 682, 3000, 682, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1032, AlizarinPlant, Alizarin Plant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 683, 3000, 683, 3000, 683, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1033, SeaSlime, Sea Slime, 70, 600, 0, 0, 9, 1, 30, 50, 3, 7, 1, 25, 1, 0, 30, 30, 1, 1, 1, 0, 41, 131, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, , , , , , , 0, 0
+1034, GrassSnake, Grass Snake, 140, 1000, 0, 0, 100, 1, 80, 120, 2, 10, 20, 40, 10, 10, 40, 50, 1, 1, 1, 0, 20, 133, 500, 1100, 672, 480, 716, 400, 716, 400, 712, 500, 676, 500, 660, 350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 40
+1035, Silkworm, Silkworm, 20, 1, 0, 0, 1, 1, 0, 0, 2, 10, 20, 11, 10, 10, 40, 10, 1, 1, 1, 0, 20, 129, 1300, 1100, 672, 480, 718, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
+1036, Zombie, Zombie, 110, 12000, 0, 0, 800, 2, 275, 355, 20, 15, 30, 15, 30, 3, 60, 40, 1, 1, 1, 0, 29, 133, 480, 1872, 672, 900, 631, 1000, 777, 700, 778, 120, 779, 200, 780, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1037, CloverPatch, Clover Patch, 1, 1, 0, 0, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 742, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1038, Squirrel, Squirrel, 15, 160, 1, 0, 1, 1, 15, 25, 1, 6, 1, 3, 1, 0, 15, 40, 1, 1, 1, 3, 20, 129, 800, 800, 672, 480, 743, 7000, 680, 1000, 681, 1000, 682, 1000, 683, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 15
+//1039, FireLizard
+1040, Wisp, Wisp, 70, 9300, 0, 0, 140, 2, 215, 350, 0, 20, 45, 12, 13, 15, 0, 45, 1, 1, 1, 0, 27, 137, 380, 2000, 672, 1500, 772, 500, 703, 150, 703, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 20
+//1041, Snail
+1042, Spectre, Spectre, 140, 6500, 0, 3978, 140, 3, 160, 220, 40, 0, 35, 70, 22, 15, 20, 70, 1, 1, 1, 0, 49, 137, 650, 1700, 800, 500, 773, 500, 703, 150, 703, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 20
+1043, Skeleton, Skeleton, 90, 6800, 0, 0, 90, 1, 51, 284, 12, 10, 35, 18, 3, 8, 71, 65, 1, 1, 1, 0, 29, 175, 340, 1800, 672, 950, 775, 200, 775, 280, 776, 300, 631, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1044, LadySkeleton, Lady Skeleton, 90, 5500, 0, 0, 90, 2, 73, 146, 31, 8, 20, 25, 15, 8, 43, 48, 1, 1, 1, 0, 29, 175, 650, 750, 672, 700, 775, 200, 775, 280, 776, 300, 631, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1045, Fallen, Fallen, 120, 10000, 0, 7812, 1000, 2, 180, 430, 5, 20, 40, 3, 25, 5, 80, 45, 1, 1, 1, 0, 49, 133, 300, 1200, 672, 300, 775, 210, 775, 210, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 0, 0, 0, 0, 0, 0, , , , , , , 4, 50
+1046, SnakeLord, Snake Lord, 300, 40000, 0, 0, 8000, 2, 80, 120, 10, 10, 20, 40, 10, 10, 40, 10, 1, 1, 1, 0, 20, 132, 200, 1500, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1047, Poltergeist, Poltergeist, 90, 9000, 0, 0, 140, 3, 110, 150, 0, 20, 35, 0, 15, 15, 75, 50, 1, 1, 1, 0, 27, 137, 330, 740, 672, 400, 774, 500, 703, 150, 703, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 20
+//1048, Duck
+1049, Bee, Bee, 30, 600, 0, 0, 40, 1, 5, 90, 12, 4, 15, 25, 20, 3, 40, 30, 1, 1, 1, 0, 25, 137, 380, 1500, 300, 350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+//1050, Larvespa
+//1051, Vespa
+//1052, Hivespa
+//1053, Froad
+//1054, Troll
+1055, Butterfly, Butterfly, 25, 250, 0, 0, 10, 2, 10, 50, 3, 5, 10, 45, 10, 15, 35, 40, 1, 1, 1, 3, 44, 129, 350, 780, 300, 800, 718, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 60
+1056, CaveMaggot, Cave Maggot, 10, 100, 0, 0, 4, 1, 10, 10, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1057, AngryScorpion, Angry Scorpion, 20, 200, 0, 0, 4, 1, 15, 15, 0, 5, 5, 5, 1, 0, 15, 5, 1, 1, 1, 3, 20, 133, 1000, 1872, 672, 480, 4000, 700, 510, 100, 509, 50, 518, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1058, IceGoblin, Ice Goblin, 25, 330, 0, 0, 2, 1, 20, 25, 0, 5, 5, 5, 1, 0, 6, 30, 1, 1, 1, 3, 23, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1059, GCMaggot, Giant Cave Maggot, 90, 2000, 0, 0, 16, 2, 60, 80, 2, 7, 10, 10, 2, 1, 22, 1, 2, 2, 1, 0, 41, 133, 1000, 1872, 672, 480, 727, 10000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 25
+1060, Archant, Archant, 30, 400, 0, 0, 200, 1, 20, 30, 4, 6, 10, 5, 1, 0, 12, 10, 1, 1, 1, 0, 25, 133, 1000, 1500, 672, 480, 537, 300, 535, 100, 640, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
+1061, Moggun, Moggun, 60, 800, 0, 0, 100, 1, 70, 90, 20, 10, 50, 40, 10, 10, 10, 10, 1, 1, 1, 0, 25, 137, 600, 1500, 672, 480, 611, 600, 4001, 600, 4002, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
+1062, Terranite, Terranite, 110, 6000, 0, 0, 1000, 1, 200, 300, 20, 40, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 4001, 600, 4004, 20, 4005, 20, 4007, 20, 763, 500, 640, 500, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1063, TheLost, The Lost, 30, 5000, 0, 9000, 1000, 5, 260, 375, 10, 70, 5, 40, 10, 70, 70, 40, 4, 9, 1, 1, 69, 141, 500, 2000, 672, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1111, Reaper, Reaper, 50, 555, 0, 20000, 0, 7, 333, 444, 30, 80, 100, 120, 70, 120, 100, 50, 1, 50, 1, 1, 89, 165, 500, 1200, 800, 300, 777, 1000, 775, 500, 776, 100, 1221, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1112, Scythe, Scythe, 40, 3000, 0, 0, 0, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 1, 50, 1, 0, 40, 133, 220, 700, 672, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+1113, BallLightning, Ball Lightning, 40, 10, 0, 0, 0, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+
+1999, Dummy, Dummy, 1, 5000, 0, 1, 1, 1, 0, 0, 100, 100, 5, 5, 5, 5, 5, 200, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 681, 3000, 681, 3000, 681, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
+# ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per, Drop2id,Drop2per, Drop3id,Drop3per, Drop4id,Drop4per, Drop5id,Drop5per, Drop6id,Drop6per, Drop7id,Drop7per, Drop8id,Drop8per, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutation count,mutation strength
+=======
#ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element, Mode, Speed, Adelay, Amotion, Dmotion, Drop1id, Drop1per, Drop2id, Drop2per, Drop3id, Drop3per, Drop4id, Drop4per, Drop5id, Drop5per, Drop6id, Drop6per, Drop7id, Drop7per, Drop8id, Drop8per, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per, MVP2id, MVP2per, MVP3id, MVP3per, mutationcount, mutationstrength
1002, Maggot, Maggot, 5, 50, 0, 0, 2, 1, 5, 10, 0, 5, 1, 1, 1, 0, 6, 5, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1003, Scorpion, Scorpion, 10, 100, 0, 0, 4, 1, 10, 15, 0, 5, 1, 1, 1, 0, 15, 5, 1, 1, 1, 3, 20, 129, 2000, 1872, 672, 480, 507, 700, 510, 100, 509, 50, 518, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -70,3 +141,4 @@
1070, BallLightning, BallLightning, 40, 50, 0, 0, 10, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1071, IceElement, IceElement, 100, 7500, 0, 0, 200, 3, 60, 200, 5, 20, 15, 25, 40, 15, 45, 30, 1, 1, 1, 0, 41, 135, 330, 740, 672, 400, 4026, 900, 537, 750, 568, 400, 543, 900, 544, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 20
1072, Yeti, Yeti, 100, 8500, 0, 0, 300, 2, 100, 400, 60, 15, 60, 5, 45, 15, 60, 32, 1, 1, 1, 0, 61, 135, 220, 1500, 672, 900, 4023, 700, 4024, 300, 4025, 400, 4027, 142, 4021, 800, 4022, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
+>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index c07f022d..b077978e 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -1,3 +1,95 @@
+<<<<<<< HEAD
+// Aegis zone 8.5 -> eAthena conversion by Komurka
+// + Mob Skills for Einbroch+ by Lupus
+//MOB_ID, a unused dummy character sequence (for information only), STATE, SKILL_ID, SKILL_LV,
+// rate (10000 = 100%), casttime, delay, cancelable, a target, a condition type, a condition value,
+// a value 1, a value 2, a value 3, a value 4, a value 5, emotion
+//Example
+//1001,Poring@TF_POISON,attack,52,3,100,1500,10000,no,target,always,0,,,,,7
+//
+//rate refers to the chance of the skill being casted when the condition is fulfilled.
+//delay is the time in milliseconds that has to be pass before recasting the same skill.
+//
+//STATE:
+// any / idle (in standby) / walk (in movement) / dead (on killed) / loot /
+// attack / angry (like attack, except player has not attacked mob yet) /
+// chase (following target, after being attacked) / follow (following
+// target, without being attacked)
+//
+//target: The target of the skill can be: target (when a PC is targetted) / self / friend / master
+// (the following are for ground-skills, a random target tile is selected from
+// the specified area):
+// around1 (3x3 area around self) / around2 (5x5 area around self) /
+// around3 (7x7 area around self) / around4 (9x9 area around self) /
+// around5 (3x3 area around target) / around6 (5x5 area around target) /
+// around7 (7x7 area around target) / around8 (9x9 area around target) /
+// around (11x11 area around self)
+//
+//conditions: (condition type) (value which specifies a condition value)
+// always uncondtional
+// myhpltmaxrate when the mob's hp drops to a certain %
+// mystatuson If the mob has any abnormalities in status (condition value),
+// mystatusoff If the mob has ended any abnormalities in status (condition value),
+// friendhpltmaxrate when the mobs' friend's hp drops to a certain %
+// friendstatuson If the friend has any abnormalities in status (condition value),
+// friendstatusoff If the friend has ended any abnormalities in status (condition value),
+// attackpcgt Attack PC becomes more than the number of specification
+// attackpcge Attack PC becomes equal or more than the number of specification.
+// slavelt when the number of slaves is lower than the original number of specification.
+// slavele when the number of slaves is lower or equal than the original number of specification.
+// closedattacked when melee attacked (close range attack)
+// longrangeattacked when long ranged attacked (like bows and far range weapons)
+// skillused when a skill is used on the mob
+// afterskill after the mob used certain skill.
+// casttargeted when a target is in cast range.
+// rudeattacked when a target is rude attacked
+// hiding *not implemented yet* when a target is hidden
+//
+// The character's state which can be specified to be a condition value by the statuson/statusoff system
+// anybad any type of state change
+// stone condition of being in stone state
+// freeze condition of being in frozen state
+// stan condition of being in stunned state
+// sleep condition of being in sleep state
+// poison condition of being in poisoned state
+// curse condition of being in cursed state
+// silence condition of being in silenced state
+// confusion condition of being in confusion state
+// blind condition of being in blind state
+// hiding condition of being in hidden state
+// sight condition of being in unhidden state
+1015,SantaSlime@NPC_EMOTION,idle,199,1,200,0,5000,yes,self,always,0,7,,,,,
+1015,SantaSlime@NPC_EMOTION,walk,199,1,100,0,10000,yes,self,always,0,5,,,,,
+1015,SantaSlime@NPC_SUMMONSLAVE,attack,198,5,10000,2000,60000,no,self,slavele,3,1016,,,,,
+1015,SantaSlime@NPC_SUMMONSLAVE,idle,198,5,10000,2000,60000,no,self,slavele,3,1016,,,,,
+
+// Poison
+// mobid, descriptive-label STATE, SKILL-ID,SKILLLV,rate, casttime,delay, cancel?,target, condition
+1009,BlackScorpion@NPC_POISON,attack,178,30,50,0,500,yes,target,always,0,,10,,,,
+1010,Snake@NPC_POISON,attack,178,20,80,0,400,yes,target,always,0,,10,,,,
+1021,CaveSnake@NPC_POISON,attack,178,10,20,0,500,yes,target,always,0,,10,,,,
+1026,MountainSnake@NPC_POISON,attack,178,60,100,0,300,yes,target,always,0,,10,,,,
+1034,GrassSnake@NPC_POISON,attack,178,45,200,0,200,yes,target,always,0,,10,,,,
+1024,PoisonSkull@NPC_POISON,attack,178,50,500,0,400,yes,target,always,0,,10,,,,
+//-- 1026,MountainSnake@NPC_POISONATTACK,attack,190,5,10000,0,500,yes,target,always,1,,,,,,
+//-- 1010,Snake@TF_POISON,attack,54,3,10000,0,500,yes,target,always,1,,,,,,
+1014,PinkFlower@NPC_SUMMONSLAVE,attack,198,1,200,2000,0,no,self,myhpltmaxrate,99,1049,,,,,
+1049,Bee@NPC_POISON,attack,178,20,1000,0,500,yes,target,always,0,,10,,,,
+1049,Bee@NPC_SELFDESTRUCTION,attack,175,1,1000,0,500,yes,self,notintown,0,30,,,,,
+
+// Reaper Quest mob abilities
+//1111,Reaper@NPC_SUMMONSLAVE_scytheX1,attack,198,1,5000,1000,10000,no,self,slavelt,1,1112,,,,,
+//1111,Reaper@NPC_SUMMONSLAVE_scytheX2,attack,198,2,3000,1000,15000,no,self,slavelt,3,1112,,,,,
+//1111,Reaper@NPC_SUMMONSLAVE_scytheX4,attack,198,4,1000,1000,20000,no,self,myhpltmaxrate,50,1112,,,,,
+1111,Reaper@NPC_SUMMONSLAVE_ballX1,any,198,1,8000,1000,5000,no,self,slavelt,5,1113,,,,,
+//1111,Reaper@NPC_SUMMONSLAVE_ballX3,any,198,3,6000,1000,10000,no,self,myhpltmaxrate,60,1113,,,,,
+//1111,Reaper@NPC_SUMMONSLAVE_ballX9,any,198,9,4000,1000,15000,no,self,myhpltmaxrate,20,1113,,,,,
+//1111,Reaper@AL_TELEPORT,attack,28,2,3500,500,5000,yes,self,always,,,,,,,
+1113,BallLightning@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,notintown,0,30,,,,,
+
+
+1999,Dummy@AL_HEAL,any,30,100,100,2500,2500,no,self,myhpltmaxrate,50,,,,,,7
+=======
// Aegis zone 8.5 -> eAthena conversion by Komurka
// + Mob Skills for Einbroch+ by Lupus
//MOB_ID, a unused dummy character sequence (for information only), STATE, SKILL_ID, SKILL_LV,
@@ -85,3 +177,4 @@
1111,Reaper@NPC_SUMMONSLAVE_ballX9,any,198,9,4000,1000,15000,no,self,myhpltmaxrate,20,1113,,,,,
1111,Reaper@AL_TELEPORT,attack,28,2,3500,500,5000,yes,self,always,,,,,,,
1113,BallLightning@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,notintown,0,30,,,,,
+>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 04ddd472..b94fefb8 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -1,3 +1,45 @@
+<<<<<<< HEAD
+//id, range, hit, inf, pl, nk, maxrse, max, list_num, castcancel, cast_defence_rate, inf2, maxcount, skill_type, blow_count, pool, stat, name
+1, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 0, 0, none, 0, no, none, Emote //NV_EMOTE
+2, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 0, 0, none, 0, no, none, Trade //NV_TRADE
+3, 0, 0, 0, 0, 0, 0, 2, 0, no, 0, 0, 0, none, 0, no, none, Party //NV_PARTY
+4, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0, no, none, X0 //SM_SWORD
+6, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X1 //SM_RECOVERY
+11, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X2 //MG_SRECOVERY
+38, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X3 //MC_INCCARRY
+39, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X4 //MC_DISCOUNT
+40, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X5 //MC_OVERCHARGE
+50, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0, no, none, X6 //TF_DOUBLE
+51, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0, no, none, X7 //TF_MISS
+54, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X8 //TF_POISON
+144, 0, 6, 4, 0, 1, 0, 1, 1, no, 0, 1, 0, none, 0, no, none, X9 //NV_FIRSTAID
+146, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 1, 0, none, 0, no, none, X10 //SM_MOVINGRECOVERY
+148, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 1, 0, weapon, 0, no, none, X11 //SM_AUTOBERSERK
+152, 0, 6, 4, 0, 1, 0, 1, 1, no, 0, 1, 0, weapon, 5, no, none, X12 //TF_BACKSLIDING
+178, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X13 //NPC_POISON
+190, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X14 //NPC_POISONATTACK
+198, 0, 0, 4, 0, 1, 0, 10, 1, no, 0, 2, 0, magic, 0, no, none, X15 //NPC_SUMMONSLAVE
+199, 0, 0, 4, 0, 1, 0, 10, 1, no, 0, 2, 0, none, 0, no, none, X16 //NPC_EMOTION
+339 0, 0, 0, 0, 0, 0, 3, 0, no, 0, 0, 0, none, 0, no, none, Skill_Pool //TMW_SKILLPOOL
+340, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Magic //TMW_MAGIC
+341, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Life_Magic //TMW_MAGIC_LIFE
+342, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, War_Magic //TMW_MAGIC_WAR
+343, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Transmutation_Magic //TMW_MAGIC_TRANSMUTE
+344, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Nature_Magic //TMW_MAGIC_NATURE
+345, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Astral_Magic //TMW_MAGIC_ASTRAL
+350, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,agi, Brawling //TMW_BRAWLING
+351, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,luk, Lucky_Counter //TMW_LUCKY_COUNTER
+352, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, none, 0, passive,agi, Speed //TMW_SPEED
+353, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, none, 0, passive,vit, Poison_Resistance //TMW_POISON_RESISTANCE
+354, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, magic, 0, passive,int, Astral_Soul //TMW_ASTRAL_SOUL
+45, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,dex, Mallard's_Eye //AC_OWL
+28, 0, 6, 4, 0, 1, 0, 2, 1, yes, 0, 0, 0, magic, 0, no, none, Teleport //AL_TELEPORT
+30, 9, 6, 16, 0, 1, 0, 10, 1, yes, 0, 0, 0, magic, 0, no, none, Heal //AL_HEAL
+// maxrse describes the max. level that the skill can be raised to through the `raise skill' option. Further raising has to happen via quests.
+// maxrse < max.
+// `pool' can be `no', `active', or `passive'.
+// `stat' can be `none', `str', `dex', `agi', `vit', `int', `luk'.
+=======
//id, range, hit, inf, pl, nk, maxrse, max, list_num, castcancel, cast_defence_rate, inf2, maxcount, skill_type, blow_count, pool, stat, name
1, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 0, 0, none, 0, no, none, Emote //NV_EMOTE
2, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 0, 0, none, 0, no, none, Trade //NV_TRADE
@@ -36,3 +78,4 @@
// maxrse < max.
// `pool' can be `no', `active', or `passive'.
// `stat' can be `none', `str', `dex', `agi', `vit', `int', `luk'.
+>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-08 22:08:20 +0000