diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 2f31f31c6f546..24ffd1b8cfe1b 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -688,7 +688,7 @@ "type": "TOOL", "name": { "str": "retractable telescope" }, "description": "A homemade collapsible telescope, perfect for a pirate. Too large and inaccurate to use as a weapon scope, but carrying it in your inventory will double the distance that is mapped around you during your travels.", - "weight": "500 g", + "weight": "330 g", "volume": "250 ml", "price": "6 USD", "price_postapoc": "7 USD 50 cent", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index aacb33b4af922..9b34901d50698 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -103,7 +103,7 @@ "type": "TOOL", "name": { "str": "ketene lamp" }, "description": "A section of glass pipe with a bulb in the middle, which contains an electrical heating element. It is used for producing ketene via pyrolysis of acetone or 1,3-butadiene from cyclohexane, for use in other chemical reactions. Due to the instability of ketene, it can't be stored and must be used immediately.", - "weight": "3 kg", + "weight": "1800 g", "volume": "2 L", "price": "200 USD", "price_postapoc": "10 USD", diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 8e52da9fdc78e..c70e9401a0aea 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -438,7 +438,8 @@ "time": " 2 h", "autolearn": true, "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "using": [ [ "plastic_molding", 10 ] ] + "using": [ [ "plastic_molding", 5 ] ], + "components": [ [ [ "plastic_chunk", 7 ] ] ] }, { "result": "hat_hard_hooded", diff --git a/data/json/recipes/electronics/parts.json b/data/json/recipes/electronics/parts.json index 2906825a1d295..ddcac1312a7ff 100644 --- a/data/json/recipes/electronics/parts.json +++ b/data/json/recipes/electronics/parts.json @@ -11,7 +11,7 @@ "time": "30 m", "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 50 ], [ "plastic_molding", 20 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 20 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 4 ] ], [ [ "lead", 2400 ] ], [ [ "chem_sulphuric_acid", 13 ] ] ] @@ -28,7 +28,7 @@ "time": "30 m", "decomp_learn": 2, "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 4 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 4 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "lead", 360 ] ], [ [ "chem_sulphuric_acid", 3 ] ] ] diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 9f7fa9db97730..980428d3a6e97 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -699,9 +699,8 @@ "book_learn": [ [ "plastics_book", 4 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "using": [ [ "plastic_molding", 1 ] ], - "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], "components": [ - [ [ "plastic_chunk", 3 ] ], + [ [ "plastic_chunk", 1 ] ], [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "bee_sting", 1 ], [ "mop", 1 ] ], [ [ "fletching", 1, "LIST" ] ] ] diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index a939ef4b57257..3d49695b218e3 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -294,7 +294,7 @@ "time": "20 m", "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "book_learn": [ [ "recipe_bullets", 6 ], [ "textbook_fabrication", 7 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 4 ] ], "tools": [ [ [ "swage", -1 ] ] ], "components": [ [ [ "plastic_chunk", 5 ] ], [ [ "scrap", 1 ] ] ] }, @@ -1352,7 +1352,7 @@ "time": "10 m", "book_learn": [ [ "plastics_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 3 ] ], "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "lens", 1 ] ], [ [ "lens", 1 ], [ "lens_small", 1 ] ], [ [ "spring", 1 ] ] ] }, { @@ -2076,8 +2076,7 @@ "autolearn": true, "book_learn": [ [ "plastics_book", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "using": [ [ "plastic_molding", 1 ] ], + "using": [ [ "plastic_molding", 2 ] ], "components": [ [ [ "plastic_chunk", 3 ] ] ] }, { diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json index 9d094fa2c2ed7..adbc18f9d540a 100644 --- a/data/json/recipes/recipe_vehicle.json +++ b/data/json/recipes/recipe_vehicle.json @@ -638,7 +638,7 @@ "time": "90 m", "autolearn": true, "//": "20cm weld", - "using": [ [ "welding_standard", 20 ], [ "steel_tiny", 4 ], [ "plastic_molding", 1 ] ], + "using": [ [ "welding_standard", 20 ], [ "steel_tiny", 4 ], [ "plastic_molding", 3 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ], "components": [ [ [ "plastic_chunk", 4 ] ] ] @@ -654,7 +654,7 @@ "time": "90 m", "autolearn": true, "//": "22cm weld", - "using": [ [ "welding_standard", 22 ], [ "steel_tiny", 5 ], [ "plastic_molding", 1 ] ], + "using": [ [ "welding_standard", 22 ], [ "steel_tiny", 5 ], [ "plastic_molding", 6 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ], "components": [ [ [ "plastic_chunk", 12 ] ] ] @@ -715,9 +715,8 @@ "time": "1 h", "autolearn": true, "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], - "using": [ [ "plastic_molding", 1 ] ], - "components": [ [ [ "plastic_chunk", 50 ] ] ] + "using": [ [ "plastic_molding", 21 ] ], + "components": [ [ [ "plastic_chunk", 18 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipes_holiday.json b/data/json/recipes/recipes_holiday.json index 09ad0669113c0..4a54095f14dac 100644 --- a/data/json/recipes/recipes_holiday.json +++ b/data/json/recipes/recipes_holiday.json @@ -12,7 +12,6 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "book_learn": [ [ "plastics_book", 1 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "using": [ [ "plastic_molding", 2 ] ], "components": [ [ [ "plastic_bottles_4l", 1, "LIST" ] ], diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json index da57c04e2641c..f420905a70517 100644 --- a/data/json/recipes/tools/containers.json +++ b/data/json/recipes/tools/containers.json @@ -161,9 +161,8 @@ "autolearn": true, "book_learn": [ [ "plastics_book", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "using": [ [ "plastic_molding", 1 ] ], - "components": [ [ [ "plastic_chunk", 2 ] ] ] + "components": [ [ [ "plastic_chunk", 1 ] ] ] }, { "type": "recipe", @@ -177,7 +176,6 @@ "autolearn": true, "book_learn": [ [ "plastics_book", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "using": [ [ "plastic_molding", 1 ] ], "components": [ [ [ "plastic_chunk", 2 ] ] ] }, @@ -193,7 +191,6 @@ "autolearn": true, "book_learn": [ [ "plastics_book", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "using": [ [ "plastic_molding", 1 ] ], "components": [ [ [ "plastic_chunk", 1 ] ] ] }, @@ -209,9 +206,8 @@ "autolearn": true, "book_learn": [ [ "plastics_book", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "using": [ [ "plastic_molding", 1 ] ], - "components": [ [ [ "plastic_chunk", 8 ] ] ] + "using": [ [ "plastic_molding", 2 ] ], + "components": [ [ [ "plastic_chunk", 3 ] ] ] }, { "type": "recipe", @@ -392,7 +388,7 @@ "autolearn": true, "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "using": [ [ "plastic_molding", 98 ] ], - "components": [ [ [ "plastic_chunk", 136 ] ] ] + "components": [ [ [ "plastic_chunk", 77 ] ] ] }, { "type": "recipe", @@ -670,9 +666,8 @@ "autolearn": true, "book_learn": [ [ "plastics_book", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], - "using": [ [ "plastic_molding", 1 ] ], - "components": [ [ [ "plastic_chunk", 4 ] ] ] + "using": [ [ "plastic_molding", 2 ] ], + "components": [ [ [ "plastic_chunk", 3 ] ] ] }, { "type": "recipe", @@ -747,8 +742,7 @@ "using": [ [ "sewing_standard", 4 ], [ "plastic_molding", 2 ] ], "book_learn": [ [ "plastics_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "plastic_chunk", 6 ] ], [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] + "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] }, { "type": "recipe", @@ -763,8 +757,7 @@ "using": [ [ "sewing_standard", 4 ], [ "plastic_molding", 2 ] ], "book_learn": [ [ "plastics_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], - "components": [ [ [ "plastic_chunk", 10 ] ], [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] + "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index d7da8014cd258..7b42f55e8454d 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -472,7 +472,7 @@ ], "qualities": [ { "id": "GRIND", "level": 2 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ], - "components": [ [ [ "scrap", 2 ] ] ] + "components": [ [ [ "scrap", 2 ] ], [ [ "plastic_chunk", 1 ] ] ] }, { "type": "recipe", @@ -1447,7 +1447,7 @@ [ "textbook_electronics", 4 ], [ "textbook_carpentry", 5 ] ], - "using": [ [ "surface_heat", 10 ], [ "soldering_standard", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 4 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_plasticworking", "required": false, "time_multiplier": 1.5 } @@ -1524,7 +1524,7 @@ "time": "5 m", "autolearn": true, "proficiencies": [ { "proficiency": "prof_plasticworking" } ], - "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 3 ] ], "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "lens", 1 ] ], [ [ "wire", 1 ] ] ] }, { diff --git a/data/json/recipes/tools/tools_electronic.json b/data/json/recipes/tools/tools_electronic.json index 16a8ed2ce41ae..c61dd78695608 100644 --- a/data/json/recipes/tools/tools_electronic.json +++ b/data/json/recipes/tools/tools_electronic.json @@ -300,7 +300,7 @@ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "plastic_chunk", 6 ] ], @@ -328,7 +328,7 @@ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "antenna", 1 ], [ "screwdriver", 1 ], [ "xacto", 1 ], [ "knife_butter", 1 ] ], @@ -356,7 +356,7 @@ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ], - "using": [ [ "soldering_standard", 12 ], [ "surface_heat", 12 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 12 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "plastic_chunk", 6 ] ], @@ -384,7 +384,7 @@ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "plastic_chunk", 6 ] ], @@ -744,7 +744,7 @@ [ "textbook_fabrication", 3 ], [ "manual_fabrication", 4 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 1 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 1.5 }, @@ -804,7 +804,7 @@ "time": "8 h 45 m", "decomp_learn": 5, "book_learn": [ [ "textbook_electronics", 7 ], [ "textbook_robots", 6 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 20 ], [ "plastic_molding", 3 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 8 ] ], "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 1.5 }, @@ -837,7 +837,7 @@ "time": "3 h", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ], "proficiencies": [ { "proficiency": "prof_glassblowing" }, { "proficiency": "prof_plasticworking" } ], - "using": [ [ "plastic_molding", 2 ], [ "soldering_standard", 5 ] ], + "using": [ [ "plastic_molding", 7 ], [ "soldering_standard", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "metalworking_tongs_any", 1, "LIST" ] ], @@ -845,7 +845,12 @@ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 150 ] ] ], - "components": [ [ [ "glass_shard", 8 ] ], [ [ "element", 1 ], [ "crude_heating_element", 1 ] ], [ [ "cable", 10 ] ] ] + "components": [ + [ [ "glass_shard", 8 ] ], + [ [ "plastic_chunk", 10 ] ], + [ [ "element", 1 ], [ "crude_heating_element", 1 ] ], + [ [ "cable", 10 ] ] + ] }, { "type": "recipe", diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index 67f221322390f..d41bb39b74cec 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -990,9 +990,8 @@ "time": "1 h", "autolearn": true, "proficiencies": [ { "proficiency": "prof_plasticworking", "skill_penalty": 4 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "using": [ [ "plastic_molding", 1 ] ], - "components": [ [ [ "plastic_chunk", 10 ] ] ] + "using": [ [ "plastic_molding", 6 ] ], + "components": [ [ [ "plastic_chunk", 8 ] ] ] }, { "type": "recipe", @@ -1020,7 +1019,7 @@ "difficulty": 6, "time": "2 h", "book_learn": [ [ "recipe_melee", 5 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 1 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 6 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_elec_soldering", "skill_penalty": 0.5 }, @@ -1028,7 +1027,7 @@ { "proficiency": "prof_plasticworking", "skill_penalty": 0.5 } ], "components": [ - [ [ "plastic_chunk", 10 ] ], + [ [ "plastic_chunk", 8 ] ], [ [ "amplifier", 2 ] ], [ [ "power_supply", 1 ] ], [ [ "scrap", 2 ] ], diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index 499f4c7a56958..ffdf1fe7e70bb 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -625,7 +625,7 @@ "time": "15 m", "decomp_learn": 3, "book_learn": [ [ "manual_rifle", 2 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 3 ] ], - "using": [ [ "soldering_standard", 10 ], [ "surface_heat", 10 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 10 ], [ "plastic_molding", 1 ] ], "qualities": [ { "id": "SCREW_FINE", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "components": [ diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 0a959f2e89e72..2d4b49b616100 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -1105,9 +1105,8 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 3 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "using": [ [ "plastic_molding", 1 ] ], - "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "scrap", 2 ] ] ] + "using": [ [ "plastic_molding", 2 ] ], + "components": [ [ [ "plastic_chunk", 2 ] ], [ [ "scrap", 1 ] ] ] }, { "type": "recipe", @@ -1254,7 +1253,7 @@ "difficulty": 5, "time": "8 h", "book_learn": [ [ "advanced_electronics", 5 ], [ "textbook_electronics", 5 ], [ "textbook_anarch", 6 ] ], - "using": [ [ "soldering_standard", 20 ], [ "surface_heat", 10 ], [ "plastic_molding", 3 ] ], + "using": [ [ "soldering_standard", 20 ], [ "plastic_molding", 7 ] ], "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_elec_soldering" }, diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_recipes.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_recipes.json index 9ea180c82d2cf..706a27e95c417 100644 --- a/data/mods/Aftershock/items/armor/exosuit/exosuit_recipes.json +++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_recipes.json @@ -93,7 +93,7 @@ "difficulty": 7, "book_learn": [ [ "plastics_book", 7 ] ], "time": "2 h", - "using": [ [ "plastic_molding", 4 ], [ "soldering_standard", 10 ], [ "surface_heat", 10 ] ], + "using": [ [ "plastic_molding", 4 ], [ "soldering_standard", 10 ] ], "components": [ [ [ "damaged_exo_helmet_plastic", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ] }, @@ -107,7 +107,7 @@ "difficulty": 7, "book_learn": [ [ "plastics_book", 7 ] ], "time": "8 h", - "using": [ [ "plastic_molding", 8 ], [ "soldering_standard", 20 ], [ "surface_heat", 20 ] ], + "using": [ [ "plastic_molding", 8 ], [ "soldering_standard", 20 ] ], "components": [ [ [ "damaged_exo_torso_plastic", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ] }, @@ -121,7 +121,7 @@ "difficulty": 7, "book_learn": [ [ "plastics_book", 7 ] ], "time": "6 h", - "using": [ [ "plastic_molding", 6 ], [ "soldering_standard", 15 ], [ "surface_heat", 15 ] ], + "using": [ [ "plastic_molding", 6 ], [ "soldering_standard", 15 ] ], "components": [ [ [ "damaged_exo_arm_plastic", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ] }, @@ -135,7 +135,7 @@ "difficulty": 7, "book_learn": [ [ "plastics_book", 7 ] ], "time": "6 h", - "using": [ [ "plastic_molding", 6 ], [ "soldering_standard", 15 ], [ "surface_heat", 15 ] ], + "using": [ [ "plastic_molding", 6 ], [ "soldering_standard", 15 ] ], "components": [ [ [ "damaged_exo_leg_plastic", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ] } diff --git a/data/mods/Magiclysm/recipes/mods.json b/data/mods/Magiclysm/recipes/mods.json index 8abc659e25da0..8d255cee98631 100644 --- a/data/mods/Magiclysm/recipes/mods.json +++ b/data/mods/Magiclysm/recipes/mods.json @@ -25,7 +25,7 @@ "skills_required": [ [ "spellcraft", 7 ], [ "gun", 4 ] ], "time": "3 h", "book_learn": [ [ "techno_basic", 5 ] ], - "using": [ [ "soldering_standard", 20 ], [ "surface_heat", 20 ], [ "plastic_molding", 2 ] ], + "using": [ [ "soldering_standard", 20 ], [ "plastic_molding", 1 ] ], "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "CHEM", "level": 2 }, { "id": "MANA_INFUSE", "level": 1 } ], "tools": [ [ diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 0b80921f012c9..9375738f79477 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -96,7 +96,6 @@ "corpse_generic_gunned", "corpse_generic_infected", "bellywrap_leather", - "survivor_scope", "triffid_fungicide", "pine_resin", "rehydration_drink", diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp index 5926912bfb9e8..c3d00218954d8 100644 --- a/tests/crafting_test.cpp +++ b/tests/crafting_test.cpp @@ -840,7 +840,7 @@ TEST_CASE( "tools_use_charge_to_craft", "[crafting][charge]" ) tools.insert( tools.end(), 6, item( "plastic_chunk" ) ); tools.insert( tools.end(), 2, item( "blade" ) ); tools.insert( tools.end(), 5, item( "cable" ) ); - tools.insert( tools.end(), 2, item( "polycarbonate_sheet" ) ); + tools.insert( tools.end(), 4, item( "polycarbonate_sheet" ) ); tools.insert( tools.end(), 1, item( "knife_paring" ) ); tools.emplace_back( "motor_micro" ); tools.emplace_back( "power_supply" ); @@ -898,11 +898,12 @@ TEST_CASE( "tools_use_charge_to_craft", "[crafting][charge]" ) THEN( "crafting succeeds, and uses charges from the UPS" ) { prep_craft( recipe_carver_off, tools, true, 0, false, false ); + // this recipe should be replaced with a test recipe that isn't impacted by changes in game recipes actually_test_craft( recipe_carver_off, INT_MAX ); CHECK( get_remaining_charges( "hotplate" ) == 0 ); CHECK( get_remaining_charges( "soldering_iron_portable" ) == 0 ); // vacuum molding takes 4 charges - CHECK( get_remaining_charges( "UPS_off" ) == 286 ); + CHECK( get_remaining_charges( "UPS_off" ) == 282 ); } }