From 051082e62cb52ad878c2b0f21c106306582ee3de Mon Sep 17 00:00:00 2001 From: Aaron Chancey Date: Thu, 24 Feb 2022 21:26:40 -0500 Subject: [PATCH 1/3] Few misc item fixes --- data/json/items/generic/toys_and_sports.json | 16 ++++++++++++++-- data/json/items/tool/woodworking.json | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index b7c880c52ccbb..024b332ed394c 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -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" ], @@ -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" ], @@ -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, @@ -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, @@ -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, @@ -174,6 +179,7 @@ "material": [ "leather" ], "weight": "400 g", "volume": "750 ml", + "longest_side": "29 cm", "bashing": 4, "to_hit": -1 }, @@ -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": "75 mm", "bashing": 6, "to_hit": -1 }, @@ -206,6 +213,7 @@ "material": [ "rubber" ], "weight": "260 g", "volume": "1 L", + "longest_side": "26 mm", "bashing": 4, "to_hit": -1 }, @@ -222,6 +230,7 @@ "material": [ "rubber" ], "weight": "280 g", "volume": "1 L", + "longest_side": "27 mm", "bashing": 4, "to_hit": -1 }, @@ -238,6 +247,7 @@ "material": [ "rubber" ], "weight": "170 g", "volume": "250 ml", + "longest_side": "76 mm", "bashing": 7, "to_hit": 2 }, @@ -254,6 +264,7 @@ "material": [ "wood" ], "weight": "81500 g", "volume": "62500 ml", + "longest_side": "180 cm", "bashing": 18, "to_hit": -2 }, @@ -270,6 +281,7 @@ "material": [ "wood" ], "weight": "81500 g", "volume": "62500 ml", + "longest_side": "180 mm", "bashing": 18, "to_hit": -2, "ammo": [ "battery" ], diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 4c887676aec93..8d434bd609278 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -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": "43 cm", "price": 5000, "price_postapoc": 250, "to_hit": -3, From 61bfc19ab9f6baf57a08fe65125074401d72a0fa Mon Sep 17 00:00:00 2001 From: Aaron Chancey Date: Thu, 24 Feb 2022 21:40:52 -0500 Subject: [PATCH 2/3] Oops damn metric sizes --- data/json/items/generic/toys_and_sports.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index 024b332ed394c..f55f75167f775 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -196,7 +196,7 @@ "material": [ "rubber" ], "weight": "800 g", "volume": "1 L", - "longest_side": "75 mm", + "longest_side": "75 cm", "bashing": 6, "to_hit": -1 }, @@ -213,7 +213,7 @@ "material": [ "rubber" ], "weight": "260 g", "volume": "1 L", - "longest_side": "26 mm", + "longest_side": "26 cm", "bashing": 4, "to_hit": -1 }, @@ -230,7 +230,7 @@ "material": [ "rubber" ], "weight": "280 g", "volume": "1 L", - "longest_side": "27 mm", + "longest_side": "27 cm", "bashing": 4, "to_hit": -1 }, @@ -281,7 +281,7 @@ "material": [ "wood" ], "weight": "81500 g", "volume": "62500 ml", - "longest_side": "180 mm", + "longest_side": "180 cm", "bashing": 18, "to_hit": -2, "ammo": [ "battery" ], From c6ac3adc39c487f8c903bd35a5b03c74ecfb6c3b Mon Sep 17 00:00:00 2001 From: Aaron Chancey Date: Fri, 25 Feb 2022 08:42:28 -0500 Subject: [PATCH 3/3] few additional adjustments after testing. Added rubber to football materials. they're made of rubber and covered in leather --- data/json/items/generic.json | 1 + data/json/items/generic/toys_and_sports.json | 4 ++-- data/json/items/tool/woodworking.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 5d3bae548f859..782d99e93bf44 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -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 diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index f55f75167f775..627172b113afe 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -176,7 +176,7 @@ "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", @@ -196,7 +196,7 @@ "material": [ "rubber" ], "weight": "800 g", "volume": "1 L", - "longest_side": "75 cm", + "longest_side": "239 mm", "bashing": 6, "to_hit": -1 }, diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 8d434bd609278..3eaf0153a1f68 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -83,7 +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": "43 cm", + "longest_side": "44 cm", "price": 5000, "price_postapoc": 250, "to_hit": -3,