summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
committerFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
commit03e7550003650cb5cf79eb0c8d470ce8bd24ae27 (patch)
tree437785d13b545d6562ba3b00513b8eb5a89c8f15 /db
parent647f4a35bf8831df4fe23754e824f4bdfb5dcf72 (diff)
parent5db6cb7d6c09dbb091edbdf21a3e0e3feae3175a (diff)
downloadserverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.gz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.bz2
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.xz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.zip
Merge branch 'master' into magic
Conflicts: db/item_db.txt
Diffstat (limited to 'db')
-rw-r--r--db/item_db.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index 3e5e6bce..cf164c25 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -223,6 +223,8 @@
731, AssassinPants, Assassin Pants, 5, 10000, 3000, 10, , 5, , -5, 0, 10477567, 2, 1, , 0, 0, {}, {}
732, DruidTreeBranch, Druid Tree Branch, 3, 0, 0, 2, , , , , , 10477567, , , , , , {}, {}
733, PurificationPotion, Purification Potion, 0, 0, 0, 5, , , , , , 10477567, , , , , , { callfunc "PurificationPotion"; }, {}
+734, BlackBoots, Black Boots, 5, 20000, 3000, 35, , 4, , -10, 0, 10477567, 2, 64, , 0, 0, {}, {}
+735, WhiteCottonBoots, WhiteCottonBoots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 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, , , , , , , , , , , , {}, {}
@@ -365,3 +367,15 @@
2147, OrangeCottonHeadBand, Orange Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {}
2148, PurpleCottonHeadBand, Purple Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {}
2149, DarkGreenCottonHeadBand, Dark Green Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {}
+
+#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Job, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
+2150, RedCottonBoots, Red Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2151, GreenCottonBoots, Green Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2152, DarkBlueCottonBoots, Dark Blue Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2153, YellowCottonBoots, Yellow Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2154, LightBlueCottonBoots, Light Blue Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2155, PinkCottonBoots, Pink Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2156, BlackCottonBoots, Black Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2157, OrangeCottonBoots, Orange Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2158, PurpleCottonBoots, Purple Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}
+2159, DarkGreenCottonBoots, Dark Green Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {}