Canning the ammunition (CleverRaven#69060)

* initial commit

* no message

* Update dictionary

* debug map should not spawn

* unburn the cans

* fix ammo cans compatibility with generic guns

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json

@@ -3,7 +3,15 @@
     "type": "item_group",
     "id": "milspec_arsenal_223_pouch_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_223_pouch_gun&ammo" }, { "item": "ammunition_can_50", "count": [ 1, 4 ] } ]
+    "items": [
+      { "group": "milspec_arsenal_223_pouch_gun&ammo" },
+      {
+        "distribution": [
+          { "item": "ammo_can_50_556_m855a1_clipped_840", "count": [ 1, 4 ], "prob": 100 },
+          { "item": "ammo_can_50_556tracer_820", "count": [ 1, 4 ], "prob": 5 }
+        ]
+      }
+    ]
   },
   {
     "type": "item_group",
@@ -12,8 +20,8 @@
     "subtype": "collection",
     "items": [
       { "group": "milspec_arsenal_223_gun&mags" },
-      { "group": "ammo_can_ammo_pouch_223_full", "prob": 30 },
-      { "group": "ammo_can_ammo_pouch_223_part", "prob": 80, "count": [ 1, 2 ] }
+      { "group": "ammo_can_223_any_full", "prob": 30 },
+      { "group": "ammo_can_223_any_part", "prob": 80, "count": [ 1, 2 ] }
     ]
   },
   {
@@ -58,33 +66,5 @@
       { "item": "stanag100drum", "prob": 5 },
       { "item": "stanag150", "prob": 3 }
     ]
-  },
-  {
-    "id": "ammo_can_ammo_pouch_223_full",
-    "type": "item_group",
-    "subtype": "collection",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_pouch_223", "count": 7 } ]
-  },
-  {
-    "id": "ammo_can_ammo_pouch_223_part",
-    "type": "item_group",
-    "subtype": "collection",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_pouch_223", "count": [ 1, 6 ] } ]
-  },
-  {
-    "id": "ammo_pouch_223",
-    "type": "item_group",
-    "//": "TODO: addd 1 stipper clip guide (aka 'spoon') for 223 in this group, when the game will be able to check his using",
-    "subtype": "collection",
-    "container-item": "cheap_ammo_pouch",
-    "items": [ { "group": "box_223_clips", "count": 4 } ]
-  },
-  {
-    "id": "box_223_clips",
-    "type": "item_group",
-    "container-item": "ammunition_box_223",
-    "items": [ { "item": "clip223_10rd", "count": 3 } ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223_mg.json

@@ -3,18 +3,28 @@
     "type": "item_group",
     "id": "milspec_arsenal_223_mg_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_223_mg_gun&ammo" }, { "item": "ammunition_can_50", "count": [ 1, 4 ] } ]
