Handle one-shot ammo weapons like RLs appropriately #5433
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After ammo selection was added for Princess, she no longer fires Rocket Launchers, for two reasons:
Since Princess verifies if prospective ammo for a weapon can be loaded into it when planning attacks, and OS ammo (like RL's single shot) the end result is that Princess skips OS weapons when actually creating her firing plans.
The first issue has already been fixed by adding specific thresholds for OS weapons based on Princess's aggression setting, which I've confirmed are generating the appropriate thresholds.
The final fix is to only check if a OS weapon's ammo still has a shot left and that it is of the appropriate type, rather than running the full gamut of checks used for regular ammo (shots left, validity, whether it is missing, damaged, or dumping, as well as valid location) since most of those states don't apply.
Testing: