summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-01 13:00:13 -0700
committerFate <fate-tmw@googlemail.com>2008-12-01 13:00:13 -0700
commitf694a2b3d37c562d88dfed245f266859d00e1f08 (patch)
treeab303c35b3fd70dffb15ef26c661abb0b98714e9
parent98860f7aa06060e6c6b59efeb3414b3bec67695a (diff)
parentf0b260b403e3f386fb5d3b425535cd7d8248f494 (diff)
downloadserverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.tar.gz
serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.tar.bz2
serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.tar.xz
serverdata-f694a2b3d37c562d88dfed245f266859d00e1f08.zip
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline into magic
Conflicts: db/item_db.txt
-rw-r--r--db/item_db.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index c55a5aa1..d430a954 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -220,6 +220,7 @@
728, MoubooFigurine, Mouboo Figurine, 3, 0, 0, 1, , , , , , , , , , , , {}, {}
729, WarpedLog, Warped Log, 3, 0, 0, 2, , , , , , , , , , , , {}, {}
730, Lifestone, Lifestone, 3, 0, 0, 1, , , , , , , , , , , , {}, {}
+731, AssassinPants, Assassin Pants, 5, 10000, 3000, 10, , 5, , -5, 0, 10477567, 2, 1, , 0, 0, {}, {}
#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, , , , , , , , , , , , {}, {}