From 988e1be04a8f92a1484f5de7c51876fc484647b6 Mon Sep 17 00:00:00 2001
From: anothersimulacrum <anothersimulacrum@gmail.com>
Date: Sun, 1 Dec 2019 09:54:28 +0000
Subject: [PATCH] Fix CI failures

The install time for all other gunmods is commented out, it doesn't
appear to work right now.

One description was missing a space.

Add an uncomfortable grip gunmod and have it installed by default on the
remington 870 MCS, instead of the handling modifier which does not work.
---
 data/json/items/gun/shot.json            |  5 +++--
 data/json/items/gunmod/grip.json         | 17 +++++++++++++++++
 data/json/items/gunmod/loading_port.json |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 95e408c745889..43e76a824510d 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -303,14 +303,15 @@
     "//": "dispersion should be 300 moa, but CDDA exaggerates dispersion.",
     "sight_dispersion": 750,
     "clip_size": 4,
-    "handling_modifier": -6,
     "price": 53800,
     "barrel_length": 0,
+    "built_in_mods": [ "breacher_grip" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
       [ "bore", 1 ],
       [ "brass catcher", 1 ],
+      [ "grip", 1 ],
       [ "grip mount", 1 ],
       [ "loading port", 1 ],
       [ "mechanism", 4 ],
@@ -340,7 +341,7 @@
     "copy-from": "shotgun_base",
     "type": "GUN",
     "name": "Remington 1100 competiton",
-    "description": "This semi-automatic shotgun features a self compensating gas system that will feed a wide array of shells while also reducing recoil.  Introduced in 1963, it is favored by law enforcement, hunters and competition shooters, and has been the best selling autoloading shotgun in U.S. history. This is the nickel finished, teflon coated competition model, with a full length magazine tube and 30 inch barrel.",
+    "description": "This semi-automatic shotgun features a self compensating gas system that will feed a wide array of shells while also reducing recoil.  Introduced in 1963, it is favored by law enforcement, hunters and competition shooters, and has been the best selling autoloading shotgun in U.S. history.  This is the nickel finished, teflon coated competition model, with a full length magazine tube and 30 inch barrel.",
     "weight": "3742 g",
     "volume": "3285 ml",
     "looks_like": "remington_870",
diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json
index d941a244cdc81..56f1db8f22947 100644
--- a/data/json/items/gunmod/grip.json
+++ b/data/json/items/gunmod/grip.json
@@ -34,5 +34,22 @@
     "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher", "bow" ],
     "handling_modifier": 2,
     "min_skills": [ [ "weapon", 2 ] ]
+  },
+  {
+    "id": "breacher_grip",
+    "type": "GUNMOD",
+    "name": "uncomfortable grip",
+    "description": "A very uncomfortable grip.  Clearly not intended for regular use.",
+    "weight": "125 g",
+    "volume": "250 ml",
+    "integral_volume": 0,
+    "integral_weight": 0,
+    "price": 38000,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "dark_gray",
+    "location": "grip",
+    "mod_targets": [ "pistol" ],
+    "handling_modifier": -6
   }
 ]
diff --git a/data/json/items/gunmod/loading_port.json b/data/json/items/gunmod/loading_port.json
index 5951c059d66d1..29e14f69aa22b 100644
--- a/data/json/items/gunmod/loading_port.json
+++ b/data/json/items/gunmod/loading_port.json
@@ -8,13 +8,13 @@
     "volume": "149 ml",
     "integral_volume": "149 ml",
     "price": 15700,
+    "//install_time": "8 m",
     "material": "aluminum",
     "symbol": ":",
     "color": "green",
     "location": "loading port",
     "mod_targets": [ "pistol", "shotgun" ],
     "acceptable_ammo": [ "shot" ],
-    "install_time": "8 m",
     "magazine_adaptor": [ [ "shot", [ "shot_speedloader6", "shot_speedloader8" ] ] ],
     "min_skills": [ [ "weapon", 2 ], [ "mechanics", 1 ] ]
   }