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

Jump to bottom

Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) #9247

Merged
merged 16 commits into from
Jul 21, 2023
Merged

Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) #9247

merged 16 commits into from
Jul 21, 2023

Conversation

LinkIsGrim
Copy link
Contributor

@LinkIsGrim LinkIsGrim commented Jul 9, 2023 •
edited
Loading

When merged this pull request will:

  • Add config property to sort items in CfgWeapons as tools.
  • Add moveOnOverwrite parameter to FUNC(addRightPanelButton). If true, button will be moved if its position is overridden (instead of deleted). Defaults to false.
  • Add Tools Tab.
  • Move Arsenal CBA Settings to initSettings.sqf.
  • Add documentation for above and fix some typos.
  • Deprecate Overheating item version of Spare Barrel.
  • Improve some documentation.

Currently includes flashlights, Defusal Kit, clacklers, Notepad, Chemlight Shield, AtragMX, Kestrel, Fortify Tool, DAGR/MicroDAGR, Entrenching Tool, rangetables and range card, Wirecutters, SSWT kit, Spotting Scope, Mine Detector, Toolkit, Cellphone. Dead Man's Switch, HuntIR Monitor, and Map Tools.

107410_20230709204108_1

107410_20230709204138_1

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Jul 9, 2023
Dystopian
Dystopian reviewed Jul 9, 2023
View reviewed changes
Copy link
Contributor

@Dystopian Dystopian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO setting is not needed. Can't imagine situation when tools grouping can hurt.

addons/arsenal/stringtable.xml Outdated Show resolved Hide resolved
@LinkIsGrim @Dystopian
derp
733cb89 
Co-authored-by: Dystopian <sddex@ya.ru>
@jonpas jonpas added this to the 3.16.0 milestone Jul 9, 2023
@LinkIsGrim @PabstMirror
Update addons/arsenal/stringtable.xml
7b951df 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@LinkIsGrim
Copy link
Contributor Author

IMHO setting is not needed. Can't imagine situation when tools grouping can hurt.

People mad about their stuff not being in the usual place? I agree though.

@LinkIsGrim
Copy link
Contributor Author

Is there anything else that should be sorted to Tools?

@LinkIsGrim LinkIsGrim changed the title Arsenal - Add optional Tools category Arsenal - Add Tools category Jul 10, 2023
@LinkIsGrim LinkIsGrim changed the title Arsenal - Add Tools category Arsenal - Add Tools category and keepIfOverriden parameter to FUNC(addCustomRightPanelButton) Jul 10, 2023
rautamiekka
rautamiekka suggested changes Jul 11, 2023
View reviewed changes
Copy link
Contributor

@rautamiekka rautamiekka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar/spelling fixes.

addons/arsenal/functions/fnc_addRightPanelButton.sqf Outdated Show resolved Hide resolved
addons/arsenal/functions/fnc_addRightPanelButton.sqf Outdated Show resolved Hide resolved
addons/arsenal/functions/fnc_addRightPanelButton.sqf Outdated Show resolved Hide resolved
docs/wiki/framework/arsenal-framework.md Outdated Show resolved Hide resolved
docs/wiki/framework/arsenal-framework.md Outdated Show resolved Hide resolved
docs/wiki/framework/arsenal-framework.md Outdated Show resolved Hide resolved
docs/wiki/framework/arsenal-framework.md Outdated Show resolved Hide resolved
@LinkIsGrim LinkIsGrim changed the title Arsenal - Add Tools category and keepIfOverriden parameter to FUNC(addCustomRightPanelButton) Arsenal - Add Tools category and keepIfOverridden parameter to FUNC(addCustomRightPanelButton) Jul 11, 2023
@LinkIsGrim LinkIsGrim changed the title Arsenal - Add Tools category and keepIfOverridden parameter to FUNC(addCustomRightPanelButton) Arsenal - Add Tools category and moveOnOverwrite parameter to FUNC(addCustomRightPanelButton) Jul 11, 2023
johnb432
johnb432 reviewed Jul 21, 2023
View reviewed changes
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens/is supposed to happen if all custom panels are taken, all of them having _moveOnOverwrite enabled, and you add another panel with _override != -1?

Is the existing panel overwritten or is the panel rejected?

addons/arsenal/functions/fnc_addRightPanelButton.sqf Outdated Show resolved Hide resolved
addons/arsenal/functions/fnc_addRightPanelButton.sqf Outdated Show resolved Hide resolved
@LinkIsGrim
Copy link
Contributor Author

LinkIsGrim commented Jul 21, 2023 •
edited
Loading

What happens/is supposed to happen if all custom panels are taken, all of them having _moveOnOverwrite enabled, and you add another panel with _override != -1?

Is the existing panel overwritten or is the panel rejected?

Existing panel is overwritten. Override wins.

@LinkIsGrim LinkIsGrim merged commit 31e1ad0 into acemod:master Jul 21, 2023
5 checks passed
Krzyciu added a commit to Krzyciu/A4ES that referenced this pull request Sep 8, 2023
@Krzyciu
Arsenal - add compatibility with ace medical
3ec18fe 
Add A4ES items to ACE medical category. Compat with:
acemod/ACE3#9247
@Krzyciu Krzyciu mentioned this pull request Sep 8, 2023
Merged
SzwedzikPL pushed a commit to Arma4Ever/A4ES_A3 that referenced this pull request Sep 9, 2023
@Krzyciu
Arsenal - add compatibility with ace medical (#107)
d2a2eee 
Add A4ES items to ACE medical category. Compat with:
acemod/ACE3#9247
@fav-MBMC fav-MBMC mentioned this pull request Oct 19, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnb432 johnb432 johnb432 left review comments

@Dystopian Dystopian Dystopian left review comments

@rautamiekka rautamiekka rautamiekka requested changes

@PabstMirror PabstMirror PabstMirror approved these changes

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.16.0
Development

Successfully merging this pull request may close these issues.
6 participants
@LinkIsGrim @rautamiekka @Dystopian @PabstMirror @johnb432 @jonpas