summaryrefslogtreecommitdiff
path: root/world/map/db
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-04-29 19:53:09 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-04-29 19:53:09 -0700
commite364c115c4c26f6fbf366c75cae1546a337d48d3 (patch)
tree5bceb771e5a103a4eaab8764a9a92b1baadcf39b /world/map/db
parente7d240bf9b3f895bd77e21d33bc6cd5d48393afe (diff)
downloadserverdata-e364c115c4c26f6fbf366c75cae1546a337d48d3.tar.gz
serverdata-e364c115c4c26f6fbf366c75cae1546a337d48d3.tar.bz2
serverdata-e364c115c4c26f6fbf366c75cae1546a337d48d3.tar.xz
serverdata-e364c115c4c26f6fbf366c75cae1546a337d48d3.zip
Be coherent about what's armor and what's a weapon
Newly added assertions in the server caught this.
Diffstat (limited to 'world/map/db')
-rw-r--r--world/map/db/item_db.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 8deda424..df7079fd 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -48,10 +48,10 @@
544, SilkHeadband, Silk Headband, 5, 5000, 2000, 10, , 10, , -10, 0, 2, 256, , 0, 0, {}, {}
545, ForestBow, Forest Bow, 4, 20000, 5000, 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";}
+547, Bardiche, Bardiche, 4, 20, 10, 10, , 100, 1, -200, 0, 2, 2, , 0, 1, {}, {callfunc "UnreleasedItem";}
+548, Halberd, Halberd, 4, 20, 10, 1400, 100, , 1, , 0, 2, 2, 1, 0, 1, {}, {callfunc "UnreleasedItem";}
+549, Axe, Axe, 4, 20, 10, 1200, 100, , 1, , 0, 2, 2, 1, 0, 1, {}, {callfunc "UnreleasedItem";}
+550, BlacksmithsAxe, Blacksmith's Axe, 4, 20, 10, 1200, 100, , 1, , 0, 2, 2, 1, 0, 1, {}, {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, , , , , , , , , , , {}, {}
@@ -88,7 +88,7 @@
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, {}, {}
+585, ScarabArmlet, Scarab Armlet, 5, 8000, 4000, 200, , 0, , 5, 0, 2, 32, , 1, 0, {}, {}
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, BastardSword, , , , , , , , , , , , , , , {}, {}