Change copper wire to a standard size, and add wire drawing. (CleverR…

…aven#48127) * Increase weight and decrease volume of copper wire. * Add manual wire drawing as an option. * Change scrap_copper and copper to more appropriate values and handle the fallout. * scrap_copper is now 50ml instead of 62. Drop rates have been increased to accommodate. * scrap_copper now requires 50 copper instead of 25. * copper_wire, copper_rod, and cable weight and volume fine-tuned. * Obsolete previous cable recipe. Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> Co-authored-by: Kevin Granade <[email protected]>
Trioct · Jul 8, 2021 · 76e3b05 · 76e3b05
1 parent bb0e1ff
commit 76e3b05
Show file tree

Hide file tree

Showing 22 changed files with 237 additions and 45 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-alien.json b/data/json/furniture_and_terrain/furniture-alien.json
@@ -187,7 +187,7 @@
         { "item": "exodii_module", "count": [ 0, 1 ] },
         { "item": "exodii_motor", "count": [ 0, 1 ] },
         { "item": "cable", "charges": [ 0, 2 ] },
-        { "item": "scrap_copper", "count": [ 2, 10 ] }
+        { "item": "scrap_copper", "count": [ 2, 12 ] }
       ]
     }
   },
@@ -216,7 +216,7 @@
         { "item": "sheet_metal_small", "count": [ 20, 30 ] },
         { "item": "exodii_chassis", "count": [ 0, 1 ] },
         { "item": "exodii_drone_chassis", "count": [ 0, 1 ] },
-        { "item": "scrap_copper", "count": [ 5, 20 ] },
+        { "item": "scrap_copper", "count": [ 6, 25 ] },
         { "item": "e_scrap", "count": [ 5, 20 ] }
       ]
     }
@@ -241,7 +241,7 @@
         { "item": "scrap", "count": [ 8, 12 ] },
         { "item": "pipe", "count": [ 0, 3 ] },
         { "item": "sheet_metal_small", "count": [ 2, 10 ] },
-        { "item": "scrap_copper", "count": [ 2, 10 ] },
+        { "item": "scrap_copper", "count": [ 2, 12 ] },
         { "item": "exodii_computer", "count": [ 0, 1 ] },
         { "item": "exodii_motor", "count": [ 0, 1 ] },
         { "item": "cable", "charges": [ 0, 3 ] },
@@ -270,7 +270,7 @@
         { "item": "scrap", "count": [ 8, 12 ] },
         { "item": "pipe", "count": [ 0, 3 ] },
         { "item": "sheet_metal_small", "count": [ 2, 10 ] },
-        { "item": "scrap_copper", "count": [ 2, 10 ] },
+        { "item": "scrap_copper", "count": [ 2, 12 ] },
         { "item": "amplifier", "count": [ 0, 5 ] },
         { "item": "power_supply", "count": [ 0, 1 ] },
         { "item": "cable", "charges": [ 0, 5 ] }
@@ -298,7 +298,7 @@
         { "item": "pipe", "count": [ 2, 4 ] },
         { "item": "55gal_drum", "count": [ 0, 1 ] },
         { "item": "sheet_metal_small", "count": [ 2, 10 ] },
-        { "item": "scrap_copper", "count": [ 5, 10 ] },
+        { "item": "scrap_copper", "count": [ 5, 12 ] },
         { "item": "exodii_module", "count": [ 0, 1 ] },
         { "item": "exodii_motor", "count": [ 0, 2 ] },
         { "item": "pipe_fittings", "count": [ 2, 6 ] }
@@ -325,7 +325,7 @@
         { "item": "scrap", "count": [ 20, 120 ] },
         { "item": "pipe", "count": [ 20, 40 ] },
         { "item": "sheet_metal_small", "count": [ 20, 100 ] },
-        { "item": "scrap_copper", "count": [ 50, 100 ] },
+        { "item": "scrap_copper", "count": [ 62, 124 ] },
         { "item": "pipe_fittings", "count": [ 2, 6 ] },
         { "item": "exodii_module", "count": [ 0, 6 ] },
         { "item": "exodii_motor", "count": [ 0, 8 ] },
@@ -354,7 +354,7 @@
         { "item": "pipe", "count": [ 10, 20 ] },
         { "item": "pipe_fittings", "count": [ 2, 4 ] },
         { "item": "sheet_metal_small", "count": [ 10, 30 ] },
-        { "item": "scrap_copper", "count": [ 20, 40 ] },
+        { "item": "scrap_copper", "count": [ 25, 62 ] },
         { "item": "e_scrap", "count": [ 20, 40 ] },
         { "item": "exodii_module", "count": [ 0, 5 ] },
         { "item": "exodii_motor", "count": [ 0, 6 ] },
@@ -385,7 +385,7 @@
         { "item": "plutonium", "charges": [ 0, 3 ] },
         { "item": "lead", "charges": [ 12, 18 ] },
         { "item": "sheet_metal_small", "count": [ 10, 30 ] },
