Reality checks Rivtech guns and 8x40mm.

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -611,7 +611,8 @@
       { "group": "nested_zpapm90", "prob": 1 },
       { "group": "nested_zpap85", "prob": 1 },
       { "group": "nested_rfb_308", "prob": 5 },
-      { "group": "nested_greasegun", "prob": 1 }
+      { "group": "nested_greasegun", "prob": 1 },
+      { "group": "nested_rsa840", "prob": 15 }
     ]
   },
   {
@@ -653,7 +654,8 @@
       { "group": "nested_ar15_with_kits", "prob": 15 },
       { "group": "nested_mdrx_with_kits", "prob": 10 },
       { "group": "nested_axmc_with_kits", "prob": 10 },
-      { "item": "rfb_308", "prob": 10 }
+      { "item": "rfb_308", "prob": 10 },
+      { "item": "rsa840", "prob": 15 }
     ]
   },
   {
@@ -700,8 +702,6 @@
       { "group": "nested_m60", "prob": 15 },
       { "group": "nested_rm11b_sniper_rifle", "prob": 15 },
       { "group": "nested_rm298", "prob": 10 },
-      { "group": "nested_rm51_assault_rifle", "prob": 25 },
-      { "group": "nested_rm614_lmg", "prob": 10 },
       { "group": "nested_rm88_battle_rifle", "prob": 25 },
       { "group": "nested_sig_assault_rifle", "prob": 50 },
       { "group": "nested_scar_l", "prob": 50 },
@@ -747,7 +747,8 @@
       { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 },
       { "group": "nested_acr_300blk", "prob": 15 },
       { "group": "nested_ak308", "prob": 25 },
-      { "group": "nested_papm77", "prob": 15 }
+      { "group": "nested_papm77", "prob": 15 },
+      { "group": "nested_rcmg840", "prob": 10 }
     ]
   },
   {
@@ -780,7 +781,8 @@
       { "item": "hk417_13", "prob": 40 },
       { "item": "m2carbine", "prob": 5 },
       { "item": "ak308", "prob": 10 },
-      { "item": "ak308", "variant": "papm77", "prob": 5 }
+      { "item": "ak308", "variant": "papm77", "prob": 5 },
+      { "item": "rcmg-840", "prob": 10 }
     ]
   },
   {

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1857,28 +1857,28 @@
     ]
   },
   {
-    "id": "nested_rm51_assault_rifle",
+    "id": "nested_rsa840",
     "type": "item_group",
     "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "rm51_assault_rifle", "charges-min": 0, "charges-max": 50 },
-      { "item": "8x40_50_mag" },
-      { "item": "8x40_50_mag", "prob": 50 },
+      { "item": "rsa840", "charges-min": 0, "charges-max": 42 },
+      { "item": "8x40_42_mag" },
+      { "item": "8x40_42_mag", "prob": 50 },
       { "group": "on_hand_8x40" }
     ]
   },
   {
-    "id": "nested_rm614_lmg",
+    "id": "nested_rcmg840",
     "type": "item_group",
     "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "rm614_lmg", "charges-min": 0, "charges-max": 100 },
-      { "item": "8x40_250_mag" },
-      { "item": "8x40_250_mag", "prob": 50 },
+      { "item": "rcmg-840", "charges-min": 0, "charges-max": 100 },
+      { "item": "8x40_96_mag" },
+      { "item": "8x40_96_mag", "prob": 50 },
       { "group": "on_hand_8x40" }
     ]
   },

data/json/itemgroups/military.json

@@ -695,7 +695,6 @@
       { "item": "atgm_heat", "prob": 1 },
       { "item": "m202_flash", "prob": 2 },
       { "item": "m74_clip", "prob": 3 },
-      { "item": "rm51_assault_rifle", "prob": 1 },
       { "item": "rm88_battle_rifle", "prob": 1 },
       { "item": "rm614_lmg", "prob": 1 },
       { "item": "rm2000_smg", "prob": 1 },

data/json/items/gun/8x40mm.json

@@ -36,6 +36,104 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "250 ml", "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] } ],
     "melee_damage": { "bash": 12 }
   },