+    "items": [
+      { "group": "milspec_arsenal_223_mg_gun&ammo" },
+      {
+        "distribution": [
+          { "item": "ammo_can_fat_50_223_1tracer4ball_800", "count": [ 1, 4 ], "prob": 100 },
+          { "item": "ammo_can_fat_50_223_1tracer4ap_800", "count": [ 1, 4 ], "prob": 50 },
+          { "item": "ammo_can_fat_50_223ap_800", "count": [ 1, 4 ], "prob": 40 },
+          { "item": "ammo_can_fat_50_223fmj_800", "count": [ 1, 4 ], "prob": 80 }
+        ]
+      }
+    ]
   },
   {
     "type": "item_group",
     "id": "milspec_arsenal_223_mg_gun&ammo",
     "subtype": "collection",
     "items": [
       { "group": "milspec_arsenal_223_mg_gun&mags" },
-      { "group": "ammo_can_belt223_any_full", "prob": 30 },
-      { "group": "ammo_can_belt223_any_full", "prob": 80, "count": [ 0, 1 ] },
-      { "group": "ammo_can_belt223_any_part", "count": [ 1, 2 ] },
-      { "group": "ammo_can_belt223_any_part", "count": [ 1, 2 ], "prob": 50 }
+      { "group": "ammo_can_223_any_full", "prob": 30 },
+      { "group": "ammo_can_223_any_full", "prob": 80, "count": [ 0, 1 ] },
+      { "group": "ammo_can_223_any_part", "count": [ 1, 2 ] },
+      { "group": "ammo_can_223_any_part", "count": [ 1, 2 ], "prob": 50 }
     ]
   },
   {
@@ -26,46 +36,5 @@
       { "item": "m249", "count": 1, "prob": 40 },
       { "item": "m249", "count": 1, "prob": 10 }
     ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_any_full",
-    "items": [ { "group": "ammo_can_belt223_full" }, { "group": "ammo_can_belt223_fat_full", "prob": 40 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_any_part",
-    "items": [ { "group": "ammo_can_belt223_part" }, { "group": "ammo_can_belt223_fat_part", "prob": 40 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_fat_full",
-    "container-item": "ammunition_can_fat_50",
-    "items": [ { "group": "ammo_can_belt223_pouch", "count": 2, "charges-min": 400, "charges-max": 400 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_fat_part",
-    "container-item": "ammunition_can_fat_50",
-    "items": [ { "item": "belt223", "count": [ 0, 1 ], "charges-min": 400, "charges-max": 400 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_full",
-    "//": "ammo belts are awfully broken due #57981, looks like this group will require the fix after resolving the bug",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_can_belt223_pouch", "count": 2 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_part",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_can_belt223_pouch", "count": [ 0, 1 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt223_pouch",
-    "container-item": "cheap_ammo_pouch_belt223",
-    "items": [ { "item": "belt223", "count": 1 } ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json

@@ -3,7 +3,7 @@
     "type": "item_group",
     "id": "milspec_arsenal_300_sniper_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_300_sniper_gun&ammo" }, { "item": "ammunition_can_30", "count": [ 1, 4 ] } ]
+    "items": [ { "group": "milspec_arsenal_300_sniper_gun&ammo" }, { "item": "ammo_can_30_300jhp_240", "count": [ 1, 4 ] } ]
   },
   {
     "type": "item_group",
@@ -30,23 +30,5 @@
     "type": "item_group",
     "subtype": "collection",
     "items": [ { "item": "m2010" }, { "item": "m2010mag", "count": [ 1, 3 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_300_full",
-    "container-item": "ammunition_can_30",
-    "items": [ { "group": "ammo_box_300", "count": 15 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_300_part",
-    "container-item": "ammunition_can_30",
-    "items": [ { "group": "ammo_box_300", "count": [ 1, 5 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_box_300",
-    "container-item": "ammunition_box_223",
-    "items": [ [ "300_winmag", 20 ] ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json

@@ -3,16 +3,24 @@
     "type": "item_group",
     "id": "milspec_arsenal_300blk_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_300blk_gun&ammo" }, { "item": "ammunition_can_30", "count": [ 1, 4 ] } ]
+    "items": [
+      { "group": "milspec_arsenal_300blk_gun&ammo" },
+      {
+        "distribution": [
+          { "item": "ammo_can_50_300AAC_otm_840", "count": [ 1, 4 ] },
+          { "item": "ammo_can_30_300AAC_otmss_720", "count": [ 1, 4 ] }
+        ]
+      }
+    ]
   },
   {
     "type": "item_group",
     "id": "milspec_arsenal_300blk_gun&ammo",
     "subtype": "collection",
     "items": [
       { "group": "milspec_arsenal_300blk_gun&mags" },
-      { "group": "ammo_can_300blk_full", "prob": 30 },
-      { "group": "ammo_can_300blk_part", "prob": 80, "count": [ 1, 2 ] }
+      { "group": "ammo_can_300AAC_any_full", "prob": 30 },
+      { "group": "ammo_can_300AAC_any_part", "prob": 80, "count": [ 1, 2 ] }
     ]
   },
   {
@@ -36,23 +44,5 @@
     "type": "item_group",
     "subtype": "collection",
     "items": [ { "item": "modular_m16_auto_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_300blk_full",
-    "container-item": "ammunition_can_30",
-    "items": [ { "group": "ammo_box_308", "count": 15 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_300blk_part",
-    "container-item": "ammunition_can_30",
-    "items": [ { "group": "ammo_box_300blk", "count": [ 1, 8 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_box_300blk",
-    "container-item": "ammunition_box_223",
-    "items": [ [ "300blk", 30 ] ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_mg.json

@@ -3,18 +3,28 @@
     "type": "item_group",
     "id": "milspec_arsenal_308_mg_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_308_mg_gun&ammo" }, { "item": "ammunition_can_50", "count": [ 1, 4 ] } ]
+    "items": [
+      { "group": "milspec_arsenal_308_mg_gun&ammo" },
+      {
+        "distribution": [
+          { "item": "ammo_can_30_308_1tracer4ap_200", "count": [ 1, 4 ] },
+          { "item": "ammo_can_30_308_4fmj1tracer_200", "count": [ 1, 4 ] },
+          { "item": "ammo_can_50_308_600", "count": [ 1, 4 ] },
+          { "item": "ammo_can_fat_50_308_1tracer4ap_600", "count": [ 1, 4 ] }
+        ]
+      }
+    ]
   },
   {
     "type": "item_group",
     "id": "milspec_arsenal_308_mg_gun&ammo",
     "subtype": "collection",
     "items": [
       { "group": "milspec_arsenal_308_mg_gun&mags" },
-      { "group": "ammo_can_belt308_full", "prob": 30 },
-      { "group": "ammo_can_belt308_full", "prob": 80, "count": [ 0, 1 ] },
-      { "group": "ammo_can_belt308_part", "count": [ 1, 2 ] },
-      { "group": "ammo_can_belt308_part", "count": [ 1, 2 ], "prob": 50 }
+      { "group": "ammo_can_308_mg_any_full", "prob": 30 },
+      { "group": "ammo_can_308_mg_any_full", "prob": 80, "count": [ 0, 1 ] },
+      { "group": "ammo_can_308_mg_any_part", "count": [ 1, 2 ] },
+      { "group": "ammo_can_308_mg_any_part", "count": [ 1, 2 ], "prob": 50 }
     ]
   },
   {
@@ -26,24 +36,5 @@
       { "item": "m240", "count": 1, "prob": 40 },
       { "item": "m240", "count": 1, "prob": 10 }
     ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt308_full",
-    "//": "ammo belts are awfully broken due #57981, looks like this group will require the fix after resolving the bug",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_can_belt308_pouch", "count": 2 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt308_part",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_can_belt308_pouch", "count": [ 0, 1 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_belt308_pouch",
-    "container-item": "cheap_ammo_pouch_belt308",
-    "items": [ { "item": "belt308", "count": 1 } ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_sniper.json

@@ -3,16 +3,21 @@
     "type": "item_group",
     "id": "milspec_arsenal_308_sniper_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_308_sniper_gun&ammo" }, { "item": "ammunition_can_30", "count": [ 1, 4 ] } ]
+    "items": [
+      { "group": "milspec_arsenal_308_sniper_gun&ammo" },
+      {
+        "distribution": [ { "item": "ammo_can_30_308ap_240", "count": [ 1, 4 ] }, { "item": "ammo_can_30_308fmj_460", "count": [ 1, 4 ] } ]
+      }
+    ]
   },
   {
     "type": "item_group",
     "id": "milspec_arsenal_308_sniper_gun&ammo",
     "subtype": "collection",
     "items": [
       { "group": "milspec_arsenal_308_sniper_gun&mags" },
-      { "group": "ammo_can_308_full", "prob": 30 },
-      { "group": "ammo_can_308_part", "prob": 80, "count": [ 1, 2 ] }
+      { "group": "ammo_can_308_any_full", "prob": 30 },
+      { "group": "ammo_can_308_any_part", "prob": 80, "count": [ 1, 2 ] }
     ]
   },
   {
@@ -74,23 +79,5 @@
     "id": "scar_mags",
     "type": "item_group",
     "items": [ { "item": "scarhmag", "prob": 500 }, { "item": "scarhmag_30rd", "prob": 50 }, { "item": "scarhbigmag", "prob": 20 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_308_full",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_box_308", "count": 32 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_308_part",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_box_308", "count": [ 1, 10 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_box_308",
-    "container-item": "ammunition_box_308",
-    "items": [ [ "308", 20 ] ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json

@@ -3,16 +3,21 @@
     "type": "item_group",
     "id": "milspec_arsenal_338lapua_sniper_gun&mags&cans",
     "subtype": "collection",
-    "items": [ { "group": "milspec_arsenal_338lapua_sniper_gun&ammo" }, { "item": "ammunition_can_50", "count": [ 1, 4 ] } ]
+    "items": [
+      { "group": "milspec_arsenal_338lapua_sniper_gun&ammo" },
+      {
+        "distribution": [ { "item": "ammo_can_30_338fmjbt_200", "count": [ 1, 4 ] }, { "item": "ammo_can_50_338fmjbt_400", "count": [ 1, 4 ] } ]
+      }
+    ]
   },
   {
     "type": "item_group",
     "id": "milspec_arsenal_338lapua_sniper_gun&ammo",
     "subtype": "collection",
     "items": [
       { "group": "milspec_arsenal_338lapua_sniper_gun&mags" },
-      { "group": "ammo_can_338lapua_full", "prob": 30 },
-      { "group": "ammo_can_338lapua_part", "prob": 80, "count": [ 1, 2 ] }
+      { "group": "ammo_can_338_any_full", "prob": 30 },
+      { "group": "ammo_can_338_any_part", "prob": 80, "count": [ 1, 2 ] }
     ]
   },
   {
@@ -30,23 +35,5 @@
     "type": "item_group",
     "subtype": "collection",
     "items": [ { "item": "tac338" }, { "item": "ai_338mag", "count": [ 1, 3 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_338lapua_full",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_box_338lapua", "count": 15 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_can_338lapua_part",
-    "container-item": "ammunition_can_50",
-    "items": [ { "group": "ammo_box_338lapua", "count": [ 1, 5 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "ammo_box_338lapua",
-    "container-item": "ammunition_box_223",
-    "items": [ { "item": "338lapua_fmjbt", "count": 1, "charges-min": 10, "charges-max": 10 } ]
   }
 ]