-        { "item": "scrap_copper", "count": [ 20, 40 ] },
+        { "item": "scrap_copper", "count": [ 25, 50 ] },
         { "item": "e_scrap", "count": [ 20, 40 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 4, 8 ] },
@@ -419,7 +419,7 @@
         { "item": "plutonium", "charges": [ 0, 3 ] },
         { "item": "lead", "charges": [ 12, 18 ] },
         { "item": "sheet_metal_small", "count": [ 10, 30 ] },
-        { "item": "scrap_copper", "count": [ 20, 40 ] },
+        { "item": "scrap_copper", "count": [ 25, 50 ] },
         { "item": "e_scrap", "count": [ 20, 40 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 4, 8 ] },
@@ -455,7 +455,7 @@
         { "item": "plutonium", "charges": [ 0, 3 ] },
         { "item": "lead", "charges": [ 12, 18 ] },
         { "item": "sheet_metal_small", "count": [ 10, 30 ] },
-        { "item": "scrap_copper", "count": [ 10, 30 ] },
+        { "item": "scrap_copper", "count": [ 12, 37 ] },
         { "item": "e_scrap", "count": [ 10, 20 ] },
         { "item": "circuit", "count": [ 2, 5 ] },
         { "item": "power_supply", "count": [ 4, 8 ] },
@@ -489,7 +489,7 @@
         { "item": "plutonium", "charges": [ 0, 3 ] },
         { "item": "lead", "charges": [ 12, 18 ] },
         { "item": "sheet_metal_small", "count": [ 10, 30 ] },
-        { "item": "scrap_copper", "count": [ 10, 30 ] },
+        { "item": "scrap_copper", "count": [ 12, 37 ] },
         { "item": "e_scrap", "count": [ 15, 30 ] },
         { "item": "circuit", "count": [ 2, 5 ] },
         { "item": "power_supply", "count": [ 2, 8 ] },

diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json
@@ -457,7 +457,7 @@
       "str_max": 100,
       "sound": "shred!",
       "sound_fail": "thud!",
-      "items": [ { "item": "scrap_copper", "count": [ 1, 4 ] }, { "item": "cable", "charges": [ 1, 4 ] } ]
+      "items": [ { "item": "scrap_copper", "count": [ 1, 5 ] }, { "item": "cable", "charges": [ 1, 4 ] } ]
     },
     "deconstruct": { "items": [ { "item": "cable", "charges": [ 3, 4 ] } ] }
   },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -449,7 +449,7 @@
       [ "frame", 20 ],
       [ "hdframe", 20 ],
       [ "cu_pipe", 25 ],
-      [ "scrap_copper", 50 ]
+      [ "scrap_copper", 62 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -147,7 +147,7 @@
       [ "jerrycan", 10 ],
       [ "pump_complex", 10 ],
       [ "well_pump", 10 ],
-      { "item": "scrap_copper", "prob": 15, "count": [ 1, 10 ] },
+      { "item": "scrap_copper", "prob": 15, "count": [ 1, 12 ] },
       { "item": "plunger_toilet", "prob": 90, "count": [ 1, 2 ] },
       [ "plunger_futuristic", 50 ]
     ]
@@ -364,7 +364,7 @@
       { "item": "copper", "prob": 10, "count": [ 1, 5 ] },
       { "item": "tin", "prob": 10, "count": [ 1, 5 ] },
       { "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 5 ] },
-      { "item": "scrap_copper", "prob": 5, "count": [ 1, 10 ] },
+      { "item": "scrap_copper", "prob": 5, "count": [ 1, 12 ] },
       { "item": "wire", "prob": 5 },
       { "item": "scrap", "prob": 70, "count": [ 1, 10 ] }
     ]

diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json
@@ -10,7 +10,7 @@
       [ "frame", 20 ],
       [ "hdframe", 20 ],
       [ "cu_pipe", 25 ],
-      [ "scrap_copper", 50 ],
+      [ "scrap_copper", 62 ],
       [ "rock", 40 ],
       [ "survnote", 1 ]
     ]

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -298,8 +298,26 @@
     "color": "dark_gray",
     "description": "Plastic jacketed copper cable of the type used in small electronics.",
     "material": [ "plastic", "copper" ],
-    "volume": "750 ml",
-    "weight": "2 g",
+    "//": "Calculated off of copper wire with an extra 0.5mm of diameter and 0.66g.",
+    "volume": "155 ml",
+    "weight": "5413 mg",
+    "ammo_type": "components",
+    "count": 200
+  },
+  {
+    "type": "AMMO",
+    "id": "copper_wire",
+    "category": "spare_parts",
+    "price": 2000,
+    "price_postapoc": 100,
+    "name": { "str": "raw copper wire" },
+    "symbol": "=",
+    "color": "dark_gray",
+    "description": "Copper wire ready to be covered with plastic.",
+    "material": [ "copper" ],
+    "//": "Calculated off of 12 AWG, at 10cm length, using http://www.mtlexs.com/technical-specifications-details/40/weight-of-copper-wire.",
+    "volume": "110 ml",
+    "weight": "4747 mg",
     "ammo_type": "components",
     "count": 200
   },
