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.

Sign up for GitHub

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

AI Control Keybinds #496

Merged
merged 59 commits into from
Mar 8, 2023
Merged

AI Control Keybinds #496

merged 59 commits into from
Mar 8, 2023

Conversation

ampersand38
Copy link
Member

@ampersand38 ampersand38 commented Dec 28, 2020 •
edited
Loading

When merged this pull request will:

  • Add keybinds for controlling AI near players
  • Watch Cursor: Makes all selected units watch the cursor location. Pressing this command with the cursor over a selected unit will cancel the watch target.
  • Move To Cursor: Makes all selected units move to the cursor location. Units will return to formation and waypoint afterward.
  • Toggle AI PATH: Makes all selected units start or stop moving. Does not affect aiming or shooting.
  • https://youtu.be/TcPfTkfiB9o
  • https://www.youtube.com/watch?v=ml0xGoXfGY4
  • https://youtu.be/-KCMRES5ii8

@mharis001 mharis001 added the feature Adds a new feature label Dec 29, 2020
@mharis001 mharis001 added this to the 1.10.0 milestone Dec 29, 2020
neilzar
neilzar approved these changes Jan 13, 2021
View reviewed changes
Copy link
Contributor

@neilzar neilzar left a comment

Choose a reason for hiding this comment

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

I nominate this for the best addition to Zeus award

mharis001
mharis001 requested changes Jan 16, 2021
View reviewed changes
ampersand38 and others added 9 commits January 17, 2021 11:09
@ampersand38 @mharis001
Update addons/editor/initKeybinds.sqf
69cd852 
Co-authored-by: mharis001 <[email protected]>
@ampersand38
Unnecessary parentheses
943868e 
zen-mod#496 (comment)
@ampersand38
_index is not used
839de51 
zen-mod#496 (comment)
@ampersand38
Incorrect spelling
a79cd99 
zen-mod#496 (comment)
@ampersand38
Merge branch 'unit-control-keybinds' of https://github.com/ampersand3…
d8bc649 
…8/ZEN into unit-control-keybinds
@ampersand38
Localize
831a906 
zen-mod#496 (comment)
@ampersand38
Just handled
f2046a9 
zen-mod#496 (comment)
@ampersand38
getPosFromScreen already exists
773f82f 
zen-mod#496 (comment)
@ampersand38
Add Watch Curator Camera and Force Fire
e4c4589 
Watch Curator Camera
Makes selected units watch the current curator camera location. This keybind is useful when making units look at upper floors, or when you are near players inside buildings where geometry may make `getPosFromScreen` intersections a little tricky.

Force Fire
Hold to force all selected to fire their current weapon.
https://www.youtube.com/watch?v=ml0xGoXfGY4
neilzar
neilzar requested changes Jan 17, 2021
View reviewed changes
neilzar
neilzar requested changes Jan 17, 2021
View reviewed changes
@ampersand38 ampersand38 mentioned this pull request Jan 18, 2021
Closed
@mharis001 mharis001 modified the milestones: 1.10.0, 1.11.0 Feb 3, 2021
@neilzar neilzar linked an issue Feb 25, 2021 that may be closed by this pull request
Manual Fire/Aim module #403
Closed
@ampersand38 ampersand38 changed the title Unit Control Keybinds AI Control Keybinds Jan 11, 2023
@ampersand38
Copy link
Member Author

Perhaps I should take the hints into a separate PR?

@mharis001
Copy link
Member

I pushed a drawHint common function that does 2D (map display) and 3D drawing and uses IDs to overwrite hints (so multiple hints are not shown for the same unit if the keybinds are used quickly - only the most recent one).

@ampersand38
Copy link
Member Author

Looks great! I think it works fine with successive inputs. There's immediate feedback for the first one(s), which is then replaced by the next.

@mharis001
Copy link
Member

The last thing I want to see done for this is remove the duplicated code between force fire and suppressive fire. Ideally, the common code would be extracted out to a separate function that both of these features can use.

mharis001
mharis001 requested changes Mar 6, 2023
View reviewed changes
@mharis001
Copy link
Member

I think this is finally good to go. I made the following changes and did some cleanup:

  • Added an is reloading check to the can fire function so that it can effectively be used to time when to fire the next shot.
  • Now using CBA_fnc_isTurnedOut for the turned out check in isUnitFFV.
  • Moved the force fire function back to common and simplified it a bit (we can look at reworking this later).
  • Finally, the keybind now uses a global event on trigger as well as release just to avoid any potential issues with different locality between a vehicle and its turret.

@ampersand38 Please look over my changes and merge when ready.

@ampersand38 ampersand38 merged commit 1679273 into zen-mod:master Mar 8, 2023
@ampersand38 ampersand38 deleted the unit-control-keybinds branch March 8, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neilzar neilzar neilzar approved these changes

@mharis001 mharis001 mharis001 approved these changes

Assignees
No one assigned
Labels
feature Adds a new feature
Projects
None yet
Milestone
Backlog
Development

Successfully merging this pull request may close these issues.

Manual Fire/Aim module
6 participants
@ampersand38 @CreepPork @IdoX1 @godgutten @mharis001 @neilzar