Skip to content

Commit

Permalink
feat(content): semi-plausible smokeless gunpowder recipe (cataclysmbn…
Browse files Browse the repository at this point in the history
…team#3503)

* Introduce a semi-plausible smokeless gunpowder recipe

* style(autofix.ci): automated formatting

* Define id_suffix for gunpowder recipe, add ether to components

* Remove obsolete gunpowder recipe from Craftable Gun Pack mod

* Revert "Define id_suffix for gunpowder recipe"

* Reapply ether addition for gunpowder recipe

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
YeOldeMiller and autofix-ci[bot] authored Oct 26, 2023
1 parent e2db31c commit 49e4e2b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
23 changes: 23 additions & 0 deletions data/json/recipes/ammo/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,29 @@
"tools": [ [ [ "hotplate", 5 ], [ "toolset", 5 ] ] ],
"components": [ [ [ "oxy_powder", 5 ] ], [ [ "lye_powder", 5 ] ], [ [ "charcoal", 1 ], [ "coal_lump", 1 ] ] ]
},
{
"type": "recipe",
"result": "gunpowder",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_COMPONENTS",
"skill_used": "cooking",
"skills_required": [ "fabrication", 6 ],
"difficulty": 8,
"time": "2 h 40 m",
"charges": 200,
"book_learn": [ [ "textbook_anarch", 7 ], [ "adv_chemistry", 8 ], [ "textbook_chemistry", 8 ] ],
"batch_time_factors": [ 50, 3 ],
"qualities": [ { "id": "CHEM", "level": 3 } ],
"tools": [ [ [ "surface_heat", 250, "LIST" ] ], [ [ "pastaextruder", -1 ] ] ],
"components": [
[ [ "cotton_ball", 5 ] ],
[ [ "chem_nitric_acid", 3 ] ],
[ [ "acid", 3 ], [ "chem_sulphuric_acid", 2 ] ],
[ [ "ether", 125 ] ],
[ [ "water", 9 ], [ "water_clean", 9 ] ],
[ [ "edible_tallow_lard", 2, "LIST" ], [ "tallow_tainted", 2 ], [ "cooking_oil", 16 ], [ "cooking_oil2", 16 ] ]
]
},
{
"type": "recipe",
"result": "exploding_arrow_warhead",
Expand Down
21 changes: 0 additions & 21 deletions data/mods/Craft_Gunpowder/cgp_recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,6 @@
[ [ "sheet_metal", 2 ] ]
]
},
{
"type": "recipe",
"result": "gunpowder",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_COMPONENTS",
"skill_used": "fabrication",
"skills_required": [ "cooking", 1 ],
"difficulty": 4,
"time": 8000,
"book_learn": [
[ "textbook_anarch", 4 ],
[ "recipe_bullets", 2 ],
[ "manual_shotgun", 3 ],
[ "manual_pistol", 3 ],
[ "adv_chemistry", 3 ],
[ "textbook_chemistry", 3 ]
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "chemistry_set", 50 ], [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
"components": [ [ [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "charcoal", 5 ] ] ]
},
{
"type": "recipe",
"result": "smg_9mm",
Expand Down

0 comments on commit 49e4e2b

Please sign in to comment.