Skip to content

Commit 74a1ffd

Browse files
BalthazarArgallBalthazarArgall
authored
Update nail making (#82557)
* initial commit * touch up the bronze header description * fix bronze nail header id in recipe * casting requires molds * fix densities * fix densities for real this time
1 parent 8093a92 commit 74a1ffd

File tree

7 files changed

+78
-71
lines changed

7 files changed

+78
-71
lines changed

‎data/json/items/tool/metalworking.json‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
[
2-
{
3-
"id": "crude_bronze_nail",
4-
"type": "ITEM",
5-
"category": "spare_parts",
6-
"name": { "str": "crude bronze nail" },
7-
"description": "A crude bronze nail. Probably not useful for many things due to its size and shape.",
8-
"ascii_picture": "nail",
9-
"weight": "7 g",
10-
"volume": "1ml",
11-
"longest_side": "40 mm",
12-
"price": "1 USD",
13-
"price_postapoc": "10 cent",
14-
"material": [ "bronze" ],
15-
"symbol": "=",
16-
"color": "yellow"
17-
},
182
{
193
"id": "anvil",
204
"type": "ITEM",

‎data/json/items/tool/workshop.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,5 +1866,31 @@
18661866
"material": [ "lc_steel" ],
18671867
"symbol": "-",
18681868
"color": "light_gray"
1869+
},
1870+
{
1871+
"id": "nail_header",
1872+
"type": "ITEM",
1873+
"subtypes": [ "TOOL" ],
1874+
"name": { "str": "nail header" },
1875+
"description": "A square hole punched through the flat end of a metal handle. Used to form the flat end of a nail by feeding it through the header then hammering the material sticking out of it.",
1876+
"longest_side": "20 cm",
1877+
"weight": "500 g",
1878+
"volume": "64 ml",
1879+
"price": "20 USD",
1880+
"price_postapoc": "3 USD",
1881+
"material": [ "mc_steel" ],
1882+
"symbol": "i",
1883+
"color": "light_gray"
1884+
},
1885+
{
1886+
"id": "nail_header_bronze",
1887+
"copy-from": "nail_header",
1888+
"type": "ITEM",
1889+
"subtypes": [ "TOOL" ],
1890+
"name": { "str": "bronze nail header" },
1891+
"description": "A square hole punched through the flat end of a metal handle. Used to form the flat end of a nail by feeding it through the header then hammering the material sticking out of it. This one is made of bronze.",
1892+
"proportional": { "weight": 1.1 },
1893+
"material": [ "bronze" ],
1894+
"color": "yellow"
18691895
}
18701896
]

‎data/json/obsoletion_and_migration_0.I/migration_items.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2686,5 +2686,10 @@
26862686
"type": "MIGRATION",
26872687
"id": "super_glue",
26882688
"replace": "glue_strong"
2689+
},
2690+
{
2691+
"type": "MIGRATION",
2692+
"id": "crude_bronze_nail",
2693+
"replace": "bronze_nail"
26892694
}
26902695
]

‎data/json/recipes/other/parts_construction.json‎

