Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add crude_bronze_nail and adjust others to allow entry to the b… #75942

Merged
merged 5 commits into from
Sep 5, 2024
Merged

feat: add crude_bronze_nail and adjust others to allow entry to the b… #75942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
599b6e5
feat: add crude_bronze_nail and adjust others to allow entry to the b…
juur Aug 25, 2024
e80a2ae
Merge branch 'master' into nail-casting
juur Aug 31, 2024
1e01367
fixed crazy mass/density
juur Aug 31, 2024
e8afdd5
fix huge mass loss
juur Aug 31, 2024
24340b0
fix huge mass loss #2
juur Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions data/json/items/tool/metalworking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "7 g",
"volume": "1ml",
"longest_side": "40 mm",
"price": "1 USD",
"price_postapoc": "10 cent",
"material": [ "bronze" ],
"symbol": "=",
"color": "yellow"
},
{
"id": "anvil",
"type": "TOOL",
Expand Down
33 changes: 33 additions & 0 deletions data/json/recipes/other/parts_construction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,39 @@
"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,
"charges": 30,
"time": "4 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": 30,
"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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/tools/tool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/tools/tools_hand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 ] ]
]
},
{
Expand Down
Loading