Migrate reload ammo selection menu to inventory_selector #70359
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
NPC / Factions
andrei8l
reviewed
Dec 22, 2023
mqrause
force-pushed
the
reload_inv_selector
branch
from
e90232b to
2e00b40
Compare
github-actions
bot
added
<Documentation>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
github-actions
bot
removed
the
json-styled
mqrause
force-pushed
the
reload_inv_selector
branch
from
2e00b40 to
aa54f1b
Compare
github-actions
bot
added
the
json-styled
… the only choice if there is only one
mqrause
force-pushed
the
reload_inv_selector
branch
from
aa54f1b to
2bfa948
Compare
github-actions
bot
added
BasicBuildPassed
mqrause
force-pushed
the
reload_inv_selector
branch
2 times, most recently
from
3ea474d to
024d6fc
Compare
mqrause
force-pushed
the
reload_inv_selector
branch
from
024d6fc to
e441c35
Compare
This was referenced Jan 24, 2024
|
This change seems to break how speedloader works. |
|
I dunno, maybe? It should only affect ammo selection and not actual reloading, though. |
This was referenced Feb 14, 2024
There are cases that this reconstruction affects. Kel-Tec shotguns have more than one magazine, and the sub-mags are gunmods, now you can only reload this kind of sub-mags after the main magazine is fully reloaded. Same for cases like compound crossbow with rail-mounted crossbow attached, M1897 Trench Gun with modified masterkey shotgun attached, etc. |
Merged
Procyonae
pushed a commit
to Procyonae/Cataclysm-DDA
that referenced
this pull request
May 24, 2024
Migrate reload ammo selection menu to inventory_selector
Maleclypse
pushed a commit
that referenced
this pull request
May 26, 2024
* Merge pull request #70359 from mqrause/reload_inv_selector Migrate reload ammo selection menu to inventory_selector * DEBUG_ONLY flag for more consistency in "seeing this is a bug" (#71065) * DEBUG_ONLY flag * apparently a fake item being wood triggers the density tests --------- Co-authored-by: mqrause <[email protected]> Co-authored-by: NetSysFire <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Infrastructure "Migrate reload ammo selection menu to inventory_selector"
Purpose of change
Necessary for #69316, also more standardized UI.
Describe the solution
A reconstruction of the old UI within the inventory_selector framework. Changing amount to reload was changed from left/right arrow to the
INCREASE_COUNT/DECREASE_COUNTkeybinds, which are+/-by default.Character::select_ammowas made virtual and avatar/npc logic split up accordingly. Avatar now uses the new menu, npc should behave like before.Reloading attached gunmods required a slightly unoptimal solution, but that should only turn into a problem when the gunmod could be reloaded with the same ammo as the gun itself, because every ammo item can show up in the menu only once currently, preventing you from reloading the gunmod if you could also reload the gun. But I don't think we have a case like that.
Describe alternatives you've considered
Testing
Reloaded a revolver, a magazine and a gun that takes a magazine. Reload an M4 with attached grenade launcher with ammo, magazine and grenades. There are surely some cases I didn't test, but hopefully nothing gamebreaking.
Additional context
Sidenote: #58473 should be very easy to fix with the added helpers from this.
Loading magazine into gun
Loading ammo into magazine with amount on highlighted ammo reduced
Loading M4 with grenade launcher
