New guns (#38683)

* New guns A handful of guns I was missing in the game, starting with the big brother of the KSG, the ridiculous KSG-25. * Some Beretta handguns Added the Beretta 90two and the Px4 Storm, in both 9mm and .40 S&W variations. Also added appropriate magazines for the .40 S&W variants. 9mm share the M9 magazine, for now. * The French are coming? Added the FAMAS G2. Quite how it ended up in New England, we'll never know... should be sufficiently rare to suggest possible illegal important by a crazy gun collector, but values may require tweaking. * Update guns.json * Update guns.json * Update guns.json Linted guns.json * Yet more linting * Update data/json/items/magazine/40.json Co-Authored-By: Rail-Runner <[email protected]> * Update 40.json Forgot to change ammo type in the .40 guns. * Update data/json/items/magazine/40.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update data/json/items/gun/shot.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update data/json/items/gun/9mm.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update data/json/items/gun/9mm.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update data/json/items/gun/40.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update data/json/items/gun/40.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update data/json/items/gun/223.json Co-Authored-By: ZhilkinSerg <[email protected]> * Update 40.json Fixed capitalization error. * Update data/json/items/gun/9mm.json Co-Authored-By: LaVeyanFiend <[email protected]> * Update data/json/items/gun/40.json Co-Authored-By: LaVeyanFiend <[email protected]> * Update data/json/items/gun/9mm.json Co-Authored-By: LaVeyanFiend <[email protected]> * Update data/json/items/gun/40.json Co-Authored-By: LaVeyanFiend <[email protected]> * Update data/json/items/gun/9mm.json Co-Authored-By: Tonkatsu <[email protected]> * Update data/json/items/gun/40.json Co-Authored-By: Tonkatsu <[email protected]> * Update data/json/items/gun/223.json Co-Authored-By: Tonkatsu <[email protected]> * Update 223.json * Update data/json/items/gun/223.json Co-Authored-By: Tonkatsu <[email protected]> * Some changes Added a proprietary magazine for the MAS 223. * Update data/json/items/gun/223.json Co-Authored-By: Tonkatsu <[email protected]> * Update 223.json Fixed missing closing bracket. * Update data/json/items/gun/223.json Co-Authored-By: Tonkatsu <[email protected]> * Update 223.json Resolved conflict (hopefully). * Yet more linting... * Px4-mag + Generic Guns support Added separate mag for the Px4 as well as the necessary GG migration/blacklist entries. * More linting * Adjusted MAS223 droprate Forgot to actually change the probability before. * Update 223.json Co-authored-by: Rail-Runner <[email protected]> Co-authored-by: ZhilkinSerg <[email protected]> Co-authored-by: LaVeyanFiend <[email protected]> Co-authored-by: Tonkatsu <[email protected]>
CleverRaven · Apr 11, 2020 · c5b249c · c5b249c
2 parents b00daf1 + b6ea82e
commit c5b249c
Show file tree

Hide file tree

Showing 13 changed files with 281 additions and 5 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -10,6 +10,8 @@
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 15 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 7 },
       { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 15 },
+      { "item": "px4", "prob": 24, "charges-min": 0, "charges-max": 15 },
+      { "item": "px4_40", "prob": 20, "charges-min": 0, "charges-max": 14 },
       { "item": "ruger_lcr_38", "prob": 10, "charges-min": 0, "charges-max": 5 },
       { "item": "sig_mosquito", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "sw_22", "prob": 15, "charges-min": 0, "charges-max": 10 },
