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

fix shotgun itemgroups #31738

Merged
merged 1 commit into from
Jun 23, 2019
Merged

fix shotgun itemgroups #31738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions data/json/itemgroups/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
"type": "item_group",
"id": "ammo_shotgun_common",
"//": "Shotgun ammo commonly owned by citizens and found in many locations.",
"items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ], [ "shot_dragon", 10 ], [ "410shot_000", 50 ] ]
"items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ], [ "shot_slug", 70 ], [ "410shot_000", 50 ] ]
},
{
"type": "item_group",
Expand All @@ -235,7 +235,7 @@
[ "20x66_flare", 10 ],
[ "20x66_shot", 40 ],
[ "20x66_slug", 20 ],
[ "shot_slug", 100 ],
[ "shot_dragon", 10 ],
[ "shot_beanbag", 20 ]
]
},
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@
"//": "Military specification shotguns only ever found at military sites.",
"items": [
{ "item": "l_def_12", "prob": 100, "charges-min": 0, "charges-max": 8 },
{ "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 }
{ "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 },
{ "item": "m1014", "prob": 100, "charges-min": 0, "charges-max": 8 }
]
},
{
Expand Down