item groups for the Rivtech SA-840, migrates the rm51.

CleverRaven · Oct 8, 2023 · 9b85605 · 9b85605
1 parent ca6965e
commit 9b85605
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/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,7 +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 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1857,15 +1857,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" }
     ]
   },

diff --git a/data/json/itemgroups/military.json b/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 },

diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json
@@ -129,6 +129,11 @@
     "type": "MIGRATION",
     "replace": "rm614_lmg"
   },
+  {
+    "id": "rm51_assault_rifle",
+    "type": "MIGRATION",
+    "replace": "rsa840"
+  },
   {
     "id": "bio_power_armor_interface",
     "type": "MIGRATION",