diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-10 20:31:40 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-10 20:31:40 +0200 |
| commit | dfa96a49bbdcb0938746adf8d2da7ffac00a6222 (patch) | |
| tree | 6baedebcd87a44cac5f8b4fb15ed0a016fc58d26 /world/map/db | |
| parent | 6f2c9210413a68524aaebe2c1a0bd9a54dbcd74a (diff) | |
| parent | 262912f0c8545a82fe2fbf68699cc53d65384b1d (diff) | |
| download | serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.gz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.bz2 serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.tar.xz serverdata-dfa96a49bbdcb0938746adf8d2da7ffac00a6222.zip | |
Merge remote-tracking branch 'origin/master' into waric
Diffstat (limited to 'world/map/db')
| -rw-r--r-- | world/map/db/item_db.txt | 10 |
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, , , , , , , , , , , , , , , {}, {} |