Lines changed: 15 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,40 @@
11
[
22
{
33
"type": "recipe",
4-
"activity_level": "MODERATE_EXERCISE",
54
"result": "nail",
65
"category": "CC_OTHER",
76
"subcategory": "CSC_OTHER_MATERIALS",
87
"skill_used": "fabrication",
9-
"difficulty": 1,
10-
"time": "3 h",
118
"autolearn": true,
12-
"using": [ [ "blacksmithing_standard", 1 ], [ "steel_chunk_any", 1 ] ],
13-
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
14-
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ]
15-
},
16-
{
17-
"type": "recipe",
9+
"difficulty": 3,
10+
"charges": 83,
1811
"activity_level": "MODERATE_EXERCISE",
19-
"result": "crude_bronze_nail",
20-
"category": "CC_OTHER",
21-
"subcategory": "CSC_OTHER_MATERIALS",
22-
"skill_used": "fabrication",
23-
"difficulty": 2,
24-
"charges": 30,
25-
"time": "4 h",
26-
"autolearn": true,
27-
"using": [ [ "bronze_tiny", 1 ] ],
28-
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 2 } ],
29-
"tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ] ] ],
30-
"proficiencies": [
31-
{ "proficiency": "prof_metalworking" },
32-
{ "proficiency": "prof_redsmithing" },
33-
{ "proficiency": "prof_redsmithing_adv" }
34-
]
12+
"time": "55 m",
13+
"batch_time_factors": [ 2, 10 ],
14+
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing", "time_multiplier": 1.5 } ],
15+
"using": [ [ "blacksmithing_standard", 1 ] ],
16+
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "nail_header", 1 ] ] ],
17+
"components": [ [ [ "lc_steel_chunk", 1 ] ] ]
3518
},
3619
{
3720
"type": "recipe",
38-
"activity_level": "MODERATE_EXERCISE",
3921
"result": "bronze_nail",
40-
"id_suffix": "simple",
41-
"charges": 30,
4222
"category": "CC_OTHER",
4323
"subcategory": "CSC_OTHER_MATERIALS",
4424
"skill_used": "fabrication",
45-
"difficulty": 2,
46-
"time": "2 h",
4725
"autolearn": true,
48-
"using": [ [ "bronze_tiny", 1 ] ],
49-
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
50-
"tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ] ] ],
51-
"proficiencies": [
52-
{ "proficiency": "prof_metalworking" },
53-
{ "proficiency": "prof_redsmithing" },
54-
{ "proficiency": "prof_redsmithing_adv" }
55-
]
56-
},
57-
{
58-
"type": "recipe",
26+
"difficulty": 3,
27+
"charges": 12,
5928
"activity_level": "MODERATE_EXERCISE",
60-
"result": "bronze_nail",
61-
"category": "CC_OTHER",
62-
"subcategory": "CSC_OTHER_MATERIALS",
63-
"skill_used": "fabrication",
64-
"difficulty": 1,
65-
"//": "Bronze is typically easier to work than steel/iron",
66-
"time": "2 h",
67-
"autolearn": true,
68-
"using": [ [ "blacksmithing_standard", 1 ], [ "bronze_tiny", 1 ] ],
29+
"time": "12 m 30 s",
30+
"batch_time_factors": [ 2, 40 ],
6931
"proficiencies": [
7032
{ "proficiency": "prof_metalworking" },
71-
{ "proficiency": "prof_redsmithing" },
33+
{ "proficiency": "prof_redsmithing", "time_multiplier": 1.5 },
7234
{ "proficiency": "prof_redsmithing_adv" }
7335
],
74-
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ] ]
36+
"using": [ [ "blacksmithing_standard", 1 ], [ "bronze_tiny", 1 ] ],
37+
"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "nail_header", 1 ], [ "nail_header_bronze", 1 ] ] ]
7538
},
7639
{
7740
"type": "recipe",

‎data/json/recipes/tools/tool.json‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"time": "5 m",
121121
"autolearn": true,
122122
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ],
123-
"components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "nails", 1, "LIST" ], [ "crude_bronze_nail", 1 ] ] ]
123+
"components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "nails", 1, "LIST" ], [ "bronze_nail", 1 ] ] ]
124124
},
125125
{
126126
"result": "shed_stick",
@@ -1430,5 +1430,35 @@
14301430
"proficiencies": [ { "proficiency": "prof_toolsmithing" } ],
14311431
"qualities": [ { "id": "DRILL", "level": 3 } ],
14321432
"components": [ [ [ "lc_steel_lump", 1 ] ] ]
1433+
},
1434+
{
1435+
"type": "recipe",
1436+
"activity_level": "LIGHT_EXERCISE",
1437+
"result": "nail_header",
1438+
"category": "CC_OTHER",
1439+
"subcategory": "CSC_OTHER_TOOLS",
1440+
"skill_used": "fabrication",
1441+
"difficulty": 2,
1442+
"time": "10 m",
1443+
"autolearn": true,
1444+
"proficiencies": [ { "proficiency": "prof_toolsmithing", "time_multiplier": 1.5 } ],
1445+
"using": [ [ "blacksmithing_standard", 1 ] ],
1446+
"tools": [ [ [ "drift", 1 ] ] ],
1447+
"components": [ [ [ "mc_steel_chunk", 1 ], [ "hc_steel_chunk", 1 ] ] ]
1448+
},
1449+
{
1450+
"type": "recipe",
1451+
"activity_level": "LIGHT_EXERCISE",
1452+
"result": "nail_header_bronze",
1453+
"category": "CC_OTHER",
1454+
"subcategory": "CSC_OTHER_TOOLS",
1455+
"skill_used": "fabrication",
1456+
"difficulty": 2,
1457+
"time": "30 m",
1458+
"autolearn": true,
1459+
"proficiencies": [ { "proficiency": "prof_redsmithing" } ],
1460+
"using": [ [ "forging_standard", 1 ], [ "bronzesmithing_tools", 1 ] ],
1461+
"tools": [ [ [ "casting_mold_large", -1 ], [ "casting_mold_long", -1 ] ] ],
1462+
"components": [ [ [ "bronze_tiny", 2, "LIST" ] ] ]
14331463
}
14341464
]

‎data/json/recipes/tools/tools_hand.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@
17031703
[ [ "clay_lump", 1 ] ],
17041704
[ [ "material_sand", 113 ] ],
17051705
[ [ "2x4", 2 ], [ "stick", 2 ] ],
1706-
[ [ "nail", 8 ], [ "bronze_nail", 8 ], [ "glue_strong", 4 ], [ "crude_bronze_nail", 8 ] ]
1706+
[ [ "nail", 8 ], [ "bronze_nail", 8 ], [ "glue_strong", 4 ] ]
17071707
]
17081708
},
17091709
{

‎data/mods/TEST_DATA/known_bad_uncrafts.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,6 @@
20612061
"crossbow_trap",
20622062
"crucible",
20632063
"crucible_clay",
2064-
"crude_bronze_nail",
20652064
"crude_firestarter",
20662065
"crude_heating_element",
20672066
"crude_lamp_oil",

0 commit comments

Comments
 (0)