Genericize NATO assault rifles

Information lost: acr - 250ml barrel volume, folding stock m38dmr - 125 dispersion Move everything using an old rifle into the new generic rifles. The m38dmr is debatable, but I figure it's fine to be generic. Only m4a1s will spawn from unspecified variants at the moment, someone else can figure out what the proper chances should be.
CleverRaven · Jan 17, 2021 · 3cb672f · 3cb672f
1 parent f5c2317
commit 3cb672f
Show file tree

Hide file tree

Showing 25 changed files with 246 additions and 337 deletions.
diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -218,9 +218,9 @@
       { "item": "ak47", "prob": 16 },
       { "item": "ak74", "prob": 4 },
       { "item": "an94", "prob": 1 },
-      { "item": "m4a1", "prob": 7 },
+      { "item": "nato_assault_rifle", "variant": "m4a1", "prob": 7 },
       { "item": "m16a4", "prob": 6 },
-      { "item": "h&k416a5", "prob": 3 },
+      { "item": "nato_assault_rifle", "variant": "h&k416a5", "prob": 3 },
       { "item": "m1014", "prob": 1 },
       { "item": "steyr_aug", "prob": 6 },
       { "item": "v29", "prob": 1 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
@@ -120,6 +120,13 @@
       [ "offset_sights", 6 ]
     ]
   },
