From f8e7c58718eaa6ae49a8f83fdc069b189766a7b6 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Sat, 27 May 2023 15:00:43 -0700 Subject: [PATCH 1/4] M249/M240 semi triggers give select fire --- 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 ce42778d9d11b..97425ffb8dee8 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -200,7 +200,7 @@ "consume_chance": 50, "consume_divisor": 110, "//durability_modifier": -3, - "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ] ], + "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "burst", 4 ] ], "min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ], "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ] }, @@ -224,7 +224,7 @@ "consume_chance": 50, "consume_divisor": 110, "//durability_modifier": -3, - "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ] ], + "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "burst", 4 ] ], "min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ], "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ] } From 1d6f58f777bc53f74f1e2c7039e4475e39f0f713 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Sat, 27 May 2023 15:09:05 -0700 Subject: [PATCH 2/4] add gunsmith prof req to triggers --- data/json/recipes/weapon/mods.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index 56152231c6950..25a23cdec93db 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -1231,7 +1231,7 @@ "subcategory": "CSC_WEAPON_MODS", "skill_used": "mechanics", "skills_required": [ [ "rifle", 4 ] ], - "proficiencies": [ { "proficiency": "prof_welding_basic" } ], + "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_gunsmithing_basic" } ], "difficulty": 4, "time": "5 h", "book_learn": [ [ "manual_rifle", 6 ] ], @@ -1248,7 +1248,7 @@ "subcategory": "CSC_WEAPON_MODS", "skill_used": "mechanics", "skills_required": [ [ "rifle", 4 ] ], - "proficiencies": [ { "proficiency": "prof_welding_basic" } ], + "proficiencies": [ { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_gunsmithing_basic" } ], "difficulty": 4, "time": "5 h", "book_learn": [ [ "manual_rifle", 6 ] ], From 8acf3a16663dd063fdff899b629bbbb1e68eaa11 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 31 May 2023 09:35:26 -0700 Subject: [PATCH 3/4] change names --- data/json/items/gunmod/mechanism.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index 97425ffb8dee8..db2f67df20fef 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -183,8 +183,8 @@ { "id": "m249semi", "type": "GUNMOD", - "name": { "str": "M249 semi-auto trigger" }, - "description": "A trigger modification that allows the M249 to fire in semi-automatic mode.", + "name": { "str": "M249 select fire trigger" }, + "description": "A trigger modification that allows the M249 to switch between semi and full automatic modes.", "weight": "60 g", "volume": "250 ml", "integral_volume": "0 ml", @@ -207,8 +207,8 @@ { "id": "m240semi", "type": "GUNMOD", - "name": { "str": "M240 semi-auto trigger" }, - "description": "A trigger modification that allows the M240 to fire in semi-automatic mode.", + "name": { "str": "M240 select fire trigger" }, + "description": "A trigger modification that allows the M249 to switch between semi and full automatic modes.", "weight": "60 g", "volume": "250 ml", "integral_volume": "0 ml", From 47009e55222c810e5c61bc62874fb7c26e79ca5a Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Fri, 2 Jun 2023 09:59:28 -0700 Subject: [PATCH 4/4] fix a whoops --- data/json/items/gunmod/mechanism.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index db2f67df20fef..829a0b1c871d8 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -208,7 +208,7 @@ "id": "m240semi", "type": "GUNMOD", "name": { "str": "M240 select fire trigger" }, - "description": "A trigger modification that allows the M249 to switch between semi and full automatic modes.", + "description": "A trigger modification that allows the M240 to switch between semi and full automatic modes.", "weight": "60 g", "volume": "250 ml", "integral_volume": "0 ml",