diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:09 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:09 +0000 |
| commit | 481d1eca66e38154063b078b84fe76a830e5ac0d (patch) | |
| tree | 936e79882218d32d4075f46ad85aff7cec199d2a /db/item_db.txt | |
| parent | fe02011f477c57c7461b2bc25456bd9426e98cd7 (diff) | |
| parent | ef7a69afc170e8c60af91583d7c1488a7590fcab (diff) | |
| download | serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.gz serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.bz2 serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.xz serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.zip | |
Merge commit 'mainline/master'
Conflicts:
db/item_db.txt
Diffstat (limited to 'db/item_db.txt')
| -rw-r--r-- | db/item_db.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/db/item_db.txt b/db/item_db.txt index dbf42473..1f5f822a 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -38,7 +38,7 @@ 536, ShortSword, Short Sword, 4, 8000, 4000, 100, 100, , 1, , 0, 10477567, 2, 2, 1, 1, 1, {}, {} 537, TreasureKey, Treasure Key, 3, 100, 50, 5, , , , , , , , , , , , {}, {} 538, GreenPresentBox, Green Present Box, 0, 20, 10, 10, , , , , , 10477567, 2, , , 0, , {}, {} -539, Beer, Beer, 0, 175, 87, 10, , , , , , 10477567, 2, , , 0, , { itemheal 200,0; }, {} +539, Beer, Beer, 0, 175, 87, 10, , , , , , 10477567, 2, , , 0, , { itemheal 200,5; }, {} 540, EmptyBottle, Empty Bottle, 3, 20, 10, 10, , , , , , , , , , , , {}, {} 541, BottleOfWater, Bottle of Water, 0, 200, 100, 10, , , , , , 10477567, 2, , , 0, , { itemheal 250,0; getitem 540,1; }, {} 542, BottleOfSand, Bottle of Sand, 3, 70, 35, 10, , , , , , , , , , , , {}, {} @@ -225,11 +225,11 @@ 733, PurificationPotion, Purification Potion, 0, 0, 0, 5, , , , , , 10477567, 2, , , , , { callfunc "usePurificationPotion"; }, {} 734, BlackBoots, Black Boots, 5, 20000, 3000, 35, , 4, , -10, 0, 10477567, 2, 64, , 0, 0, {}, {} 735, WhiteCottonBoots, White Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} -736, WhiteCake, WhiteCake, 0, 500, 100, 10, , , , , , 10477567, 2, , , 0, , { itemheal 10,0; }, {} -737, ChocolateCake, ChocolateCake, 0, 550, 125, 10, , , , , , 10477567, 2, , , 0, , { itemheal 11,0; }, {} -738, OrangeCake, OrangeCake, 0, 600, 150, 10, , , , , , 10477567, 2, , , 0, , { itemheal 12,0; }, {} -739, AppleCake, AppleCake, 0, 600, 150, 10, , , , , , 10477567, 2, , , 0, , { itemheal 12,0; }, {} - +736, WhiteCake, White Cake, 0, 500, 100, 10, , , , , , 10477567, 2, , , 0, , { itemheal 10,0; }, {} +737, ChocolateCake, Chocolate Cake, 0, 550, 125, 10, , , , , , 10477567, 2, , , 0, , { itemheal 11,0; }, {} +738, OrangeCake, Orange Cake, 0, 600, 150, 10, , , , , , 10477567, 2, , , 0, , { itemheal 12,0; }, {} +739, AppleCake, Apple Cake, 0, 600, 150, 10, , , , , , 10477567, 2, , , 0, , { itemheal 12,0; }, {} +740, Root, Root, 3, 500, 200, 5, , , , , , , , , , , , {}, {} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Job, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 1198, JackOSoul, Jack O Soul, 3, 100000, 1, 1, , , , , , , , , , , , {}, {} |