Attempt to audit power costs of welding (#60660)

CleverRaven · Mar 12, 2023 · ce1081a · ce1081a
1 parent 1866f16
commit ce1081a
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 35 deletions.
diff --git a/data/json/itemgroups/SUS/garage.json b/data/json/itemgroups/SUS/garage.json
@@ -13,6 +13,7 @@
               { "item": "oxy_torch" },
               { "item": "weldtank", "count": [ 1, 3 ], "prob": 80 },
               { "item": "tinyweldtank", "count": [ 1, 3 ], "prob": 60 },
+              { "item": "oxygen_cylinder", "count": [ 1, 2 ], "prob": 90 },
               {
                 "distribution": [
                   { "item": "brazing_rod_bronze", "prob": 75, "charges": [ 100, 360 ] },

diff --git a/data/json/items/ammo/weldgas.json b/data/json/items/ammo/weldgas.json
@@ -1,18 +1,19 @@
 [
   {
+    "//": "roughly 35grams of acetylene per cubic foot at STP. Volume given is when compressed - B tank has 9.17 L tank and holds 40 cubic feet.",
     "id": "oxyacetylene",
     "type": "AMMO",
-    "name": { "str_sp": "oxyacetylene" },
-    "description": "A highly explosive fuel mixture composed of equal parts oxygen and acetylene gas.",
-    "weight": "40 g",
+    "name": { "str_sp": "acetylene" },
+    "description": "Pressurized, dangerous acetylene gas.  Can be used for welding or cutting with a torch.",
+    "weight": "1 g",
     "volume": "250 ml",
     "price": 2400,
     "price_postapoc": 500,
     "material": [ "hydrocarbons" ],
     "symbol": "=",
     "color": "red",
-    "count": 100,
-    "stack_size": 100,
+    "count": 35,
+    "stack_size": 35,
     "ammo_type": "weldgas",
     "phase": "liquid",
     "effects": [ "COOKOFF" ],

diff --git a/data/json/items/magazine/weldgas.json b/data/json/items/magazine/weldgas.json
@@ -1,40 +1,44 @@
 [
   {
     "id": "tinyweldtank",
+    "//": "Hot Max 24012 Acetylene Cylinder",
     "looks_like": "pressurized_tank",
     "type": "MAGAZINE",
     "name": { "str": "small welding tank" },
-    "description": "A compact steel cylinder designed for holding pressurized welding gases.  It is marked with several faded and now unreadable symbols.",
-    "weight": "1500 g",
-    "volume": "1 L",
-    "price": 5600,
+    "description": "A compact MC size acetylene tank.  It can pressurize up to 10 cubic feet of welding gas.",
+    "weight": "3640 g",
+    "volume": "3 L",
+    "longest_side": "39 cm",
+    "price": 15790,
     "price_postapoc": 100,
     "material": [ "steel" ],
     "symbol": "#",
     "color": "brown",
     "ammo_type": [ "weldgas" ],
-    "capacity": 60,
-    "count": 60,
+    "capacity": 350,
+    "count": 350,
     "flags": [ "NO_UNLOAD", "NO_RELOAD" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "weldgas": 60 }, "watertight": true } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "weldgas": 350 }, "watertight": true } ]
   },
   {
     "id": "weldtank",
+    "//": "Lemorele B Steel Acetylene Cylinder",
     "looks_like": "pressurized_tank",
     "type": "MAGAZINE",
     "name": { "str": "welding tank" },
-    "description": "A large steel cylinder designed for holding pressurized welding gases.  It is marked with several faded and now unreadable symbols.",
-    "weight": "6000 g",
-    "volume": "3 L",
-    "price": 5600,
+    "description": "A bulky B size acetylene tank.  It can pressurize up to 40 cubic feet of welding gas.",
+    "weight": "11360 g",
+    "volume": "18 L",
+    "longest_side": "60 cm",
+    "price": 16990,
     "price_postapoc": 100,
     "material": [ "steel" ],
     "symbol": "#",
     "color": "brown",
     "ammo_type": [ "weldgas" ],
-    "capacity": 240,
-    "count": 240,
+    "capacity": 1400,
+    "count": 1400,
     "flags": [ "NO_UNLOAD", "NO_RELOAD" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "weldgas": 240 }, "watertight": true } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "weldgas": 1400 }, "watertight": true } ]
   }
 ]
diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -692,9 +692,18 @@
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "blue",
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "airtight": true,
+        "watertight": true,
+        "rigid": true,
+        "ammo_restriction": { "oxygen": 300 }
+      }
+    ],
     "initial_charges": 300,
     "max_charges": 300,
