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: Quiver Display #1190

Merged
merged 51 commits into from
Apr 13, 2024
Merged

Feature: Quiver Display #1190

merged 51 commits into from
Apr 13, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Mar 16, 2024

Dependencies

What

Adds a Quiver Display that shows the amount of arrows you have, an alert to get after a dungeon/kuudra run if you ran out/are low on certain arrows, and a customizable amount to get that reminder and a low quiver notification. Also makes QuiverAPI use the item in the 9th slot of the hotbar to get more accurate numbers.

Images

image

TODO
  • Create QuiverUpdateEvent and use to update display.
  • Option to only show Quiver Display with bow in inventory.
  • Hide arrow count when wearing Skeleton Master Chestplate.
  • Remind at end of Dungeon run if low quiver.
  • Create KuudraEnterEvent and KuudraCompleteEvent.
  • Fix display not appearing on startup until QuiverUpdateEvent.
  • Refactor Low Quiver Alert inside Quiver Display and add a customizable amount at which to alert.
  • Remind at end of Kuudra run if low quiver.

Changelog New Features

  • Added Quiver Display. - Empa
    • Only shows the type of arrow when wearing a Skeleton Master Chestplate.
  • Added Low Quiver Reminder at the end of Dungeon/Kuudra run. - Empa

Changelog Improvements

  • Added customizable amount at which to get a Low Quiver Notification / Quiver Reminder. - Empa

Changelog Technical Details

  • Added slot to OwnInventoryItemUpdateEvent. - Empa
  • Added QuiverUpdateEvent. - Empa
  • Use Quiver item in 9th hotbar slot for QuiverAPI. - Empa

Changelog Removed Features

  • Removed Bow Sound distance setting. - Empa

@ItsEmpa ItsEmpa mentioned this pull request Mar 18, 2024
@ItsEmpa ItsEmpa marked this pull request as ready for review March 18, 2024 13:36
@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Mar 18, 2024

Finished what i wanted to do with this (mostly), only thing left in my todo is merging the dungeon and kuudra enter/complete events into an instance event, but apart from that it should be ready for review.

@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Mar 18, 2024

The description and names of the new configs also still have to be improved

@hannibal002 hannibal002 changed the title Feature: Quiver Display Feature + Fix: Quiver Display Mar 18, 2024
@hannibal002 hannibal002 added this to the Version 0.24 milestone Mar 18, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 4, 2024
Copy link

github-actions bot commented Apr 4, 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/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 4, 2024
Copy link

github-actions bot commented Apr 4, 2024

Conflicts have been resolved! 🎉

Copy link

github-actions bot commented Apr 7, 2024

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

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 7, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 7, 2024
Copy link

github-actions bot commented Apr 7, 2024

Conflicts have been resolved! 🎉

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.

works fine in game.
maybe split "display" and "warning" up into different categories?

@ItsEmpa ItsEmpa requested a review from hannibal002 April 7, 2024 20:47
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.

looks like it works fine in game

@hannibal002 hannibal002 merged commit 0d41a28 into hannibal002:beta Apr 13, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Apr 13, 2024
Thunderblade73 pushed a commit to Thunderblade73/SkyHanni that referenced this pull request Apr 13, 2024
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
@ItsEmpa ItsEmpa deleted the quiver-api branch May 13, 2024 12:21
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.

4 participants