Sanify stats of railroad tracks and crude anvil (#76285)

* sanify stats of railroad tracks and anvils * more fixes
CleverRaven · Sep 21, 2024 · 8f1ff34 · 8f1ff34
1 parent bf996fe
commit 8f1ff34
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 57 deletions.
diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1523,7 +1523,7 @@
   {
     "type": "construction_group",
     "id": "place_anvil_crude",
-    "name": "Place Crude Anvil"
+    "name": "Place Small Anvil"
   },
   {
     "type": "construction_group",

diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json
@@ -281,15 +281,15 @@
   {
     "type": "furniture",
     "id": "f_anvil_crude",
-    "name": "crude anvil",
+    "name": "small anvil",
     "looks_like": "f_anvil",
-    "description": "A heavy anvil-shaped block of steel.  It's used for simple metalworking.",
+    "description": "A small, handcrafted anvil.",
     "symbol": "^",
     "color": "light_red",
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 10,
-    "crafting_pseudo_item": "fake_anvil_crude",
+    "crafting_pseudo_item": "fake_anvil",
     "deconstruct": { "items": [ { "item": "anvil_crude", "count": 1 } ] },
     "flags": [ "TRANSPARENT", "NOITEM", "EASY_DECONSTRUCT" ],
     "bash": {

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -5,6 +5,7 @@
     "//": "Tools commonly used by blacksmiths",
     "items": [
       [ "anvil", 30 ],
+      [ "anvil_crude", 10 ],
       [ "chisel", 90 ],
       [ "crucible", 30 ],
       [ "swage", 60 ],

diff --git a/data/json/items/fake.json b/data/json/items/fake.json
@@ -197,13 +197,6 @@
     "name": { "str": "heavy anvil" },
     "qualities": [ [ "ANVIL", 4 ] ]
   },
-  {
-    "id": "fake_anvil_crude",
-    "type": "TOOL",
-    "copy-from": "fake_item",
-    "name": { "str": "anvil" },
-    "qualities": [ [ "ANVIL", 2 ] ]
-  },
   {
     "id": "fake_milling_item",
     "copy-from": "fake_item",

diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
@@ -1120,33 +1120,32 @@
     "category": "spare_parts",
     "name": { "str": "length of railroad track", "str_pl": "lengths of railroad track" },
     "description": "A heavy one-meter length of railroad track with a smooth top, liberated from a now-defunct rail line.  Far too heavy to be useful for much as-is, but perhaps could be shaped into something with some metalworking skill, or cut down into an anvil if sawed in half first.",
-    "weight": "60000 g",
-    "//0": "Modern railroad tracks are typically around 60kg per meter.",
-    "volume": "10 L",
+    "weight": "59826 g",
+    "//0": "60E1, 76.7 cm2 of surface area",
+    "volume": "7670 ml",
     "longest_side": "100 cm",
     "price": "100 USD",
     "price_postapoc": "1 USD",
     "material": [ "mc_steel" ],
     "symbol": "=",
     "color": "light_gray",
-    "qualities": [ [ "ANVIL", 1 ] ]
+    "qualities": [ [ "ANVIL", 2 ] ]
   },
   {
     "id": "railroad_track_item_half",
     "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "half-meter length of railroad track", "str_pl": "half-meter lengths of railroad track" },
     "description": "A heavy half-meter length of railroad track with a smooth top, liberated from a now-defunct rail line.  Could be used as a makeshift anvil, especially with some modifications, or as spare steel.",
-    "weight": "30000 g",
-    "//0": "Modern railroad tracks are typically around 60kg per meter.",
-    "volume": "5 L",
+    "weight": "29913 g",
+    "volume": "3835 ml",
     "longest_side": "50 cm",
     "price": "50 USD",
     "price_postapoc": "50 cent",
     "material": [ "mc_steel" ],
     "symbol": "=",
     "color": "light_gray",
-    "qualities": [ [ "ANVIL", 1 ] ]
+    "qualities": [ [ "ANVIL", 2 ] ]
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -66,13 +66,15 @@
   {
     "id": "anvil_crude",
     "type": "TOOL",
-    "name": { "str": "crude anvil" },
-    "description": "An anvil-shaped object cut out of some form of metal stock or a railroad track.  Usable on its own for simpler metalworking, but could be improved for more advanced recipes.",
-    "weight": "27 kg",
-    "volume": "12 L",
+    "name": { "str": "small anvil" },
+    "description": "A proper, albeit small, anvil.  Pretty handy.",
+    "//": "30 cm of railroad track, minus roughly 400 ml for different chunks of metal.",
+    "weight": "14827 g",
+    "volume": "1901 ml",
+    "longest_side": "30 cm",
     "price": "1 kUSD",
     "price_postapoc": "20 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -19,6 +19,11 @@
     "type": "MIGRATION",
     "replace": "qt_steel_chunk"
   },
+  {
+    "id": "fake_anvil_crude",
+    "type": "MIGRATION",
+    "replace": "fake_anvil"
+  },
   {
     "id": "power_armor_generator",
     "type": "MIGRATION",

diff --git a/.../recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json b/.../recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json
@@ -67,7 +67,7 @@
       { "id": "scrap_copper", "description": " Craft: Copper, Scrap" },
       { "id": "spike", "description": " Craft: Spike" },
       { "id": "steel_chunk", "description": " Craft: Steel, Chunk" },
-      { "id": "anvil", "description": " Craft: Anvil" },
+      { "id": "anvil_crude", "description": " Craft: Small Anvil" },
       { "id": "steel_lump", "description": " Craft: Steel, Lump" },
       { "id": "copper_knife", "description": " Craft: Knife, Copper" },
       { "id": "sword_crude", "description": " Craft: Sword, Crude" },

diff --git a/...ecipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json b/...ecipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json
@@ -85,7 +85,7 @@
       { "id": "spike", "description": " Craft: Spike" },
       { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" },
       { "id": "steel_chunk", "description": " Craft: Steel, Chunk" },
-      { "id": "anvil", "description": " Craft: Anvil" },
+      { "id": "anvil_crude", "description": " Craft: Small Anvil" },
       { "id": "steel_lump", "description": " Craft: Steel, Lump" }
     ]
   },

diff --git a/...json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json b/...json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json
@@ -398,9 +398,9 @@
     "blueprint_requires": [ { "id": "fbmc_firestation1_forge" } ],
     "blueprint_provides": [ { "id": "fbmc_firestation1_anvil" }, { "id": "fbmc_firestation_blacksmith_recipes_2" } ],
     "blueprint_excludes": [ { "id": "fbmc_firestation1_anvil" } ],
-    "blueprint_resources": [ "anvil", "crucible" ],
+    "blueprint_resources": [ "anvil_crude", "crucible" ],
     "check_blueprint_needs": false,
-    "components": [ [ [ "anvil", 1 ] ], [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ] ]
+    "components": [ [ [ "anvil_crude", 1 ] ], [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -417,7 +417,7 @@
     "blueprint_requires": [ { "id": "fbmc_firestation1_anvil" } ],
     "blueprint_provides": [ { "id": "fbmc_firestation1_pottery" }, { "id": "fbmc_firestation_blacksmith_recipes_3" } ],
     "blueprint_excludes": [ { "id": "fbmc_firestation1_pottery" } ],
-    "blueprint_resources": [ "anvil", "crucible" ],
+    "blueprint_resources": [ "anvil_crude", "crucible" ],
     "components": [ [ [ "glassblowing_book", 1 ] ], [ [ "glasses_safety", 1 ] ], [ [ "chemistry_set", 1 ] ], [ [ "pipe", 1 ] ] ]
   },
   {

diff --git a/...basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json b/...basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json
@@ -46,7 +46,7 @@
     "blueprint_requires": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_2" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 3 } ],
-    "blueprint_resources": [ "anvil" ],
+    "blueprint_resources": [ "anvil_crude" ],
     "components": [ [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ]
   },
   {

diff --git a/...basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json b/...basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json
@@ -43,7 +43,7 @@
       { "id": "spike", "description": " Craft: Spike" },
       { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" },
       { "id": "steel_chunk", "description": " Craft: Steel, Chunk" },
-      { "id": "anvil", "description": " Craft: Anvil" },
+      { "id": "anvil_crude", "description": " Craft: Small Anvil" },
       { "id": "steel_lump", "description": " Craft: Steel, Lump" },
       { "id": "lc_steel_lump", "description": " Craft: Mild Steel, Lump" }
     ]

diff --git a/...basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_common.json b/...basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_common.json
@@ -99,7 +99,7 @@
     "blueprint_requires": [ { "id": "fbmw_2_common_smithy_2" } ],
     "blueprint_provides": [ { "id": "fbmw_2_common_smithy_3" }, { "id": "fbmw_2_blacksmith_recipes_3" } ],
     "blueprint_excludes": [ { "id": "fbmw_2_common_smithy_3" } ],
-    "blueprint_resources": [ "anvil" ],
+    "blueprint_resources": [ "anvil_crude" ],
     "components": [ [ [ "55gal_drum", 1 ] ], [ [ "30gal_drum", 1 ] ] ],
     "flags": [
       "MAP_MIRROR_HORIZONTAL_IF_N",

diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json
@@ -414,7 +414,7 @@
       { "id": "spike", "description": " Craft: Spike" },
       { "id": "caltrops_glass", "description": " Craft: Glass Caltrops" },
       { "id": "steel_chunk", "description": " Craft: Steel, Chunk" },
-      { "id": "anvil", "description": " Craft: Anvil" },
+      { "id": "anvil_crude", "description": " Craft: Small Anvil" },
       { "id": "steel_lump", "description": " Craft: Steel, Lump" },
       { "id": "lc_steel_lump", "description": " Craft: Mild Steel, Lump" }
     ]

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -1452,6 +1452,7 @@
         [ "sheet_metal", -1 ],
         [ "fire_brick", -1 ],
         [ "anvil", -1 ],
+        [ "anvil_crude", -1 ],
         [ "anvil_bronze", -1 ],
         [ "casting_mold_small", -1 ]
       ],

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1207,21 +1207,6 @@
       [ [ "fire_brick", 8 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "anvil",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "time": "6 h",
-    "autolearn": true,
-    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 }, { "id": "GRIND", "level": 2 } ],
-    "tools": [ [ [ "drill_press_tool", 20 ] ], [ [ "angle_grinder", 20 ] ] ],
-    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
-    "components": [ [ [ "anvil_crude", 1 ] ] ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
@@ -2965,12 +2950,13 @@
     "subcategory": "CSC_OTHER_TOOLS",
     "skill_used": "fabrication",
     "difficulty": 3,
-    "time": "4 h",
+    "time": "10 h",
     "autolearn": true,
-    "qualities": [ { "id": "HAMMER", "level": 2 } ],
-    "tools": [ [ [ "angle_grinder", 200 ] ] ],
-    "proficiencies": [ { "proficiency": "prof_metalworking" } ],
-    "components": [ [ [ "railroad_track_item_half", 1 ] ] ]
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CHISEL", "level": 3 }, { "id": "GRIND", "level": 2 } ],
+    "tools": [ [ [ "angle_grinder", 220 ] ], [ [ "drill_press_tool", 20 ] ] ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
+    "components": [ [ [ "railroad_track_item_half", 1 ] ] ],
+    "byproducts": [ [ "steel_lump", 15 ] ]
   },
   {
     "result": "anvil_bronze",

diff --git a/data/json/uncraft/tool/metalworking.json b/data/json/uncraft/tool/metalworking.json
@@ -45,6 +45,6 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "50 m",
     "tools": [ [ [ "angle_grinder", 45 ] ] ],
-    "components": [ [ [ "steel_lump", 27 ] ] ]
+    "components": [ [ [ "steel_lump", 14 ] ] ]
   }
 ]
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -29,7 +29,6 @@
       "analytical_set_basic",
       "anvil",
       "anvil_bronze",
-      "anvil_crude",
       "anvil_heavy",
       "ar10",
       "arisaka_monopod",

diff --git a/data/mods/innawood/recipes/other/materials.json b/data/mods/innawood/recipes/other/materials.json
@@ -61,7 +61,14 @@
     "qualities": [ { "id": "CHEM", "level": 1 } ],
     "tools": [
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ],
-      [ [ "sheet_metal", -1 ], [ "fire_brick", -1 ], [ "anvil", -1 ], [ "anvil_bronze", -1 ], [ "casting_mold", -1 ] ],
+      [
+        [ "sheet_metal", -1 ],
+        [ "fire_brick", -1 ],
+        [ "anvil", -1 ],
+        [ "anvil_crude", -1 ],
+        [ "anvil_bronze", -1 ],
+        [ "casting_mold", -1 ]
+      ],
       [ [ "forge", 26 ] ]
     ],
     "components": [
@@ -91,7 +98,14 @@
     "//": "Forest glass, as cited: https://etheses.whiterose.ac.uk/3464/1/287681.pdf",
     "tools": [
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ],
-      [ [ "sheet_metal", -1 ], [ "fire_brick", -1 ], [ "anvil", -1 ], [ "anvil_bronze", -1 ], [ "casting_mold", -1 ] ],
+      [
+        [ "sheet_metal", -1 ],
+        [ "fire_brick", -1 ],
+        [ "anvil", -1 ],
+        [ "anvil_crude", -1 ],
+        [ "anvil_bronze", -1 ],
+        [ "casting_mold", -1 ]
+      ],
       [ [ "forge", 26 ] ]
     ],
     "components": [ [ [ "material_sand", 10 ] ], [ [ "ash", 540 ] ], [ [ "material_quicklime", 2 ], [ "material_limestone", 2 ] ] ]