From 8669ab5316a66d49a87b90700f9d9cb82ea509ff Mon Sep 17 00:00:00 2001 From: GuardianDll <67688115+GuardianDll@users.noreply.github.com> Date: Mon, 27 Dec 2021 22:58:14 +0100 Subject: [PATCH 1/3] added m240 and m249 semi-auto mods --- data/json/items/gunmod/mechanism.json | 48 +++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index 5230986522b0f..6c2c6c1d9d5ad 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -85,5 +85,53 @@ "install_time": "10 m", "min_skills": [ [ "weapon", 2 ] ], "flags": [ "WATERPROOF_GUN" ] + }, + { + "id": "m249semi", + "type": "GUNMOD", + "name": { "str": "M249 semi-auto trigger" }, + "description": "Trigger modification, that allow an m249 to work in semi-auto mode.", + "weight": "60 g", + "volume": "250 ml", + "integral_volume": "0 ml", + "price": 24000, + "price_postapoc": 350, + "material": [ "steel" ], + "symbol": ":", + "color": "red", + "location": "mechanism", + "mod_targets": [ "m249" ], + "install_time": "2 h", + "dispersion_modifier": 5, + "consume_chance": 50, + "consume_divisor": 110, + "//durability_modifier": -3, + "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ] ], + "min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ], + "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ] + }, + { + "id": "m240semi", + "type": "GUNMOD", + "name": { "str": "M240 semi-auto trigger" }, + "description": "Trigger modification, that allow an m240 to work in semi-auto mode.", + "weight": "60 g", + "volume": "250 ml", + "integral_volume": "0 ml", + "price": 24000, + "price_postapoc": 350, + "material": [ "steel" ], + "symbol": ":", + "color": "red", + "location": "mechanism", + "mod_targets": [ "m240" ], + "install_time": "2 h", + "dispersion_modifier": 5, + "consume_chance": 50, + "consume_divisor": 110, + "//durability_modifier": -3, + "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ] ], + "min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ], + "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ] } ] From 05b1b0b6e76fb4534e1919487b886e4b84d27d29 Mon Sep 17 00:00:00 2001 From: GuardianDll <67688115+GuardianDll@users.noreply.github.com> Date: Mon, 27 Dec 2021 22:59:00 +0100 Subject: [PATCH 2/3] added recipe to m240semi and m249semi --- data/json/recipes/weapon/mods.json | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index eb9fbe115fbf9..58412c6d60188 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -1091,5 +1091,39 @@ "book_learn": [ [ "manual_shotgun", 4 ] ], "tools": [ [ [ "small_repairkit", 150 ], [ "large_repairkit", 150 ] ] ], "components": [ [ [ "scrap", 1 ] ], [ [ "pipe", 2 ] ] ] + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "m249semi", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_MODS", + "skill_used": "mechanics", + "skills_required": [ [ "rifle", 4 ] ], + "proficiencies": [ { "proficiency": "prof_welding_basic" } ], + "difficulty": 4, + "time": "5 h", + "book_learn": [ [ "manual_rifle", 6 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 20 ] ], + "tools": [ [ [ "m249", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ], + "components": [ [ [ "sheet_metal_small", 6 ] ] ] + }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "m240semi", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_MODS", + "skill_used": "mechanics", + "skills_required": [ [ "rifle", 4 ] ], + "proficiencies": [ { "proficiency": "prof_welding_basic" } ], + "difficulty": 4, + "time": "5 h", + "book_learn": [ [ "manual_rifle", 6 ] ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 20 ] ], + "tools": [ [ [ "m249", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ], + "components": [ [ [ "sheet_metal_small", 5 ] ] ] } ] From 6718685c6652a99c5dc4f84aa2fb95eff403fafc Mon Sep 17 00:00:00 2001 From: GuardianDll <67688115+GuardianDll@users.noreply.github.com> Date: Tue, 28 Dec 2021 00:09:34 +0100 Subject: [PATCH 3/3] description update --- data/json/items/gunmod/mechanism.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index 6c2c6c1d9d5ad..f439021999165 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -90,7 +90,7 @@ "id": "m249semi", "type": "GUNMOD", "name": { "str": "M249 semi-auto trigger" }, - "description": "Trigger modification, that allow an m249 to work in semi-auto mode.", + "description": "A trigger modification that allows the M249 to fire in semi-automatic mode.", "weight": "60 g", "volume": "250 ml", "integral_volume": "0 ml", @@ -114,7 +114,7 @@ "id": "m240semi", "type": "GUNMOD", "name": { "str": "M240 semi-auto trigger" }, - "description": "Trigger modification, that allow an m240 to work in semi-auto mode.", + "description": "A trigger modification that allows the M240 to fire in semi-automatic mode.", "weight": "60 g", "volume": "250 ml", "integral_volume": "0 ml",