Interaction - Add condition to zeus actions #6665
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
Dystopian
commented
Nov 7, 2018
addons/main/script_macros.hpp
Outdated
| @@ -134,4 +134,6 @@ | |||
| #define MRAD_TO_DEG(d) ((d) / 17.45329252) // Conversion factor: 9 / (50 * PI) | |||
| #define MOA_TO_RAD(d) ((d) * 0.00029088) // Conversion factor: PI / 10800 | |||
|
|
|||
| #define ZEUS_ACTION_CONDITION (QUOTE(QUOTE(ADDON)) in curatorAddons _target) | |||
There was a problem hiding this comment.
not sure about macro name because double QUOTE can't be used in actions added by script not config
There was a problem hiding this comment.
"ace_zeus" in curatorAddons z is ~0.2ms with just ace or 0.5 with my full modset
so we might want to use cached call instead
#define ZEUS_ACTION_CONDITION ([nil, {QUOTE(QUOTE(ADDON)) in curatorAddons _target}, missionNamespace, QUOTE(QUOTE(GVAR(zeusCheck))), 60] call ace_common_fnc_cachedCall)
There was a problem hiding this comment.
Maybe add event to clear this cache, e.g. that one on interaction menu closed (don't remember exactly name)? 60s timeout can be not so effective if removeCuratorAddons/addCuratorAddons are used.
PabstMirror
approved these changes
Nov 11, 2018
BaerMitUmlaut
pushed a commit
that referenced
this pull request
Aug 5, 2019
* Add conditions to zeus actions * Add condition caching
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:
Zeus modules can be disabled/enabled with
removeCuratorAddons/addCuratorAddonscommands. This PR adds condition which checks if addon is enabled for curator and thus zeus interaction menu are controlled the same way.ref #6632
@Bummeri