Skip to content

Conversation

bolivierjr
Copy link
Contributor

@bolivierjr bolivierjr commented Jul 9, 2018

issue #1429

Deleted an else if block of code to get the ability hotkeys to start working right again.

@bolivierjr bolivierjr changed the title Fix: ability hotkeys ability hotkeys (toggling/switching/cancelling) Jul 9, 2018
@DreadKnight DreadKnight temporarily deployed to ancientbeast-pr-1435 July 10, 2018 13:21 Inactive
@DreadKnight
Copy link
Member

@bolivierjr Funny how deleting a part of code almost did this. Need a bit more going on though.
In the case of having Abolished active and selecting Wild Fire: pressing Q while while Wild Fire is selected should switch to Greater Pyre ability (the switch order seems to be inverted, canceling the ability selection if no viable target in range for Fiery Touch).

@bolivierjr
Copy link
Contributor Author

bolivierjr commented Jul 10, 2018

@DreadKnight Ah, ok, I can take a look at that and see what's going on. I've only touched on the Esc/close hotkey and not the Q hotkey. This is a separate issue it seems and that code I committed should have been deleted from another issue/merge that happened. Didn't seem to delete that section of code though. I'm a bit confused lol

@bolivierjr
Copy link
Contributor Author

bolivierjr commented Jul 10, 2018

@DreadKnight Figured out that the code inside the selectNextAbility and selectPreviousAbility functions were backwards for what it is supposed to do. Swapped the names of the functions. This also fixes the scrollwheel action for switching between abilities.

@DreadKnight
Copy link
Member

@bolivierjr It's almost there, renaming those classes caused the scroll wheel to switch inverse order now...

@bolivierjr
Copy link
Contributor Author

bolivierjr commented Jul 11, 2018

@DreadKnight Yeah, I was just typing that! Should I make another commit to fix that or rebase the current one so it's all one? Not sure how you guys like it.

@DreadKnight DreadKnight merged commit cf3e729 into FreezingMoon:master Jul 11, 2018
@DreadKnight
Copy link
Member

@bolivierjr Merged, so just do another commit. Funny we had one inverting the mouse scroll wheel a few weeks ago xD

@bolivierjr bolivierjr deleted the issue/1429 branch December 13, 2018 04:19
CyberBishop pushed a commit to CyberBishop/AncientBeast that referenced this pull request Apr 20, 2023
ability hotkeys (toggling/switching/cancelling), fixes FreezingMoon#1429
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants