From 599b6e53b19b1c1600121e21ab5f376487cc91c1 Mon Sep 17 00:00:00 2001 From: juur Date: Sun, 25 Aug 2024 13:21:26 +0100 Subject: [PATCH 1/4] feat: add crude_bronze_nail and adjust others to allow entry to the bronze age --- data/json/items/tool/metalworking.json | 16 ++++++++++ .../recipes/other/parts_construction.json | 32 +++++++++++++++++++ data/json/recipes/tools/tool.json | 2 +- data/json/recipes/tools/tools_hand.json | 4 +-- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index b4f12eba441e7..948195d32316f 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -1,4 +1,20 @@ [ + { + "id": "crude_bronze_nail", + "type": "GENERIC", + "category": "spare_parts", + "name": { "str": "crude bronze nail" }, + "description": "A crude bronze nail. Probably not useful for many things due to its size and shape.", + "ascii_picture": "nail", + "weight": "16 g", + "volume": "750ml", + "longest_side": "30 mm", + "price": "1 USD", + "price_postapoc": "10 cent", + "material": [ "bronze" ], + "symbol": "=", + "color": "yellow" + }, { "id": "anvil", "type": "TOOL", diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index 426a8b9361e15..a98b7f4bfc9ed 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -13,6 +13,38 @@ "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ] }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "crude_bronze_nail", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "1 h", + "autolearn": true, + "using": [ [ "bronze_tiny", 1 ] ], + "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 } ], + "tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ] ] ], + "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ] + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "bronze_nail", + "id_suffix": "simple", + "charges": 6, + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 2, + "time": "2 h", + "autolearn": true, + "using": [ [ "bronze_tiny", 1 ] ], + "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ], + "tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ] ] ], + "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ] + }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index 8170e7337b16d..6ab22c1a82003 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -197,7 +197,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "nails", 1, "LIST" ] ] ] + "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "nails", 1, "LIST" ], [ "crude_bronze_nail", 1 ] ] ] }, { "result": "shed_stick", diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json index 3cafa85828451..70a89fe717698 100644 --- a/data/json/recipes/tools/tools_hand.json +++ b/data/json/recipes/tools/tools_hand.json @@ -139,7 +139,7 @@ "using": [ [ "forging_standard", 3 ], [ "bronze_tiny", 3 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "GRIND", "level": 2 } ], "tools": [ [ [ "casting_mold_large", -1 ], [ "casting_mold_long", -1 ] ] ], - "components": [ [ [ "nail", 1 ], [ "bronze_nail", 1 ], [ "nuts_bolts", 1 ] ] ] + "components": [ [ [ "nail", 1 ], [ "crude_bronze_nail", 1 ], [ "bronze_nail", 1 ], [ "nuts_bolts", 1 ] ] ] }, { "type": "recipe", @@ -1683,7 +1683,7 @@ [ [ "clay_lump", 1 ] ], [ [ "material_sand", 113 ] ], [ [ "2x4", 2 ], [ "stick", 2 ] ], - [ [ "nail", 8 ], [ "bronze_nail", 8 ], [ "super_glue", 4 ] ] + [ [ "nail", 8 ], [ "bronze_nail", 8 ], [ "super_glue", 4 ], [ "crude_bronze_nail", 8 ] ] ] }, { From 1e013678ddc30c3771821532ab8534ef32b2d771 Mon Sep 17 00:00:00 2001 From: juur Date: Sat, 31 Aug 2024 09:01:53 +0100 Subject: [PATCH 2/4] fixed crazy mass/density --- data/json/items/tool/metalworking.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index 948195d32316f..01da8545c13e1 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -6,9 +6,9 @@ "name": { "str": "crude bronze nail" }, "description": "A crude bronze nail. Probably not useful for many things due to its size and shape.", "ascii_picture": "nail", - "weight": "16 g", - "volume": "750ml", - "longest_side": "30 mm", + "weight": "7 g", + "volume": "1ml", + "longest_side": "40 mm", "price": "1 USD", "price_postapoc": "10 cent", "material": [ "bronze" ], From e8afdd5848d73af1f947953478941d1373de9fa9 Mon Sep 17 00:00:00 2001 From: juur Date: Sat, 31 Aug 2024 10:14:47 +0100 Subject: [PATCH 3/4] fix huge mass loss --- data/json/recipes/other/parts_construction.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index a98b7f4bfc9ed..b8d7c29a0a31f 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -21,7 +21,8 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, - "time": "1 h", + "charges": 30, + "time": "4 h", "autolearn": true, "using": [ [ "bronze_tiny", 1 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 } ], From 24340b07a696f46b069b88d4362e57025316d427 Mon Sep 17 00:00:00 2001 From: juur Date: Sat, 31 Aug 2024 11:36:35 +0100 Subject: [PATCH 4/4] fix huge mass loss #2 --- data/json/recipes/other/parts_construction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index b8d7c29a0a31f..7fd5f7ab60879 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -34,7 +34,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "bronze_nail", "id_suffix": "simple", - "charges": 6, + "charges": 30, "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication",