Expand metalworking and other older proficiencies (#44446)

CleverRaven · Oct 2, 2020 · e208a89 · e208a89
1 parent 0eeabd2
commit e208a89
Show file tree

Hide file tree

Showing 13 changed files with 894 additions and 189 deletions.
diff --git a/data/json/professions.json b/data/json/professions.json
@@ -598,6 +598,7 @@
     "id": "mechanic",
     "name": "Home Mechanic",
     "description": "You've always loved cars, and there's nothing like getting under the hood and fixing it yourself.  You've kept hold of some handy tools for the job, and at least now you'll never want for parts.",
+    "proficiencies": [ "prof_metalworking", "prof_welding_basic" ],
     "points": 2,
     "skills": [ { "level": 3, "name": "mechanics" }, { "level": 1, "name": "driving" } ],
     "items": {
@@ -1519,6 +1520,7 @@
     "name": { "male": "Handy Man", "female": "Handy Woman" },
     "description": "You used to work at a local hardware store, and you did plenty of home renovations yourself.  Now you look out at the horizon of a ruined world, and wonder - are your meager skills, and the few supplies you grabbed on the way out, sufficient to help rebuild?",
     "points": 1,
+    "proficiencies": [ "prof_plumbing" ],
     "skills": [ { "level": 2, "name": "fabrication" }, { "level": 1, "name": "lockpick" } ],
     "items": {
       "both": {
@@ -2264,7 +2266,7 @@
     "description": "You ran into trouble coming out of class at your community college's metalsmithing program, but despite the havoc you've managed to keep ahold of some of the equipment you were carrying.",
     "points": 1,
     "skills": [ { "level": 4, "name": "fabrication" } ],
-    "proficiencies": [ "prof_blacksmithing" ],
+    "proficiencies": [ "prof_metalworking", "prof_blacksmithing" ],
     "items": {
       "both": {
         "items": [ "jeans", "socks", "boots", "tank_top", "apron_leather", "fire_gauntlets", "wristwatch", "hammer" ],

diff --git a/data/json/proficiencies/metalwork.json b/data/json/proficiencies/metalwork.json
@@ -0,0 +1,73 @@
+[
+  {
+    "type": "proficiency",
+    "id": "prof_metalworking",
+    "name": { "str": "Principles of Metalworking" },
+    "description": "A basic understanding of the properties of metal as a material, and the concepts behind smithing, die casting, and other metalworking techniques.",
+    "can_learn": true,
+    "time_to_learn": "2 h"
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_welding_basic",
+    "name": { "str": "Principles of Welding" },
+    "description": "A basic understanding of the different types of welding, welding tools and fuels, how to weld different materials, and more.",
+    "can_learn": true,
+    "time_to_learn": "6 h",
+    "required_proficiencies": [ "prof_metalworking" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_welding",
+    "name": { "str": "Welding" },
+    "description": "You are an experienced welder.",
+    "can_learn": true,
+    "time_to_learn": "10 h",
+    "required_proficiencies": [ "prof_welding_basic" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_blacksmithing",
+    "name": { "str": "Blacksmithing" },
+    "description": "The craft of working metal into tools and other items of use.",
+    "can_learn": true,
+    "time_to_learn": "10 h",
+    "required_proficiencies": [ "prof_metalworking" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_redsmithing",
+    "name": { "str": "Redsmithing" },
+    "description": "Working copper and bronze shares a lot of techniques with blacksmithing, but the more ductile copper-containing metals have a trick all their own.",
+    "can_learn": true,
+    "time_to_learn": "10 h",
+    "required_proficiencies": [ "prof_metalworking" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_armorsmithing",
+    "name": { "str": "Armorsmithing" },
+    "description": "How to make articulated armor from pieces of metal.",
+    "can_learn": true,
+    "time_to_learn": "12 h",
+    "required_proficiencies": [ "prof_blacksmithing", "prof_articulation" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_bladesmith",
+    "name": { "str": "Bladesmithing" },
+    "description": "How to fabricate sharp and reliable blades from scratch.",
+    "can_learn": true,
+    "time_to_learn": "12 h",
+    "required_proficiencies": [ "prof_blacksmithing" ]
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_toolsmithing",
+    "name": { "str": "Manual Tooling" },
+    "description": "How to make high-quality tools and parts by hand.  Includes techniques like threading, durable articulation points, and using appropriate metals for appropriate tasks.",
+    "can_learn": true,
+    "time_to_learn": "10 h",
+    "required_proficiencies": [ "prof_blacksmithing" ]
+  }
+]
diff --git a/data/json/proficiencies/misc.json b/data/json/proficiencies/misc.json
@@ -2,10 +2,19 @@
   {
     "type": "proficiency",
     "id": "prof_knapping",
+    "name": { "str": "Basic Knapping" },
+    "description": "You know the basic principles of turning stones into more useful tools.",
+    "can_learn": true,
+    "time_to_learn": "8 h"
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_knapping_speed",
     "name": { "str": "Knapping" },
-    "description": "The art of turning stones into more useful tools.",
+    "description": "You've banged rocks together so much and for so long, you've become extremely fast at it.",
     "can_learn": true,
-    "time_to_learn": "10 h"
+    "time_to_learn": "12 h",
+    "required_proficiencies": [ "prof_knapping" ]
   },
   {
     "type": "proficiency",
@@ -15,6 +24,14 @@
     "can_learn": true,
     "time_to_learn": "8 h"
   },
+  {
+    "type": "proficiency",
+    "id": "prof_plumbing",
+    "name": { "str": "Plumbing" },
+    "description": "Working with pipes and pipe fittings to transport fluids without leakage.",
+    "can_learn": true,
+    "time_to_learn": "8 h"
+  },
   {
     "type": "proficiency",
     "id": "prof_pottery",
@@ -55,40 +72,6 @@
     "can_learn": true,
     "time_to_learn": "10 h"
   },
-  {
-    "type": "proficiency",
-    "id": "prof_blacksmithing",
-    "name": { "str": "Blacksmithing" },
-    "description": "The craft of working metal into tools and other items of use.",
-    "can_learn": true,
-    "time_to_learn": "10 h"
-  },
-  {
-    "type": "proficiency",
-    "id": "prof_redsmithing",
-    "name": { "str": "Redsmithing" },
-    "description": "Working copper and bronze shares a lot of techniques with blacksmithing, but the more ductile copper-containing metals have a trick all their own.",
-    "can_learn": true,
-    "time_to_learn": "10 h"
-  },
-  {
-    "type": "proficiency",
-    "id": "prof_armorsmithing",
-    "name": { "str": "Armorsmithing" },
-    "description": "How to make articulated armor from pieces of metal.",
-    "can_learn": true,
-    "time_to_learn": "12 h",
-    "required_proficiencies": [ "prof_blacksmithing", "prof_articulation" ]
-  },
-  {
-    "type": "proficiency",
-    "id": "prof_bladesmith",
-    "name": { "str": "Bladesmithing" },
-    "description": "How to fabricate sharp and reliable blades from scratch.",
-    "can_learn": true,
-    "time_to_learn": "12 h",
-    "required_proficiencies": [ "prof_blacksmithing" ]
-  },
   {
     "type": "proficiency",
     "id": "prof_helicopter_pilot",

diff --git a/data/json/proficiencies/tailoring.json b/data/json/proficiencies/tailoring.json
@@ -42,6 +42,15 @@
     "time_to_learn": "10 h",
     "required_proficiencies": [ "prof_closures", "prof_leatherworking_basic" ]
   },
+  {
+    "type": "proficiency",
+    "id": "prof_spinning",
+    "name": { "str": "Spinning" },
+    "description": "The art of spinning fiber into thread.",
+    "//": "In the future, having this proficiency could give a boost to learning rope making and vice versa",
+    "can_learn": true,
+    "time_to_learn": "6 h"
+  },
   {
     "type": "proficiency",
     "id": "prof_millinery",

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -213,7 +213,8 @@
     "proficiencies": [
       { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5 },
-      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3 },
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_armorsmithing", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2, "fail_multiplier": 1.5 }
     ],
@@ -236,8 +237,7 @@
     "proficiencies": [
       { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 1.5 },
-      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
-      { "proficiency": "prof_armorsmithing", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2, "fail_multiplier": 1.5 }
     ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
@@ -686,6 +686,7 @@
       { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 3 },
       { "proficiency": "prof_closures", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_plasticworking", "required": false, "time_multiplier": 3 },
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
       { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 }
     ],
     "tools": [ [ [ "swage", -1 ] ] ],
@@ -704,6 +705,7 @@
     "using": [ [ "blacksmithing_standard", 6 ] ],
     "proficiencies": [
       { "proficiency": "prof_cobbling", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
       { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 }
     ],
     "tools": [ [ [ "swage", -1 ] ] ],

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -294,7 +294,8 @@
     "book_learn": [ [ "textbook_armwest", 5 ] ],
     "using": [ [ "blacksmithing_standard", 24 ], [ "steel_standard", 6 ], [ "clasps", 2 ], [ "strap_small", 2 ] ],
     "proficiencies": [
-      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3 },
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_armorsmithing", "required": false, "time_multiplier": 3 },
       {
         "proficiency": "prof_closures",

diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json
@@ -291,7 +291,8 @@
     "book_learn": [ [ "textbook_armwest", 6 ] ],
     "using": [ [ "blacksmithing_standard", 28 ], [ "steel_standard", 7 ], [ "strap_small", 4 ], [ "clasps", 4 ] ],
     "proficiencies": [
-      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3 },
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
       { "proficiency": "prof_armorsmithing", "required": false, "time_multiplier": 2.5 },
       { "proficiency": "prof_articulation", "required": false, "time_multiplier": 2 }
     ],

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -278,12 +278,8 @@
     "components": [ [ [ "fur", 6 ], [ "tanned_pelt", 1 ], [ "leather", 6 ], [ "tanned_hide", 1 ] ] ],
     "proficiencies": [
       { "proficiency": "prof_armorsmithing", "required": false, "time_multiplier": 2.5 },
-      {
-        "proficiency": "prof_blacksmithing",
-        "required": false,
-        "learning_time_multiplier": 0.5,
-        "time_multiplier": 3
-      }
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 }
     ]
   },
   {

diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json
@@ -100,6 +100,10 @@
     "time": "164 m",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 52 ], [ "steel_standard", 13 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2.5 }
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
@@ -154,6 +158,7 @@
     "using": [ [ "adhesive", 1 ], [ "waterproofing", 1 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SAW_W", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "proficiencies": [ { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 } ],
     "components": [
       [ [ "2x4", 2 ] ],
       [ [ "wire", 1 ], [ "scrap", 2 ], [ "copper_scrap_equivalent", 1, "LIST" ] ],
@@ -168,9 +173,13 @@
     "subcategory": "CSC_OTHER_CONTAINERS",
     "skill_used": "fabrication",
     "difficulty": 2,
-    "time": 90000,
+    "time": "2 h",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2.5 }
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ]
   },
   {

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -265,7 +265,11 @@
     "time": "3 h",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
-    "proficiencies": [ { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 3 } ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
+      { "proficiency": "prof_toolsmithing", "required": false, "time_multiplier": 2 }
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },

diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
@@ -10,6 +10,11 @@
     "time": "10 h",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2.5 },
+      { "proficiency": "prof_toolsmithing", "required": false, "time_multiplier": 2 }
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
@@ -24,6 +29,11 @@
     "time": "5 h",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 6 ], [ "steel_standard", 1 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2.5 },
+      { "proficiency": "prof_bladesmith", "required": false, "time_multiplier": 2 }
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
@@ -39,6 +49,11 @@
     "autolearn": true,
     "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2.5 },
+      { "proficiency": "prof_toolsmithing", "required": false, "time_multiplier": 2 }
+    ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
   {
@@ -53,6 +68,10 @@
     "autolearn": true,
     "using": [ [ "forging_standard", 5 ], [ "steel_standard", 6 ] ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 }
+    ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
   {
@@ -67,6 +86,11 @@
     "time": "30 m",
     "autolearn": true,
     "using": [ [ "welding_standard", 10 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_welding_basic", "required": false, "time_multiplier": 2.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_welding", "required": false, "time_multiplier": 2 }
+    ],
     "components": [ [ [ "sheet_metal_small", 24 ] ] ]
   },
   {
@@ -81,6 +105,10 @@
     "autolearn": true,
     "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ],
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 }
+    ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
   {
@@ -95,6 +123,11 @@
     "reversible": true,
     "autolearn": true,
     "using": [ [ "welding_standard", 6 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_welding_basic", "required": false, "time_multiplier": 2.5, "fail_multiplier": 5 },
+      { "proficiency": "prof_welding", "required": false, "time_multiplier": 2 }
+    ],
     "components": [ [ [ "material_aluminium_ingot", 8 ] ] ]
   }
 ]