diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index e21276f2b5fa..3b1dad435390 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -479,7 +479,7 @@ [ "wire", 40 ], { "item": "sheet_metal", "prob": 5 }, { "item": "sheet_metal_small", "prob": 5, "count": [ 2, 4 ] }, - { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 5 ] } + { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 10 ] } ] }, { @@ -703,7 +703,7 @@ [ "can_drink", 130 ], [ "can_drink_unsealed", 130 ], [ "keg", 15 ], - [ "material_aluminium_ingot", 25 ], + { "item": "material_aluminium_ingot", "prob": 25, "count": [ 2, 3 ] }, [ "xlframe", 10 ], [ "survival_kit_box", 1 ], [ "wearable_light", 5 ], diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index a2b5b93db429..54d3f3e9ac15 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -347,7 +347,7 @@ { "item": "steel_chunk", "prob": 15, "count": [ 1, 5 ] }, { "item": "copper", "prob": 10, "count": [ 1, 5 ] }, { "item": "tin", "prob": 10, "count": [ 1, 5 ] }, - { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 5 ] }, + { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 10 ] }, { "item": "scrap_copper", "prob": 5, "count": [ 1, 10 ] }, { "item": "wire", "prob": 5 }, { "item": "scrap", "prob": 70, "count": [ 1, 10 ] } diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index dba8ba51d7b9..5adfa2d27ed2 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1049,8 +1049,9 @@ "category": "spare_parts", "name": { "str_sp": "bronze" }, "description": "Decent-sized chunks of bronze, for fashioning some old-school items.", - "weight": "218 g", - "volume": "250 ml", + "//": "Density 7.4-8.9g/cm³ depending on composition ~ 825g/100ml if we use DF's chosen density, scrap stacks at ~25% efficiency", + "weight": "220 g", + "volume": "100 ml", "price": 1200, "price_postapoc": 250, "to_hit": -2, diff --git a/data/json/items/containers.json b/data/json/items/containers.json index b40a9e96863a..98b7539baf78 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -432,7 +432,7 @@ "category": "container", "name": { "str": "aluminum can" }, "description": "An aluminum can, like what soda comes in.", - "weight": "13 g", + "weight": "15 g", "volume": "250 ml", "price": 0, "price_postapoc": 0, diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 8ac50aab4e06..e291673ce76c 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -78,9 +78,9 @@ "category": "spare_parts", "name": { "str": "aluminum ingot" }, "description": "A small aluminum ingot, standardized for further processing. Light but durable, this could be cast into various shapes for construction or ground down to a powder, for more… high-profile applications.", - "weight": "675 g", - "//": "Density 2.70g/cm³ = 675g/250ml", - "volume": "250 ml", + "weight": "270 g", + "//": "Density 2.70g/cm³ = 270g/100ml", + "volume": "100 ml", "price": 500, "price_postapoc": 10, "material": [ "aluminum" ], @@ -304,8 +304,9 @@ "price": 1000, "price_postapoc": 10, "material": "copper", + "//": "Density 8.96g/cm³ ~ 2.24kg/250ml, scrap stacks at ~20-25% efficiency", "weight": "50 g", - "volume": "62 ml", + "volume": "25 ml", "bashing": 1, "to_hit": -2 }, diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index 1bd134586141..cd99bf407572 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -23,7 +23,7 @@ "category": "tools", "name": { "str": "bronze anvil" }, "description": "This is a block of oddly shaped bronze with a chisel-like projection set into the corner. It's used in most metalworking fabrication recipes.", - "weight": "2180 g", + "weight": "2200 g", "volume": "2500 ml", "price": 60000, "price_postapoc": 750, diff --git a/data/json/recipes/electronic/components.json b/data/json/recipes/electronic/components.json index 2a173a91b53c..cf99ec1ddaf0 100644 --- a/data/json/recipes/electronic/components.json +++ b/data/json/recipes/electronic/components.json @@ -301,6 +301,6 @@ "book_learn": [ [ "recipe_lab_elec", 5 ], [ "textbook_robots", 7 ] ], "using": [ [ "steel_standard", 1 ], [ "welding_standard", 20 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ], - "components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "material_aluminium_ingot", 1 ] ] ] + "components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "material_aluminium_ingot", 2 ] ] ] } ] diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index ad17aeb555a3..d301fc051f01 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -1048,16 +1048,26 @@ "using": [ [ "forging_standard", 1 ] ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ - [ - [ "tin", 12 ], - [ "material_aluminium_ingot", 1 ], - [ "aluminum_foil", 40 ], - [ "chem_aluminium_powder", 15 ], - [ "can_drink_unsealed", 2 ] - ], - [ [ "copper_scrap_equivalent", 2, "LIST" ] ] + [ [ "tin", 10 ], [ "aluminum_foil", 10 ], [ "chem_aluminium_powder", 15 ], [ "can_drink_unsealed", 2 ] ], + [ [ "copper_scrap_equivalent", 4, "LIST" ] ] ] }, + { + "result": "scrap_bronze", + "id_suffix": "bulk", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "90 m", + "charges": 10, + "batch_time_factors": [ 90, 4 ], + "autolearn": true, + "using": [ [ "forging_standard", 1 ] ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "copper_scrap_equivalent", 40, "LIST" ] ] ] + }, { "type": "recipe", "result": "tempered_glass_sheet", diff --git a/data/json/recipes/other/other.json b/data/json/recipes/other/other.json index 3d6cea1ceceb..91955901707f 100644 --- a/data/json/recipes/other/other.json +++ b/data/json/recipes/other/other.json @@ -206,10 +206,11 @@ "skill_used": "fabrication", "difficulty": 5, "time": "5 m", + "charges": 125, "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 } ], "components": [ - [ [ "material_aluminium_ingot", 1 ], [ "can_drink_unsealed", 6 ], [ "aluminum_foil", 40 ] ], + [ [ "material_aluminium_ingot", 1 ], [ "can_drink_unsealed", 20 ], [ "aluminum_foil", 75 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ], [ [ "material_sand", 25 ] ] ] @@ -500,6 +501,6 @@ "reversible": true, "using": [ [ "welding_standard", 6 ], [ "sewing_standard", 12 ] ], "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "DRILL", "level": 2 } ], - "components": [ [ [ "material_aluminium_ingot", 8 ] ], [ [ "sheet", 1 ] ] ] + "components": [ [ [ "material_aluminium_ingot", 20 ] ], [ [ "sheet", 1 ] ] ] } ] diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index 59087a09e5b5..4a4544d9451e 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -217,6 +217,6 @@ "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 6 ] ], - "components": [ [ [ "material_aluminium_ingot", 8 ] ] ] + "components": [ [ [ "material_aluminium_ingot", 20 ] ] ] } ] diff --git a/data/json/recipes/other/tools.json b/data/json/recipes/other/tools.json index ea953ab965e9..9455dee7df29 100644 --- a/data/json/recipes/other/tools.json +++ b/data/json/recipes/other/tools.json @@ -153,14 +153,13 @@ "tools": [ [ [ "swage", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ - [ "tin", 12 ], - [ "zinc_metal", 12 ], - [ "material_aluminium_ingot", 1 ], - [ "aluminum_foil", 40 ], + [ "tin", 10 ], + [ "zinc_metal", 15 ], + [ "aluminum_foil", 10 ], [ "chem_aluminium_powder", 15 ], [ "can_drink_unsealed", 2 ] ], - [ [ "copper_scrap_equivalent", 2, "LIST" ] ] + [ [ "copper_scrap_equivalent", 4, "LIST" ] ] ] }, { diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 3e9fc13e9656..32189991d951 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -2179,7 +2179,7 @@ "difficulty": 3, "time": "10 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "cable", 12 ] ], [ [ "amplifier", 2 ] ], [ [ "lightstrip_inactive", 1 ] ], [ [ "material_aluminium_ingot", 1 ] ] ] + "components": [ [ [ "cable", 12 ] ], [ [ "amplifier", 2 ] ], [ [ "lightstrip_inactive", 1 ] ], [ [ "material_aluminium_ingot", 3 ] ] ] }, { "result": "holy_symbol", diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index c9962956db69..abfef88c2fb0 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -13,7 +13,7 @@ "type": "item_group", "id": "ig_vp_xlframe", "subtype": "collection", - "entries": [ { "item": "material_aluminium_ingot", "count": [ 1, 4 ] } ] + "entries": [ { "item": "material_aluminium_ingot", "count": [ 2, 10 ] } ] }, { "type": "item_group",