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

UAV Self-interactions #5379

Merged
merged 4 commits into from
Aug 22, 2017
Merged

Conversation

tbeswick96
Copy link
Contributor

@tbeswick96 tbeswick96 commented Jul 22, 2017

When merged this pull request will:

@commy2
Copy link
Contributor

commy2 commented Jul 22, 2017

This looks very strange to me.

@PabstMirror
Copy link
Contributor

We use ace_player over 1000 times, this changes it with no corresponding event.
A lot of weird things happen, like medical menu opening for the AI.
It also limits things like setting off explosives linked to the real player while viewing camera feed.

There is a keybind for fire mode cycling, so the interaction menu really isn't needed.

Another option would be to add an interaction node to player for the UAV and add them there.
Something like this

    class CAManBase: Man {
        class ACE_Actions {
            class ACE_MainActions {
               class ACE_UAV {
                  condition = "!isNull (ACE_controlledUAV param [0, objNul])";

@tbeswick96
Copy link
Contributor Author

OK ignore this, this was the wrong approach.
I'm going to try one more thing that will not touch ACE_Player, and hopefully that will be satisfactory.

@tbeswick96
Copy link
Contributor Author

@commy2 @PabstMirror How does that look? It no longer interferes with ACE_Player at all.

@tbeswick96 tbeswick96 changed the title Switch ACE_Player to uav AI on valid seat change UAV Self-interactions Jul 23, 2017
@commy2
Copy link
Contributor

commy2 commented Jul 23, 2017

Looks good. Not tested. But why use:

ACE_controlledUAV param [0, objNull]

when it could just be:

ACE_controlledUAV select 0

Some of these are called quite often and it would be a shame to waste computing time.

@jonpas jonpas added kind/enhancement Release Notes: **IMPROVED:** status/review-pending labels Jul 23, 2017
@jonpas jonpas added this to the 3.11.0 milestone Jul 23, 2017
@tbeswick96
Copy link
Contributor Author

Updated with that improvement

@commy2
Copy link
Contributor

commy2 commented Jul 29, 2017

lgtm

@PabstMirror PabstMirror merged commit 9d08a03 into acemod:uavEvent Aug 22, 2017
@tbeswick96 tbeswick96 deleted the uavinteractions branch August 22, 2017 21:02
PabstMirror added a commit that referenced this pull request Aug 22, 2017
* Add EH for UAV control, Add Hellfire support

* cycle guidance keybind

* Handle broken PlayerViewChanged

* humps

* UAV Self-interactions (#5379)

* Switch ACE_Player to uav AI on valid seat change

* Different approach to UAV interactions

* Forgot to remove a variable

* Changed param to select
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants