From 1e225055aa27abf1942535eb4d49482b5ced1a4a Mon Sep 17 00:00:00 2001 From: borsek Date: Sun, 27 Aug 2023 22:53:29 +0100 Subject: [PATCH] Rivtech mainline (#3092) * Update rifle.json * Update 8x40mm.json * Update rifle.json * Update cgp_recipes.json * Create obsoletion.json * Update rifle.json * Update shot.json * Update rifle.json * Update shot.json * Update rifle.json * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/rifle.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/ammo/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update migration.json * Delete obsoletion.json * Update shot.json * Update rifle.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/ammo/8x40mm.json | 36 ++++- data/json/obsoletion/migration.json | 22 ++- data/json/recipes/ammo/rifle.json | 153 +++++++++++++++++++-- data/json/recipes/ammo/shot.json | 73 ++++++++++ data/mods/Craft_Gunpowder/cgp_recipes.json | 102 -------------- 6 files changed, 274 insertions(+), 124 deletions(-) diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json index 8ca62a1bfb3..de9a47bac7a 100644 --- a/data/json/items/ammo/8x40mm.json +++ b/data/json/items/ammo/8x40mm.json @@ -1,10 +1,40 @@ [ { - "id": "8mm_bootleg", + "id": "8mm_jhp_reloaded", "copy-from": "8mm_jhp", "type": "AMMO", - "name": { "str": "bootleg 8x40mm JHP" }, - "description": "Bootleg duplicates of Rivtech 8x40mm caseless rounds. Being caseless rounds, these cannot be disassembled or reloaded.", + "name": { "str": "8x40mm JHP, handmade" }, + "description": "Handmade duplicates of Rivtech 8x40mm JHP rounds. Being caseless rounds, these cannot be disassembled or reloaded.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "8mm_caseless_reloaded", + "copy-from": "8mm_caseless", + "type": "AMMO", + "name": { "str": "8x40mm caseless, handmade" }, + "description": "Handmade duplicates of Rivtech 8x40mm caseless rounds. Being caseless rounds, these cannot be disassembled or reloaded.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "8mm_hvp_reloaded", + "copy-from": "8mm_hvp", + "type": "AMMO", + "name": { "str": "8x40mm HVP, handmade" }, + "description": "Handmade duplicates of Rivtech 8x40mm HVP rounds. Being caseless rounds, these cannot be disassembled or reloaded.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "8mm_inc_reloaded", + "copy-from": "8mm_inc", + "type": "AMMO", + "name": { "str": "8x40mm tracer, handmade" }, + "description": "Handmade duplicates of Rivtech 8x40mm tracer rounds. Being caseless rounds, these cannot be disassembled or reloaded.", "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migration.json index aae147246c5..1d37113786d 100644 --- a/data/json/obsoletion/migration.json +++ b/data/json/obsoletion/migration.json @@ -69,10 +69,15 @@ "type": "MIGRATION", "replace": "40x46mm_m651" }, + { + "id": "8mm_bootleg", + "type": "MIGRATION", + "replace": "8mm_jhp_reloaded" + }, { "id": "8mm_bootleg_jsp", "type": "MIGRATION", - "replace": "8mm_bootleg" + "replace": "8mm_jhp_reloaded" }, { "id": "20x66_bootleg_shot", diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json index dc0713e00bc..64b2d43cdf6 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -395,6 +395,135 @@ "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ] }, + { + "type": "recipe", + "result": "8mm_jhp_reloaded", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "skills_required": [ "cooking", 2 ], + "difficulty": 8, + "time": 35000, + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_caseless", 5 ] ], + "charges": 40, + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ], + "components": [ + [ [ "adhesive", 1, "LIST" ] ], + [ [ "plastic_chunk", 5 ] ], + [ [ "gunpowder", 280 ] ], + [ [ "oxy_powder", 80 ] ], + [ [ "lead", 80 ] ], + [ + [ "gold_small", 4 ], + [ "silver_small", 4 ], + [ "tin", 4 ], + [ "bismuth", 4 ], + [ "solder_wire", 4 ], + [ "platinum_small", 4 ] + ], + [ [ "copper", 40 ] ], + [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "8mm_caseless_reloaded", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "skills_required": [ "cooking", 2 ], + "difficulty": 9, + "time": 45000, + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_caseless", 5 ] ], + "charges": 40, + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ], + "components": [ + [ [ "adhesive", 1, "LIST" ] ], + [ [ "plastic_chunk", 5 ] ], + [ [ "gunpowder", 320 ] ], + [ [ "oxy_powder", 80 ] ], + [ [ "lead", 120 ] ], + [ + [ "gold_small", 4 ], + [ "silver_small", 4 ], + [ "tin", 4 ], + [ "bismuth", 4 ], + [ "solder_wire", 4 ], + [ "platinum_small", 4 ] + ], + [ [ "copper", 80 ] ], + [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "8mm_hvp_reloaded", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "skills_required": [ "cooking", 2 ], + "difficulty": 9, + "time": 55000, + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_caseless", 5 ] ], + "charges": 40, + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ], + "components": [ + [ [ "adhesive", 1, "LIST" ] ], + [ [ "plastic_chunk", 5 ] ], + [ [ "gunpowder", 400 ] ], + [ [ "oxy_powder", 120 ] ], + [ [ "lead", 80 ] ], + [ + [ "gold_small", 40 ], + [ "silver_small", 40 ], + [ "tin", 40 ], + [ "bismuth", 40 ], + [ "solder_wire", 40 ], + [ "platinum_small", 40 ] + ], + [ [ "copper", 80 ] ], + [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "8mm_inc_reloaded", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "skills_required": [ "cooking", 2 ], + "difficulty": 9, + "time": 55000, + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_caseless", 5 ] ], + "charges": 40, + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ], + "components": [ + [ [ "adhesive", 1, "LIST" ] ], + [ [ "plastic_chunk", 5 ] ], + [ [ "gunpowder", 320 ] ], + [ [ "oxy_powder", 160 ] ], + [ [ "incendiary", 80 ] ], + [ [ "lead", 80 ] ], + [ + [ "gold_small", 4 ], + [ "silver_small", 4 ], + [ "tin", 4 ], + [ "bismuth", 4 ], + [ "solder_wire", 4 ], + [ "platinum_small", 4 ] + ], + [ [ "copper", 40 ] ], + [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ] + ] + }, { "result": "5x50dart", "type": "recipe", @@ -406,15 +535,15 @@ "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_caseless", 4 ] ], - "charges": 1, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "charges": 8, + "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 16 ] ], "tools": [ [ [ "mold_plastic", -1 ] ] ], "components": [ - [ [ "5x50_hull", 1 ] ], + [ [ "5x50_hull", 8 ] ], [ [ "plastic_chunk", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 3 ] ], - [ [ "combatnail", 1 ] ] + [ [ "smrifle_primer", 8 ] ], + [ [ "gunpowder", 24 ] ], + [ [ "combatnail", 8 ] ] ] }, { @@ -428,15 +557,15 @@ "time": "2 m", "batch_time_factors": [ 60, 5 ], "book_learn": [ [ "recipe_caseless", 4 ] ], - "charges": 1, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ] ], + "charges": 8, + "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 24 ] ], "tools": [ [ [ "mold_plastic", -1 ] ] ], "components": [ - [ [ "5x50_hull", 1 ] ], + [ [ "5x50_hull", 8 ] ], [ [ "plastic_chunk", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 4 ] ], - [ [ "scrap", 1 ] ] + [ [ "smrifle_primer", 8 ] ], + [ [ "gunpowder", 32 ] ], + [ [ "scrap", 8 ] ] ] }, { diff --git a/data/mods/Craft_Gunpowder/cgp_recipes.json b/data/mods/Craft_Gunpowder/cgp_recipes.json index f73bcb1507c..4302b8f86dc 100644 --- a/data/mods/Craft_Gunpowder/cgp_recipes.json +++ b/data/mods/Craft_Gunpowder/cgp_recipes.json @@ -48,34 +48,6 @@ "tools": [ [ [ "chemistry_set", 50 ], [ "hotplate", 50 ], [ "toolset", 50 ] ] ], "components": [ [ [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "charcoal", 5 ] ] ] }, - { - "type": "recipe", - "result": "8mm_bootleg", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", - "skill_used": "fabrication", - "skills_required": [ "cooking", 2 ], - "difficulty": 8, - "time": 45000, - "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_pistol", 10 ], [ "manual_rifle", 10 ] ], - "qualities": [ { "id": "CHEM", "level": 2 } ], - "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ], - "components": [ - [ [ "acid", 1 ] ], - [ [ "plastic_chunk", 5 ] ], - [ [ "oxy_powder", 100 ] ], - [ [ "incendiary", 100 ] ], - [ - [ "lead", 75 ], - [ "gold_small", 75 ], - [ "silver_small", 75 ], - [ "tin", 75 ], - [ "bismuth", 75 ], - [ "solder_wire", 75 ] - ], - [ [ "copper", 35 ] ] - ] - }, { "type": "recipe", "result": "smg_9mm", -- 2.41.0