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

CBA zeus integration #3084

Merged
merged 2 commits into from
Dec 31, 2015
Merged

CBA zeus integration #3084

merged 2 commits into from
Dec 31, 2015

Conversation

PabstMirror
Copy link
Contributor

Close #2937

CBA now adds keyDown EH to zeus interface, so #1951 (CTRL+V from climb blocking paste in zeus) is back.

  • Adds "isNotInZeus" to caninteractWith conditions.
  • Removed code to forward interaction keybind to CBA as this is handled by CBA
  • Use CBA_curatorOpened/Closed events from CBA to trigger ACE's zeus event (trivial savings from removing constant checking in PFEH).

@commy2 - tested with this code and it seems to handle scripted closing fine.

[] spawn {sleep 2; systemChat "scipted closing zeus"; (findDisplay 312) closeDisplay 1};

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Dec 30, 2015
@PabstMirror PabstMirror added this to the 3.4.2 milestone Dec 30, 2015
@kymckay
Copy link
Member

kymckay commented Dec 30, 2015

Looks good upon initial inspection 👍

@commy2
Copy link
Contributor

commy2 commented Dec 30, 2015

(findDisplay 312) closeDisplay 1

That works, because 1 and 2 emulate closing with either OK (1) or Cancel (2). Closing with any other exit code might however not work.
I tested with ESC (by default exits with no code / default 0), but it seems that zeus handles that with a key handler or some hard coded magic.

👍

@kymckay
Copy link
Member

kymckay commented Dec 31, 2015

it seems that zeus handles that with a key handler or some hard coded magic

iirc it's using a key handler

PabstMirror added a commit that referenced this pull request Dec 31, 2015
@PabstMirror PabstMirror merged commit 586449e into release Dec 31, 2015
@PabstMirror PabstMirror deleted the cbaZeusIntegration branch December 31, 2015 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants