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.

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

Updates pertaining to mag pouches and speedloaders #1533

Merged
merged 2 commits into from
May 28, 2022

Conversation

chaosvolt
Copy link
Member

Summary

SUMMARY: Balance "Allow storing speedloaders and batteries in relevant mag pouches, related changes"

Purpose of change

This is a collection of updates pertaining to storage of items and compatiability between holsters, mag pouches, and the like.

Describe the solution

  1. MAG_COMPACT flag added to all light and medium class batteries, and MAG_BULKY added to heavy class batteries, allowing them to be stored in relevant mag pouches that will fit them. Ultralight batteries and mech batteries left untouched. Idea is mainly this allows a utility use for magazine storage beyond just firearm magazines, plus utility for mods that add battery-fueled weapons.
  2. Allowed small enough mag pouches to also fit items with the SPEEDLOADER flag, as it'd make sense to store speedloaders there too, and nothing in-game could actually store them. Favored items that could store MAG_COMPACT but not MAG_BULKY, with a max volume under 1 liter.
  3. Defined min_volume of 25 for ankle ammo pouch to ensure it can actually hold magazines that might be too tiny otherwise, and a min volume of 50 for leg ammo pouches.
  4. Set it so the handmade six-shooter can make use of the .40 6-round speedloader.
  5. Implemented something fun I discovered while adding the survivor's belt rig (https://github.com/Noctifer-de-Mortem/nocts_cata_mod/blob/master/nocts_cata_mod_BN/Surv_help/c_armor.json#L901) to Cataclysm++: in BN, though not in DDA, the holster use_action can accept both skills to store guns, and flags to store non-gun items, meaning an item can accept both. Set it so that cowboy boots can store boot knives as well as holdout pistols. Left minimum volume unset so that its utility doesn't compete with ankle sheathes as directly, just as the volume range on ankle holsters is different.
  6. Added NO_QUICKDRAW flag to western boots. The "offer to draw holstered weapon on hitting f" feature does not work right if an item can stow two or more guns in it, so western boots were running into this issue already.

Describe alternatives you've considered

  1. Giving ultralight batteries a higher volume than a single milliliter so there might be some hope of fitting them in any mag pouch.
  2. Adding relevant flag to small storage batteries possibly?
  3. Adding dedicated speedloader pouch items, i.e. like these:
    image

Testing

  1. Checked affected files for syntax and lint errors.
  2. Load-tested in compiled build.
  3. Checked that light batteries said they had some pouches they could be stored in.
  4. Checked that various speedloaders and clips showed being compatible with ammo pouches.
  5. Tested you can indeed stow both a dive knife and a Kel-Tec PF-9 in cowboy boots.

Additional context

@Coolthulhu Coolthulhu self-assigned this May 13, 2022
@Coolthulhu
Copy link
Member

I don't like bringing back boot holsters. Rest is OK.

@chaosvolt
Copy link
Member Author

I don't like bringing back boot holsters. Rest is OK.

Cowboy boots are already holsters, unless you meant adding ability to sheath a knife in them.

@Coolthulhu
Copy link
Member

Cowboy boots are already holsters, unless you meant adding ability to sheath a knife in them.

I missed it because it was one line and I expected many.
I'm thinking whether to drop the boot holster because it's pointless (why would you use a holdout pistol?), allow pistol-or-knife, or allow only pistol because it's a meme.

I could merge it right now without that change. Merging it with it will require arguing.

@chaosvolt
Copy link
Member Author

I could merge it right now without that change. Merging it with it will require arguing.

Now that I'm able to glom onto wifi while out, I'll go ahead and remove that change. Can always ponder adding it in a future PR.

@Coolthulhu Coolthulhu merged commit cb83add into cataclysmbnteam:upload May 28, 2022
@chaosvolt chaosvolt deleted the go-speed-loader-go branch May 28, 2022 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants