Realistic stock removal for smithing and related (CleverRaven#51698)

* Realistic stock removal This update expands mainly on recipes that require forging. Replaces chiseling on most recipes with grinding tools, adds grind qualities to some tools and adds new ones. Co-authored-by: Tealc <45678006+TealcOneill@users.noreply.github.com>
sonphantrung · Oct 3, 2021 · 3376047 · 3376047
1 parent d1e8b47
commit 3376047
Show file tree

Hide file tree

Showing 18 changed files with 251 additions and 144 deletions.
diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -381,5 +381,56 @@
     "material": [ "clay", "wood" ],
     "symbol": ";",
     "color": "brown"
+  },
+  {
+    "id": "stone_polishing",
+    "type": "TOOL",
+    "name": { "str": "polishing stone" },
+    "description": "A large, natural stone with a flat surface to grind against.",
+    "weight": "8000 g",
+    "volume": "3 L",
+    "price": 400,
+    "price_postapoc": 15,
+    "to_hit": -2,
+    "bashing": 25,
+    "material": [ "stone" ],
+    "color": "dark_gray",
+    "symbol": ";",
+    "qualities": [ [ "GRIND", 2 ] ],
+    "flags": [ "DURABLE_MELEE" ]
+  },
+  {
+    "id": "pedal_grindstone",
+    "type": "TOOL",
+    "name": { "str": "pedal powered grindstone" },
+    "description": "A round, pedal-powered grindstone, useful for grinding metal.",
+    "weight": "15000g",
+    "volume": "4 L",
+    "price": 1500,
+    "price_postapoc": 35,
+    "to_hit": -5,
+    "bashing": 30,
+    "material": [ "stone", "wood", "steel" ],
+    "color": "dark_gray",
+    "symbol": ";",
+    "qualities": [ [ "GRIND", 2 ] ]
+  },
+  {
+    "id": "scraper_steel",
+    "type": "TOOL",
+    "name": { "str": "steel scraper" },
+    "description": "A hardened steel tool similar to a drawknife, but for metal.",
+    "weight": "500g",
+    "volume": "500 ml",
+    "price": 1200,
+    "price_postapoc": 20,
+    "to_hit": -1,
+    "bashing": 3,
+    "cutting": 4,
+    "material": [ "wood", "steel" ],
+    "color": "brown",
+    "symbol": ";",
+    "qualities": [ [ "GRIND", 2 ] ],
+    "flags": [ "DURABLE_MELEE" ]
   }
 ]
diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -583,7 +583,7 @@
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
-    "qualities": [ [ "FILE", 2 ] ]
+    "qualities": [ [ "FILE", 2 ], [ "GRIND", 2 ] ]
   },
   {
     "id": "metal_smoother",
@@ -784,6 +784,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
+    "qualities": [ [ "GRIND", 2 ] ],
     "ammo": [ "battery" ],
     "flags": [ "TRADER_AVOID", "WATER_BREAK" ],
     "pocket_data": [

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -691,7 +691,7 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 }, { "id": "FILE", "level": 1 } ],
+    "qualities": [ { "id": "FILE", "level": 1 } ],
     "tools": [ [ [ "hotcut", -1 ] ], [ [ "nail", -1 ] ] ],
     "components": [ [ [ "scrap", 1 ] ] ]
   },

diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
@@ -50,7 +50,7 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 3 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
     "tools": [ [ [ "swage", -1 ] ] ],
     "components": [ [ [ "scrap", 4 ] ] ]
   },
@@ -70,7 +70,6 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_toolsmithing" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
@@ -145,7 +144,6 @@
     "book_learn": [ [ "manual_electronics", 1 ], [ "textbook_electronics", 1 ], [ "advanced_electronics", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
@@ -197,7 +195,7 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_bladesmith" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
@@ -212,7 +210,6 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "hotcut", -1 ] ] ]
   },
   {
@@ -231,7 +228,7 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_toolsmithing" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
@@ -250,7 +247,7 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_bladesmith" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
     "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
@@ -277,7 +274,7 @@
     "time": "300 m",
     "autolearn": true,
     "using": [ [ "forging_standard", 5 ], [ "steel_standard", 6 ] ],
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
@@ -311,7 +308,7 @@
     "time": "180 m",
     "autolearn": true,
     "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ],
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
@@ -430,7 +427,7 @@
     "time": "10 m",
     "autolearn": true,
     "charges": 1,
-    "qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "HAMMER", "level": 2 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 10 ], [ "oxy_torch", 10 ] ] ],
     "components": [ [ [ "copper_scrap_equivalent", 2, "LIST" ] ] ]

diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json
@@ -11,7 +11,6 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
@@ -156,7 +155,6 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
@@ -171,7 +169,6 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "hotcut", -1 ] ] ]
   },
   {
@@ -185,7 +182,7 @@
     "time": "210 m",
     "autolearn": true,
     "using": [ [ "forging_standard", 1 ], [ "steel_tiny", 1 ] ],
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
     "proficiencies": [
       { "proficiency": "prof_metalworking" },
       { "proficiency": "prof_blacksmithing" },
@@ -290,7 +287,6 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_toolsmithing" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
@@ -303,7 +299,7 @@
     "difficulty": 5,
     "time": "1 h 30 m",
     "autolearn": true,
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ],
     "components": [ [ [ "copper_scrap_equivalent", 8, "LIST" ] ] ]

diff --git a/data/json/recipes/other/power_supplies.json b/data/json/recipes/other/power_supplies.json
@@ -563,7 +563,6 @@
     "time": "45 m",
     "book_learn": [ [ "adv_chemistry", 4 ] ],
     "using": [ [ "blacksmithing_standard", 1 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [
       [ [ "chem_manganese_dioxide", 29 ] ],
@@ -585,7 +584,6 @@
     "time": "1 h",
     "book_learn": [ [ "adv_chemistry", 4 ] ],
     "using": [ [ "blacksmithing_standard", 1 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [
       [ [ "chem_manganese_dioxide", 87 ] ],
@@ -607,7 +605,6 @@
     "time": "1 h 20 m",
     "book_learn": [ [ "adv_chemistry", 4 ] ],
     "using": [ [ "blacksmithing_standard", 1 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [
       [ [ "chem_manganese_dioxide", 348 ] ],
@@ -629,7 +626,6 @@
     "time": "1 h 45 m",
     "book_learn": [ [ "adv_chemistry", 4 ] ],
     "using": [ [ "blacksmithing_standard", 1 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [
       [ [ "chem_manganese_dioxide", 725 ] ],

diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json
@@ -678,8 +678,7 @@
     "difficulty": 2,
     "time": "100 m",
     "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 16 ], [ "steel_standard", 4 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ]
+    "using": [ [ "blacksmithing_standard", 16 ], [ "steel_standard", 4 ] ]
   },
   {
     "type": "recipe",
@@ -693,7 +692,6 @@
     "time": "180 m",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {

diff --git a/data/json/recipes/recipe_companion.json b/data/json/recipes/recipe_companion.json
@@ -26,7 +26,7 @@
     "autolearn": false,
     "never_learn": true,
     "using": [ [ "forging_standard", 1 ], [ "steel_standard", 6 ] ],
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
   {
@@ -42,7 +42,7 @@
     "autolearn": false,
     "never_learn": true,
     "using": [ [ "forging_standard", 1 ], [ "steel_standard", 8 ] ],
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ]
   },
   {
@@ -57,7 +57,7 @@
     "time": "18 m",
     "autolearn": false,
     "never_learn": true,
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 5 ], [ "oxy_torch", 1 ] ] ],
     "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 3 ] ] ]
   },
@@ -73,7 +73,7 @@
     "time": "3 m",
     "autolearn": false,
     "never_learn": true,
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "forge", 10 ], [ "oxy_torch", 2 ] ] ],
     "components": [ [ [ "scrap", 1 ] ] ]
   },
@@ -89,7 +89,7 @@
     "time": "12 m",
     "autolearn": false,
     "never_learn": true,
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 10 ], [ "oxy_torch", 2 ] ] ],
     "components": [ [ [ "scrap", 7 ] ] ]
   },
@@ -105,7 +105,7 @@
     "time": "9 m",
     "autolearn": false,
     "never_learn": true,
-    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 }, { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 5 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 10 ], [ "oxy_torch", 2 ] ] ],
     "components": [ [ [ "scrap", 3 ] ] ]
   },

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -612,7 +612,6 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "components": [ [ [ "scrap", 1 ] ] ]
   },
   {
@@ -1114,7 +1113,6 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_toolsmithing" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
@@ -1133,7 +1131,7 @@
       { "proficiency": "prof_blacksmithing" },
       { "proficiency": "prof_toolsmithing" }
     ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "qualities": [ { "id": "GRIND", "level": 2 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {

diff --git a/data/json/recipes/recipe_traps.json b/data/json/recipes/recipe_traps.json
@@ -12,7 +12,6 @@
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
   {

diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -1000,7 +1000,6 @@
     "time": "3 h",
     "autolearn": true,
     "using": [ [ "blacksmithing_standard", 20 ], [ "steel_standard", 5 ] ],
-    "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
   {