Arsenal - Improve magazine removal after weapon switch #8786
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
Previously: - When a new weapon was selected, only magazines defined in the "magazines" attribute of the old weapon's class were deleted. - When a new weapon was selected, it would consume a magazine from the loadout. Now: - When a new weapon is selected, it will only remove the magazines from the previous weapon that are not compatible with the current weapon. - When a new weapon is selected, it does not consume a magazine from the loadout.
LinkIsGrim
approved these changes
Jan 23, 2022
PabstMirror
approved these changes
Mar 7, 2022
PabstMirror
reviewed
Mar 7, 2022
| @@ -29,10 +29,15 @@ private _containerDefaultRightPanel = _display displayCtrl IDC_buttonMisc; | |||
| private _selectCorrectPanelContainer = [_containerDefaultRightPanel, _display displayCtrl GVAR(currentRightPanel)] select (!isNil QGVAR(currentRightPanel) && {GVAR(currentRightPanel) in [RIGHT_PANEL_ITEMS_IDCS]}); | |||
|
|
|||
| private _fnc_clearPreviousWepMags = { | |||
| private _compatibleMags = getArray (configfile >> "cfgweapons" >> _baseWeapon >> "magazines"); | |||
| private _compatibleMagsBaseWeapon = [_baseWeapon, true] call CBA_fnc_compatibleMagazines; | |||
There was a problem hiding this comment.
this also gets mags from other muzzles (e.g. grenade launcher), which I think is what we want
3 tasks
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.
When merged this pull request will:
Improve the removal of magazines when switching weapons in the arsenal.
Current behaviour:
See here.
This leads to inconsistent and unnecessary magazine removal upon weapon switching.
See here.
Improved behaviour:
See here.
This is also valid when selecting no weapon: It will remove all magazines of the previous weapon.
On a personal note, I think the above can be seen as good and bad behaviour: When selecting launcher ammunition when you have a launcher equipped means that when you unequip the launcher in the arsenal, it will delete the launcher magazines.
However for other weapon types, especially side arms in my opinion, it can be very handy to remove all of the side arm magazines along with the unequipped weapon.
This behaviour can be circumvented by selecting the desired magazines via the all magazines tab in the arsenal, but it might pose an inconvenience for some.
Either way, I'm open for discussion - a CBA setting could be added if needed.
See here.
What hasn't changed is if you have magazines from a weapon that isn't involved in switching process, it still won't affect those magazines.
E.g: If you have an RPG-7 and you switch your primary weapon (e.g. basegame HK416), it will not remove the RPG-7 rounds you have in your loadout.
IMPORTANT
Component - Add|Fix|Improve|Change|Make|Remove {changes}.