@@ -792,8 +810,9 @@
     "color": "yellow",
     "description": "Copper bits.  Could be used to craft something, for example makeshift shotgun shells.",
     "material": [ "copper" ],
+    "//": "80% of 8.63g/ml is 6.904g/ml.",
     "volume": "250 ml",
-    "weight": "2 g",
+    "weight": "8630 mg",
     "ammo_type": "components",
     "count": 200
   },

diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
@@ -304,8 +304,9 @@
     "price": 1000,
     "price_postapoc": 10,
     "material": [ "copper" ],
-    "weight": "50 g",
-    "volume": "62 ml",
+    "//": "Density of 8.63g/cm³ = 431.5g/50ml ~ 432g",
+    "volume": "50 ml",
+    "weight": "432 g",
     "bashing": 1,
     "to_hit": -2
   },
@@ -343,5 +344,23 @@
     "//": "Density ~ 8g/cm³ ~ 2000kg/250ml @ stack 1000 = 2g/unit",
     "ammo_type": "components",
     "count": 200
+  },
+  {
+    "type": "AMMO",
+    "id": "copper_rod",
+    "category": "spare_parts",
+    "price": 2000,
+    "price_postapoc": 20,
+    "name": { "str": "copper rod" },
+    "symbol": "=",
+    "color": "light_gray",
+    "description": "A thin copper rod, ready to be made into copper wire.",
+    "material": [ "copper" ],
+    "//": "9mm in diameter and 1.572m long.",
+    "volume": "100 ml",
+    "weight": "863 g",
+    "longest_side": "1572 mm",
+    "ammo_type": "components",
+    "count": 1
   }
 ]
diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -294,5 +294,20 @@
     "symbol": "`",
     "color": "brown",
     "qualities": [ [ "FILE", 1 ] ]
+  },
+  {
+    "id": "draw_plate",
+    "type": "TOOL",
+    "name": { "str": "draw plate" },
+    "description": "A piece of metal with holes of varying size drilled into it.  Used as part of wire drawing.",
+    "weight": "200 g",
+    "volume": "250 ml",
+    "price": 1000,
+    "price_postapoc": 10,
+    "bashing": 5,
+    "to_hit": -3,
+    "material": [ "steel" ],
+    "symbol": "]",
+    "color": "light_cyan"
   }
 ]
diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -1267,5 +1267,30 @@
     "color": "light_gray",
     "looks_like": "hand_drill",
     "qualities": [ [ "DRILL", 1 ] ]
+  },
+  {
+    "id": "wire_draw_machine",
+    "type": "TOOL",
+    "name": { "str": "wire draw machine" },
+    "description": "A machine designed specifically for turning metal rods into wire.",
+    "weight": "26 kg",
+    "volume": "20 L",
+    "price": 1000,
+    "price_postapoc": 10,
+    "to_hit": -3,
+    "bashing": 7,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "holster": true,
+        "magazine_well": "200 ml",
+        "max_contains_volume": "20 L",
+        "max_contains_weight": "20 kg",
+        "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
+      }
+    ]
   }
 ]
diff --git a/data/json/obsolete.json b/data/json/obsolete.json
@@ -1526,5 +1526,26 @@
     "price": 10000,
     "weight": "3000 g",
     "difficulty": 4
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "cable",
+    "category": "CC_ELECTRONIC",
+    "subcategory": "CSC_ELECTRONIC_COMPONENTS",
+    "skill_used": "fabrication",
+    "skills_required": [ "electronics", 2 ],
+    "difficulty": 5,
+    "time": "3 m",
+    "autolearn": true,
+    "charges": 1,
+    "qualities": [
+      { "id": "ANVIL", "level": 1 },
+      { "id": "HAMMER", "level": 2 },
+      { "id": "CHISEL", "level": 3 },
+      { "id": "CUT", "level": 1 }
+    ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "surface_heat", 1, "LIST" ], [ "forge", 1 ], [ "oxy_torch", 1 ] ] ],
+    "components": [ [ [ "copper", 1 ] ], [ [ "duct_tape", 1 ] ] ]
   }
 ]
diff --git a/data/json/proficiencies/metalwork.json b/data/json/proficiencies/metalwork.json
@@ -95,5 +95,16 @@
     "default_fail_multiplier": 1.15,
     "time_to_learn": "10 h",
     "required_proficiencies": [ "prof_blacksmithing" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_wiremaking",
+    "name": { "str": "Wire Making" },
+    "description": "How to turn raw ingots and metals into usable wire.  Includes both drawing and extruding.",
+    "can_learn": true,
+    "default_time_multiplier": 2,
+    "default_fail_multiplier": 1.5,
+    "time_to_learn": "10 h",
+    "required_proficiencies": [ "prof_metalworking" ]
   }
 ]
diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -88,7 +88,7 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "copper", 25 ] ] ]
+    "components": [ [ [ "copper", 50 ] ] ]
   },
   {
     "type": "recipe",