summaryrefslogtreecommitdiff
path: root/world/map/db
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-10-19 16:21:44 -0500
committerWushin <pasekei@gmail.com>2014-10-19 16:21:44 -0500
commitf0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779 (patch)
tree2ab7edf218f90deded9ce980bf4d560bdbb0ae5f /world/map/db
parent4526fb388dabd53a1f6f4c987b11c5d0afb2489e (diff)
parentd5501b061b6fb92643bb36c523bde62bcf7181bc (diff)
downloadserverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.tar.gz
serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.tar.bz2
serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.tar.xz
serverdata-f0f18c3c731c7bc1d4d3a9a0b32696cf0c8e1779.zip
Merge pull request #173 from wushin/halloween-annual
Halloween Annual Base Commit
Diffstat (limited to 'world/map/db')
-rw-r--r--world/map/db/generic_item_db.txt4
-rw-r--r--world/map/db/use_item_db.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/world/map/db/generic_item_db.txt b/world/map/db/generic_item_db.txt
index 5b17fa3e..0b3732dc 100644
--- a/world/map/db/generic_item_db.txt
+++ b/world/map/db/generic_item_db.txt
@@ -190,10 +190,6 @@
3002, RealisticBrain, Realistic Brain, 3, 200, 100, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
3003, JarofBlood, Jar of Blood, 3, 200, 100, 375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
3004, Tongue, Tongue, 3, 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-3006, TonoriDelight, Tonori Delight, 3, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
-3007, Marshmallow, Marshmallow, 3, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
-3009, JellySkull, Jelly Skull, 3, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
-3010, CandyPumpkin, Candy Pumpkin, 3, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
3011, PumpkinSeeds, Pumpkin Seeds, 3, 5, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
4000, AngryScorpionStinger, Angry Scorpion Stinger, 3, 50, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
4001, Coal, Coal, 3, 250, 100, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/use_item_db.txt b/world/map/db/use_item_db.txt
index fa8283d9..7f7ad2c6 100644
--- a/world/map/db/use_item_db.txt
+++ b/world/map/db/use_item_db.txt
@@ -85,6 +85,10 @@
1258, Honey, Honey, 0, 100, 80, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 45, 0;}, {}
1280, Scissors, Scissors, 0, 1000, 500, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useScissors";}, {}
1281, ShockSweet, Shock Sweet, 0, 1000, 500, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "useShockSweet";}, {}
+3006, TonoriDelight, Tonori Delight, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 10, 0;}, {}
+3007, Marshmallow, Marshmallow, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 10, 0;}, {}
+3009, JellySkull, Jelly Skull, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 10, 0;}, {}
+3010, CandyPumpkin, Candy Pumpkin, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 10, 0;}, {}
4035, PickledBeets, Pickled Beets, 0, 100, 50, 150, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 50, 0; setlook LOOK_HAIR_COLOR, HC_PURPLE;}, {}
4036, RoastedAcorn, Roasted Acorn, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {itemheal 15, 0;}, {}
5126, MTJarofOwnBlood, MTJar of Own Blood, 0, 200, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {itemheal -250, 0;getitem 5127, 1;}, {}