-    "charges_per_use": 10,
+    "charges_per_use": 1,
     "use_action": [ "OXYGEN_BOTTLE" ]
   },
   {

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -1250,7 +1250,7 @@
     "symbol": ";",
     "color": "red",
     "ammo": [ "battery" ],
-    "charges_per_use": 5,
+    "charges_per_use": 10,
     "charged_qualities": [ [ "WELD", 2 ] ],
     "use_action": [
       {
@@ -1307,7 +1307,7 @@
     "symbol": ";",
     "color": "light_red",
     "ammo": [ "battery" ],
-    "charges_per_use": 10,
+    "charges_per_use": 25,
     "charged_qualities": [ [ "WELD", 1 ] ],
     "use_action": [
       {
@@ -1364,7 +1364,7 @@
     "symbol": ";",
     "color": "red",
     "ammo": [ "battery" ],
-    "charges_per_use": 5,
+    "charges_per_use": 10,
     "charged_qualities": [ [ "WELD", 2 ] ],
     "use_action": [
       {

diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json
@@ -140,38 +140,42 @@
   {
     "id": "welding_standard",
     "type": "requirement",
-    "//": "Crafting of steel/iron items or installation of vehicle parts",
+    "//": "Crafting of steel/iron items or installation of vehicle parts, measured in 1 cm segments - assume roughly 360 cm per hour, 10 seconds per # of this quality",
+    "//1": "Arc welding is about 85% efficient, acetylene welding is about 40% efficient, propane welding is about 10% efficient",
     "qualities": [ { "id": "GLARE", "level": 1 } ],
-    "tools": [ [ [ "welder", 10 ], [ "welding_kit", 10 ], [ "welder_crude", 15 ], [ "toolset", 15 ], [ "oxy_torch", 2 ] ] ],
-    "components": [ [ [ "welding_rod_steel", 3 ], [ "welding_wire_steel", 3 ], [ "brazing_rod_bronze", 3 ] ] ]
+    "tools": [ [ [ "welder", 20 ], [ "welding_kit", 20 ], [ "welder_crude", 40 ], [ "toolset", 30 ], [ "oxy_torch", 1 ] ] ],
+    "components": [ [ [ "welding_rod_steel", 1 ], [ "welding_wire_steel", 1 ], [ "brazing_rod_bronze", 1 ] ] ]
   },
   {
     "id": "welding_alloys",
     "type": "requirement",
-    "//": "Crafting items made of aluminium alloy or installation of vehicle parts",
+    "//": "Crafting items made of aluminium alloy or installation of vehicle parts, currently making the same assumption for time/coverage as steel",
+    "//1": "Arc welding is about 85% efficient, acetylene welding is about 40% efficient, propane welding is about 10% efficient",
     "qualities": [ { "id": "GLARE", "level": 1 } ],
-    "tools": [ [ [ "welder", 10 ], [ "welding_kit", 10 ], [ "welder_crude", 15 ], [ "toolset", 15 ], [ "oxy_torch", 2 ] ] ],
-    "components": [ [ [ "welding_rod_alloy", 3 ], [ "welding_wire_alloy", 3 ], [ "brazing_rod_alloy", 3 ] ] ]
+    "tools": [ [ [ "welder", 20 ], [ "welding_kit", 20 ], [ "welder_crude", 40 ], [ "toolset", 30 ], [ "oxy_torch", 1 ] ] ],
+    "components": [ [ [ "welding_rod_alloy", 1 ], [ "welding_wire_alloy", 1 ], [ "brazing_rod_alloy", 1 ] ] ]
   },
   {
     "id": "repair_welding_standard",
     "type": "requirement",
-    "//": "Repair of steel/iron items",
+    "//": "Repair of steel/iron items - costs double over that of standard welding",
+    "//1": "Arc welding is about 85% efficient, acetylene welding is about 40% efficient, propane welding is about 10% efficient",
     "qualities": [ { "id": "GLARE", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
-    "tools": [ [ [ "welder", 20 ], [ "welding_kit", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ], [ "oxy_torch", 4 ] ] ],
+    "tools": [ [ [ "welder", 40 ], [ "welding_kit", 40 ], [ "welder_crude", 80 ], [ "toolset", 60 ], [ "oxy_torch", 2 ] ] ],
     "components": [
-      [ [ "welding_rod_steel", 6 ], [ "welding_wire_steel", 6 ], [ "brazing_rod_bronze", 6 ] ],
+      [ [ "welding_rod_steel", 2 ], [ "welding_wire_steel", 2 ], [ "brazing_rod_bronze", 2 ] ],
       [ [ "steel_tiny", 1, "LIST" ] ]
     ]
   },
   {
     "id": "repair_welding_alloys",
     "type": "requirement",
-    "//": "Repair items made of aluminium alloy",
+    "//": "Repair items made of aluminium alloy - costs double over that of standard welding",
+    "//1": "Arc welding is about 85% efficient, acetylene welding is about 40% efficient, propane welding is about 10% efficient",
     "qualities": [ { "id": "GLARE", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
-    "tools": [ [ [ "welder", 20 ], [ "welding_kit", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ], [ "oxy_torch", 4 ] ] ],
+    "tools": [ [ [ "welder", 40 ], [ "welding_kit", 40 ], [ "welder_crude", 80 ], [ "toolset", 60 ], [ "oxy_torch", 2 ] ] ],
     "components": [
-      [ [ "welding_rod_alloy", 6 ], [ "welding_wire_alloy", 6 ], [ "brazing_rod_alloy", 6 ] ],
+      [ [ "welding_rod_alloy", 2 ], [ "welding_wire_alloy", 2 ], [ "brazing_rod_alloy", 2 ] ],
       [ [ "material_aluminium_ingot", 1 ] ]
     ]
   },