Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust military/police magazines #76016

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Adjust military/police magazines #76016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73b7428
Main commit
Holli-Git Aug 28, 2024
982506e
Lint
Holli-Git Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,6 @@
{
"id": "stanag_mags",
"type": "item_group",
"items": [
{ "item": "stanag30", "prob": 1000 },
{ "item": "stanag40", "prob": 100 },
{ "item": "stanag50", "prob": 80 },
{ "item": "stanag60", "prob": 60 },
{ "item": "stanag60drum", "prob": 40 },
{ "item": "stanag90", "prob": 20 },
{ "item": "stanag100", "prob": 10 },
{ "item": "stanag100drum", "prob": 5 },
{ "item": "stanag150", "prob": 3 }
]
"items": [ { "item": "stanag30", "prob": 100 }, { "item": "stanag30ranger", "prob": 10 } ]
}
]
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_sniper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@
{
"id": "scar_mags",
"type": "item_group",
"items": [ { "item": "scarhmag", "prob": 500 }, { "item": "scarhmag_30rd", "prob": 50 }, { "item": "scarhbigmag", "prob": 20 } ]
"items": [ { "item": "scarhmag", "prob": 500 }, { "item": "scarhmag_30rd", "prob": 50 } ]
}
]
23 changes: 3 additions & 20 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@
{ "item": "m9mag_10rd", "prob": 50 },
{ "item": "m9mag_17rd", "prob": 400 },
{ "item": "m9mag_18rd", "prob": 70 },
{ "item": "m9mag_20rd", "prob": 50 },
{ "item": "m9bigmag", "prob": 40 },
{ "item": "m9mag_32rd", "prob": 30 },
{ "item": "m9mag_35rd", "prob": 20 }
{ "item": "m9mag_20rd", "prob": 50 }
]
},
{
Expand Down Expand Up @@ -110,15 +107,7 @@
{
"id": "glock_19_mags",
"type": "item_group",
"items": [
{ "item": "glockmag", "prob": 50 },
{ "item": "glock17_17", "prob": 400 },
{ "item": "glock17_22", "prob": 70 },
{ "item": "glockbigmag", "prob": 50 },
{ "item": "m9bigmag", "prob": 40 },
{ "item": "glock_drum_50rd", "prob": 30 },
{ "item": "glock_drum_100rd", "prob": 20 }
]
"items": [ { "item": "glockmag", "prob": 50 }, { "item": "glock17_17", "prob": 400 }, { "item": "glock17_22", "prob": 70 } ]
},
{
"id": "nested_glock_17_no_ammo",
Expand All @@ -129,12 +118,6 @@
{
"id": "glock_17_mags",
"type": "item_group",
"items": [
{ "item": "glock17_17", "prob": 400 },
{ "item": "glock17_22", "prob": 70 },
{ "item": "glockbigmag", "prob": 50 },
{ "item": "glock_drum_50rd", "prob": 30 },
{ "item": "glock_drum_100rd", "prob": 20 }
]
"items": [ { "item": "glock17_17", "prob": 400 }, { "item": "glock17_22", "prob": 70 } ]
}
]
8 changes: 2 additions & 6 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm_submachine_gun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
{ "item": "btmp9mag_9x19mm_10rd", "prob": 100 },
{ "item": "btmp9mag_9x19mm_20", "prob": 200 },
{ "item": "btmp9mag_9x19mm_25", "prob": 300 },
{ "item": "btmp9mag_9x19mm_30", "prob": 400 },
{ "item": "btmp9mag_9x19mm_50rd", "prob": 10 }
{ "item": "btmp9mag_9x19mm_30", "prob": 400 }
]
},
{
Expand All @@ -77,10 +76,7 @@
{ "item": "mp5mag_15rd", "prob": 200 },
{ "item": "mp5mag_20rd", "prob": 300 },
{ "item": "mp5mag", "prob": 500 },
{ "item": "mp5mag_38rd", "prob": 50 },
{ "item": "mp5mag_40rd", "prob": 25 },
{ "item": "mp5bigmag", "prob": 13 },
{ "item": "mp5mag_100rd", "prob": 7 }
{ "item": "mp5mag_38rd", "prob": 50 }
]
}
]
51 changes: 1 addition & 50 deletions data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
{ "group": "police_armory_any_9mm_smg", "prob": 50 },
{ "group": "police_armory_ump40", "prob": 30 },
{ "group": "police_armory_ump45", "prob": 25 },
{ "group": "police_armory_p90", "prob": 3 },
{ "group": "police_armory_mp7", "prob": 1 }
{ "group": "police_armory_p90", "prob": 3 }
]
},
{
Expand Down Expand Up @@ -627,54 +626,6 @@
"container-item": "ammo_box_2",
"entries": [ { "item": "57mm", "charges": [ 1, 60 ] } ]
},
{
"type": "item_group",
"id": "police_armory_mp7",
"//": "One or more MP7 'submachine guns', empty mags, full mags, 4.6mm ammo and a chance of extra ammo.",
"subtype": "collection",
"entries": [
{ "item": "hk_mp7", "contents-item": [ "red_dot_sight", "suppressor_compact" ] },
{ "item": "hk_mp7", "contents-item": [ "red_dot_sight", "suppressor_compact" ], "prob": 50 },
{ "item": "hk_mp7", "contents-item": [ "red_dot_sight", "suppressor_compact" ], "prob": 25 },
{ "item": "hk46mag", "count": [ 1, 3 ] },
{ "item": "hk46bigmag", "count": [ 1, 4 ] },
{ "group": "police_armory_full_mp7mag_46mm", "count": [ 1, 4 ] },
{ "group": "police_armory_boxes_46mm" },
{ "group": "police_armory_boxes_46mm", "prob": 30 }
]
},
{
"id": "police_armory_full_mp7mag_46mm",
"type": "item_group",
"subtype": "collection",
"container-item": "hk46bigmag",
"entries": [ { "item": "46mm", "charges": 40 } ]
},
{
"id": "police_armory_boxes_46mm",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "group": "police_armory_box_some_46mm" },
{ "group": "police_armory_box_some_46mm", "prob": 60 },
{ "item": "ammo_box_2", "count": [ 15, 25 ] },
{ "group": "police_armory_box_full_46mm", "count": [ 0, 8 ] }
]
},
{
"id": "police_armory_box_full_46mm",
"type": "item_group",
"subtype": "collection",
"container-item": "ammo_box_2",
"entries": [ { "item": "46mm", "charges": 60 } ]
},
{
"id": "police_armory_box_some_46mm",
"type": "item_group",
"subtype": "collection",
"container-item": "ammo_box_2",
"entries": [ { "item": "46mm", "charges": [ 1, 60 ] } ]
},
{
"type": "item_group",
"id": "police_armory_any_357sig",
Expand Down
55 changes: 14 additions & 41 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,26 @@
"id": "mags_milspec",
"//": "Current military specification magazines.",
"items": [
[ "huge_atomic_battery_cell", 2 ],
[ "20x66_20_mag", 10 ],
[ "20x66_40_mag", 5 ],
[ "8x40_10_mag", 5 ],
[ "8x40_25_mag", 5 ],
[ "8x40_50_mag", 10 ],
[ "8x40_100_mag", 10 ],
[ "8x40_250_mag", 5 ],
[ "8x40_500_mag", 5 ],
[ "hk46mag", 15 ],
[ "hk46bigmag", 5 ],
[ "m107a1mag", 50 ],
[ "tac50mag", 20 ],
[ "ai_338mag", 10 ],
[ "ai_338mag_10", 10 ],
[ "m2010mag", 10 ],
[ "scarhmag", 50 ],
[ "scarhbigmag", 20 ],
[ "stanag5", 2 ],
[ "stanag5ranger", 1 ],
[ "stanag10", 5 ],
[ "stanag10ranger", 2 ],
[ "stanag20", 10 ],
[ "stanag20ranger", 3 ],
[ "stanag30", 20 ],
[ "stanag30ranger", 5 ],
[ "stanag40", 2 ],
[ "stanag50", 2 ],
[ "stanag60", 3 ],
[ "stanag100", 2 ],
[ "hk417mag_20rd", 30 ],
[ "hk417mag_10rd", 20 ],
[ "p320mag_17rd_9x19mm", 60 ],
[ "p226mag_15rd_9x19mm", 5 ],
[ "sp2022mag_15rd_9mm", 5 ],
[ "btmp9mag_9x19mm_15", 1 ],
[ "btmp9mag_9x19mm_20", 1 ],
[ "btmp9mag_9x19mm_25", 1 ],
[ "btmp9mag_9x19mm_30", 1 ]
[ "m107a1mag", 5 ],
[ "tac50mag", 1 ],
[ "ai_338mag", 1 ],
[ "ai_338mag_10", 1 ],
[ "m2010mag", 15 ],
[ "scarhmag", 20 ],
[ "stanag30", 100 ],
[ "stanag30ranger", 10 ],
[ "hk417mag_20rd", 20 ],
[ "m14mag", 5 ],
[ "belt223", 20 ],
[ "p320mag_17rd_9x19mm", 30 ],
[ "p226mag_15rd_9x19mm", 1 ]
]
},
{
"type": "item_group",
"id": "mags_military",
"//": "_DEPRECATED_ Older military magazines still in service.",
"items": [ [ "m1911mag", 5 ], [ "m9mag", 15 ], [ "stanag30", 20 ], [ "stanag50", 5 ], [ "usp45mag", 5 ] ]
"items": [ [ "m1911mag", 5 ], [ "m9mag", 15 ], [ "usp45mag", 5 ] ]
},
{
"type": "item_group",
Expand All @@ -60,7 +34,6 @@
[ "pressurized_tank", 5 ],
[ "falmag", 20 ],
[ "g3mag", 15 ],
[ "m14mag", 25 ],
[ "m1911mag", 15 ],
[ "m1918mag", 5 ],
[ "m9mag", 25 ],
Expand Down
Loading