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

Toggle ACE captive and surrender via context menu #278

Merged
merged 4 commits into from
Feb 22, 2020

Conversation

zharf
Copy link
Contributor

@zharf zharf commented Dec 27, 2019

When merged this pull request will:

I decided to use the strings and icons from ace_captives and ace_zeus since it's currently dependent on the former and I doubt many would remove the latter. Other alternative I guess is copying over the strings and possibly the icons if ACE team is fine with that.

@mharis001 mharis001 added the feature Adds a new feature label Dec 27, 2019
@mharis001 mharis001 added this to the 1.7.0 milestone Dec 27, 2019
Copy link
Member

@mharis001 mharis001 left a comment

Choose a reason for hiding this comment

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

Looks good, just some cleanup needed. This should also only require ace_captives - the icons exist in ace_captives and can copy the strings if needed.

addons/context_actions/CfgContext.hpp Outdated Show resolved Hide resolved
addons/context_actions/CfgContext.hpp Outdated Show resolved Hide resolved
addons/context_actions/XEH_PREP.hpp Outdated Show resolved Hide resolved
addons/context_actions/functions/fnc_toggleCaptive.sqf Outdated Show resolved Hide resolved
addons/context_actions/functions/fnc_toggleCaptive.sqf Outdated Show resolved Hide resolved
addons/context_actions/functions/fnc_toggleSurrender.sqf Outdated Show resolved Hide resolved
addons/context_actions/functions/fnc_toggleSurrender.sqf Outdated Show resolved Hide resolved
@zharf
Copy link
Contributor Author

zharf commented Jan 17, 2020

Alrighty, removed ace_zeus dependency and made the other requested changes

@mharis001
Copy link
Member

👍Looks good to me. Should merge after #286 I think, will be easier to deal with any conflicts or make small adjustments.

@mharis001
Copy link
Member

I did some cleanup for the context menu changes, added an icon to the main node, added the "Captives" string (would cause an RPT error if ACE was not loaded), and moved the ToggleSurrender condition to a separate function.

@mharis001 mharis001 merged commit c60b4c4 into zen-mod:master Feb 22, 2020
@zharf zharf deleted the captive_context branch February 23, 2020 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature Adds a new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature Request: Mass toggle surrender/captive
3 participants