+  {
+    "type": "item_group",
+    "id": "m38dmr_mods",
+    "//": "Default mods for the m38dmr variant of the NATO assault rifle",
+    "subtype": "collection",
+    "entries": [ { "item": "suppressor" }, { "item": "rifle_scope" }, { "item": "bipod" } ]
+  },
   {
     "type": "item_group",
     "id": "sights_shotgun_readied",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -346,7 +346,7 @@
     "id": "guns_rifle_rare",
     "//": "Less common rifles including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 30 },
+      { "item": "nato_assault_rifle", "variant": "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 },
@@ -356,7 +356,7 @@
       { "item": "henry_big_boy", "prob": 10, "charges-min": 0, "charges-max": 10 },
       { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 },
       { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 5 },
-      { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 },
+      { "item": "nato_assault_rifle", "variant": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 },
       { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 },
       { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 },
       { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 },
@@ -375,7 +375,7 @@
     "id": "guns_rifle_rare_display",
     "//": "Less common rifles found exclusively in gun stores.",
     "items": [
-      { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 0 },
+      { "item": "nato_assault_rifle", "variant": "acr", "prob": 25, "charges-min": 0, "charges-max": 0 },
       { "item": "colt_lightning", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "fn_fal", "prob": 40, "charges-min": 0, "charges-max": 0 },
       { "item": "m249_semi", "prob": 5, "charges-min": 0, "charges-max": 0 },
@@ -384,7 +384,7 @@
       { "item": "henry_big_boy", "prob": 10, "charges-min": 0, "charges-max": 0 },
       { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 0 },
-      { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 0 },
+      { "item": "nato_assault_rifle", "variant": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 0 },
       { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 0 },
       { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 0 },
@@ -403,23 +403,23 @@
     "id": "guns_rifle_milspec",
     "//": "Military specification rifles only ever found at military sites.",
     "items": [
-      { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 },
+      { "item": "nato_assault_rifle", "variant": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 },
       { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 },
       { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 },
       { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 },
       { "item": "tac50", "prob": 5, "charges-min": 0, "charges-max": 5 },
       { "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 },
       { "item": "m240", "prob": 15, "charges-min": 0, "charges-max": 100 },
       { "item": "m249", "prob": 25, "charges-min": 0, "charges-max": 10 },
-      { "item": "m27iar", "prob": 50, "charges-min": 0, "charges-max": 30 },
+      { "item": "nato_assault_rifle", "variant": "m27iar", "prob": 50, "charges-min": 0, "charges-max": 30 },
       { "item": "m60", "prob": 15, "charges-min": 0, "charges-max": 100 },
       { "item": "rm11b_sniper_rifle", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "rm298", "prob": 10, "charges-min": 0, "charges-max": 100 },
       { "item": "rm51_assault_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 },
       { "item": "rm614_lmg", "prob": 10, "charges-min": 0, "charges-max": 100 },
       { "item": "rm88_battle_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 },
       { "item": "sig552", "prob": 100, "charges-min": 0, "charges-max": 30 },
-      { "item": "scar_l", "prob": 50, "charges-min": 0, "charges-max": 30 },
+      { "item": "nato_assault_rifle", "variant": "scar_l", "prob": 50, "charges-min": 0, "charges-max": 30 },
       { "item": "scar_h", "prob": 50, "charges-min": 0, "charges-max": 20 },
       { "item": "m110a1", "prob": 50, "charges-min": 0, "charges-max": 20 },
       { "item": "acr_300blk", "prob": 15, "charges-min": 0, "charges-max": 30 }
@@ -782,7 +782,7 @@
       { "item": "hk_mp5k", "prob": 10, "charges-min": 0, "charges-max": 30 },
       { "item": "hk_mp5sd", "prob": 5, "charges-min": 0, "charges-max": 30 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
-      { "item": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 },
+      { "item": "nato_assault_rifle", "variant": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 },
       { "item": "as50", "prob": 5, "charges-min": 0, "charges-max": 10 },
       { "item": "USAS_12", "prob": 1, "charges-min": 0, "charges-max": 10 },
       { "item": "hk417_13", "prob": 30, "charges-min": 0, "charges-max": 20 }

diff --git a/data/json/itemgroups/defense_mode.json b/data/json/itemgroups/defense_mode.json
@@ -35,7 +35,7 @@
       { "item": "remington_870" },
       { "item": "browning_blr" },
       { "item": "ak47" },
-      { "item": "m4a1" },
+      { "item": "nato_assault_rifle", "variant": "m4a1" },
       { "item": "savage_111f" },
       { "item": "hk_g3" },
       { "item": "hk_g80" },

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -4,9 +4,15 @@
     "id": "military_standard_assault_rifles",
     "subtype": "distribution",
     "entries": [
-      { "item": "m4a1", "prob": 88, "charges": [ 0, 30 ] },
-      { "item": "m27iar", "prob": 10, "charges": [ 0, 30 ] },
-      { "item": "m38dmr", "prob": 1, "charges": [ 0, 30 ] },
+      { "item": "nato_assault_rifle", "variant": "m4a1", "prob": 88, "charges": [ 0, 30 ] },
+      { "item": "nato_assault_rifle", "variant": "m27iar", "prob": 10, "charges": [ 0, 30 ] },
+      {
+        "item": "nato_assault_rifle",
+        "variant": "m38dmr",
+        "contents-group": "m38dmr_mods",
+        "prob": 1,
+        "charges": [ 0, 30 ]
+      },
       { "item": "m16a4", "prob": 2, "charges": [ 0, 30 ] }
     ]
   },
@@ -174,23 +180,23 @@
       { "item": "20x66_flechette", "prob": 3 },
       { "item": "m9", "prob": 6 },
       { "item": "usp_45", "prob": 6 },
-      { "item": "m4a1", "prob": 7 },
-      { "item": "m4_cqbr", "prob": 1 },
+      { "item": "nato_assault_rifle", "variant": "m4a1", "prob": 7 },
+      { "item": "nato_assault_rifle", "variant": "m4_cqbr", "prob": 1 },
       { "item": "m231pfw", "prob": 1 },
       { "item": "m16a4", "prob": 5 },
-      { "item": "m16a3", "prob": 1 },
+      { "item": "nato_assault_rifle", "variant": "m16a3", "prob": 1 },
       { "item": "colt_ro635", "prob": 1 },
       { "item": "p226_9mm", "prob": 1 },
       { "item": "sp2022", "prob": 1 },
-      { "item": "h&k416a5", "prob": 7 },
+      { "item": "nato_assault_rifle", "variant": "h&k416a5", "prob": 7 },
       { "item": "m1014", "prob": 2 },
-      { "item": "scar_l", "prob": 6 },
+      { "item": "nato_assault_rifle", "variant": "scar_l", "prob": 6 },
       { "item": "scar_h", "prob": 5 },
       { "item": "sig_mcx_rattler_sbr", "prob": 1 },
       { "item": "m249", "prob": 1 },
       { "item": "m240", "prob": 1 },
-      { "item": "m27iar", "prob": 1 },
-      { "item": "m38dmr", "prob": 1 },
+      { "item": "nato_assault_rifle", "variant": "m27iar", "prob": 1 },
+      { "item": "nato_assault_rifle", "variant": "m38dmr", "contents-group": "m38dmr_mods", "prob": 1 },
       { "item": "plasma_gun", "prob": 1 },
       { "item": "m320", "prob": 5 },
       { "item": "m320_mod", "prob": 10 },
@@ -376,8 +382,8 @@
       { "item": "rm451_flamethrower", "prob": 10 },
       { "item": "m249", "prob": 30 },
       { "item": "m240", "prob": 20 },
-      { "item": "m27iar", "prob": 30 },
-      { "item": "m38dmr", "prob": 3 },
+      { "item": "nato_assault_rifle", "variant": "m27iar", "prob": 30 },
+      { "item": "nato_assault_rifle", "variant": "m38dmr", "contents-group": "m38dmr_mods", "prob": 3 },
       { "item": "m2browning", "prob": 15 },
       { "item": "mark19", "prob": 15 },
       { "item": "556", "prob": 30 },