@@ -82,6 +84,8 @@
     "id": "guns_pistol_rare",
     "//": "Less common pistols including those only used by police/paramilitary forces.",
     "items": [
+      { "item": "90two", "prob": 25, "charges-min": 0, "charges-max": 15 },
+      { "item": "90two40", "prob": 10, "charges-min": 0, "charges-max": 12 },
       { "item": "bond_410", "prob": 20, "charges-min": 0, "charges-max": 2 },
       { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 },
       { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 9 },
@@ -398,6 +402,7 @@
       { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 },
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
+      { "item": "famas", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "rifle_flintlock", "prob": 180 },
       { "item": "oa93", "prob": 3, "charges-min": 0, "charges-max": 30 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
@@ -459,6 +464,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 },
+      { "item": "ksg-25", "prob": 8, "charges-min": 0, "charges-max": 12 },
       { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 16 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -108,6 +108,8 @@
       [ "40_speedloader6", 10 ],
       [ "glock17_17", 14 ],
       [ "glock17_22", 6 ],
+      [ "px4mag", 55 ],
+      [ "px4_40mag", 6 ],
       [ "glockmag", 33 ],
       [ "glock40mag", 7 ],
       [ "m1911mag", 25 ],
@@ -159,6 +161,7 @@
       [ "8x40_speedloader5", 5 ],
       [ "glock_drum_50rd", 5 ],
       [ "glock_drum_100rd", 5 ],
+      [ "90two40mag", 5 ],
       [ "deaglemag", 40 ],
       [ "fn57mag", 80 ],
       [ "glockbigmag", 60 ],

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -71,6 +71,43 @@
     "min_cycle_recoil": 1350,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "famas",
+    "copy-from": "rifle_auto",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "name": { "str": "MAS 223", "str_pl": "MAS 223" },
+    "description": "A bullpup assault rifle that was used by French armed forces only until recently.  While the FAMAS was famous for its high fire rate, the MAS .223 is a semi-auto only variation imported to the US in the late eighties.  It retains the integral bipod, though.",
+    "weight": "3800 g",
+    "volume": "4162 ml",
+    "price": 2800000,
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "ranged_damage": -2,
+    "dispersion": 180,
+    "durability": 8,
+    "min_cycle_recoil": 1350,
+    "built_in_mods": [ "bipod" ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 4 ],
+      [ "magazine", 1 ],
+      [ "muzzle", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel mount", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "magazines": [ [ "223", [ "famasmag" ] ] ]
+  },
   {
     "id": "h&k416a5",
     "copy-from": "rifle_auto",

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
@@ -1,4 +1,27 @@
 [
+  {
+    "id": "90two40",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta 90-two .40 S&W" },
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.  This one is chambered in .40 S&W.",
+    "weight": "921 g",
+    "volume": "518 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "40",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "40", [ "90two40mag" ] ] ]
+  },
   {
     "id": "glock_22",
     "looks_like": "glock_17",
@@ -39,6 +62,29 @@
     "magazine_well": 1,
     "magazines": [ [ "40", [ "glock40mag", "glock40bigmag" ] ] ]
   },
+  {
+    "id": "px4_40",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta Px4 Storm .40 S&W" },
+    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utilizing light-weight polymer construction with steel inserts.  Its shape was also optimized for concealed carry.  This one is chambered in .40 S&W.",
+    "weight": "785 g",
+    "volume": "505 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "plastic", "steel" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "40",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "40", [ "px4_40mag" ] ] ]
+  },
   {
     "id": "rifle_40",
     "copy-from": "gun_base",

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
@@ -1,4 +1,27 @@
 [
+  {
+    "id": "90two",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta 90-two" },
+    "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same.  The main difference is a sleeker, almost futuristic-looking design owed in large parts to the polymer underbarrel rail cover.",
+    "weight": "921 g",
+    "volume": "518 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "range": 1,
+    "dispersion": 480,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
+  },
   {
     "id": "calico",
     "looks_like": "hk_mp5",
@@ -312,6 +335,29 @@
     "magazine_well": 1,
     "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
   },
+  {
+    "id": "px4",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str": "Beretta Px4 Storm" },
+    "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utilizing light-weight polymer construction with steel inserts.  Its shape was also optimized for concealed carry, while maintaining the reliability the 92 series is known for.",
+    "weight": "785 g",
+    "volume": "505 ml",
+    "price": 65000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "plastic", "steel" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "range": 1,
+    "dispersion": 440,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "magazine_well": 1,
+    "magazines": [ [ "9mm", [ "px4mag" ] ] ]
+  },
   {
     "id": "rifle_9mm",
     "looks_like": "ar15",

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -84,7 +84,7 @@
     "name": { "str": "Kel-Tec KSG", "str_pl": "Kel-Tec KSG" },
     "description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.",
     "weight": "1550 g",
-    "volume": "4784 ml",
+    "volume": "3371 ml",
     "price": 99000,
     "price_postapoc": 2250,
     "to_hit": -1,
@@ -110,6 +110,39 @@
       [ "underbarrel", 2 ]
     ]
   },
+  {
+    "id": "ksg-25",
+    "copy-from": "shotgun_pump",
+    "looks_like": "remington_870",
+    "type": "GUN",
+    "name": { "str": "Kel-Tec KSG-25", "str_pl": "Kel-Tec KSG-25" },
+    "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.  The big brother of the KSG, it has a longer barrel and longer magazine tubes.",
+    "weight": "2100 g",
+    "volume": "4495 ml",
+    "price": 140000,
+    "to_hit": -1,
+    "bashing": 9,
+    "material": [ "steel", "plastic" ],
+    "ranged_damage": 5,
+    "dispersion": 425,
+    "sight_dispersion": 500,
+    "durability": 7,
+    "clip_size": 12,
+    "built_in_mods": [ "ksg25_aux_shotgun" ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel", 2 ]
+    ]
+  },
   {
     "id": "m1014",
     "copy-from": "shotgun_base",

diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
@@ -130,6 +130,30 @@
     },
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
   },
+  {
+    "id": "ksg25_aux_shotgun",
+    "type": "GUNMOD",
+    "name": { "str": "KSG-25 second magazine" },
+    "description": "The integrated second shotgun magazine of the Kel-Tec KSG-25 which holds 12 shots.  It's irremovable.",
+    "weight": "1550 g",
+    "volume": "1750 ml",
+    "price": 0,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "light_red",
+    "location": "underbarrel",
+    "mod_targets": [ "shotgun" ],
+    "gun_data": {
+      "ammo": "shot",
+      "skill": "shotgun",
+      "ranged_damage": 5,
+      "dispersion": 425,
+      "durability": 7,
+      "clip_size": 12,
+      "reload": 120
+    },
+    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
+  },
   {
     "id": "ts12_aux_shotgun",
     "type": "GUNMOD",

diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
@@ -11,6 +11,23 @@
     "default_ammo": "556",
     "linkage": "ammolink223"
   },
+  {
+    "id": "famasmag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "MAS 223 magazine" },
+    "description": "A 25-round magazine for the MAS 223.  It resembles a STANAG magazine but is not compatible nor interchangeable.",
+    "weight": "340 g",
+    "volume": "480 ml",
+    "price": 115000,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "223",
+    "capacity": 25,
+    "reliability": 8,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "ruger5",
     "looks_like": "stanag30",

diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
@@ -15,6 +15,24 @@
     "capacity": 6,
     "flags": [ "SPEEDLOADER" ]
   },
+  {
+    "id": "90two40mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "90two .40 S&W magazine" },
+    "description": "A magazine for the 92 and 96 series of Beretta handguns, this one is for .40 S&W and can hold 12 rounds.",
+    "weight": "135 g",
+    "volume": "250 ml",
+    "price": 3200,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "40", "357sig" ],
+    "capacity": 12,
+    "reliability": 8,
+    "reload_time": 140,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "glock40bigmag",
     "looks_like": "glock17_17",
@@ -50,6 +68,24 @@
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
   },
+  {
+    "id": "px4_40mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "Px4 .40 magazine" },
+    "description": "A magazine for the Px4 Storm chambered for .40 S&W.  It holds 14 rounds.",
+    "weight": "135 g",
+    "volume": "250 ml",
+    "price": 3200,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "40", "357sig" ],
+    "capacity": 14,
+    "reliability": 8,
+    "reload_time": 140,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "sig40mag",
     "looks_like": "glock17_17",

diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json
@@ -191,6 +191,23 @@
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
   },
+  {
+    "id": "px4mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "Px4 magazine" },
+    "description": "The standard magazine for the Beretta Px4, in 9x19mm.",
+    "weight": "135 g",
+    "volume": "250 ml",
+    "price": 3600,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "9mm",
+    "capacity": 17,
+    "reliability": 8,
+    "flags": [ "MAG_COMPACT" ]
+  },
   {
     "id": "stenmag",
     "looks_like": "mp5mag",