Skip to content

Commit

Permalink
fix: follow-up fixes to carry gun spawns, speedloaders, ammo belts (#…
Browse files Browse the repository at this point in the history 
…4838)
  • Loading branch information
@chaosvolt
chaosvolt authored Jun 22, 2024
1 parent 67d47f4 commit 07455e0
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 68 deletions.
135 changes: 68 additions & 67 deletions data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"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": "glock_20", "ammo-group": "on_hand_10mm", "charges": [ 0, 15 ] },
{ "group": "nested_glock20_mag", "charges-min": 0 },
Expand Down Expand Up @@ -82,7 +81,6 @@
"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": "asr_10mm", "ammo-group": "on_hand_10mm", "charges": [ 0, 15 ] },
{ "group": "nested_glock20_mag", "charges-min": 0 },
Expand Down Expand Up @@ -195,8 +193,8 @@
"subtype": "collection",
"entries": [
{ "item": "p226_357sig", "ammo-group": "on_hand_357sig", "charges": [ 0, 12 ] },
{ "item": "p226mag_12rd_357sig", "ammo-group": "on_hand_357sig" },
{ "item": "p226mag_12rd_357sig", "ammo-group": "on_hand_357sig", "prob": 50 }
{ "item": "p226mag_12rd_357sig", "charges-min": 0, "ammo-group": "on_hand_357sig" },
{ "item": "p226mag_12rd_357sig", "charges-min": 0, "ammo-group": "on_hand_357sig", "prob": 50 }
]
},
{
Expand All @@ -206,8 +204,8 @@
"subtype": "collection",
"entries": [
{ "item": "p320_357sig", "ammo-group": "on_hand_357sig", "charges": [ 0, 13 ] },
{ "item": "p320mag_13rd_357sig", "ammo-group": "on_hand_357sig" },
{ "item": "p320mag_13rd_357sig", "ammo-group": "on_hand_357sig", "prob": 50 }
{ "item": "p320mag_13rd_357sig", "charges-min": 0, "ammo-group": "on_hand_357sig" },
{ "item": "p320mag_13rd_357sig", "charges-min": 0, "ammo-group": "on_hand_357sig", "prob": 50 }
]
},
{
Expand Down Expand Up @@ -437,8 +435,8 @@
"subtype": "collection",
"entries": [
{ "item": "m1911a1_38super", "ammo-group": "on_hand_38super", "charges": [ 0, 9 ] },
{ "item": "m1911mag_10rd_38super", "ammo-group": "on_hand_38super" },
{ "item": "m1911mag_10rd_38super", "ammo-group": "on_hand_38super", "prob": 50 }
{ "item": "m1911mag_10rd_38super", "charges-min": 0, "ammo-group": "on_hand_38super" },
{ "item": "m1911mag_10rd_38super", "charges-min": 0, "ammo-group": "on_hand_38super", "prob": 50 }
]
},
{
Expand Down Expand Up @@ -514,8 +512,8 @@
"subtype": "collection",
"entries": [
{ "item": "m17", "charges": [ 0, 17 ] },
{ "item": "p320mag_17rd_9x19mm", "ammo-group": "on_hand_9mm" },
{ "item": "p320mag_17rd_9x19mm", "ammo-group": "on_hand_9mm", "prob": 50 }
{ "item": "p320mag_17rd_9x19mm", "charges-min": 0, "ammo-group": "on_hand_9mm" },
{ "item": "p320mag_17rd_9x19mm", "charges-min": 0, "ammo-group": "on_hand_9mm", "prob": 50 }
]
},
{
Expand Down Expand Up @@ -591,8 +589,8 @@
"subtype": "collection",
"entries": [
{ "item": "m1911-460", "charges": [ 0, 7 ] },
{ "group": "nested_m1911_mag_460" },
{ "group": "nested_m1911_mag_460", "prob": 50 }
{ "group": "nested_m1911_mag_460", "charges-min": 0 },
{ "group": "nested_m1911_mag_460", "charges-min": 0, "prob": 50 }
]
},
{
Expand Down Expand Up @@ -844,8 +842,8 @@
"subtype": "collection",
"entries": [
{ "item": "garand", "ammo-group": "on_hand_3006", "charges": [ 0, 8 ] },
{ "item": "garandclip", "ammo-group": "on_hand_3006" },
{ "item": "garandclip", "ammo-group": "on_hand_3006", "prob": 50 }
{ "item": "garandclip", "charges-min": 0, "ammo-group": "on_hand_3006" },
{ "item": "garandclip", "charges-min": 0, "ammo-group": "on_hand_3006", "prob": 50 }
]
},
{
Expand All @@ -855,8 +853,8 @@
"subtype": "collection",
"entries": [
{ "item": "ar10", "ammo-group": "on_hand_308", "charges": [ 0, 20 ] },
{ "item": "ar10mag_20rd", "ammo-group": "on_hand_308" },
{ "item": "ar10mag_20rd", "ammo-group": "on_hand_308", "prob": 50 }
{ "item": "ar10mag_20rd", "charges-min": 0, "ammo-group": "on_hand_308" },
{ "item": "ar10mag_20rd", "charges-min": 0, "ammo-group": "on_hand_308", "prob": 50 }
]
},
{
Expand Down Expand Up @@ -1058,8 +1056,8 @@
"subtype": "collection",
"entries": [
{ "item": "iwi_tavor_x95_300blk", "ammo-group": "on_hand_300BLK", "charges": [ 0, 30 ] },
{ "group": "nested_stanag_mag_300" },
{ "group": "nested_stanag_mag_300", "prob": 50 }
{ "group": "nested_stanag_mag_300", "charges-min": 0 },
{ "group": "nested_stanag_mag_300", "charges-min": 0, "prob": 50 }
]
},
{
Expand Down Expand Up @@ -1107,8 +1105,8 @@
"subtype": "collection",
"entries": [
{ "item": "stanag100", "ammo-group": "on_hand_223", "container-item": "m27iar", "charges": [ 0, 100 ] },
{ "item": "stanag100", "ammo-group": "on_hand_223" },
{ "item": "stanag100", "prob": 50, "ammo-group": "on_hand_223" }
{ "item": "stanag100", "charges-min": 0, "ammo-group": "on_hand_223" },
{ "item": "stanag100", "charges-min": 0, "prob": 50, "ammo-group": "on_hand_223" }
]
},
{
Expand Down Expand Up @@ -1282,8 +1280,8 @@
"subtype": "collection",
"entries": [
{ "item": "acr_300blk", "charges": [ 0, 30 ] },
{ "group": "nested_stanag_mag_300" },
{ "group": "nested_stanag_mag_300", "prob": 50 }
{ "group": "nested_stanag_mag_300", "charges-min": 0 },
{ "group": "nested_stanag_mag_300", "charges-min": 0, "prob": 50 }
]
},
{
Expand Down Expand Up @@ -1396,8 +1394,8 @@
"distribution": [
{
"collection": [
{ "item": "38_speedloader5", "ammo-group": "on_hand_38" },
{ "item": "38_speedloader5", "ammo-group": "on_hand_38", "prob": 50 }
{ "item": "38_speedloader5", "charges-min": 0, "ammo-group": "on_hand_38" },
{ "item": "38_speedloader5", "charges-min": 0, "ammo-group": "on_hand_38", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1417,8 +1415,8 @@
"distribution": [
{
"collection": [
{ "item": "40_speedloader6", "ammo-group": "on_hand_40sw_or_10mm" },
{ "item": "40_speedloader6", "ammo-group": "on_hand_40sw_or_10mm", "prob": 50 }
{ "item": "40_speedloader6", "charges-min": 0, "ammo-group": "on_hand_40sw_or_10mm" },
{ "item": "40_speedloader6", "charges-min": 0, "ammo-group": "on_hand_40sw_or_10mm", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1438,8 +1436,8 @@
"distribution": [
{
"collection": [
{ "item": "38_speedloader", "ammo-group": "on_hand_357_38mixed" },
{ "item": "38_speedloader", "ammo-group": "on_hand_357_38mixed", "prob": 50 }
{ "item": "38_speedloader", "charges-min": 0, "ammo-group": "on_hand_357_38mixed" },
{ "item": "38_speedloader", "charges-min": 0, "ammo-group": "on_hand_357_38mixed", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1459,8 +1457,8 @@
"distribution": [
{
"collection": [
{ "item": "38_speedloader6", "ammo-group": "on_hand_357_38mixed" },
{ "item": "38_speedloader6", "ammo-group": "on_hand_357_38mixed", "prob": 50 }
{ "item": "38_speedloader6", "charges-min": 0, "ammo-group": "on_hand_357_38mixed" },
{ "item": "38_speedloader6", "charges-min": 0, "ammo-group": "on_hand_357_38mixed", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1480,8 +1478,8 @@
"distribution": [
{
"collection": [
{ "item": "38_speedloader6", "ammo-group": "on_hand_38" },
{ "item": "38_speedloader6", "ammo-group": "on_hand_38", "prob": 50 }
{ "item": "38_speedloader6", "charges-min": 0, "ammo-group": "on_hand_38" },
{ "item": "38_speedloader6", "charges-min": 0, "ammo-group": "on_hand_38", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -1511,8 +1509,8 @@
"distribution": [
{
"collection": [
{ "item": "22_speedloader8", "ammo-group": "on_hand_22" },
{ "item": "22_speedloader8", "ammo-group": "on_hand_22", "prob": 50 }
{ "item": "22_speedloader8", "charges-min": 0, "ammo-group": "on_hand_22" },
{ "item": "22_speedloader8", "charges-min": 0, "ammo-group": "on_hand_22", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1532,8 +1530,8 @@
"distribution": [
{
"collection": [
{ "item": "44_speedloader6", "ammo-group": "on_hand_44" },
{ "item": "44_speedloader6", "ammo-group": "on_hand_44", "prob": 50 }
{ "item": "44_speedloader6", "charges-min": 0, "ammo-group": "on_hand_44" },
{ "item": "44_speedloader6", "charges-min": 0, "ammo-group": "on_hand_44", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1553,8 +1551,8 @@
"distribution": [
{
"collection": [
{ "item": "500_speedloader5", "ammo-group": "on_hand_500" },
{ "item": "500_speedloader5", "ammo-group": "on_hand_500", "prob": 50 }
{ "item": "500_speedloader5", "charges-min": 0, "ammo-group": "on_hand_500" },
{ "item": "500_speedloader5", "charges-min": 0, "ammo-group": "on_hand_500", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1574,8 +1572,8 @@
"distribution": [
{
"collection": [
{ "item": "44_speedloader6", "ammo-group": "on_hand_44" },
{ "item": "44_speedloader6", "ammo-group": "on_hand_44", "prob": 50 }
{ "item": "44_speedloader6", "charges-min": 0, "ammo-group": "on_hand_44" },
{ "item": "44_speedloader6", "charges-min": 0, "ammo-group": "on_hand_44", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -1609,8 +1607,8 @@
"distribution": [
{
"collection": [
{ "item": "454_speedloader5", "ammo-group": "on_hand_454_mixed" },
{ "item": "454_speedloader5", "ammo-group": "on_hand_454_mixed", "prob": 50 }
{ "item": "454_speedloader5", "charges-min": 0, "ammo-group": "on_hand_454_mixed" },
{ "item": "454_speedloader5", "charges-min": 0, "ammo-group": "on_hand_454_mixed", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1630,8 +1628,8 @@
"distribution": [
{
"collection": [
{ "item": "454_speedloader6", "ammo-group": "on_hand_454_mixed" },
{ "item": "454_speedloader6", "ammo-group": "on_hand_454_mixed", "prob": 50 }
{ "item": "454_speedloader6", "charges-min": 0, "ammo-group": "on_hand_454_mixed" },
{ "item": "454_speedloader6", "charges-min": 0, "ammo-group": "on_hand_454_mixed", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -1686,8 +1684,8 @@
"distribution": [
{
"collection": [
{ "item": "marlin_tubeloader", "ammo-group": "on_hand_22" },
{ "item": "marlin_tubeloader", "ammo-group": "on_hand_22", "prob": 50 }
{ "item": "marlin_tubeloader", "charges-min": 0, "ammo-group": "on_hand_22" },
{ "item": "marlin_tubeloader", "charges-min": 0, "ammo-group": "on_hand_22", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1707,8 +1705,8 @@
"distribution": [
{
"collection": [
{ "item": "762R_clip", "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "ammo-group": "on_hand_762R", "prob": 50 }
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1728,8 +1726,8 @@
"distribution": [
{
"collection": [
{ "item": "762R_clip", "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "ammo-group": "on_hand_762R", "prob": 50 }
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -1763,8 +1761,8 @@
"distribution": [
{
"collection": [
{ "item": "762x39_clip", "ammo-group": "on_hand_762" },
{ "item": "762x39_clip", "ammo-group": "on_hand_762", "prob": 50 }
{ "item": "762x39_clip", "charges-min": 0, "ammo-group": "on_hand_762" },
{ "item": "762x39_clip", "charges-min": 0, "ammo-group": "on_hand_762", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -1829,8 +1827,8 @@
"distribution": [
{
"collection": [
{ "item": "3006_clip", "ammo-group": "on_hand_3006" },
{ "item": "3006_clip", "ammo-group": "on_hand_3006", "prob": 50 }
{ "item": "3006_clip", "charges-min": 0, "ammo-group": "on_hand_3006" },
{ "item": "3006_clip", "charges-min": 0, "ammo-group": "on_hand_3006", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1850,8 +1848,8 @@
"distribution": [
{
"collection": [
{ "item": "762R_clip", "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "ammo-group": "on_hand_762R", "prob": 50 }
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R", "prob": 50 }
],
"prob": 50
},
Expand All @@ -1871,8 +1869,8 @@
"distribution": [
{
"collection": [
{ "item": "762R_clip", "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "ammo-group": "on_hand_762R", "prob": 50 }
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R" },
{ "item": "762R_clip", "charges-min": 0, "ammo-group": "on_hand_762R", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -1911,7 +1909,7 @@
{ "item": "m134", "ammo-group": "on_hand_308", "charges": [ 0, 100 ] },
{
"distribution": [
{ "item": "belt308", "ammo-group": "on_hand_308", "charges": 100, "prob": 50 },
{ "item": "belt308", "ammo-group": "on_hand_308", "charges": [ 1, 100 ], "prob": 50 },
{ "group": "on_hand_308", "prob": 50 }
]
}
Expand All @@ -1926,7 +1924,7 @@
{ "item": "m240", "ammo-group": "on_hand_308", "charges": [ 0, 100 ] },
{
"distribution": [
{ "item": "belt308", "ammo-group": "on_hand_308", "charges": 100, "prob": 50 },
{ "item": "belt308", "ammo-group": "on_hand_308", "charges": [ 1, 100 ], "prob": 50 },
{ "group": "on_hand_308", "prob": 50 }
]
}
Expand All @@ -1941,7 +1939,7 @@
{ "item": "m249", "ammo-group": "on_hand_223", "charges": [ 0, 100 ] },
{
"distribution": [
{ "item": "belt223", "ammo-group": "on_hand_223", "charges": 100, "prob": 50 },
{ "item": "belt223", "ammo-group": "on_hand_223", "charges": [ 1, 100 ], "prob": 50 },
{ "group": "on_hand_223", "prob": 50 }
]
}
Expand All @@ -1956,7 +1954,7 @@
{ "item": "m60", "ammo-group": "on_hand_308", "charges": [ 0, 100 ] },
{
"distribution": [
{ "item": "belt308", "ammo-group": "on_hand_308", "charges": 100, "prob": 50 },
{ "item": "belt308", "ammo-group": "on_hand_308", "charges": [ 1, 100 ], "prob": 50 },
{ "group": "on_hand_308", "prob": 50 }
]
}
Expand All @@ -1970,7 +1968,10 @@
"entries": [
{ "item": "m2browning", "ammo-group": "on_hand_50", "charges": [ 0, 100 ] },
{
"distribution": [ { "item": "belt50", "ammo-group": "on_hand_50", "charges": 100, "prob": 50 }, { "group": "on_hand_50", "prob": 50 } ]
"distribution": [
{ "item": "belt50", "ammo-group": "on_hand_50", "charges": [ 1, 100 ], "prob": 50 },
{ "group": "on_hand_50", "prob": 50 }
]
}
]
},
Expand Down Expand Up @@ -2227,8 +2228,8 @@
"distribution": [
{
"collection": [
{ "item": "8x40_speedloader5", "ammo-group": "on_hand_8x40" },
{ "item": "8x40_speedloader5", "ammo-group": "on_hand_8x40", "prob": 50 }
{ "item": "8x40_speedloader5", "charges-min": 0, "ammo-group": "on_hand_8x40" },
{ "item": "8x40_speedloader5", "charges-min": 0, "ammo-group": "on_hand_8x40", "prob": 50 }
],
"prob": 50
},
Expand Down Expand Up @@ -2288,8 +2289,8 @@
"subtype": "collection",
"entries": [
{ "item": "ar15_retool_300blk", "ammo-group": "on_hand_300BLK", "charges": [ 0, 30 ] },
{ "group": "nested_stanag_mag_300", "ammo-group": "on_hand_300BLK" },
{ "group": "nested_stanag_mag_300", "ammo-group": "on_hand_300BLK", "prob": 50 }
{ "group": "nested_stanag_mag_300", "charges-min": 0, "ammo-group": "on_hand_300BLK" },
{ "group": "nested_stanag_mag_300", "charges-min": 0, "ammo-group": "on_hand_300BLK", "prob": 50 }
]
},
{
Expand Down
Loading

0 comments on commit 07455e0

Please sign in to comment.