From d9dd69087542c64ab20d1ab6665732d0911913f0 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 14 Mar 2023 13:09:59 -0700 Subject: Port to DDA. --- json/items/ammo/40x46mm.json | 50 ------- json/items/ammo/40x53mm.json | 25 ---- json/items/tool/explosive.json | 58 +------- json/recipes/ammo/40x46mm.json | 278 ++++++++++++++++++++++++++++++------ json/recipes/ammo/40x53mm.json | 142 ++++++++++++++---- json/recipes/chem/chemicals.json | 29 +++- json/recipes/other/materials.json | 4 + json/recipes/weapons/explosive.json | 117 ++------------- json/uncraft/ammo/40x46mm.json | 120 +++------------- json/uncraft/ammo/40x53mm.json | 68 ++------- json/unobsoletion/recipes.json | 12 -- modinfo.json | 2 +- readme | 3 +- 13 files changed, 422 insertions(+), 486 deletions(-) delete mode 100644 json/unobsoletion/recipes.json diff --git a/json/items/ammo/40x46mm.json b/json/items/ammo/40x46mm.json index 0a374e4..cd63290 100644 --- a/json/items/ammo/40x46mm.json +++ b/json/items/ammo/40x46mm.json @@ -50,55 +50,5 @@ }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "40x46mm_buckshot_m118", - "copy-from": "40x46mm_buckshot_m118", - "type": "AMMO", - "name": { "str": "40x46mm buckshot" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_buckshot_m199", - "copy-from": "40x46mm_buckshot_m199", - "type": "AMMO", - "name": { "str": "40x46mm buckshot" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_slug_m118", - "copy-from": "40x46mm_slug_m118", - "type": "AMMO", - "name": { "str": "40x46mm slug" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_slug_m199", - "copy-from": "40x46mm_slug_m199", - "type": "AMMO", - "name": { "str": "40x46mm slug" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_flechette_m118", - "copy-from": "40x46mm_flechette_m199", - "type": "AMMO", - "name": { "str": "40x46mm flechette" }, - "description": "An improvised 40x46mm flechette load somewhat resembling M1001.", - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_flechette_m199", - "copy-from": "40x46mm_flechette_m199", - "type": "AMMO", - "name": { "str": "40x46mm flechette" }, - "description": "An improvised 40x46mm flechette load somewhat resembling M1001.", - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/json/items/ammo/40x53mm.json b/json/items/ammo/40x53mm.json index 1bb9c28..1e0d941 100644 --- a/json/items/ammo/40x53mm.json +++ b/json/items/ammo/40x53mm.json @@ -24,30 +24,5 @@ }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "40x53mm_buckshot_m169", - "copy-from": "40x53mm_buckshot_m169", - "type": "AMMO", - "name": { "str": "40x53mm buckshot" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x53mm_slug_m169", - "copy-from": "40x53mm_slug_m169", - "type": "AMMO", - "name": { "str": "40x53mm slug" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x53mm_flechette_m169", - "copy-from": "40x53mm_flechette_m169", - "type": "AMMO", - "name": { "str": "40x53mm flechette" }, - "description": "An improvised 40x53mm flechette load somewhat resembling M1001.", - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json index 0c8033c..09652be 100644 --- a/json/items/tool/explosive.json +++ b/json/items/tool/explosive.json @@ -1,11 +1,4 @@ [ - { - "id": "can_bomb_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "can_bomb_act", - "name": { "str": "can bomb (active)", "str_pl": "can bombs (active)" } - }, { "id": "c4", "type": "TOOL", @@ -20,7 +13,7 @@ "material": [ "plastic" ], "symbol": ";", "color": "light_gray", - "use_action": "C4" + "use_action": [ "C4" ] }, { "id": "c4armed", @@ -54,13 +47,6 @@ "weight": "370 g", "description": "This stun grenade is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby. It may be a good idea to throw it!" }, - { - "id": "fragment_bomb_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "fragment_bomb_act", - "name": { "str": "fragment bomb (lit)", "str_pl": "fragment bombs (lit)" } - }, { "id": "fungicidalbomb", "type": "TOOL", @@ -100,20 +86,6 @@ "name": { "str": "M67 fragmentation grenade (active)", "str_pl": "M67 fragmentation grenades (active)" }, "description": "This fragmentation grenade is active, and will explode any second now. Better throw it!" }, - { - "id": "makeshift_grenade", - "type": "TOOL", - "category": "weapons", - "copy-from": "makeshift_grenade", - "name": { "str": "makeshift fragmentation grenade" } - }, - { - "id": "makeshift_grenade_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "makeshift_grenade_act", - "name": { "str": "makeshift fragmentation grenade (active)", "str_pl": "makeshift fragmentation grenades (active)" } - }, { "id": "grenade_emp_act", "type": "TOOL", @@ -199,13 +171,6 @@ "copy-from": "molotov_lit", "name": { "str": "Molotov cocktail (lit)", "str_pl": "Molotov cocktails (lit)" } }, - { - "id": "nail_bomb_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "nail_bomb_act", - "name": { "str": "nail bomb (lit)", "str_pl": "nail bombs (lit)" } - }, { "id": "pipebomb_act", "type": "TOOL", @@ -238,27 +203,6 @@ "weight": "539 g", "description": "This smoke grenade has had its pin removed and is expelling thick smoke." }, - { - "id": "tool_anfo_charge_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "tool_anfo_charge_act", - "name": { "str": "ANFO charge (lit)", "str_pl": "ANFO charges (lit)" } - }, - { - "id": "tool_black_powder_charge_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "tool_black_powder_charge_act", - "name": { "str": "black gunpowder charge (lit)", "str_pl": "black gunpowder charges (lit)" } - }, - { - "id": "tool_rdx_charge_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "tool_rdx_charge_act", - "name": { "str": "RDX charge (lit)", "str_pl": "RDX charges (lit)" } - }, { "id": "tool_rocket_candy_act", "type": "TOOL", diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json index fa00a20..36d27e5 100644 --- a/json/recipes/ammo/40x46mm.json +++ b/json/recipes/ammo/40x46mm.json @@ -2,6 +2,7 @@ { "result": "40x46mm_bootleg_m433", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -11,13 +12,14 @@ "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "textbook_anarch", 7 ] ], "charges": 1, + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities" : [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "military_explosive", 23, "LIST" ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 2 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m118_casing", 1 ] ] ] @@ -25,6 +27,7 @@ { "result": "40x46mm_bootleg_m576", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -34,12 +37,13 @@ "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "textbook_anarch", 7 ] ], "charges": 1, + "proficiencies": [ { "proficiency": "prof_handloading" } ], "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ], "tools": [ [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 3 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m199_casing", 1 ] ] ] @@ -47,6 +51,7 @@ { "result": "40x46mm_bootleg_m651", "type" : "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "cooking", @@ -56,13 +61,14 @@ "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "textbook_anarch", 7 ] ], "charges": 1, + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities" : [ { "id": "SCREW", "level": 1 }, { "id": "CHEM", "level": 2 } ], "components": [ [ [ "bleach", 2 ] ], [ [ "ammonia", 2 ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m195_casing", 1 ] ] ] @@ -70,6 +76,7 @@ { "result": "40x46mm_bootleg_m1006", "type" : "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -79,20 +86,22 @@ "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "textbook_anarch", 7 ] ], "charges": 1, + "proficiencies": [ { "proficiency": "prof_handloading" } ], "using": [ [ "shot_forming", 2 ] ], "tools": [ [ [ "swage", -1 ] ] ], "qualities" : [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "paper", 1 ], [ "wax", 1 ] ], [ [ "rubber_slug", 2 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m212_casing", 1 ] ] ] }, - { + { "result": "40x46mm_buckshot_m118", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -103,19 +112,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ], - "tools": [ [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m118_casing", 1 ] ] + [ [ "gunpowder_shotgun", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] ] }, - { + { "result": "40x46mm_buckshot_m199", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -126,19 +139,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ], - "tools": [ [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m199_casing", 1 ] ] + [ [ "gunpowder_shotgun", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] ] }, - { + { "result": "40x46mm_slug_m118", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -149,19 +166,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 36 ] ], - "tools": [ [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m118_casing", 1 ] ] + [ [ "gunpowder_shotgun", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] ] }, - { + { "result": "40x46mm_slug_m199", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -172,19 +193,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 36 ] ], - "tools": [ [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m199_casing", 1 ] ] + [ [ "gunpowder_shotgun", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] ] }, { "result": "40x46mm_flechette_m118", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -195,19 +220,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "combatnail", 40 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m118_casing", 1 ] ] + [ [ "combatnail", 10 ] ], + [ [ "gunpowder_shotgun", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] ] }, - { + { "result": "40x46mm_flechette_m199", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -218,14 +247,173 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "combatnail", 40 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m199_casing", 1 ] ] + [ [ "combatnail", 10 ] ], + [ [ "gunpowder_shotgun", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_buckshot_m118", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_buckshot_m199", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_slug_m118", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_slug_m199", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_flechette_m118", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 10 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_flechette_m199", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 10 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] ] } ] diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json index 55c8a37..4bad210 100644 --- a/json/recipes/ammo/40x53mm.json +++ b/json/recipes/ammo/40x53mm.json @@ -2,6 +2,7 @@ { "result": "40x53mm_bootleg_m430a1", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -11,13 +12,14 @@ "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "textbook_anarch", 7 ] ], "charges": 1, + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities" : [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], - [ [ "military_explosive", 36, "LIST" ] ], + [ [ "chem_compositionb", 32 ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 42 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "40x53mm_m169_casing", 1 ] ] ] @@ -25,6 +27,7 @@ { "result": "40x53mm_bootleg_m1001", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -35,19 +38,21 @@ "book_learn": [ [ "textbook_anarch", 7 ] ], "charges": 1, "using": [ [ "shot_forming", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "combatnail", 50 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "combatnail", 115 ] ], + [ [ "gunpowder_shotgun", 86 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "40x53mm_m169_casing", 1 ] ] ] }, - { + { "result": "40x53mm_buckshot_m169", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -58,19 +63,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 22 ] ], - "tools": [ [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "using": [ [ "shot_forming", 12 ], [ "ammo_bullet", 126 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "11.5x the propellant and 11.5x the payload of 12 gauge 00 shot load. 13409 mg gunpowder rounded to 134 100 mg 'pieces'", "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 35 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "40x53mm_m169_casing", 1 ] ] + [ [ "gunpowder_shotgun", 134 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] ] }, - { + { "result": "40x53mm_slug_m169", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -81,19 +90,23 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 44 ] ], - "tools": [ [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 115 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "11.5x the propellant and 11.5x the payload of 12 gauge slug load. 19366 mg gunpowder rounded to 194 100 mg 'pieces'", "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder", 35 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "40x53mm_m169_casing", 1 ] ] + [ [ "gunpowder_shotgun", 194 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] ] }, { "result": "40x53mm_flechette_m169", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", @@ -104,14 +117,95 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "//": "11.5x the propellant and 11.5x the payload of 12 gauge flechette load. 8625 mg gunpowder rounded to 86 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ + [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "combatnail", 50 ] ], - [ [ "gunpowder", 35 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "40x53mm_m169_casing", 1 ] ] + [ [ "combatnail", 115 ] ], + [ [ "gunpowder_shotgun", 86 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "bp_40x53mm_buckshot_m169", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 12 ], [ "ammo_bullet", 126 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 134 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "bp_40x53mm_slug_m169", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 115 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 194 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "bp_40x53mm_flechette_m169", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_GRENADES", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 2 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 115 ] ], + [ [ "chem_black_powder", 86 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] ] } ] diff --git a/json/recipes/chem/chemicals.json b/json/recipes/chem/chemicals.json index ce6fe3e..4776c57 100644 --- a/json/recipes/chem/chemicals.json +++ b/json/recipes/chem/chemicals.json @@ -1,10 +1,11 @@ [ { "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "result": "chem_compositionb", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 8, "time": "45 m", "batch_time_factors": [ 80, 5 ], @@ -18,15 +19,33 @@ }, { "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "result": "chem_hmtd", + "id_suffix": "from_acetic", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 7, - "time": "55 m", + "skill_used": "chemistry", + "difficulty": 5, + "time": "55 m", "batch_time_factors": [ 80, 5 ], "book_learn": [ [ "recipe_labchem", 8 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], - "components": [ [ [ "chem_hexamine", 25 ] ], [ [ "chem_hydrogen_peroxide_conc", 5 ] ], [ [ "chem_acetic_acid", 2] ] ] + "components": [ [ [ "chem_hexamine", 25 ] ], [ [ "chem_hydrogen_peroxide_conc", 5 ] ], [ [ "chem_acetic_acid", 2 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "chem_hmtd", + "id_suffix": "from_citric", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_CHEMICALS", + "skill_used": "chemistry", + "difficulty": 5, + "time": "55 m", + "batch_time_factors": [ 80, 5 ], + "charges": 2, + "book_learn": [ [ "recipe_labchem", 8 ] ], + "qualities": [ { "id": "BOIL", "level": 2 } ], + "components": [ [ [ "chem_hexamine", 25 ] ], [ [ "chem_hydrogen_peroxide_conc", 5 ] ], [ [ "chem_citric_acid", 2 ] ] ] } ] diff --git a/json/recipes/other/materials.json b/json/recipes/other/materials.json index 1d2df2d..b0e28a3 100644 --- a/json/recipes/other/materials.json +++ b/json/recipes/other/materials.json @@ -2,6 +2,7 @@ { "type": "recipe", "//": "Loosely based on plastic chunk from plastic bag recipe", + "activity_level": "LIGHT_EXERCISE", "result": "rubber_slug", "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", @@ -12,6 +13,7 @@ "book_learn": [ [ "textbook_anarch", 6 ] ], "reversible": false, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ], + "proficiencies": [ { "proficiency": "prof_plasticworking", "required": false, "time_multiplier": 1.5 } ], "tools": [ [ [ "surface_heat", 15, "LIST" ] ], [ [ "mold_plastic", -1 ] ] @@ -23,6 +25,7 @@ { "result": "delay_fuze", "//": "Loosely based on fuse and wire recipes", + "activity_level": "LIGHT_EXERCISE", "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", @@ -53,6 +56,7 @@ { "result": "impact_fuze", "//": "Loosely based on fuse and wire recipes", + "activity_level": "LIGHT_EXERCISE", "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json index 43fddf6..6f50e1b 100644 --- a/json/recipes/weapons/explosive.json +++ b/json/recipes/weapons/explosive.json @@ -2,6 +2,7 @@ { "result": "c4", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", @@ -19,25 +20,10 @@ [ [ "lamp_oil", 100 ], [ "motor_oil", 100 ] ] ] }, - { - "result": "can_bomb", - "//": "Poor man's grenade.", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "time": "2 m", - "reversible": true, - "autolearn": true, - "components": [ - [ [ "volatile_explosive", 18, "LIST" ], [ "stable_explosive", 18, "LIST" ], [ "military_explosive", 18, "LIST" ] ], - [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ] ], - [ [ "fuse", 1 ] ] - ] - }, { "result": "flashbang", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", @@ -57,6 +43,7 @@ { "result": "fungicidalbomb", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", @@ -77,6 +64,7 @@ { "result": "gasbomb", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", @@ -97,6 +85,7 @@ "result": "grenade", "//": "Assumed to be the M67 with 180g of comp b.", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", @@ -119,6 +108,7 @@ { "result": "grenade_emp", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "electronics", @@ -139,6 +129,7 @@ { "result": "grenade_inc", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", @@ -154,63 +145,10 @@ [ [ "canister_empty", 1 ] ] ] }, - { - "result": "improvised_demolition_charge", - "//": "A homemade explosive similar to C4. Uses 50% more explosive components.", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 2, - "time": "5 m", - "autolearn": true, - "components": [ - [ [ "volatile_explosive", 94, "LIST" ], [ "stable_explosive", 94, "LIST" ], [ "military_explosive", 94, "LIST" ] ], - [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ], - [ [ "jug_plastic", 1 ] ] - ] - }, - { - "result": "improvised_grenade", - "//": "A homemade explosive similar to a grenade. Uses 50% more explosive components.", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "skills_required": [ "mechanics", 1 ], - "difficulty": 2, - "time": "5 m", - "reversible": true, - "autolearn": true, - "components": [ - [ [ "volatile_explosive", 35, "LIST" ], [ "stable_explosive", 35, "LIST" ], [ "military_explosive", 35, "LIST" ] ], - [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ], - [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ], - [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ] ], - [ [ "nail", 30 ], [ "scrap", 2 ] ] - ] - }, - { - "result": "improvised_pipebomb", - "//": "A homemade explosive with half the blast of a grenade, but with more shrapnel.", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 1, - "time": "15 m", - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "volatile_explosive", 35, "LIST" ], [ "stable_explosive", 35, "LIST" ], [ "military_explosive", 35, "LIST" ] ], - [ [ "pipe", 1 ] ], - [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ] - ] - }, { "result": "insecticidalbomb", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "cooking", @@ -231,6 +169,7 @@ { "result": "landmine", "//": "Since there is no blast redius and low damage, assumed to be the US M14 mine.", + "activity_level": "LIGHT_EXERCISE", "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TRAPS", @@ -253,6 +192,7 @@ }, { "result": "scrambler", + "activity_level": "LIGHT_EXERCISE", "type": "recipe", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", @@ -273,6 +213,7 @@ }, { "result": "smokebomb", + "activity_level": "LIGHT_EXERCISE", "type": "recipe", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", @@ -292,41 +233,5 @@ [ [ "canister_empty", 1 ] ], [ [ "superglue", 1 ] ] ] - }, - { - "result": "tool_improvised_barrel_bomb", - "//": "A homemade explosive comparable to a mininuke. Uses x5 materials compared to C4 due to the large blast radius.", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 3, - "time": "2 h", - "reversible": true, - "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ], - "components": [ - [ [ "volatile_explosive", 500, "LIST" ], [ "stable_explosive", 500, "LIST" ], [ "military_explosive", 500, "LIST" ] ], - [ [ "30gal_drum", 1 ] ], - [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ] - ] - }, - { - "result": "tool_small_improvised_fragmentation_device", - "//": "A homemade explosive similar to C4, but with less blast and more shrapnel. Uses 50% more explosive components.", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 2, - "time": "5 m", - "reversible": true, - "book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ], - "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ - [ [ "volatile_explosive", 94, "LIST" ], [ "stable_explosive", 94, "LIST" ], [ "military_explosive", 94, "LIST" ] ], - [ [ "jug_plastic", 1 ] ], - [ [ "scrap", 20 ] ], - [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ] - ] } ] diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json index b6e48ae..63db506 100644 --- a/json/uncraft/ammo/40x46mm.json +++ b/json/uncraft/ammo/40x46mm.json @@ -2,6 +2,7 @@ { "result": "40x46mm_m433", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", @@ -10,7 +11,7 @@ [ [ "sheet_metal_small", 1 ] ], [ [ "chem_compositionb", 288 ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 2 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m118_casing", 1 ] ] ], @@ -19,6 +20,7 @@ { "result": "40x46mm_bootleg_m433", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", @@ -27,7 +29,7 @@ [ [ "sheet_metal_small", 1 ] ], [ [ "chem_compositionb", 288 ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 2 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m118_casing", 1 ] ] ], @@ -36,6 +38,7 @@ { "result": "40x46mm_m576", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", @@ -43,7 +46,7 @@ "components": [ [ [ "paper", 1 ] ], [ [ "lead", 18 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 3 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m199_casing", 1 ] ] ], @@ -52,6 +55,7 @@ { "result": "40x46mm_bootleg_m576", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", @@ -59,7 +63,7 @@ "components": [ [ [ "paper", 1 ] ], [ [ "lead", 18 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 3 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m199_casing", 1 ] ] ], @@ -68,6 +72,7 @@ { "result": "40x46mm_m651", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", @@ -76,7 +81,7 @@ [ [ "bleach", 2 ] ], [ [ "ammonia", 2 ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m195_casing", 1 ] ] ], @@ -85,6 +90,7 @@ { "result": "40x46mm_bootleg_m651", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", @@ -93,7 +99,7 @@ [ [ "bleach", 2 ] ], [ [ "ammonia", 2 ] ], [ [ "impact_fuze", 1 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m195_casing", 1 ] ] ], @@ -102,13 +108,14 @@ { "result": "40x46mm_m1006", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], "components": [ [ [ "rubber_slug", 2 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m212_casing", 1 ] ] ], @@ -117,112 +124,17 @@ { "result": "40x46mm_bootleg_m1006", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 4, "time": "3 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], "components": [ [ [ "rubber_slug", 2 ] ], - [ [ "gunpowder", 35 ] ], + [ [ "gunpowder_shotgun", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "40x46mm_m212_casing", 1 ] ] ], "charges": 1 - }, - { - "result": "40x46mm_buckshot_m118", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "lead", 18 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m118_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x46mm_buckshot_m199", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "lead", 18 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m199_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x46mm_slug_m118", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "lead", 36 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m118_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x46mm_slug_m199", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "lead", 36 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m199_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x46mm_flechette_m118", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "combatnail", 40 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m118_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x46mm_flechette_m199", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "combatnail", 40 ] ], - [ [ "gunpowder", 30 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "40x46mm_m199_casing", 1 ] ] - ], - "charges": 1 } ] diff --git a/json/uncraft/ammo/40x53mm.json b/json/uncraft/ammo/40x53mm.json index c96ef39..1f77503 100644 --- a/json/uncraft/ammo/40x53mm.json +++ b/json/uncraft/ammo/40x53mm.json @@ -2,6 +2,7 @@ { "result": "40x53mm_m430a1", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 6, "time": "3 m", @@ -9,8 +10,8 @@ "components": [ [ [ "impact_fuze", 1 ] ], [ [ "sheet_metal_small", 1 ] ], - [ [ "chem_compositionb", 288 ] ], - [ [ "gunpowder_shotgun", 35 ] ], + [ [ "chem_compositionb", 32 ] ], + [ [ "gunpowder_shotgun", 42 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "40x53mm_m169_casing", 1 ] ] ], @@ -19,6 +20,7 @@ { "result": "40x53mm_bootleg_m430a1", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 6, "time": "3 m", @@ -26,8 +28,8 @@ "components": [ [ [ "impact_fuze", 1 ] ], [ [ "sheet_metal_small", 1 ] ], - [ [ "chem_compositionb", 288 ] ], - [ [ "gunpowder_shotgun", 35 ] ], + [ [ "chem_compositionb", 32 ] ], + [ [ "gunpowder_shotgun", 42 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "40x53mm_m169_casing", 1 ] ] ], @@ -36,14 +38,15 @@ { "result": "40x53mm_m1001", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 6, "time": "3 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], "components": [ [ [ "paper", 1 ] ], - [ [ "combatnail", 50 ] ], - [ [ "gunpowder_shotgun", 35 ] ], + [ [ "combatnail", 115 ] ], + [ [ "gunpowder_shotgun", 86 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "40x53mm_m169_casing", 1 ] ] ], @@ -52,62 +55,15 @@ { "result": "40x53mm_bootleg_m1001", "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", "skill_used": "fabrication", "difficulty": 6, "time": "3 m", "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], "components": [ [ [ "paper", 1 ] ], - [ [ "combatnail", 50 ] ], - [ [ "gunpowder_shotgun", 35 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "40x53mm_m169_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x53mm_buckshot_m169", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "lead", 22 ] ], - [ [ "gunpowder_shotgun", 35 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "40x53mm_m169_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x53mm_slug_m169", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "lead", 44 ] ], - [ [ "gunpowder_shotgun", 35 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "40x53mm_m169_casing", 1 ] ] - ], - "charges": 1 - }, - { - "result": "40x53mm_flechette_m169", - "type": "uncraft", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 m", - "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "paper", 1 ] ], - [ [ "combatnail", 50 ] ], - [ [ "gunpowder_shotgun", 35 ] ], + [ [ "combatnail", 115 ] ], + [ [ "gunpowder_shotgun", 86 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "40x53mm_m169_casing", 1 ] ] ], diff --git a/json/unobsoletion/recipes.json b/json/unobsoletion/recipes.json deleted file mode 100644 index b8a7bf1..0000000 --- a/json/unobsoletion/recipes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "type": "recipe", - "result": "grenade", - "obsolete": false - }, - { - "type": "recipe", - "result": "scrambler", - "obsolete": false - } -] diff --git a/modinfo.json b/modinfo.json index c3d93b6..d367c68 100644 --- a/modinfo.json +++ b/modinfo.json @@ -6,6 +6,6 @@ "authors": ["jc_gargma"], "description": "Add recipes for military grenades. Also standardize the naming scheme.", "category": "items", - "dependencies": [ "bn" ] + "dependencies": [ "dda" ] } ] diff --git a/readme b/readme index 46a95c2..8f1bc14 100644 --- a/readme +++ b/readme @@ -36,4 +36,5 @@ Fix the wildly inconsistent use of grenade, canister, armed, active, lit amongst Todo- -Clean up smoke grenade recipe +Recheck non-military 40mm grenade recipes + -- cgit v1.2.1