diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/db/item_db.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/db/item_db.txt')
| -rw-r--r-- | world/map/db/item_db.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index f31e0203..023cbbef 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -2,7 +2,7 @@ 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, , , , , , , , , , , {}, {} +503, CasinoCoins, Casino Coins, 3, 10, 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;}, {} |