From e233bb4efb4881a2a91a639d8530540c70ca0e2a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:35:07 -0600 Subject: [PATCH 1/5] Update landscaping.json --- data/json/items/tool/landscaping.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index 7f4c66d1de225..e81ff8c219410 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -168,17 +168,16 @@ "color": "light_gray", "name": { "str": "grim reaper's scythe" }, "description": "A long, crooked tool used to reap souls, with a skull engraved in its blade. Let the harvest begin.", - "weight": "2721 g", + "weight": "1685 g", "volume": "3550 ml", "longest_side": "150 cm", "price": 3000, - "price_postapoc": 10, + "price_postapoc": 5, "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "uneven" }, "material": [ "plastic" ], - "techniques": [ "WIDE", "BRUTAL" ], - "flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK", "ALWAYS_TWOHAND" ], + "flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE", "POLEARM", "SHEATH_SPEAR", "REACH_ATTACK" ], "weapon_category": [ "HOOKING_WEAPONRY", "POLEARMS" ], - "melee_damage": { "bash": 7 } + "melee_damage": { "bash": 2 } }, { "id": "shovel", From 6fb33a07c4a3ae38054d888fec9a12a7f42f64b3 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:43:53 -0600 Subject: [PATCH 2/5] Update landscaping.json --- data/json/items/tool/landscaping.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index e81ff8c219410..09ee191833fdc 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -168,7 +168,7 @@ "color": "light_gray", "name": { "str": "grim reaper's scythe" }, "description": "A long, crooked tool used to reap souls, with a skull engraved in its blade. Let the harvest begin.", - "weight": "1685 g", + "weight": "1160 g", "volume": "3550 ml", "longest_side": "150 cm", "price": 3000, From d6f978136d1884ef19cad0c45189960a0a496707 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:47:46 -0600 Subject: [PATCH 3/5] Update landscaping.json --- data/json/items/tool/landscaping.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index 09ee191833fdc..7a69446377690 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -168,7 +168,7 @@ "color": "light_gray", "name": { "str": "grim reaper's scythe" }, "description": "A long, crooked tool used to reap souls, with a skull engraved in its blade. Let the harvest begin.", - "weight": "1160 g", + "weight": "586 g", "volume": "3550 ml", "longest_side": "150 cm", "price": 3000, From 83ca045bfddc506ba19c710717020349e40195fe Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:52:18 -0600 Subject: [PATCH 4/5] Update known_bad_density.json --- data/mods/TEST_DATA/known_bad_density.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 06d94bd8b71da..e69239129d54a 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -774,7 +774,8 @@ "rocuronium", "alumentum", "rebreather_filler_ko2", - "rebreather_filler_soda_lime" + "rebreather_filler_soda_lime", + "scythe_toy" ] } ] From f367b4039e2b10c1fa321518d50656b053378d37 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:16:18 -0600 Subject: [PATCH 5/5] Update known_bad_density.json --- data/mods/TEST_DATA/known_bad_density.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index e69239129d54a..06d94bd8b71da 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -774,8 +774,7 @@ "rocuronium", "alumentum", "rebreather_filler_ko2", - "rebreather_filler_soda_lime", - "scythe_toy" + "rebreather_filler_soda_lime" ] } ]