+  {
+    "id": "xm88",
+    "//": "Essentially a modernized H&K G11 assault rifle, upsized and chambered for full-power rifle cartridges, it retains the G11’s bullpup layout, fire modes, and general features.",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "automatic 8x40mm rifle" },
+    "description": "A highly experimental battle rifle utilizing a proprietary caseless cartridge, this weapon was unexpectedly released by Rivtech for army weapons trials a few years before the Cataclysm.  Failing to gain favor thanks to its cuckoo clock-level complexity and unpleasant propensity for overheating and, subsequently, detonating, Rivtech attempted to commercialize the project.  Marketing it as \"yesterday’s future weapon, reimagined for the present\" the rifle’s civilian iterations met with limited interest and would have likely been relegated to obscurity had the Cataclysm not given its testers a dramatically shorter life span.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "xm88",
+        "name": { "str": "Rivtech XM88E1" },
+        "description": "An experimental, caseless bullpup battle rifle with a rotary breech action free-floating within its boxy receiver and an integral gun sight peeking over its recessed barrel, the XM88 was unexpectedly introduced by Rivtech a few years before the Cataclysm and submitted for US Army Next Generation Service Weapon trials.  With only a handful of prototypes produced, the weapon failed to impress thanks to overheating and cookoff issues, as well as its general complexity.  Rivtech sought to commercialize the project, marketing it as \"yesterday’s future weapon, reimagined for the present\" although, had the Cataclysm not insured that the rifle would outlive its testers, the XM88 would have likely still faded into obscurity.",
+        "weight": 1
+      }
+    ],
+    "weight": "3850 g",
+    "volume": "4704 ml",
+    "longest_side": "840 mm",
+    "barrel_length": "533 mm",
+    "price": 900000,
+    "price_postapoc": 1500,
+    "//2": "No sensible person in the apocalypse is going to put much value in an experimental, highly rare, overly bulky, high-maintenance gun with a history of malfunctions and unobtainable or reloadable ammo that requires an engineering degree just to field strip and tend to the damages that will take place and whose replacement parts are virtually non-existent.",
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "aluminum", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "8x40mm" ],
+    "skill": "rifle",
+    "dispersion": 80,
+    "durability": 8,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "hyper-burst", 4 ], [ "AUTO", "auto", 2 ] ],
+    "built_in_mods": [ "high_end_folding_stock", "riv_scope" ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "stock accessory", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_42_mag", "8x40_24_mag", "8x40_54_mag" ] } ]
+  },
+  {
+    "id": "rcmg840",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "Rivtech 8x40mm machine gun" },
+    "description": "An angular machine gun possessing a folding bipod as well as a hyper-burst mode that discharges two cartridges before recoil is felt, this weapon, manufactured by Rivtech, has room for great potential accuracy.  Produced as a prototype alongside its caseless rifle brother for submission into US Army weapons trials, the design was upscaled to fire an 8mm caseless cartridge following its subsequent failure to win the military’s contract.  Seeing limited production sales to third parties, including private military contractors, the machine gun was often criticised for attempting to be a jack of all trades firearm—light, highly accurate, suppressively potent, and packed to the gunnels with advanced technical features—at the cost of simplicity and end-user functionality.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "rcmg840",
+        "name": { "str": "Rivtech CMG-840 hailstorm" },
+        "description": "An exceedingly angular machine gun housing a cylindrical, rotating breach free-floating within its boxy receiver and an upwards jutting cocking handle, the weapon possesses a recessed barrel under which a collapsing bipod is stowed.  Produced as a prototype squad automatic weapon by Rivtech and presented for evaluation within the US military’s NGSW weapon trials alongside the XM88 rifle, this particular gun is a relatively recent production version of the design chambered for 8x40mm Caseless and offered for private contracters, law enforcement, and international sales after Rivtech failed to secure the contract.  Possessing a hyper-burst mechanism that dispenses two cartridges before the recoil hits the shooter as well as standard automatic capabilities, it has the potential to achieve remarkable target accuracy.",
+        "weight": 1
+      }
+    ],
+    "weight": "7000 g",
+    "volume": "10815 ml",
+    "longest_side": "1030 mm",
+    "barrel_length": "660 mm",
+    "price": 3750000,
+    "price_postapoc": 3500,
+    "to_hit": -1,
+    "material": [ "steel", "aluminum", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "8x40mm" ],
+    "skill": "rifle",
+    "dispersion": 180,
+    "durability": 8,
+    "reload": 200,
+    "modes": [ [ "DEFAULT", "AUTO", "auto", 4 ] ],
+    "built_in_mods": [ "riv_scope", "bipod_handguard" ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock accessory", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "flags": [ "WATERPROOF_GUN" ],
+    "pocket_data": [
+      { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_96_mag" ] }
+    ]
+  },
   {
     "id": "rm11b_sniper_rifle",
     "looks_like": "modular_ar15",
@@ -152,117 +250,22 @@
     "melee_damage": { "bash": 18 }
   },
   {
-    "id": "rm51_assault_rifle",
+    "id": "rsa840",
     "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "RM51 assault rifle" },
-    "description": "Originally produced for military use, the Rivtech RM51 assault rifle was designed for durability and ease of use under less than ideal circumstances, with its considerable bulk minimized by a compact and ergonomic layout.  Accepts box magazines.",
-    "weight": "2850 g",
-    "volume": "2150 ml",
-    "longest_side": "905 mm",
-    "price": 1800000,
-    "price_postapoc": 12000,
-    "to_hit": -1,
-    "material": [ "superalloy", "ceramic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "8x40mm" ],
-    "skill": "rifle",
-    "dispersion": 50,
-    "durability": 9,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
-    "valid_mod_locations": [
-      [ "grip", 1 ],
-      [ "mechanism", 4 ],
-      [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "stock accessory", 1 ],
-      [ "underbarrel", 1 ]
+    "copy-from": "xm88",
+    "name": { "str": "Rivtech 8x40mm bullpup rifle" },
+    "description": "A large and hefty rifle that looks suspiciously like a weapon prop that escaped from the set of a sci-fi blockbuster, this advanced offering from Rivtech is chambered for proprietary 8x40mm caseless munitions.  Originally entered for military trials years before the Cataclysm, what rests before you today is a civilian, semi-automatic version of the design offered by Rivtech shortly after their prototype failed to win the US Army’s weapon contract.  Sold as a novelty rifle before the end of the world, its steep price and the company’s later controversy kept it out of most laymen’s hands and shy of achieving true market success.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "rsa840",
+        "name": { "str": "Rivtech SA-840 Mirage" },
+        "description": "Encased within a boxy aluminum receiver and uncannily similar to a sci-fi prop with a recessed barrel and pistol grip, this is a bullpup 8x40mm caseless rifle produced by the Rivtech corporation.  Originally entered for military trials as a battle rifle before being trounced by its competitors, this version of the design has been adapted, with a few extra bells and whistles in the ergonomics department, into a semi-automatic civilian rifle.  While its impractically hefty price point made it little more than a trophy gun among the general population, and Rivtech’s latter-day controversy awarded it a less than ideal reputation, the SA-840 remains a capable rifle, and quite the goochy one at that.",
+        "weight": 1
+      }
     ],
-    "flags": [ "WATERPROOF_GUN" ],
-    "weapon_category": [ "AUTOMATIC_RIFLES" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] } ],
-    "melee_damage": { "bash": 12 }
-  },
-  {
-    "id": "rm614_lmg",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "RM614 LMG" },
-    "description": "Utilizing a powerful and unusual caliber, the Rivtech RM614 light machine gun was designed for durability and extreme volume of sustained fire under the worst possible circumstances.  Accepts RMXB500 box and RMGD250 drum magazines.",
-    "weight": "4600 g",
-    "volume": "2750 ml",
-    "longest_side": "935 mm",
-    "price": 3750000,
-    "price_postapoc": 15000,
-    "to_hit": -1,
-    "material": [ "superalloy", "ceramic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "8x40mm" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
-    "//2": "Barrel length is estimated to be 21-inches.",
-    "skill": "rifle",
-    "dispersion": 70,
-    "durability": 9,
-    "reload": 200,
-    "barrel_volume": "500 ml",
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 6 ] ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 4 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "stock accessory", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "flags": [ "WATERPROOF_GUN" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_250_mag", "8x40_500_mag" ] } ],
-    "melee_damage": { "bash": 12 }
-  },
-  {
-    "id": "rm88_battle_rifle",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "RM88 battle rifle" },
-    "description": "Originally produced for military use, the Rivtech RM88 battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability.  Accepts box and RMGD250 drum magazines.",
-    "weight": "3200 g",
-    "volume": "2500 ml",
-    "longest_side": "995 mm",
-    "price": 900000,
-    "price_postapoc": 17500,
-    "to_hit": -1,
-    "material": [ "superalloy", "ceramic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "8x40mm" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
-    "//2": "Barrel length is estimated to be 18-inches.",
-    "skill": "rifle",
-    "dispersion": 30,
-    "durability": 9,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_volume": "500 ml",
-    "valid_mod_locations": [
-      [ "grip", 1 ],
-      [ "mechanism", 4 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "stock accessory", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "magazines": [ [ "8x40mm", [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] ] ],
-    "flags": [ "WATERPROOF_GUN" ],
-    "weapon_category": [ "AUTOMATIC_RIFLES" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] } ],
-    "melee_damage": { "bash": 12 }
+    "price": 396500,
+    "price_postapoc": 85000,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ]
   }
 ]

data/json/items/gunmod/sights.json

@@ -264,11 +264,11 @@
     "copy-from": "rifle_scope",
     "type": "GUNMOD",
     "name": { "str": "RS1219 scope" },
-    "description": "An integral component of the RM11B rifle system, the RS1219 Accipiter digital scope provides auto-adjusting focal length, a user-selectable reticle, and an offset reflex sight for close objectives.",
+    "description": "An integral component of experimental Rivtech NGSW trial rifles, the RS1219 Accipiter digital scope provides auto-adjusting focal length, a user-selectable reticle, and an offset reflex sight for close objectives.",
     "weight": "0 g",
     "volume": "0 ml",
     "price": 0,
-    "material": [ "superalloy", "ceramic" ],
+    "material": [ "aluminum", "plastic", "glass" ],
     "aim_speed_modifier": 0,
     "flags": [ "ZOOM", "IRREMOVABLE" ]
   },