From 4120937e049187444c30918e7d781d36fba4d0b5 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Fri, 26 May 2023 04:32:51 -0500 Subject: [PATCH] Updates to repairing straw and wood items, repair with medical tape too (#2846) --- data/json/items/ammo.json | 2 +- data/json/items/armor/boots.json | 2 +- data/json/items/armor/hats.json | 2 +- data/json/items/armor/storage.json | 2 +- data/json/items/generic.json | 8 ++++---- data/json/items/generic/string.json | 3 ++- data/json/items/tool/workshop.json | 2 +- data/json/items/tool_armor.json | 2 +- data/json/materials.json | 5 ++++- data/json/requirements/materials.json | 3 ++- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index dd44d99f90da..dba8ba51d7b9 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -663,7 +663,7 @@ "material": "plastic", "volume": "250 ml", "weight": "3 g", - "ammo_type": "components", + "ammo_type": "tape", "count": 35 }, { diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index deb31577f185..0c65139429dd 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -1073,7 +1073,7 @@ "price": 2000, "price_postapoc": 50, "to_hit": -2, - "material": [ "paper" ], + "material": [ "dry_plant" ], "symbol": "[", "looks_like": "leathersandals", "color": "light_gray", diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json index 0c16dc9df64e..2cde06a920b8 100644 --- a/data/json/items/armor/hats.json +++ b/data/json/items/armor/hats.json @@ -520,7 +520,7 @@ "volume": "750 ml", "price": 300, "price_postapoc": 100, - "material": [ "paper" ], + "material": [ "dry_plant" ], "symbol": "[", "looks_like": "cowboy_hat", "color": "dark_gray", diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index ab195b3bacb1..e1f50671385e 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -798,7 +798,7 @@ "price": 200, "price_postapoc": 50, "to_hit": -1, - "material": [ "paper" ], + "material": [ "dry_plant" ], "symbol": "[", "looks_like": "plastic_shopping_bag", "color": "light_gray", diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 34d8a96a179a..825f66a6eb55 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -177,11 +177,11 @@ "color": "light_gray", "name": { "str": "withered plant" }, "description": "A dead plant. Good for starting fires or making a pile of leaves to sleep on.", - "material": "paper", + "material": "dry_plant", "weight": "20 g", "volume": "250 ml", "to_hit": -2, - "flags": [ "TRADER_AVOID" ] + "flags": [ "TRADER_AVOID", "NO_SALVAGE" ] }, { "type": "GENERIC", @@ -2227,7 +2227,7 @@ "name": { "str": "pile of straw", "str_pl": "piles of straw" }, "category": "spare_parts", "description": "A pile of dry grass. Can be used to craft a straw bed if there is nothing else to sleep on.", - "material": [ "paper" ], + "material": [ "dry_plant" ], "flags": [ "TRADER_AVOID" ], "weight": "20 g", "volume": "250 ml", @@ -2242,7 +2242,7 @@ "description": "Old straw doll. Represents a woman in a dress.", "price": 100, "price_postapoc": 0, - "material": [ "paper" ], + "material": [ "dry_plant" ], "weight": "80 g", "volume": "500 ml" }, diff --git a/data/json/items/generic/string.json b/data/json/items/generic/string.json index 2144803e8324..01cb60178b08 100644 --- a/data/json/items/generic/string.json +++ b/data/json/items/generic/string.json @@ -117,6 +117,7 @@ "healthy": -20, "volume": "1 L", "stack_size": 10, - "weight": "80 g" + "weight": "80 g", + "flags": [ "NO_SALVAGE" ] } ] diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 7b3a65acbaa0..dcf6e5082adb 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -578,7 +578,7 @@ { "type": "repair_item", "item_action_type": "repair_metal", - "materials": [ "acidchitin", "bone", "chitin", "paper", "cardboard", "wood", "kevlar_rigid" ], + "materials": [ "acidchitin", "bone", "chitin", "paper", "dry_plant", "cardboard", "wood", "kevlar_rigid" ], "skill": "fabrication", "tool_quality": 5, "cost_scaling": 0.1, diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 813040bdb971..e7bafaae8e06 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -1962,7 +1962,7 @@ "description": "Straw fedora hat, comfortable and stylish. Its brim helps keep the sun out of your eyes.", "price": 5000, "price_postapoc": 50, - "material": [ "paper" ], + "material": [ "dry_plant" ], "volume": "1250 ml", "warmth": 5, "environmental_protection": 3, diff --git a/data/json/materials.json b/data/json/materials.json index 241f110f28a6..26c092dc561c 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1050,6 +1050,7 @@ "specific_heat_liquid": 1.34, "specific_heat_solid": 1.34, "latent_heat": 333, + "reinforces": true, "bash_resist": 1, "cut_resist": 1, "bullet_resist": 1, @@ -1057,6 +1058,8 @@ "fire_resist": 0, "elec_resist": 2, "chip_resist": 0, + "repaired_with": "withered", + "salvaged_into": "withered", "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], "bash_dmg_verb": "ripped", "cut_dmg_verb": "cut", @@ -1600,7 +1603,7 @@ "fire_resist": 1, "elec_resist": 2, "chip_resist": 10, - "repaired_with": "2x4", + "repaired_with": "splinter", "salvaged_into": "splinter", "dmg_adj": [ "scratched", "chipped", "cracked", "splintered" ], "bash_dmg_verb": "splintered", diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json index bb3dc0e8544a..fbb70915b617 100644 --- a/data/json/requirements/materials.json +++ b/data/json/requirements/materials.json @@ -3,7 +3,7 @@ "id": "adhesive", "type": "requirement", "//": "Materials used for joining (typically non-metallic) parts", - "components": [ [ [ "duct_tape", 25 ], [ "superglue", 1 ], [ "bone_glue", 1 ] ] ] + "components": [ [ [ "duct_tape", 25 ], [ "medical_tape", 25 ], [ "superglue", 1 ], [ "bone_glue", 1 ] ] ] }, { "id": "ammo_bullet", @@ -157,6 +157,7 @@ [ [ "feather", 10 ], [ "duct_tape", 40 ], + [ "medical_tape", 40 ], [ "cardboard", 10 ], [ "bag_plastic", 1 ], [ "bottle_plastic_small", 1 ],