From 3928c8fe3acf312adbaad14911f8f82ceff44aca Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Mon, 4 May 2020 18:37:41 -0400
Subject: [PATCH] Add FS2000(plus STANAG mag volume update) (#36838)

---
 .../itemgroups/Weapons_Mods_Ammo/guns.json    |  1 +
 data/json/items/gun/223.json                  | 33 +++++++++++++++++++
 data/json/items/gunmod/underbarrel.json       | 16 +++++++++
 data/json/items/magazine/223.json             |  4 +--
 .../firearms/gg_firearms_migration.json       |  3 +-
 .../gunmods/gg_gunmods_blacklist.json         |  3 +-
 6 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index e5ad9e2b885db..6e42cfdfe0589 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -311,6 +311,7 @@
       { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 30 },
       { "item": "colt_lightning", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "fn_fal", "prob": 40, "charges-min": 0, "charges-max": 20 },
+      { "item": "fs2000", "prob": 6, "charges-min": 0, "charges-max": 30 },
       { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 20 },
       { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 30 },
       { "item": "henry_big_boy", "prob": 10, "charges-min": 0, "charges-max": 10 },
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index e3ae02dca776c..5a63aef38dc7f 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -146,6 +146,39 @@
     ],
     "magazines": [ [ "223", [ "famasmag" ] ] ]
   },
+  {
+    "id": "fs2000",
+    "copy-from": "rifle_semi",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "name": "FS2000",
+    "description": "A sleek bullpup carbine designed by FN Herstal, complete with an integrated sight accessory rail.  The forward ejecting action and ambidextrous controls make firing comfortable for both left and right-handed shooting.  The whole rifle is well sealed from mud and dust for reliability, but this makes it incompatible with many aftermarket magazines.",
+    "weight": "3319 g",
+    "volume": "7986 ml",
+    "price": 125000,
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "ranged_damage": { "damage_type": "stab", "amount": -2 },
+    "dispersion": 150,
+    "durability": 9,
+    "min_cycle_recoil": 1350,
+    "default_mods": [ "factory_handguard" ],
+    "magazines": [ [ "223", [ "stanag30" ] ] ],
+    "//": "Forward ejection port would require a different brass catcher design, so there is no slot for it. Bullpup design requires the factory stock to function.",
+    "valid_mod_locations": [
+      [ "accessories", 2 ],
+      [ "muzzle", 1 ],
+      [ "sling", 1 ],
+      [ "grip mount", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "underbarrel mount", 1 ]
+    ]
+  },
   {
     "id": "h&k416a5",
     "copy-from": "rifle_auto",
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index 958ff84b1f619..281518e1c64cc 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -64,6 +64,22 @@
     "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 480, "durability": 6, "clip_size": 2 },
     "flags": [ "IRREMOVABLE", "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
   },
+  {
+    "id": "factory_handguard",
+    "type": "GUNMOD",
+    "name": "factory handguard",
+    "description": "A removable molded grip that comes standard on guns without rails.  It's not as efficient as a proper forward grip or bipod at controlling recoil, but it's better than nothing.",
+    "weight": "246 g",
+    "volume": "568ml",
+    "price": 6000,
+    "material": [ "plastic" ],
+    "symbol": ":",
+    "color": "light_gray",
+    "location": "underbarrel mount",
+    "mod_targets": [ "fs2000" ],
+    "//install_time": 5000,
+    "handling_modifier": 2
+  },
   {
     "id": "grip",
     "type": "GUNMOD",
diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
index 74ffa8b8ba15a..63b169868bef4 100644
--- a/data/json/items/magazine/223.json
+++ b/data/json/items/magazine/223.json
@@ -159,8 +159,8 @@
     "name": { "str": "STANAG 30-round magazine" },
     "//": "Tileset whitelist for rifle magazines",
     "description": "A standard capacity 30-round box magazine for use with STANAG compatible rifles.",
-    "weight": "245 g",
-    "volume": "500 ml",
+    "weight": "360 g",
+    "volume": "290 ml",
     "price": 8000,
     "price_postapoc": 250,
     "material": "steel",
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 3def752d7090f..ff004849dbf03 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -263,7 +263,8 @@
       "sks",
       "mosin44",
       "famas",
-      "aksemi"
+      "aksemi",
+      "fs2000"
     ],
     "type": "MIGRATION",
     "replace": "rifle_sporter"
diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
index 942d253a4958f..63b5a370ac159 100644
--- a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
+++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
@@ -16,6 +16,7 @@
     "lwfeed",
     "lead_barrel_big",
     "lead_barrel_heavy_duty",
-    "inter_bayonet"
+    "inter_bayonet",
+    "factory_handguard"
   ]
 }