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

Jump to bottom

Zeus - Toggle NVGs and Flashlights improvements #6219

Merged
merged 5 commits into from Apr 19, 2018
Merged

Zeus - Toggle NVGs and Flashlights improvements #6219

merged 5 commits into from Apr 19, 2018

Conversation

mharis001
Copy link
Member

@mharis001 mharis001 commented Mar 28, 2018 •
edited

When merged this pull request will:

  • Improve Toggle NVGs module UI and function
    • Before:
      nvg_old
    • After:
      nvg_new
  • Improve Toggle Flashlights module UI and function
    • Before:
      flashlight_old
    • After:
      flashlight_new
  • Add Icon for Toggle Flashlights module
  • Clean up ace_ai XEH_postInit.sqf

@jonpas jonpas added the kind/enhancement Release Notes: **IMPROVED:** label Mar 28, 2018
@jonpas jonpas added this to the 3.13.0 milestone Mar 28, 2018
@jonpas jonpas requested a review from kymckay March 28, 2018 21:37
bux
bux reviewed Mar 29, 2018
View reviewed changes
addons/zeus/stringtable.xml Outdated
<Key ID="STR_ACE_Zeus_ToggleTarget">
<English>Toggle Target</English>
</Key>
<Key ID="STR_ACE_Zeus_ToggleTarget_tooltip">
Copy link
Member

Choose a reason for hiding this comment

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

upper casing on _Tooltip?

@jones140
Copy link

jones140 commented Apr 8, 2018

Would it be possible to add modded flashlights to a selection either via class name or list
For example this module becomes useless with rhs opfor units as they can't equip vanilla flashlight on most weapons but have there own rhs flashlight

kymckay
kymckay approved these changes Apr 8, 2018
View reviewed changes
Copy link
Member

@kymckay kymckay left a comment

Choose a reason for hiding this comment

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

Code and configs all look good to me.

Screenshots get a massive thumbs up, makes reviewing so much easier 👍

I love you for going through all the zeus stuff @mharis001

@jonpas
Copy link
Member

jonpas commented Apr 8, 2018

@jones140 but it does that https://github.com/acemod/ACE3/pull/6219/files#diff-f9b1874ef83cc0f4109d45c63b090e05R48?

@mharis001
Copy link
Member Author

mharis001 commented Apr 8, 2018 •
edited

@jones140 The old function checked if a compatible item was a flashlight by checking if the Pointer class was null, now we check if the FlashLight class has size > 0. This should ensure that if a weapon has a compatible flashlight item that it is added as some attachments have both the Pointer & FlashLight class defined.

@PabstMirror PabstMirror merged commit ec8115d into acemod:master Apr 19, 2018
@mharis001 mharis001 deleted the zeus-improve-toggles branch April 22, 2018 20:17
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.3 Jul 5, 2018
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
@mharis001 @PabstMirror
Zeus - Toggle NVGs and Flashlights improvements (#6219)
82b313a 
* New Toggle NVG ui and improve function

* Add Toggle Flashlights icon

* New Toggle Flashlights ui and improve function

* Stringtable changes and ace_ai postInit clean up

* TRACE fix and stringtable capitalization
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bux bux bux left review comments

@kymckay kymckay kymckay approved these changes

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

Successfully merging this pull request may close these issues.

None yet
6 participants
@mharis001 @jones140 @jonpas @bux @kymckay @PabstMirror