diff options
| author | o11c <b.r.longbons@gmail.com> | 2013-05-24 23:28:30 -0700 |
|---|---|---|
| committer | o11c <b.r.longbons@gmail.com> | 2013-05-24 23:28:30 -0700 |
| commit | e2f9b74abbf96b6acf26eda3a3e173cdb6f437e2 (patch) | |
| tree | 70389dddedb18bccaa5ce23675d5eaeb3ad6bc1d | |
| parent | 79f1abf1dedadcb5683822151bd578dc093e19e8 (diff) | |
| parent | b9858ff72f5dc184b9fccc94c6210603879b6dad (diff) | |
| download | serverdata-e2f9b74abbf96b6acf26eda3a3e173cdb6f437e2.tar.gz serverdata-e2f9b74abbf96b6acf26eda3a3e173cdb6f437e2.tar.bz2 serverdata-e2f9b74abbf96b6acf26eda3a3e173cdb6f437e2.tar.xz serverdata-e2f9b74abbf96b6acf26eda3a3e173cdb6f437e2.zip | |
Merge pull request #17 from cody/master
Some fixes to item_db
| -rw-r--r-- | world/map/db/item_db.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index df7079fd..bd8e8550 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -97,7 +97,7 @@ //591, RESERVED, LongSword, , , , , , , , , , , , , , , {}, {} //592, RESERVED, Stiletto, , , , , , , , , , , , , , , {}, {} //593, RESERVED, Rapier, , , , , , , , , , , , , , , {}, {} -594, Spear, Spear, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} +//594, Spear, Spear, 4, 1000, 500, 200, 15, , 1, , 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} //595, RESERVED, HeavySpear, , , , , , , , , , , , , , , {}, {} //596, RESERVED, Pike, , , , , , , , , , , , , , , {}, {} //597, RESERVED, HeavyPike, , , , , , , , , , , , , , , {}, {} @@ -351,9 +351,9 @@ 835, HyvernStinger, Hyvern Stinger, 3, 100, 25, 10, , , , 0, 0, 2, , , 0, 0, {}, {} 836, GrubSlime, Grub Slime, 3, 40, 10, 2, , , , 0, 0, 2, , , 0, 0, {}, {} //837, RESERVED, WitchRoot, , , , , , , , , , , , , , , {}, {} -838, CranberryLollipop, Cranberry Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} -839, GrapeLollipop, Grape Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} -840, OrangeLollipop, Orange Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} +838, CranberryLollipop, Cranberry Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} +839, GrapeLollipop, Grape Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} +840, OrangeLollipop, Orange Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 750, 0;}, {} 841, RedDottedWrap, Red Dotted Wrap, 3, 50, 25, 500, , , , , , , , , , , {}, {} 842, YellowDottedWrap, Yellow Dotted Wrap, 3, 50, 25, 500, , , , , , , , , , , {}, {} 843, BlueDottedWrap, Blue Dotted Wrap, 3, 50, 25, 500, , , , , , , , , , , {}, {} @@ -442,10 +442,10 @@ //1227, EnchantersAmulet, Enchanter's Amulet, , , , , , , , , , , , , , , {}, {} 1228, LightCrystal, Light Crystal, 3, 1000, 250, 10, , , , , , , , , , , {}, {} 1229, CaramelApple, Caramel Apple, 0, 500, 75, 5, , , , , , 2, , , 0, , {itemheal 1000, 0;}, {} -1230, LollipopColor1, Booberry Blue Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} -1231, LollipopColor2, Ghastly Green Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} -1232, LollipopColor3, Blood Red Lollipop, 0, 20, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} -1233, FakeFangs, Cheap Plastic Fangs, 3, 20, 10000, 1, , , , , , 2, , , 0, , {}, {} +1230, LollipopColor1, Booberry Blue Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} +1231, LollipopColor2, Ghastly Green Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} +1232, LollipopColor3, Blood Red Lollipop, 0, 100, 50, 1, , , , , , 2, , , 0, , {itemheal 800, 0;}, {} +1233, FakeFangs, Cheap Plastic Fangs, 3, 20000, 10000, 1, , , , , , 2, , , 0, , {}, {} 1234, RedOrnament, Red Christmas Ornament, 3, 5000, 1, 1, , , , , , 2, , , 0, , {}, {} 1235, YellowOrnament, Yellow Christmas Ornament, 3, 5000, 1, 1, , , , , , 2, , , 0, , {}, {} 1236, GreenOrnament, Green Christmas Ornament, 3, 5000, 1, 1, , , , , , 2, , , 0, , {}, {} @@ -662,7 +662,7 @@ 2204, LightBlueWizardHat, Light Blue Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 2205, PinkWizardHat, Pink Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} -2206, BlackWizardHat, Red Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} +2206, BlackWizardHat, Black Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2207, OrangeWizardHat, Orange Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2208, PurpleWizardHat, Purple Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2209, DarkGreenWizardHat, Dark Green Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} @@ -726,11 +726,11 @@ 3003, JarofBlood, Jar of Blood, 3, 200, 100, 375, , , , , , , , , , , {}, {} 3004, Tongue, Tongue, 3, 5, 1, 5, , , , , , , , , , , {}, {} //3005 -3006, TonoriDelight, Tonori Delight, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} -3007, Marshmallow, Marshmallow, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3006, TonoriDelight, Tonori Delight, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3007, Marshmallow, Marshmallow, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} //3008 -3009, JellySkull, Jelly Skull, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} -3010, CandyPumpkin, Candy Pumpkin, 0, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3009, JellySkull, Jelly Skull, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} +3010, CandyPumpkin, Candy Pumpkin, 3, 5, 1, 2, , , , , , 2, , , 0, , {}, {} 3011, PumpkinSeeds, Pumpkin Seeds, 3, 5, 1, 1, , , , , , , , , , , {}, {} // No new additions to the 3000s please. Add to the bottom of the < 1000s for regular entries and the 2000s for dyed entries. 4000, AngryScorpionStinger, Angry Scorpion Stinger, 3, 50, 25, 1, , , , , , , , , , , {}, {} |