diff --git a/data/json/recipes/armor/other.json b/data/json/recipes/armor/other.json index 8f1e07c8cf78e..638122716aa84 100644 --- a/data/json/recipes/armor/other.json +++ b/data/json/recipes/armor/other.json @@ -63,7 +63,7 @@ "using": [ [ "blacksmithing_standard", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], - "components": [ [ [ "copper", 60 ] ] ] + "components": [ [ [ "copper_scrap_equivalent", 2, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json index f00dbe49f849f..64713f696bbf1 100644 --- a/data/json/recipes/other/containers.json +++ b/data/json/recipes/other/containers.json @@ -127,7 +127,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "2x4", 2 ] ], - [ [ "wire", 1 ], [ "scrap", 2 ], [ "copper", 20 ] ], + [ [ "wire", 1 ], [ "scrap", 2 ], [ "copper_scrap_equivalent", 1, "LIST" ] ], [ [ "rag", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] }, diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index ba96198ffc175..1587b8ecaea5f 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -451,7 +451,7 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ], [ "forge", 10 ], [ "oxy_torch", 2 ] ] ], - "components": [ [ [ "scrap_copper", 4 ], [ "copper", 400 ] ] ] + "components": [ [ [ "copper_scrap_equivalent", 16, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index af0ae42ffb8e3..95e4643077fdb 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -772,7 +772,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], - [ [ "scrap_copper", 10 ], [ "copper", 1000 ] ], + [ [ "copper_scrap_equivalent", 40, "LIST" ] ], [ [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ], [ "duct_tape", 40 ] ] ] }, @@ -2219,7 +2219,7 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "press", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "scrap_copper", 5 ], [ "copper", 500 ] ], [ [ "tin", 30 ] ] ] + "components": [ [ [ "copper_scrap_equivalent", 20, "LIST" ] ], [ [ "tin", 30 ] ] ] }, { "type": "recipe", @@ -2235,7 +2235,7 @@ "qualities": [ { "id": "HAMMER", "level": 3 } ], "tools": [ [ [ "electrolysis_kit", 10 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ [ "scrap_copper", 5 ], [ "copper", 500 ] ], + [ [ "copper_scrap_equivalent", 20, "LIST" ] ], [ [ "tin", 30 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "acid", 1 ] ] @@ -3246,7 +3246,7 @@ "autolearn": true, "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ], - "components": [ [ [ "scrap_copper", 7 ], [ "copper", 175 ] ] ] + "components": [ [ [ "copper_scrap_equivalent", 7, "LIST" ] ] ] }, { "type": "recipe", @@ -4166,7 +4166,7 @@ "tools": [ [ [ "hotplate", 100 ], [ "toolset", 100 ] ] ], "components": [ [ [ "chem_ethanol", 50 ], [ "denat_alcohol", 50 ] ], - [ [ "copper", 50 ] ], + [ [ "copper_scrap_equivalent", 2, "LIST" ] ], [ [ "acid", 1 ] ], [ [ "bleach", 2 ] ], [ [ "oxy_powder", 50 ] ], @@ -4486,7 +4486,7 @@ "autolearn": true, "using": [ [ "forging_standard", 1 ] ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "tin", 12 ] ], [ [ "copper", 50 ] ] ] + "components": [ [ [ "tin", 12 ] ], [ [ "copper_scrap_equivalent", 2, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index e4bb0a7ba96d3..4063e2a54420a 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -74,7 +74,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "duct_tape", 50 ], [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ], - [ [ "scrap_copper", 2 ], [ "copper", 200 ] ] + [ [ "copper_scrap_equivalent", 8, "LIST" ] ] ] }, { @@ -249,7 +249,7 @@ [ [ "stick_long", 1 ], [ "pool_cue", 1 ] ], [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], [ [ "duct_tape", 20 ], [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ], - [ [ "scrap_copper", 3 ], [ "copper", 300 ] ] + [ [ "copper_scrap_equivalent", 12, "LIST" ] ] ] }, { diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json index 5b2dfbbddfaeb..fee059bafc45a 100644 --- a/data/json/requirements/materials.json +++ b/data/json/requirements/materials.json @@ -11,6 +11,12 @@ "//": "Materials used when forming bullets", "components": [ [ [ "lead", 1 ] ] ] }, + { + "id": "copper_scrap_equivalent", + "type": "requirement", + "//": "Material used for equivalence between one unit of scrap copper and corresponding amount of elemental copper.", + "components": [ [ [ "scrap_copper", 1 ], [ "copper", 25 ] ] ] + }, { "id": "cordage", "type": "requirement",