summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-11-24 18:53:05 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-11-24 18:53:05 -0800
commite8c324b4435a94877934f89c3ee339df52247062 (patch)
tree2468ee94c20cd889e5ef17564bcc92af677f9867 /world
parent14b0731f8a74aad602e004fa726c53584bb72029 (diff)
downloadserverdata-e8c324b4435a94877934f89c3ee339df52247062.tar.gz
serverdata-e8c324b4435a94877934f89c3ee339df52247062.tar.bz2
serverdata-e8c324b4435a94877934f89c3ee339df52247062.tar.xz
serverdata-e8c324b4435a94877934f89c3ee339df52247062.zip
Fix indenting of item_db
At some point, 'make indent' needs to be run, but that will cause merge conflicts so I'm not doing it yet.
Diffstat (limited to 'world')
-rw-r--r--world/map/db/item_db.txt30
1 files changed, 15 insertions, 15 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 01a43db9..42227b27 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -407,21 +407,21 @@
889, MurdererCrown, Murderer Crown, 5, 75000, 12000, 240, 0, 4, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
890, BeanieCopter, Beanie Copter, 5, 8000, 2000, 20, 0, 4, 0, 2, 0, 2, 256, 0, 0, 0, {}, {}
891, SilkSheet, Silk Sheet, 3, 1000, 250, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-892, OrangeSummonFlower, Orange Summon Flower, 3, 50, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-893, PurpleSummonFlower, Purple Summon Flower, 3, 100, 50, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-894, WhiteSummonFlower, White Summon Flower, 3, 200, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-895, YellowSummonFlower, Yellow Summon Flower, 3, 400, 200, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-896, RedSummonFlower, Red Summon Flower, 3, 600, 300, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-897, RedRoseHat, Red Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
-898, WhiteRoseHat, White Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
-899, PinkRoseHat, Pink Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
-900, YellowRoseHat, Yellow Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
-901, OrangeRoseHat, Orange Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
-902, BlueRoseHat, Blue Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
-903, SlingShot, Sling Shot, 4, 500, 50, 10, 5, 0, 3, 0, 0, 2, 34, 1, 1, 11, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";}
-904, SlingBullet, Sling Bullet, 10, 1, 0, 1, 5, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";}
+892, OrangeSummonFlower, Orange Summon Flower, 3, 50, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+893, PurpleSummonFlower, Purple Summon Flower, 3, 100, 50, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+894, WhiteSummonFlower, White Summon Flower, 3, 200, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+895, YellowSummonFlower, Yellow Summon Flower, 3, 400, 200, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+896, RedSummonFlower, Red Summon Flower, 3, 600, 300, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+897, RedRoseHat, Red Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
+898, WhiteRoseHat, White Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
+899, PinkRoseHat, Pink Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
+900, YellowRoseHat, Yellow Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
+901, OrangeRoseHat, Orange Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
+902, BlueRoseHat, Blue Rose Hat, 5, 5000, 1000, 0, 0, 1, 0, 8, 0, 2, 256, 0, 0, 0, {}, {}
+903, SlingShot, Sling Shot, 4, 500, 50, 10, 5, 0, 3, 0, 0, 2, 34, 1, 1, 11, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";}
+904, SlingBullet, Sling Bullet, 10, 1, 0, 1, 5, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";}
-// Add new entries above here. For dyed entries,add to the bottom of the 2000s.
+// Add new entries above here. For dyed entries, add to the bottom of the 2000s.
1197, SkeletonCharm, Skeleton Charm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, { callfunc "CheckMunro"; }
1198, JackOSoul, Jack O Soul, 3, 100000, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
@@ -734,7 +734,7 @@
2259, DarkGreenCottonCloth, Dark Green Cotton Cloth, 3, 400, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
//ID, Name___________________, Label__________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
-// Add dyed entries above here. For regular entries,please use the < 1000s.
+// Add dyed entries above here. For regular entries, please use the < 1000s.
3000, JackOLantern, Jack-o-Lantern, 3, 200, 100, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
3001, RubberBat, Rubber Bat, 3, 200, 100, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}