Skip to content

Commit

Permalink
Fix CI failures
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
anothersimulacrum committed Dec 1, 2019
1 parent 847e182 commit 988e1be
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
5 changes: 3 additions & 2 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down Expand Up @@ -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",
Expand Down
17 changes: 17 additions & 0 deletions data/json/items/gunmod/grip.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
2 changes: 1 addition & 1 deletion data/json/items/gunmod/loading_port.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
}
Expand Down

0 comments on commit 988e1be

Please sign in to comment.