Merge pull request #53821 from GuardianDll/master

Adding gun mod to use m240 and m249 in semi-auto mode
CleverRaven · Dec 28, 2021 · fbab99b · fbab99b
2 parents 7f32d77 + 6718685
commit fbab99b
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 0 deletions.
diff --git 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": "A trigger modification that allows the M249 to fire in semi-automatic 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": "A trigger modification that allows the M240 to fire in semi-automatic 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" ]
   }
 ]
diff --git 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 ] ] ]
   }
 ]