Merge branch '8x40_retool' of https://github.com/DoctorBoomstick/Cata…

…clysm-DDA into 8x40_retool

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -614,7 +614,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 }
     ]
   },
   {
@@ -656,7 +657,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 }
     ]
   },
   {
@@ -703,8 +705,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 },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1833,15 +1833,15 @@
     ]
   },
   {
-    "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" }
     ]
   },

data/json/itemgroups/military.json

@@ -705,7 +705,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/obsoletion/migration_items.json

@@ -101,6 +101,21 @@
     "type": "MIGRATION",
     "replace": "badge_marshal"
   },
+  {
+    "id": "rm298",
+    "type": "MIGRATION",
+    "replace": "rcmg840"
+  },
+  {
+    "id": "rm614_lmg",
+    "type": "MIGRATION",
+    "replace": "rcmg840"
+  },
+  {
+    "id": "rm51_assault_rifle",
+    "type": "MIGRATION",
+    "replace": "rsa840"
+  },
   {
     "id": "bio_power_armor_interface",
     "type": "MIGRATION",

data/json/snippets/newspapers.json

@@ -131,10 +131,16 @@
       },
       {
         "id": "years_old_news_12",
-        "text": "FROM SCI-FI TO REALITY: RIVTECH'S CASELESS TECHNOLOGY ENTERS THE NEXT-GEN SERVICE WEAPON RACE.\n\nWith the US Army’s Next Generation Squad Weapon (NGSW) trials on track to find a replacement for the military's M16 rifle series and M249 machinegun, a brand-new and riveting competitor has joined Sig Sauer, General Dynamics, and Textron Systems in the race to define the next service rifle platform.  Rivtech, a defense contractor already possessing a mandate to produce advanced components for the army’s combat exoskeleton program, has recently unveiled its contenders for the multibillion-dollar weapons contract: the XM88 and XM614 caseless rifles.\n\n\"We’re looking to bring the future ideas of yesterday to practical life in the present,\" said the project’s lead engineer, Angela Griffith, during the weapons' unveiling earlier today.  \"A lot's changed since the days of the H&K G11, and with our advanced materials and machining techniques, we believed that it was time to give caseless technology a fresh shake.  Our preliminary design was going to revolve around an 8x40mm round weighing in at 170 grains, but, per army requirements, we’ve scaled it down to a .270-caliber projectile and, using our proprietary high-ignition gunpowder, have waved good-bye to any overheating and cookoff issues that caseless tech had in the past.  What's more, while we’ve upsized the bullet from 5.56mm, giving it greater long-range terminal bolistics and man-stopping potential, we've still been able to make 40 percent weight savings, resulting in a battlefield SAW loadout with an XM614 and 900 rounds of ammunition that only weighs 31.3 pounds, as apposed to a comparably equipped M249's 48.28 pounds.  All this, gentlemen, and we've not even touched on our platform’s accuracy potential with its delayed-recoil system.\"\n\nAt present, Rivtech has supplied 53 XM88 rifles, 43 XM614 light machine guns, and over 800,000 rounds of 6.8x40mm caseless ammunition for Soldier Touchpoint testing."
+        "text": {
+          "str": "SOYPELUSA SUITS FIND NEW AMMO:  Following the infamous disaster of the DaiZoom product launch and the numerous lawsuits that sprung from its failure, research from Harvard's Cognitive Neuropsychology labs has brought new evidence in the ongoing litigation against the company.  We spoke with lead researcher Doctor Soren Eldridge who had this to say: \"The DaiZoom bar, beyond its notoriously bad taste, appears to cause in its consumers symptoms similar to those of a major depressive disorder.  There is an actual tangible impact on mood that lasts well beyond the initial consumption of even just a few bars in a short span of time - we suspect DaiZoom may actually be chemically inhibiting dopamine receptors.  This is unprecedented, and quite exciting, given that it consists entirely of otherwise biochemically bland ingredients.\"  Doctor Eldridge stated that further research would be needed to determine the full extent of the issue and whether consumption of DaiZoom had long-term health effects similar to existing dopamine blocking drugs, and if there is any role for it as a medical therapy in the future.  The full interview can be found on page 7."
+        }
       },
       {
         "id": "years_old_news_13",
+        "text": "FROM SCI-FI TO REALITY: RIVTECH'S CASELESS TECHNOLOGY ENTERS THE NEXT-GEN SERVICE WEAPON RACE.\n\nWith the US Army’s Next Generation Squad Weapon (NGSW) trials on track to find a replacement for the military's M16 rifle series and M249 machinegun, a brand-new and riveting competitor has joined Sig Sauer, General Dynamics, and Textron Systems in the race to define the next service rifle platform.  Rivtech, a defense contractor already possessing a mandate to produce advanced components for the army’s combat exoskeleton program, has recently unveiled its contenders for the multibillion-dollar weapons contract: the XM88 and XM614 caseless rifles.\n\n\"We’re looking to bring the future ideas of yesterday to practical life in the present,\" said the project’s lead engineer, Angela Griffith, during the weapons' unveiling earlier today.  \"A lot's changed since the days of the H&K G11, and with our advanced materials and machining techniques, we believed that it was time to give caseless technology a fresh shake.  Our preliminary design was going to revolve around an 8x40mm round weighing in at 170 grains, but, per army requirements, we’ve scaled it down to a .270-caliber projectile and, using our proprietary high-ignition gunpowder, have waved good-bye to any overheating and cookoff issues that caseless tech had in the past.  What's more, while we’ve upsized the bullet from 5.56mm, giving it greater long-range terminal bolistics and man-stopping potential, we've still been able to make 40 percent weight savings, resulting in a battlefield SAW loadout with an XM614 and 900 rounds of ammunition that only weighs 31.3 pounds, as apposed to a comparably equipped M249's 48.28 pounds.  All this, gentlemen, and we've not even touched on our platform’s accuracy potential with its delayed-recoil system.\"\n\nAt present, Rivtech has supplied 53 XM88 rifles, 43 XM614 light machine guns, and over 800,000 rounds of 6.8x40mm caseless ammunition for Soldier Touchpoint testing."
+      },
+      {
+        "id": "years_old_news_14",
         "text": "RIVTECH'S NGSW ENTRIES: WILL THE ARMY BITE THE BULLET?\n\nWith the winner of the US military’s Next Generation Squad Weapon trials expected to be announced in the fall of 2022, excitement runs high to see which of the three remaining contenders will take back home the prized 8-year army contract.  Certainly, among all the entries, the Rivtech XM88 rifle and XM614 SAW systems have stood out as the most unique and ambitious projects from the lot.\n\nAccording to the project’s engineering leader, Angela Griffith, the firearms were designed with feedback from soldiers in mind.  \"As much as possible, we’ve tried, in the XM88 and XM614, to create a weapon system that molds next-generation technology around the feedback from the soldiers who’ll be using the guns,\" Griffith said.\n\nWith their round of touchpoint testing concluded, Rivtech has sent 33 of their NGSW rifles and 23 machineguns for formal evaluation, though concerns over the very features that make the rifles distinct, their caseless and bullpup nature, do exist.  \"Fundamentally, the Rivtech stuff’s something we haven’t seen for 30 years,\" said corporal Ian Kasarda, a member of the Special Operations unit formerly testing the weapons.  \"That said, I reckon that we were all surprised to find just how well the guns worked, with only about 15 malfunctions per 1000 rounds, and their low weight's also something to appreciate.\"  The soldier wasn’t shy about voicing his concerns, however.  \"We can’t overlook the fact that they’re complicated guns, complicated to make, complicated to field strip, and so different from what we’ve got fielded that each soldier would require a complete re-familiarization program just to use.  They’re fine pieces of kit,\" added Kasarda, \"but, in an age where drones and heavy weapons are dictating the flow of warfare far more than the average soldier, I’d be surprised if the army splashes out that sort of cash.\""
       }
     ]