Skip to content

Commit

Permalink
Merge pull request #55664 from a-chancey/miscitemfixes
Browse files Browse the repository at this point in the history
Few misc item fixes
  • Loading branch information
Rivet-the-Zombie authored Mar 2, 2022
2 parents 2c922b0 + 9c10e8e commit 51e41b7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@
"material": [ "steel" ],
"weight": "349 g",
"volume": "250 ml",
"longest_side": "204 mm",
"cutting": 14,
"flags": [ "HURT_WHEN_WIELDED" ],
"to_hit": -4
Expand Down
18 changes: 15 additions & 3 deletions data/json/items/generic/toys_and_sports.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"description": "A high-drag projectile used in the sport of badminton.",
"weight": "5 g",
"volume": "600 ml",
"longest_side": "90 mm",
"price": 200,
"price_postapoc": 0,
"material": [ "rubber", "plastic" ],
Expand All @@ -76,6 +77,7 @@
"description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.",
"weight": "3 g",
"volume": "250 ml",
"longest_side": "70 mm",
"price": 1000,
"price_postapoc": 0,
"material": [ "wood" ],
Expand All @@ -88,7 +90,8 @@
"category": "other",
"name": { "str": "golf ball" },
"description": "A small ball with round indentations on it.",
"weight": "50 g",
"weight": "46 g",
"longest_side": "43 mm",
"volume": "250 ml",
"price": 2000,
"price_postapoc": 0,
Expand All @@ -113,6 +116,7 @@
"flags": [ "NPC_THROWN" ],
"weight": "170 g",
"volume": "250 ml",
"longest_side": "57 mm",
"bashing": 8,
"damage": { "damage_type": "bash", "amount": 8 },
"range": 10,
Expand Down Expand Up @@ -153,6 +157,7 @@
"flags": [ "NPC_THROWN" ],
"weight": "150 g",
"volume": "250 ml",
"longest_side": "75 mm",
"bashing": 6,
"damage": { "damage_type": "bash", "amount": 6 },
"range": 12,
Expand All @@ -171,9 +176,10 @@
"description": "An oval made of leather and string, it's easily thrown but does little damage. You could take it apart into leather if you wanted.",
"price": 1000,
"price_postapoc": 10,
"material": [ "leather" ],
"material": [ { "type": "leather", "portion": 9 }, { "type": "rubber" } ],
"weight": "400 g",
"volume": "750 ml",
"longest_side": "29 cm",
"bashing": 4,
"to_hit": -1
},
Expand All @@ -184,12 +190,13 @@
"color": "brown",
"name": { "str": "basketball" },
"category": "other",
"description": "A high-quality indoor basketball. You may throw it at zombies.",
"description": "A high-quality, size 7 indoor basketball. You may throw it at zombies.",
"price": 1200,
"price_postapoc": 10,
"material": [ "rubber" ],
"weight": "800 g",
"volume": "1 L",
"longest_side": "239 mm",
"bashing": 6,
"to_hit": -1
},
Expand All @@ -206,6 +213,7 @@
"material": [ "rubber" ],
"weight": "260 g",
"volume": "1 L",
"longest_side": "26 cm",
"bashing": 4,
"to_hit": -1
},
Expand All @@ -222,6 +230,7 @@
"material": [ "rubber" ],
"weight": "280 g",
"volume": "1 L",
"longest_side": "27 cm",
"bashing": 4,
"to_hit": -1
},
Expand All @@ -238,6 +247,7 @@
"material": [ "rubber" ],
"weight": "170 g",
"volume": "250 ml",
"longest_side": "76 mm",
"bashing": 7,
"to_hit": 2
},
Expand All @@ -254,6 +264,7 @@
"material": [ "wood" ],
"weight": "81500 g",
"volume": "62500 ml",
"longest_side": "180 cm",
"bashing": 18,
"to_hit": -2
},
Expand All @@ -270,6 +281,7 @@
"material": [ "wood" ],
"weight": "81500 g",
"volume": "62500 ml",
"longest_side": "180 cm",
"bashing": 18,
"to_hit": -2,
"ammo": [ "battery" ],
Expand Down
1 change: 1 addition & 0 deletions data/json/items/tool/woodworking.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.",
"weight": "2940 g",
"volume": "750 ml",
"longest_side": "44 cm",
"price": 5000,
"price_postapoc": 250,
"to_hit": -3,
Expand Down

0 comments on commit 51e41b7

Please sign in to comment.