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

Feature + Fix: Chocfactorykeybinds #1644

Merged
merged 13 commits into from
May 2, 2024

Conversation

catgirlseraid
Copy link
Contributor

@catgirlseraid catgirlseraid commented May 2, 2024

Dependencies

What

Adds keybinds to buy hoppity upgrades. This uses the same code as the keybinds for the harp so i presume it's allowed?
Fixed harp keybinds still allowing vanilla keybinds for swapping slots through

Changelog New Features

  • Added keybinds for Chocolate Factory. - seraid

Changelog Fixes

  • Fixed harp keybinds. - seraid

@catgirlseraid catgirlseraid marked this pull request as draft May 2, 2024 05:56
@catgirlseraid catgirlseraid marked this pull request as ready for review May 2, 2024 05:57
@catgirlseraid catgirlseraid marked this pull request as draft May 2, 2024 07:09
@catgirlseraid
Copy link
Contributor Author

there is a edge case where two items can be brought with one keypress if hovering over an item and pressing a keybind for a different item. this happens as the vanilla keypress is not canceled

@hannibal002
Copy link
Owner

there is a edge case where two items can be brought with one keypress if hovering over an item and pressing a keybind for a different item. this happens as the vanilla keypress is not canceled

The same edge case exists in harp keybind. If you find a good fix for this, please be so kind and also fix it in harp keybind

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label May 2, 2024
Copy link

github-actions bot commented May 2, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 2, 2024
Copy link

github-actions bot commented May 2, 2024

Conflicts have been resolved! 🎉

@catgirlseraid catgirlseraid marked this pull request as ready for review May 2, 2024 10:39
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

not tested in game yet

@hannibal002 hannibal002 merged commit 510c025 into hannibal002:beta May 2, 2024
3 checks passed
@hannibal002 hannibal002 changed the title Chocfactorykeybinds Feature + Fix: Chocfactorykeybinds May 2, 2024
@catgirlseraid catgirlseraid deleted the chocfactorykeybinds branch July 18, 2024 06:31
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.

3 participants