replace modular m4 carabin item with respective itemgroup

CleverRaven · Jul 28, 2024 · 276b395 · 276b395
1 parent 67026ae
commit 276b395
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 201 deletions.
diff --git a/data/json/effects_on_condition/item_eocs.json b/data/json/effects_on_condition/item_eocs.json
@@ -15,7 +15,7 @@
     "type": "effect_on_condition",
     "id": "get_m4_carbine",
     "global": true,
-    "effect": { "u_spawn_item": "modular_m4_carbine" }
+    "effect": { "u_spawn_item": "m4_carbine", "use_item_group": true }
   },
   {
     "id": "EOC_vitrified_doll_talk",

diff --git a/data/json/furniture_and_terrain/furniture-graves.json b/data/json/furniture_and_terrain/furniture-graves.json
@@ -109,7 +109,7 @@
     "flags": [ "EASY_DECONSTRUCT", "TRANSPARENT", "MOUNTABLE" ],
     "deconstruct": {
       "items": [
-        { "item": "modular_m4_carbine", "count": 1, "charges": 0, "variant": "modular_m4a1" },
+        { "group": "modular_m4a1", "count": 1, "charges": 0 },
         { "item": "helmet_army", "count": 1, "damage": [ 0, 3 ] },
         { "item": "boots_combat", "count": [ 0, 1 ], "damage": [ 0, 3 ] }
       ]
@@ -120,7 +120,7 @@
       "sound": "thump.",
       "sound_fail": "whack.",
       "items": [
-        { "item": "modular_m4_carbine", "count": 1, "charges": 0, "variant": "modular_m4a1" },
+        { "group": "modular_m4a1", "count": 1, "charges": 0 },
         { "item": "helmet_army", "count": 1, "damage": [ 0, 3 ] },
         { "item": "boots_combat", "count": [ 0, 1 ], "damage": [ 0, 3 ] }
       ]

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json
@@ -44,7 +44,7 @@
     "id": "nested_m4_carbine_no_ammo",
     "type": "item_group",
     "subtype": "collection",
-    "items": [ { "item": "modular_m4_carbine" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
+    "items": [ { "group": "modular_m4a1" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
   },
   {
     "id": "nested_m27_assault_rifle_no_ammo",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json
@@ -1259,9 +1259,9 @@
     "//": "1-3 rifles of one type",
     "subtype": "collection",
     "entries": [
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "contents-item": "red_dot_sight" },
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "contents-item": "red_dot_sight", "prob": 50 },
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "contents-item": "red_dot_sight", "prob": 25 }
+      { "group": "modular_m4a1", "contents-item": "red_dot_sight" },
+      { "group": "modular_m4a1", "contents-item": "red_dot_sight", "prob": 50 },
+      { "group": "modular_m4a1", "contents-item": "red_dot_sight", "prob": 25 }
     ]
   },
   {
@@ -1270,19 +1270,9 @@
     "//": "1-3 rifles of one type",
     "subtype": "collection",
     "entries": [
-      { "item": "modular_m4_carbine", "variant": "m4_cqbr", "contents-item": [ "red_dot_sight", "suppressor" ] },
-      {
-        "item": "modular_m4_carbine",
-        "variant": "m4_cqbr",
-        "contents-item": [ "red_dot_sight", "suppressor" ],
-        "prob": 50
-      },
-      {
-        "item": "modular_m4_carbine",
-        "variant": "m4_cqbr",
-        "contents-item": [ "red_dot_sight", "suppressor" ],
-        "prob": 25
-      }
+      { "group": "m4_cqbr", "contents-item": [ "red_dot_sight", "suppressor" ] },
+      { "group": "m4_cqbr", "contents-item": [ "red_dot_sight", "suppressor" ], "prob": 50 },
+      { "group": "m4_cqbr", "contents-item": [ "red_dot_sight", "suppressor" ], "prob": 25 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json
@@ -1,14 +1,16 @@
 [
+  {
+    "id": "m4_carbine",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "group": "modular_m4a1", "contents-item": [ "retool_ar15_223rem_medium" ] } ]
+  },
   {
     "id": "m4_cqbr",
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      {
-        "item": "modular_m4_carbine",
-        "variant": "m4_cqbr",
-        "contents-item": [ "pistol_grip", "retool_ar15_223rem_short", "suppressor", "adjustable_stock" ]
-      }
+      { "group": "m4_cqbr", "contents-item": [ "pistol_grip", "retool_ar15_223rem_short", "suppressor", "adjustable_stock" ] }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -462,7 +462,7 @@
       { "item": "fn_fal_semi", "variant": "fal_dsa", "prob": 40 },
       { "item": "hk_g3", "prob": 40 },
       { "item": "m1918", "prob": 30 },
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 45 },
+      { "group": "modular_m4a1", "prob": 45 },
       { "item": "m14ebr", "prob": 15 },
       { "item": "arx160", "prob": 10 },
       { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "prob": 25 },
@@ -844,16 +844,14 @@
         "prob": 40
       },
       {
-        "item": "modular_m4_carbine",
-        "variant": "modular_m4a1",
+        "group": "modular_m4a1",
         "ammo-item": "556_mk318",
         "charges": [ 0, 30 ],
         "contents-item": "shoulder_strap",
         "prob": 8
       },
       {
-        "item": "modular_m4_carbine",
-        "variant": "m4_cqbr",
+        "group": "modular_m4a1",
         "ammo-item": "556_mk318",
         "charges": [ 0, 30 ],
         "contents-item": "shoulder_strap",
@@ -918,16 +916,14 @@
       { "group": "ar15_223short", "ammo-item": "223", "charges": 30, "contents-item": "shoulder_strap", "prob": 70 },
       { "group": "ar15_223long", "ammo-item": "223", "charges": 30, "contents-item": "shoulder_strap", "prob": 40 },
       {
-        "item": "modular_m4_carbine",
-        "variant": "modular_m4a1",
+        "group": "modular_m4a1",
         "ammo-item": "556_mk318",
         "charges": 30,
         "contents-item": "shoulder_strap",
         "prob": 8
       },
       {
-        "item": "modular_m4_carbine",
-        "variant": "m4_cqbr",
+        "group": "modular_m4a1",
         "ammo-item": "556_mk318",
         "charges": 30,
         "contents-item": "shoulder_strap",
@@ -1028,8 +1024,7 @@
       {
         "collection": [
           {
-            "item": "modular_m4_carbine",
-            "variant": "modular_m4a1",
+            "group": "modular_m4a1",
             "ammo-item": "556_mk318",
             "charges": [ 0, 30 ],
             "contents-item": "shoulder_strap",
@@ -1046,8 +1041,7 @@
       {
         "collection": [
           {
-            "item": "modular_m4_carbine",
-            "variant": "m4_cqbr",
+            "group": "m4_cqbr",
             "ammo-item": "556_mk318",
             "charges": [ 0, 30 ],
             "contents-item": "shoulder_strap",
@@ -1375,8 +1369,7 @@
       {
         "collection": [
           {
-            "item": "modular_m4_carbine",
-            "variant": "modular_m4a1",
+            "group": "modular_m4a1",
             "ammo-item": "556_mk318",
             "charges": [ 0, 30 ],
             "contents-item": "shoulder_strap",
@@ -1393,8 +1386,7 @@
       {
         "collection": [
           {
-            "item": "modular_m4_carbine",
-            "variant": "m4_cqbr",
+            "group": "m4_cqbr",
             "ammo-item": "556_mk318",
             "charges": [ 0, 30 ],
             "contents-item": "shoulder_strap",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1594,7 +1594,7 @@
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "charges": [ 0, 30 ] },
+      { "group": "modular_m4a1", "charges": [ 0, 30 ] },
       { "item": "stanag30" },
       { "item": "stanag30", "prob": 50 },
       { "group": "on_hand_223" }

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": "modular_m4_carbine", "variant": "modular_m4a1" },
+      { "group": "m4_carbine" },
       { "item": "savage_111f" },
       { "item": "hk_g3" },
       { "item": "hk_g80" },

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -4,13 +4,7 @@
     "id": "military_standard_assault_rifles",
     "subtype": "distribution",
     "entries": [
-      {
-        "item": "modular_m4_carbine",
-        "variant": "modular_m4a1",
-        "prob": 88,
-        "charges": [ 0, 30 ],
-        "contents-group": "issued_carbine_mods"
-      },
+      { "group": "modular_m4a1", "prob": 88, "charges": [ 0, 30 ], "contents-group": "issued_carbine_mods" },
       {
         "item": "modular_m27_assault_rifle",
         "variant": "modular_m27iar",
@@ -32,7 +26,7 @@
     "type": "item_group",
     "id": "military_grenadier_assault_rifles",
     "subtype": "distribution",
-    "entries": [ { "item": "modular_m4_carbine", "contents-group": "issued_grenadier_mods", "prob": 100, "charges": [ 0, 30 ] } ]
+    "entries": [ { "group": "modular_m4a1", "contents-group": "issued_grenadier_mods", "prob": 100, "charges": [ 0, 30 ] } ]
   },
   {
     "id": "armor_plates",
@@ -638,7 +632,7 @@
       { "item": "20x66_slug", "prob": 4 },
       { "item": "m9", "variant": "m9", "prob": 6 },
       { "item": "usp_45", "prob": 6 },
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 7 },
+      { "group": "modular_m4a1", "prob": 7 },
       { "group": "m4_cqbr", "prob": 1 },
       { "item": "modular_m16a4", "prob": 5 },
       { "item": "modular_m16_auto_rifle", "variant": "modular_m16a3", "prob": 1 },

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -361,7 +361,6 @@
     "min_cycle_recoil": 1350,
     "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "default_mods": [ "retool_ar15_223rem_medium" ],
     "valid_mod_locations": [ [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 2 ], [ "sling", 1 ], [ "stock accessory", 2 ], [ "stock", 1 ] ],
     "flags": [ "NO_TURRET" ],
     "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.",

diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json
@@ -767,15 +767,7 @@
         { "item": "m203", "x": 10, "y": 11, "chance": 75, "repeat": 5 },
         { "item": "mgl", "x": 10, "y": 11, "chance": 75, "repeat": 3 },
         { "item": "40x46mm_m433", "x": 10, "y": 12, "chance": 75, "repeat": 20 },
-        {
-          "item": "modular_m4_carbine",
-          "variant": "modular_m4a1",
-          "x": 12,
-          "y": [ 9, 11 ],
-          "magazine": 100,
-          "chance": 75,
-          "repeat": 30
-        },
+        { "group": "modular_m4a1", "x": 12, "y": [ 9, 11 ], "magazine": 100, "chance": 75, "repeat": 30 },
         {
           "item": "modular_m27_assault_rifle",
           "variant": "modular_m27iar",
@@ -789,15 +781,7 @@
         { "item": "stanag30", "x": 12, "y": 12, "chance": 75, "repeat": 80 },
         { "item": "stanag50", "x": 12, "y": 12, "chance": 75, "repeat": 20 },
         { "item": "556", "x": 14, "y": [ 9, 12 ], "chance": 75, "repeat": 150 },
-        {
-          "item": "modular_m4_carbine",
-          "variant": "modular_m4a1",
-          "x": 16,
-          "y": [ 9, 11 ],
-          "magazine": 100,
-          "chance": 75,
-          "repeat": 36
-        },
+        { "group": "modular_m4a1", "x": 16, "y": [ 9, 11 ], "magazine": 100, "chance": 75, "repeat": 36 },
         { "item": "stanag30", "x": 16, "y": 12, "chance": 75, "repeat": 100 },
         { "item": "556", "x": 18, "y": [ 9, 12 ], "chance": 75, "repeat": 150 },
         { "item": "m249", "x": 20, "y": 9, "chance": 75, "repeat": 6 },

diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -656,7 +656,7 @@
     "magazine": 100,
     "ammo": 10,
     "id": "feral_autogun",
-    "items": [ [ "modular_m4_carbine", 500 ], { "group": "modular_ar15", "prob": 500 } ]
+    "items": [ { "group": "modular_m4a1", "prob": 500 }, { "group": "modular_ar15", "prob": 500 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/npcs/NC_ARMY.json b/data/json/npcs/NC_ARMY.json
@@ -163,11 +163,7 @@
     "type": "item_group",
     "id": "NC_ARMY_rifle",
     "subtype": "distribution",
-    "entries": [
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 50 },
-      { "item": "m14ebr", "prob": 35 },
-      { "item": "m249", "prob": 20 }
-    ]
+    "entries": [ { "group": "modular_m4a1", "prob": 50 }, { "item": "m14ebr", "prob": 35 }, { "item": "m249", "prob": 20 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/npcs/NC_ARSONIST.json b/data/json/npcs/NC_ARSONIST.json
@@ -195,11 +195,7 @@
     "type": "item_group",
     "id": "NC_ARSONIST_rifle",
     "subtype": "distribution",
-    "entries": [
-      { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 35 },
-      { "item": "m1a", "prob": 35 },
-      { "item": "ak47", "prob": 35 }
-    ]
+    "entries": [ { "group": "modular_m4a1", "prob": 35 }, { "item": "m1a", "prob": 35 }, { "item": "ak47", "prob": 35 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/npcs/NC_OPS.json b/data/json/npcs/NC_OPS.json
@@ -136,7 +136,13 @@
   {
     "type": "item_group",
     "id": "NC_OPS_rifle",
-    "items": [ [ "modular_m4_carbine", 50 ], [ "m14ebr", 35 ], [ "m249", 20 ], [ "modular_m27_assault_rifle", 50 ], [ "M24", 35 ] ]
+    "items": [
+      { "group": "modular_m4a1", "prob": 50 },
+      [ "m14ebr", 35 ],
+      [ "m249", 20 ],
+      [ "modular_m27_assault_rifle", 50 ],
+      [ "M24", 35 ]
+    ]
   },
   {
     "type": "item_group",

diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json
@@ -121,13 +121,13 @@
     "type": "item_group",
     "id": "NC_SOLDIER_rifle",
     "subtype": "distribution",
-    "entries": [ { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 90 }, { "item": "m14ebr", "prob": 10 } ]
+    "entries": [ { "group": "modular_m4a1", "prob": 90 }, { "item": "m14ebr", "prob": 10 } ]
   },
   {
     "type": "item_group",
     "id": "NC_SOLDIER_weapon_random",
     "subtype": "distribution",
-    "entries": [ { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 35 } ]
+    "entries": [ { "group": "modular_m4a1", "prob": 35 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
@@ -72,8 +72,7 @@
     "subtype": "collection",
     "items": [
       {
-        "item": "modular_m4_carbine",
-        "variant": "modular_m4a1",
+        "group": "modular_m4a1",
         "ammo-item": "556",
         "charges": 30,
         "contents-item": [ "shoulder_strap", "holo_sight", "suppressor" ]

diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json b/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json
@@ -57,14 +57,6 @@
     "type": "item_group",
     "id": "NC_ANCILLA_GRUNT_wield",
     "subtype": "collection",
-    "items": [
-      {
-        "item": "modular_m4_carbine",
-        "variant": "modular_m4a1",
-        "ammo-item": "556",
-        "charges": 30,
-        "contents-item": [ "shoulder_strap", "suppressor" ]
-      }
-    ]
+    "items": [ { "group": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "suppressor" ] } ]
   }
 ]