From a82180e05560c493b253fb5bafb9eeedf0001da0 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sun, 29 Sep 2024 19:05:25 -0500 Subject: [PATCH] Pending BN Update: assorted content being mainlined --- MST_Extra/harvest.json | 5 - MST_Extra/item_groups.json | 12 -- MST_Extra/items/comestibles.json | 15 -- MST_Extra/items/generic.json | 12 -- .../mod_tileset/mod_tileset_DP_Normal.json | 4 +- MST_Extra/obsolete.json | 44 +++- .../recipes/recipe_medsandchemicals.json | 2 +- MST_Extra/recipes/recipe_other.json | 64 ------ .../furniture_and_terrain/construction.json | 69 ------- .../construction_group.json | 5 - .../furniture_and_terrain/furniture.json | 104 ---------- MST_Extra_BN/item_groups.json | 10 - MST_Extra_BN/items/ammo.json | 16 -- MST_Extra_BN/items/ammo_types.json | 6 - MST_Extra_BN/items/comestibles.json | 15 -- MST_Extra_BN/items/generic.json | 30 --- MST_Extra_BN/items/item_overrides.json | 70 ------- MST_Extra_BN/items/tools.json | 31 --- MST_Extra_BN/items/wheels.json | 17 -- .../mod_tileset/mod_tileset_DP_Normal.json | 4 +- .../mod_tileset/mod_tileset_dp_normal.png | Bin 14871 -> 13256 bytes MST_Extra_BN/monstergroup_additions.json | 20 -- MST_Extra_BN/obsolete.json | 35 +++- .../recipes/recipe_medsandchemicals.json | 16 -- MST_Extra_BN/recipes/recipe_other.json | 191 ------------------ MST_Extra_BN/recipes/recipe_weapon.json | 20 -- MST_Extra_BN/recipes/requirements.json | 24 --- MST_Extra_BN/vehicles/vehicleparts.json | 28 --- 28 files changed, 79 insertions(+), 790 deletions(-) diff --git a/MST_Extra/harvest.json b/MST_Extra/harvest.json index 2a05861..0d4f101 100644 --- a/MST_Extra/harvest.json +++ b/MST_Extra/harvest.json @@ -1,7 +1,2 @@ [ - { - "id": "hive_ready_harv", - "type": "harvest", - "entries": [ { "drop": "honeycomb", "base_num": [ 1, 8 ] } ] - } ] diff --git a/MST_Extra/item_groups.json b/MST_Extra/item_groups.json index 5dd4280..edaee62 100644 --- a/MST_Extra/item_groups.json +++ b/MST_Extra/item_groups.json @@ -5,12 +5,6 @@ "type": "item_group", "extend": { "items": [ [ "crossbow_makeshift", 1 ] ] } }, - { - "id": "survivorzed_extra", - "copy-from": "survivorzed_extra", - "type": "item_group", - "extend": { "items": [ [ "hat_hooded", 1 ] ] } - }, { "id": "tools_survival", "copy-from": "tools_survival", @@ -25,12 +19,6 @@ "items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ] } }, - { - "id": "hive", - "copy-from": "hive", - "type": "item_group", - "extend": { "items": [ [ "beehive_empty", 1 ] ] } - }, { "id": "museum_misc", "copy-from": "museum_misc", diff --git a/MST_Extra/items/comestibles.json b/MST_Extra/items/comestibles.json index 31b2970..020a0a5 100644 --- a/MST_Extra/items/comestibles.json +++ b/MST_Extra/items/comestibles.json @@ -1,19 +1,4 @@ [ - { - "id": "tar_oil", - "type": "COMESTIBLE", - "comestible_type": "MED", - "name": { "str_sp": "tar oil" }, - "description": "A thick, runny tar typically made from birch bark or pine. Among various historical uses, it is also used as an antiseptic and astringent.", - "weight": "40 g", - "volume": "250 ml", - "material": [ "oil" ], - "symbol": "~", - "color": "yellow", - "phase": "liquid", - "charges": 5, - "use_action": { "type": "heal", "disinfectant_power": 2, "bleed": 2, "bite": 0.75, "move_cost": 100 } - }, { "type": "COMESTIBLE", "id": "oil_garlic", diff --git a/MST_Extra/items/generic.json b/MST_Extra/items/generic.json index 1929c05..09f9899 100644 --- a/MST_Extra/items/generic.json +++ b/MST_Extra/items/generic.json @@ -89,18 +89,6 @@ "volume": "4 L", "category": "veh_parts" }, - { - "id": "beehive_empty", - "type": "GENERIC", - "name": { "str": "empty beehive" }, - "description": "A large, enclosed wooden box with multiple sliding frames in it. With something to attract bees, it can be used to grow a hive.", - "weight": "10000 g", - "volume": "20 L", - "price": "92 USD", - "material": [ "wood" ], - "symbol": "-", - "color": "brown" - }, { "id": "cordage_6_leather", "copy-from": "string_6", diff --git a/MST_Extra/mod_tileset/mod_tileset_DP_Normal.json b/MST_Extra/mod_tileset/mod_tileset_DP_Normal.json index 0438057..2560efe 100644 --- a/MST_Extra/mod_tileset/mod_tileset_DP_Normal.json +++ b/MST_Extra/mod_tileset/mod_tileset_DP_Normal.json @@ -11,9 +11,7 @@ { "id": "f_barricade_windbreak", "fg": 2 }, { "id": "f_tarptent_leather", "fg": 3 }, { "id": "f_hobo_stove_clay_placed", "fg": 4 }, - { "id": "t_covered_well_bucket", "fg": 5 }, - { "id": [ "f_hive_young", "f_hive_growing", "f_hive_recovering" ], "fg": 6 }, - { "id": "f_hive_ready", "fg": 7 } + { "id": "t_covered_well_bucket", "fg": 5 } ], "sprite_width": 32, "sprite_height": 32 diff --git a/MST_Extra/obsolete.json b/MST_Extra/obsolete.json index dd96926..b49b4c2 100644 --- a/MST_Extra/obsolete.json +++ b/MST_Extra/obsolete.json @@ -330,6 +330,45 @@ "result": "tea_willow", "obsolete": true }, + { + "type": "recipe", + "result": "cured_hide", + "id_suffix": "drying", + "obsolete": true + }, + { + "type": "recipe", + "result": "cured_pelt", + "id_suffix": "drying", + "obsolete": true + }, + { + "id": "tar_oil", + "type": "MIGRATION", + "replace": "pitch_wood" + }, + { + "type": "recipe", + "result": "tar_oil", + "obsolete": true + }, + { + "id": "beehive_empty", + "type": "GENERIC", + "name": { "str": "empty beehive" }, + "description": "A large, enclosed wooden box with multiple sliding frames in it. With something to attract bees, it can be used to grow a hive.", + "weight": "10000 g", + "volume": "20 L", + "price": "92 USD", + "material": [ "wood" ], + "symbol": "-", + "color": "brown" + }, + { + "type": "recipe", + "result": "beehive_empty", + "obsolete": true + }, { "type": "terrain", "id": "t_hive_young", @@ -470,8 +509,9 @@ { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": [ 2, 6 ] } ] - }, - { + } + }, + { "id": "t_tarptent_leather", "type": "terrain", "name": "leather tarp lean-to", diff --git a/MST_Extra/recipes/recipe_medsandchemicals.json b/MST_Extra/recipes/recipe_medsandchemicals.json index 302368d..39ec2c3 100644 --- a/MST_Extra/recipes/recipe_medsandchemicals.json +++ b/MST_Extra/recipes/recipe_medsandchemicals.json @@ -14,7 +14,7 @@ "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], - "components": [ [ [ "tar_oil", 1 ] ] ] + "components": [ [ [ "pine_bough", 5 ], [ "birchbark", 5 ] ] ] }, { "type": "recipe", diff --git a/MST_Extra/recipes/recipe_other.json b/MST_Extra/recipes/recipe_other.json index 99fcbd5..df73f54 100644 --- a/MST_Extra/recipes/recipe_other.json +++ b/MST_Extra/recipes/recipe_other.json @@ -21,38 +21,6 @@ ], "components": [ [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ] ] }, - { - "type": "recipe", - "result": "cured_hide", - "activity_level": "NO_EXERCISE", - "id_suffix": "drying", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "difficulty": 3, - "time": "10 m", - "autolearn": true, - "batch_time_factors": [ 83, 5 ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ] ] ] - }, - { - "type": "recipe", - "result": "cured_pelt", - "activity_level": "NO_EXERCISE", - "id_suffix": "drying", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "difficulty": 3, - "time": "10 m", - "autolearn": true, - "batch_time_factors": [ 83, 5 ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ], [ "raw_hfur", 1 ] ] ] - }, { "type": "recipe", "result": "sharp_rock", @@ -183,22 +151,6 @@ "qualities": [ { "id": "SAW_W", "level": 1 } ], "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ], [ [ "cordage_short", 2, "LIST" ] ] ] }, - { - "result": "tar_oil", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", - "difficulty": 1, - "skills_required": [ "survival", 1 ], - "time": "60 m", - "batch_time_factors": [ 80, 4 ], - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "pine_bough", 5 ], [ "birchbark", 5 ] ] ] - }, { "type": "recipe", "result": "primitive_hoe", @@ -298,21 +250,6 @@ [ [ "vehicle_sled", 2, "LIST" ] ] ] }, - { - "type": "recipe", - "result": "beehive_empty", - "activity_level": "MODERATE_EXERCISE", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "fabrication", - "difficulty": 4, - "skills_required": [ "survival", 3 ], - "time": "10 m", - "autolearn": true, - "book_learn": [ [ "textbook_fabrication", 4 ], [ "atomic_survival", 3 ], [ "survival_book", 3 ] ], - "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ], - "components": [ [ [ "2x4", 4 ], [ "stick", 8 ] ], [ [ "nail", 10 ], [ "pointy_stick", 5 ], [ "spike", 5 ] ] ] - }, { "type": "recipe", "result": "log_frame_item", @@ -418,7 +355,6 @@ [ "garlic_clove", 6 ], [ "oil_garlic", 6 ], [ "raw_dandelion", 8 ], - [ "tar_oil", 1 ], [ "honey_glassed", 5 ], [ "honey_bottled", 5 ] ] diff --git a/MST_Extra_BN/furniture_and_terrain/construction.json b/MST_Extra_BN/furniture_and_terrain/construction.json index 76b9227..714384c 100644 --- a/MST_Extra_BN/furniture_and_terrain/construction.json +++ b/MST_Extra_BN/furniture_and_terrain/construction.json @@ -1,73 +1,4 @@ [ - { - "type": "construction", - "id": "constr_mst_door_frame", - "group": "build_door", - "//": "Step 1: door frame", - "category": "CONSTRUCT", - "required_skills": [ [ "fabrication", 1 ] ], - "time": "60 m", - "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ] ], - "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 12 ] ] ], - "pre_terrain": "t_window_empty", - "post_terrain": "t_door_frame" - }, - { - "type": "construction", - "id": "constr_mst_door_frame_2", - "group": "build_door", - "//": "Step 1: door frame", - "category": "CONSTRUCT", - "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ], - "time": "80 m", - "qualities": [ - [ { "id": "HAMMER", "level": 2 } ], - [ { "id": "CUT", "level": 1 } ], - [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ] - ], - "components": [ [ [ "wood_structural", 3, "LIST" ] ], [ [ "adhesive", 4, "LIST" ] ] ], - "pre_terrain": "t_window_empty", - "post_terrain": "t_door_frame" - }, - { - "type": "construction", - "id": "constr_mst_door_frame_3", - "group": "build_door", - "//": "Step 1: door frame", - "category": "CONSTRUCT", - "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ], - "time": "80 m", - "qualities": [ - [ { "id": "HAMMER", "level": 2 } ], - [ { "id": "CUT", "level": 1 } ], - [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ] - ], - "components": [ [ [ "wood_structural", 6, "LIST" ] ], [ [ "adhesive", 4, "LIST" ] ] ], - "pre_special": "check_empty", - "post_terrain": "t_door_frame" - }, - { - "type": "construction", - "id": "constr_mst_beehive", - "group": "build_beehive", - "//": "Hive lure includes classic of sweet water, or a few other substitutes. Bee balm tea however is because we don't have lemongrass.", - "category": "FURN", - "required_skills": [ [ "survival", 2 ] ], - "time": "5 m", - "components": [ - [ [ "beehive_empty", 1 ] ], - [ - [ "sweet_water", 1 ], - [ "bee_balm_tea", 1 ], - [ "honey_bottled", 3 ], - [ "honey_glassed", 3 ], - [ "syrup", 3 ], - [ "beet_syrup", 5 ] - ] - ], - "pre_special": "check_empty", - "post_furniture": "f_hive_young" - }, { "type": "construction", "id": "constr_mst_cpurifier", diff --git a/MST_Extra_BN/furniture_and_terrain/construction_group.json b/MST_Extra_BN/furniture_and_terrain/construction_group.json index 857eabf..08eef63 100644 --- a/MST_Extra_BN/furniture_and_terrain/construction_group.json +++ b/MST_Extra_BN/furniture_and_terrain/construction_group.json @@ -1,9 +1,4 @@ [ - { - "type": "construction_group", - "id": "build_beehive", - "name": "Build Beehive" - }, { "type": "construction_group", "id": "build_cpurifier", diff --git a/MST_Extra_BN/furniture_and_terrain/furniture.json b/MST_Extra_BN/furniture_and_terrain/furniture.json index 99c07fb..e4807ba 100644 --- a/MST_Extra_BN/furniture_and_terrain/furniture.json +++ b/MST_Extra_BN/furniture_and_terrain/furniture.json @@ -254,109 +254,5 @@ "sound_fail": "whunk!", "items": [ { "item": "ceramic_shard", "count": [ 1, 5 ] } ] } - }, - { - "type": "furniture", - "id": "f_hive_young", - "name": "empty beehive", - "description": "A traditional beehive, baited to attract bees. It will take a while before any bees decide to make use of it.", - "symbol": "^", - "color": "brown", - "looks_like": "f_rack_wood", - "move_cost_mod": -1, - "coverage": 60, - "required_str": 8, - "transforms_into": "f_hive_growing", - "deconstruct": { "items": [ { "item": "beehive_empty", "count": 1 } ] }, - "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "HARVESTED" ], - "bash": { - "str_min": 12, - "str_max": 40, - "sound": "smash!", - "sound_fail": "whump.", - "items": [ - { "item": "2x4", "count": [ 1, 4 ] }, - { "item": "nail", "charges": [ 4, 8 ] }, - { "item": "splinter", "count": [ 2, 6 ] } - ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } - } - }, - { - "type": "furniture", - "id": "f_hive_growing", - "copy-from": "f_hive_young", - "name": "growing beehive", - "description": "A traditional beehive, buzzing with slight activity. Some bees have started work on this hive, but it won't be ready just yet.", - "symbol": "^", - "color": "brown", - "transforms_into": "f_hive_ready", - "deconstruct": { "items": [ { "item": "beehive_empty", "count": 1 }, { "item": "wax", "count": [ 1, 3 ] } ] }, - "bash": { - "str_min": 12, - "str_max": 40, - "sound": "smash!", - "sound_fail": "whump.", - "items": [ - { "item": "wax", "count": [ 0, 1 ] }, - { "item": "2x4", "count": [ 1, 4 ] }, - { "item": "nail", "charges": [ 4, 8 ] }, - { "item": "splinter", "count": [ 2, 6 ] } - ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } - } - }, - { - "type": "furniture", - "id": "f_hive_ready", - "copy-from": "f_hive_young", - "name": "mature beehive", - "description": "A traditional beehive, buzzing with activity. The colony is doing well enough that you could harvest a good amount without the hive dying off, except during the winter.", - "symbol": "^", - "color": "yellow", - "transforms_into": "f_hive_recovering", - "examine_action": "harvest_furn", - "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "entries": [ { "drop": "honeycomb", "base_num": [ 2, 4 ] } ] } ], - "deconstruct": { "items": [ { "item": "beehive_empty", "count": 1 }, { "item": "honeycomb", "count": [ 3, 6 ] } ] }, - "delete": { "flags": [ "HARVESTED" ] }, - "bash": { - "str_min": 12, - "str_max": 40, - "sound": "smash!", - "sound_fail": "whump.", - "items": [ - { "item": "wax", "count": [ 1, 4 ] }, - { "item": "honeycomb", "count": [ 0, 3 ] }, - { "item": "2x4", "count": [ 1, 4 ] }, - { "item": "nail", "charges": [ 4, 8 ] }, - { "item": "splinter", "count": [ 2, 6 ] } - ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } - } - }, - { - "type": "furniture", - "id": "f_hive_recovering", - "copy-from": "f_hive_young", - "name": "recovering beehive", - "description": "A traditional beehive, buzzing with activity. The colony is still recovering from last harvest.", - "symbol": "^", - "color": "brown", - "transforms_into": "f_hive_regrowing", - "deconstruct": { "items": [ { "item": "beehive_empty", "count": 1 }, { "item": "honeycomb", "count": [ 1, 2 ] } ] }, - "bash": { - "str_min": 12, - "str_max": 40, - "sound": "smash!", - "sound_fail": "whump.", - "items": [ - { "item": "wax", "count": [ 1, 4 ] }, - { "item": "honeycomb", "count": [ 0, 1 ] }, - { "item": "2x4", "count": [ 1, 4 ] }, - { "item": "nail", "charges": [ 4, 8 ] }, - { "item": "splinter", "count": [ 2, 6 ] } - ], - "ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 40, "block_unaimed_chance": "50%" } - } } ] diff --git a/MST_Extra_BN/item_groups.json b/MST_Extra_BN/item_groups.json index 2313fa0..5a0db8a 100644 --- a/MST_Extra_BN/item_groups.json +++ b/MST_Extra_BN/item_groups.json @@ -4,11 +4,6 @@ "type": "item_group", "items": [ [ "crossbow_makeshift", 1 ] ] }, - { - "id": "survivorzed_extra", - "type": "item_group", - "items": [ [ "hat_hooded", 1 ] ] - }, { "id": "tools_survival", "type": "item_group", @@ -19,11 +14,6 @@ "type": "item_group", "items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ] }, - { - "id": "hive", - "type": "item_group", - "items": [ [ "beehive_empty", 1 ] ] - }, { "id": "museum_misc", "type": "item_group", diff --git a/MST_Extra_BN/items/ammo.json b/MST_Extra_BN/items/ammo.json index 445338a..7f9cef0 100644 --- a/MST_Extra_BN/items/ammo.json +++ b/MST_Extra_BN/items/ammo.json @@ -73,21 +73,5 @@ "price": "20 USD", "price_postapoc": "90 cent", "dont_recover_one_in": 35 - }, - { - "type": "AMMO", - "id": "pitch_wood", - "category": "spare_parts", - "symbol": ",", - "color": "brown", - "name": { "str_sp": "pitch" }, - "description": "Sticky resin made from pine or birch tar. The adhesive isn't strong enough for heavy duty uses, but it can be used as a varnish or holding together small items, or for improvised repairs with the right tools.", - "price": "9 USD", - "material": [ "oil" ], - "weight": "1 g", - "volume": "50 ml", - "ammo_type": "pitch_wood", - "count": 10, - "flags": [ "UNRECOVERABLE" ] } ] diff --git a/MST_Extra_BN/items/ammo_types.json b/MST_Extra_BN/items/ammo_types.json index 53354e5..543b9f3 100644 --- a/MST_Extra_BN/items/ammo_types.json +++ b/MST_Extra_BN/items/ammo_types.json @@ -4,11 +4,5 @@ "name": "atlatl dart", "default": "atlatl_dart_iron", "type": "ammunition_type" - }, - { - "type": "ammunition_type", - "id": "pitch_wood", - "name": "pitch", - "default": "pitch_wood" } ] diff --git a/MST_Extra_BN/items/comestibles.json b/MST_Extra_BN/items/comestibles.json index 505ac75..2f6ab67 100644 --- a/MST_Extra_BN/items/comestibles.json +++ b/MST_Extra_BN/items/comestibles.json @@ -12,21 +12,6 @@ "fun": -3, "use_action": { "type": "consume_drug", "effects": [ { "id": "pkill1", "duration": 90 } ] } }, - { - "id": "tar_oil", - "type": "COMESTIBLE", - "comestible_type": "MED", - "name": { "str_sp": "tar oil" }, - "description": "A thick, runny tar typically made from birch bark or pine. Among various historical uses, it is also used as an antiseptic.", - "weight": "40 g", - "volume": "250 ml", - "material": [ "oil" ], - "symbol": "~", - "color": "yellow", - "phase": "liquid", - "charges": 5, - "use_action": { "type": "heal", "disinfectant_power": 2, "bite": 0.75, "move_cost": 100 } - }, { "type": "COMESTIBLE", "id": "oil_garlic", diff --git a/MST_Extra_BN/items/generic.json b/MST_Extra_BN/items/generic.json index f83052b..6372105 100644 --- a/MST_Extra_BN/items/generic.json +++ b/MST_Extra_BN/items/generic.json @@ -88,35 +88,5 @@ "bashing": 3, "category": "veh_parts", "price": 1000 - }, - { - "id": "beehive_empty", - "type": "GENERIC", - "name": { "str": "empty beehive" }, - "description": "A large, enclosed wooden box with multiple sliding frames in it. With something to attract bees, it can be used to grow a hive.", - "weight": "10000 g", - "volume": "20 L", - "price": "92 USD", - "material": [ "wood" ], - "symbol": "-", - "color": "brown" - }, - { - "id": "cordage_6_leather", - "copy-from": "string_6", - "type": "GENERIC", - "name": { "str": "short leather cord" }, - "description": "A 6-inch (or about 15 cm) long piece of rawhide or leather cord. Useful for some purposes, but not as strong or flexible as proper string.", - "proportional": { "price": 0.5 }, - "material": [ "leather" ] - }, - { - "id": "cordage_36_leather", - "copy-from": "string_36", - "type": "GENERIC", - "name": { "str": "long leather cord" }, - "description": "A 3-foot (or about 90 cm) long piece of rawhide or leather cord. Useful for some purposes, but not as strong or flexible as proper string.", - "proportional": { "price": 0.5 }, - "material": [ "leather" ] } ] diff --git a/MST_Extra_BN/items/item_overrides.json b/MST_Extra_BN/items/item_overrides.json index 1378906..0d4f101 100644 --- a/MST_Extra_BN/items/item_overrides.json +++ b/MST_Extra_BN/items/item_overrides.json @@ -1,72 +1,2 @@ [ - { - "id": "rubber_slug", - "copy-from": "rubber_slug", - "type": "AMMO", - "name": { "str": "rubber slug" }, - "ammo_type": "pebble", - "damage": { "damage_type": "stab", "amount": 2 }, - "range": 10, - "dispersion": 7, - "dont_recover_one_in": 2, - "extend": { "effects": [ "BEANBAG", "NEVER_MISFIRES", "NON_FOULING" ] } - }, - { - "id": "petrified_eye", - "copy-from": "petrified_eye", - "type": "AMMO", - "name": { "str": "petrified eye" }, - "ammo_type": "rock", - "damage": { "damage_type": "stab", "amount": 7 }, - "range": 10, - "dispersion": 14, - "dont_recover_one_in": 80, - "extend": { "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] } - }, - { - "id": "spiral_stone", - "copy-from": "spiral_stone", - "type": "AMMO", - "name": { "str": "spiral stone" }, - "ammo_type": "rock", - "damage": { "damage_type": "stab", "amount": 7 }, - "range": 10, - "dispersion": 14, - "dont_recover_one_in": 80, - "extend": { "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] } - }, - { - "id": "chunk_sulfur", - "copy-from": "chunk_sulfur", - "type": "AMMO", - "name": { "str": "chunk of sulfur" }, - "ammo_type": "rock", - "damage": { "damage_type": "stab", "amount": 7 }, - "range": 10, - "dispersion": 14, - "extend": { "effects": [ "BLINDS_EYES", "NEVER_MISFIRES", "NON_FOULING" ] } - }, - { - "id": "material_limestone", - "copy-from": "material_limestone", - "type": "AMMO", - "name": { "str": "limestone" }, - "ammo_type": "pebble", - "damage": { "damage_type": "stab", "amount": 2 }, - "range": 10, - "dispersion": 14, - "extend": { "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] } - }, - { - "id": "baseball", - "copy-from": "baseball", - "type": "AMMO", - "name": { "str": "baseball" }, - "ammo_type": "rock", - "damage": { "damage_type": "stab", "amount": 5 }, - "range": 14, - "dispersion": 14, - "dont_recover_one_in": 60, - "extend": { "effects": [ "NEVER_MISFIRES", "NON_FOULING" ] } - } ] diff --git a/MST_Extra_BN/items/tools.json b/MST_Extra_BN/items/tools.json index b205b89..801941a 100644 --- a/MST_Extra_BN/items/tools.json +++ b/MST_Extra_BN/items/tools.json @@ -258,37 +258,6 @@ "use_action": [ { "type": "deploy_furn", "furn_type": "f_hobo_stove_clay_placed" } ], "flags": [ "SHATTERS", "ALLOWS_REMOTE_USE" ] }, - { - "id": "misc_repairkit_makeshift", - "looks_like": "misc_repairkit", - "type": "TOOL", - "name": { "str": "makeshift repair kit" }, - "description": "This is a portable toolkit, consisting of a primitive knife for carving replacement parts, an adze for more heavy-duty wood cutting, and a patch of soft material for cleaning surfaces. It can be used to repair certain items if supplied with pitch, though it isn't ideal for complex work.", - "weight": "1800 g", - "volume": "1500 ml", - "price": "10 USD", - "to_hit": -1, - "bashing": 2, - "material": [ "stone", "wood" ], - "symbol": ";", - "color": "light_gray", - "ammo": "pitch_wood", - "max_charges": 100, - "charges_per_use": 1, - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 11 ], [ "SAW_W", 1 ] ], - "use_action": [ - { - "type": "repair_item", - "item_action_type": "repair_metal", - "materials": [ "acidchitin", "bone", "chitin", "paper", "dry_plant", "cardboard", "wood", "kevlar_rigid" ], - "skill": "fabrication", - "tool_quality": 1, - "cost_scaling": 0.1, - "move_cost": 2000 - } - ], - "flags": [ "ALLOWS_REMOTE_USE" ] - }, { "id": "hand_drill_makeshift", "copy-from": "hand_drill", diff --git a/MST_Extra_BN/items/wheels.json b/MST_Extra_BN/items/wheels.json index 9253302..0d4f101 100644 --- a/MST_Extra_BN/items/wheels.json +++ b/MST_Extra_BN/items/wheels.json @@ -1,19 +1,2 @@ [ - { - "id": "makeshift_sled_runners_item", - "category": "veh_parts", - "type": "WHEEL", - "name": { "str_sp": "sled runners" }, - "description": "Simple wooden runners for a hand-pulled sled.", - "weight": "2500 g", - "volume": "2500 ml", - "price": "5 USD", - "bashing": 6, - "to_hit": -1, - "material": [ "wood" ], - "symbol": "]", - "color": "brown", - "diameter": 1, - "width": 1 - } ] diff --git a/MST_Extra_BN/mod_tileset/mod_tileset_DP_Normal.json b/MST_Extra_BN/mod_tileset/mod_tileset_DP_Normal.json index 0438057..2560efe 100644 --- a/MST_Extra_BN/mod_tileset/mod_tileset_DP_Normal.json +++ b/MST_Extra_BN/mod_tileset/mod_tileset_DP_Normal.json @@ -11,9 +11,7 @@ { "id": "f_barricade_windbreak", "fg": 2 }, { "id": "f_tarptent_leather", "fg": 3 }, { "id": "f_hobo_stove_clay_placed", "fg": 4 }, - { "id": "t_covered_well_bucket", "fg": 5 }, - { "id": [ "f_hive_young", "f_hive_growing", "f_hive_recovering" ], "fg": 6 }, - { "id": "f_hive_ready", "fg": 7 } + { "id": "t_covered_well_bucket", "fg": 5 } ], "sprite_width": 32, "sprite_height": 32 diff --git a/MST_Extra_BN/mod_tileset/mod_tileset_dp_normal.png b/MST_Extra_BN/mod_tileset/mod_tileset_dp_normal.png index 85f51b3420b13d4650b0dea22b6b81136c9140c2..e4eab2b83a8b6403b4c87d28448142de1decef28 100644 GIT binary patch delta 9758 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 hjGoaSxBm&<&L{7bp(66dJO;o diff --git a/MST_Extra_BN/monstergroup_additions.json b/MST_Extra_BN/monstergroup_additions.json index 92a135a..0d4f101 100644 --- a/MST_Extra_BN/monstergroup_additions.json +++ b/MST_Extra_BN/monstergroup_additions.json @@ -1,22 +1,2 @@ [ - { - "name": "GROUP_FOREST", - "type": "monstergroup", - "override": false, - "auto_total": true, - "monsters": [ - { "monster": "mon_chicken", "freq": 3, "cost_multiplier": 2, "starts": 2880 }, - { "monster": "mon_chicken", "freq": 1, "cost_multiplier": 2, "starts": 1440, "pack_size": [ 1, 8 ] }, - { "monster": "mon_cow", "freq": 1, "cost_multiplier": 3, "starts": 4320 }, - { "monster": "mon_cow", "freq": 1, "cost_multiplier": 3, "starts": 5040, "pack_size": [ 1, 3 ] }, - { "monster": "mon_horse", "freq": 1, "cost_multiplier": 2, "starts": 2160 }, - { "monster": "mon_horse", "freq": 1, "cost_multiplier": 2, "starts": 3600, "pack_size": [ 1, 4 ] }, - { "monster": "mon_pig", "freq": 2, "cost_multiplier": 2, "starts": 2880 }, - { "monster": "mon_pig", "freq": 1, "cost_multiplier": 2, "starts": 1440, "pack_size": [ 1, 6 ] }, - { "monster": "mon_zombie_pig", "freq": 2, "cost_multiplier": 2, "starts": 2160 }, - { "monster": "mon_zombie_pig", "freq": 1, "cost_multiplier": 2, "starts": 3600, "pack_size": [ 1, 5 ] }, - { "monster": "mon_sheep", "freq": 2, "cost_multiplier": 3, "starts": 4320 }, - { "monster": "mon_sheep", "freq": 1, "cost_multiplier": 3, "starts": 5040, "pack_size": [ 1, 5 ] } - ] - } ] diff --git a/MST_Extra_BN/obsolete.json b/MST_Extra_BN/obsolete.json index 2adccd5..ec35a01 100644 --- a/MST_Extra_BN/obsolete.json +++ b/MST_Extra_BN/obsolete.json @@ -315,7 +315,6 @@ "result": "jar_clay_sourdough_young", "obsolete": true }, - { "id": "t_tarptent_leather", "type": "terrain", @@ -364,5 +363,39 @@ "sound_fail": "whump.", "items": [ { "item": "glass_shard", "count": [ 1, 2 ] } ] } + }, + { + "type": "recipe", + "result": "spear_stone", + "id_suffix": "realism", + "obsolete": true + }, + { + "type": "recipe", + "result": "cured_hide", + "id_suffix": "drying", + "obsolete": true + }, + { + "type": "recipe", + "result": "cured_pelt", + "id_suffix": "drying", + "obsolete": true + }, + { + "type": "recipe", + "result": "hand_paddles", + "id_suffix": "cordage", + "obsolete": true + }, + { + "id": "tar_oil", + "type": "MIGRATION", + "replace": "pitch_wood" + }, + { + "type": "recipe", + "result": "tar_oil", + "obsolete": true } ] diff --git a/MST_Extra_BN/recipes/recipe_medsandchemicals.json b/MST_Extra_BN/recipes/recipe_medsandchemicals.json index 5a49252..391f78d 100644 --- a/MST_Extra_BN/recipes/recipe_medsandchemicals.json +++ b/MST_Extra_BN/recipes/recipe_medsandchemicals.json @@ -1,20 +1,4 @@ [ - { - "result": "pitch_wood", - "type": "recipe", - "category": "CC_CHEM", - "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "skills_required": [ "survival", 2 ], - "time": "10 m", - "batch_time_factors": [ 80, 4 ], - "autolearn": true, - "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], - "components": [ [ [ "tar_oil", 1 ] ] ] - }, { "result": "oil_garlic", "type": "recipe", diff --git a/MST_Extra_BN/recipes/recipe_other.json b/MST_Extra_BN/recipes/recipe_other.json index ac33617..77522c5 100644 --- a/MST_Extra_BN/recipes/recipe_other.json +++ b/MST_Extra_BN/recipes/recipe_other.json @@ -1,86 +1,4 @@ [ - { - "type": "recipe", - "result": "flint_steel", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "survival", - "skills_required": [ "fabrication", 3 ], - "difficulty": 4, - "time": 10000, - "autolearn": true, - "book_learn": [ [ "textbook_survival", 2 ], [ "mag_survival", 3 ] ], - "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ], - "qualities": [ { "id": "HAMMER", "level": 3 } ], - "components": [ [ [ "sharp_rock", 1 ] ] ] - }, - { - "type": "recipe", - "result": "cured_hide", - "id_suffix": "drying", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "skills_required": [ "cooking", 1 ], - "difficulty": 1, - "time": "10 m", - "autolearn": true, - "batch_time_factors": [ 83, 5 ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ] ] ] - }, - { - "type": "recipe", - "result": "cured_pelt", - "id_suffix": "drying", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "skills_required": [ "cooking", 1 ], - "difficulty": 1, - "time": "10 m", - "autolearn": true, - "batch_time_factors": [ 83, 5 ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ], [ "raw_hfur", 1 ] ] ] - }, - { - "type": "recipe", - "result": "sharp_rock", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "fabrication", - "skills_required": [ "survival", 1 ], - "difficulty": 0, - "time": "1 m", - "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "rock", 1 ] ] ] - }, - { - "type": "recipe", - "result": "tarp", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "fabrication", - "skills_required": [ "survival", 1 ], - "difficulty": 1, - "time": "10 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ - [ - [ "folding_poncho", 1 ], - [ "folding_poncho_on", 1 ], - [ "emer_blanket", 1 ], - [ "emer_blanket_on", 1 ], - [ "plastic_sheet", 1 ] - ], - [ [ "duct_tape", 20 ] ] - ] - }, { "type": "recipe", "result": "snare_trigger", @@ -122,32 +40,6 @@ "using": [ [ "rope_natural_short", 1 ] ], "components": [ [ [ "snare_trigger", 1 ] ] ] }, - { - "type": "recipe", - "result": "waterskin", - "id_suffix": "sealed_stomach", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_CONTAINERS", - "skill_used": "tailor", - "skills_required": [ "survival", 1 ], - "difficulty": 2, - "time": "10 m", - "autolearn": true, - "components": [ [ [ "stomach_sealed", 1 ] ], [ [ "cordage", 1, "LIST" ] ] ] - }, - { - "type": "recipe", - "result": "waterskin2", - "id_suffix": "sealed_stomach", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_CONTAINERS", - "skill_used": "tailor", - "skills_required": [ "survival", 2 ], - "difficulty": 2, - "time": "10 m", - "autolearn": true, - "components": [ [ [ "large_stomach_sealed", 1 ] ], [ [ "cordage", 1, "LIST" ] ] ] - }, { "type": "recipe", "result": "tree_spile", @@ -162,34 +54,6 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ] }, - { - "type": "recipe", - "result": "hand_paddles", - "id_suffix": "cordage", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_VEHICLE", - "skill_used": "fabrication", - "difficulty": 1, - "time": "60 m", - "autolearn": true, - "qualities": [ { "id": "SAW_W", "level": 1 } ], - "components": [ [ [ "2x4", 2 ], [ "stick", 2 ] ], [ [ "cordage_short", 2, "LIST" ] ] ] - }, - { - "result": "tar_oil", - "type": "recipe", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", - "difficulty": 1, - "skills_required": [ "survival", 1 ], - "time": "60 m", - "batch_time_factors": [ 80, 4 ], - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "pine_bough", 5 ], [ "birchbark", 5 ] ] ] - }, { "type": "recipe", "result": "primitive_hoe", @@ -394,7 +258,6 @@ [ "garlic_clove", 6 ], [ "oil_garlic", 6 ], [ "raw_dandelion", 8 ], - [ "tar_oil", 1 ], [ "honey_glassed", 5 ], [ "honey_bottled", 5 ] ] @@ -512,25 +375,6 @@ "using": [ [ "earthenware_firing", 100 ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 8 ] ] ] }, - { - "type": "recipe", - "result": "misc_repairkit_makeshift", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "fabrication", - "difficulty": 1, - "skills_required": [ "survival", 1 ], - "time": "1 m", - "reversible": true, - "autolearn": true, - "decomp_learn": 1, - "flags": [ "BLIND_EASY" ], - "components": [ - [ [ "primitive_knife", 1 ], [ "copper_knife", 1 ], [ "makeshift_knife", 1 ] ], - [ [ "primitive_adze", 1 ] ], - [ [ "rag", 1 ], [ "leather", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ] ] - ] - }, { "type": "recipe", "result": "hand_drill_makeshift", @@ -561,41 +405,6 @@ "flags": [ "BLIND_EASY" ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ], [ "pointy_stick", 1 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ] ] }, - { - "type": "recipe", - "result": "cordage_6_leather", - "result_mult": 3, - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "time": "20 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "leather", 1 ], [ "fur", 1 ], [ "cured_hide", 1 ], [ "cured_pelt", 1 ] ] ] - }, - { - "type": "recipe", - "result": "cordage_36_leather", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "time": "40 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "leather", 2 ], [ "fur", 2 ], [ "cured_hide", 2 ], [ "cured_pelt", 2 ] ] ] - }, - { - "type": "recipe", - "result": "cordage_36_leather", - "id_suffix": "weaving", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "time": "5 m", - "reversible": true, - "autolearn": true, - "components": [ [ [ "cordage_6_leather", 6 ] ] ] - }, { "type": "recipe", "result": "jar_clay_yeast", diff --git a/MST_Extra_BN/recipes/recipe_weapon.json b/MST_Extra_BN/recipes/recipe_weapon.json index 25d5182..c2e77e3 100644 --- a/MST_Extra_BN/recipes/recipe_weapon.json +++ b/MST_Extra_BN/recipes/recipe_weapon.json @@ -60,25 +60,5 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "using": [ [ "cordage", 3 ] ], "components": [ [ [ "2x4", 2 ], [ "stick", 4 ] ], [ [ "splinter", 1 ] ] ] - }, - { - "type": "recipe", - "result": "spear_stone", - "id_suffix": "realism", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_PIERCING", - "skill_used": "fabrication", - "difficulty": 2, - "skills_required": [ "survival", 2 ], - "time": "30 m", - "book_learn": [ [ "manual_survival", 2 ], [ "textbook_survival", 2 ], [ "survival_book", 2 ] ], - "autolearn": [ [ "fabrication", 3 ], [ "survival", 3 ] ], - "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ - [ [ "stick_long", 1 ], [ "long_pole", 1 ] ], - [ [ "ceramic_shard", 1 ], [ "sharp_rock", 1 ] ], - [ [ "adhesive", 1, "LIST" ] ], - [ [ "cordage_short", 2, "LIST" ] ] - ] } ] diff --git a/MST_Extra_BN/recipes/requirements.json b/MST_Extra_BN/recipes/requirements.json index 522ea92..b1ca939 100644 --- a/MST_Extra_BN/recipes/requirements.json +++ b/MST_Extra_BN/recipes/requirements.json @@ -1,16 +1,4 @@ [ - { - "id": "adhesive_proper", - "type": "requirement", - "//": "Materials used for joining (typically non-metallic) parts, excluding tape", - "components": [ [ [ "superglue", 1 ], [ "bone_glue", 2 ], [ "pitch_wood", 5 ] ] ] - }, - { - "id": "waterproofing", - "type": "requirement", - "//": "Materials for waterproofing leather and wooden items.", - "components": [ [ [ "wax", 1 ], [ "pine_bough", 5 ], [ "pitch_wood", 25 ] ] ] - }, { "id": "vehicle_sled", "type": "requirement", @@ -29,17 +17,5 @@ "type": "requirement", "//": "For installing birchbark boat boards.", "components": [ [ [ "waterproofing", 1, "LIST" ] ], [ [ "vehicle_sled", 1, "LIST" ] ] ] - }, - { - "id": "cordage", - "type": "requirement", - "//": "Materials used for tying items, primitive bowstrings, and other uses involving string or makeshift cordage, 36 g/90 cm of cordage per unit.", - "components": [ [ [ "string_36", 1 ], [ "cordage_36", 1 ], [ "cordage_36_leather", 1 ], [ "cordage_short", 6, "LIST" ] ] ] - }, - { - "id": "cordage_short", - "type": "requirement", - "//": "Materials used for tying smaller items requiring less string, 6 g/15 cm of cordage per unit.", - "components": [ [ [ "string_6", 1 ], [ "cordage_6", 1 ], [ "cordage_6_leather", 1 ], [ "filament", 50, "LIST" ] ] ] } ] diff --git a/MST_Extra_BN/vehicles/vehicleparts.json b/MST_Extra_BN/vehicles/vehicleparts.json index 724296a..10cb88a 100644 --- a/MST_Extra_BN/vehicles/vehicleparts.json +++ b/MST_Extra_BN/vehicles/vehicleparts.json @@ -24,34 +24,6 @@ }, "damage_reduction": { "all": 6 } }, - { - "id": "makeshift_sled_runner_part", - "looks_like": "wheel_wood", - "type": "vehicle_part", - "name": "sled runners", - "item": "makeshift_sled_runners_item", - "location": "under", - "symbol": "o", - "broken_symbol": "x", - "color": "brown", - "durability": 25, - "damage_modifier": 50, - "folded_volume": "2500 ml", - "flags": [ "WHEEL", "STABLE", "FOLDABLE" ], - "wheel_type": "rigid", - "contact_area": 50, - "breaks_into": [ { "item": "splinter", "count": [ 3, 6 ] } ], - "requirements": { - "install": { "skills": [ [ "survival", 0 ] ], "time": "15 m", "using": [ [ "vehicle_sled", 1 ] ] }, - "removal": { "skills": [ [ "survival", 0 ] ], "time": "10 m" }, - "repair": { - "skills": [ [ "survival", 1 ] ], - "time": "15 m", - "using": [ [ "vehicle_sled", 1 ], [ "vehicle_repair_small_wood", 2 ] ] - } - }, - "damage_reduction": { "all": 8 } - }, { "type": "vehicle_part", "id": "makeshift_sled_basket_part",