summaryrefslogtreecommitdiff
path: root/world/map/db
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-06-09 20:38:38 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-09 20:38:38 +0200
commit7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch)
treee4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/db
parent8ac35610a416d3937ccf4b3b74a61622382e8162 (diff)
parentfa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff)
downloadserverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz
serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2
serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz
serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/item_db.txt
Diffstat (limited to 'world/map/db')
-rw-r--r--world/map/db/item_db.txt27
1 files changed, 14 insertions, 13 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 9481ee81..f31e0203 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, , , , , , , , , , , {}, {}
@@ -405,6 +405,7 @@
888, MagicGMTopHat, Magic GM Top Hat, 5, 4200, 1900, 30, , 60, , 20, 0, 2, 256, , 0, 0, {}, {set @minLvl, 60; callfunc "RestrictedItem"; bonus bMaxHP, 31000; bonus bFlee, -200; bonus bHPrecovRate, -400; bonus bCriticalDef, 250; bonus bMdef, 89;}
889, MurdererCrown, Murderer Crown, 5, 75000, 12000, 240, , 4, , 0, 0, 2, 256, , 0, 0, {}, {}
890, BeanieCopter, Beanie Copter, 5, 8000, 2000, 20, , 4, , 2, 0, 2, 256, , 0, 0, {}, {}
+891, SilkSheet, Silk Sheet, 3, 1000, 250, 5, , , , , , , , , , , {}, {}
892, OrangeSummonFlower, Orange Summon Flower, 3, 50, 25, 1, , , , , , , , , , , {}, {}
893, PurpleSummonFlower, Purple Summon Flower, 3, 100, 50, 1, , , , , , , , , , , {}, {}
894, WhiteSummonFlower, White Summon Flower, 3, 200, 100, 1, , , , , , , , , , , {}, {}
@@ -453,10 +454,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, , {}, {}
@@ -673,7 +674,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;}
@@ -737,11 +738,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, , , , , , , , , , , {}, {}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 11:24:22 +0000