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

Feature + Fix: West Village/Dreadfarm/Living Cave features #2616

Merged
merged 16 commits into from
Sep 29, 2024
Merged

Feature + Fix: West Village/Dreadfarm/Living Cave features #2616

merged 16 commits into from
Sep 29, 2024

Conversation

MTOnline69
Copy link
Contributor

@MTOnline69 MTOnline69 commented Sep 28, 2024 •
edited
Loading

Dependencies

What

Adds various features for things in the West Village, Dreadfarm and Living Cave areas of The Rift. This includes a parkour route for Gunther's Rift Race, a helper for the Buttons Enigma Soul, the ability to mute Wilted Berberis sounds when not farming, and the ability to customize the colour of the Living Metal block helper.

Also fixes the Rift Timer not updating during the Rift Race by using the XP Bar, and replaces ActionBarUpdateEvent with ActionBarValueUpdateEvent.

Button Helper video
Rift Race video

Changelog New Features

  • Added a helper for tracking the Buttons Enigma Soul in the Rift. - MTOnline
    • Uses pathfinding to guide the player to the nearest spot with unpressed buttons and highlights them.
  • Added a route helper for Gunther's Rift Race in the West Village. - MTOnline
  • Added the ability to mute Wilted Berberis sounds when not farming. - MTOnline

Changelog Improvements

  • Added the option to choose the color of the Living Metal Helper highlight. - MTOnline

Changelog Fixes

  • Fixed the Rift Timer pausing while in Gunther's Rift Race. - MTOnline

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 28, 2024
@github-actions GitHub Actions
Copy link

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

@MTOnline69 MTOnline69 mentioned this pull request Sep 28, 2024
Merged
@hannibal002 hannibal002 added this to the Version 0.27 milestone Sep 28, 2024
@MTOnline69
Merge branch 'beta' into rift-features
0ecf259 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@MTOnline69
fix pathfind labels missing (merge conflict)
561958e
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 28, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

hannibal002
hannibal002 requested changes Sep 28, 2024
View reviewed changes
src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/RiftRaceHelper.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/WoodenButtonsHelper.kt Outdated Show resolved Hide resolved
@hannibal002 hannibal002 self-requested a review September 29, 2024 08:08
@hannibal002 hannibal002 added Bug Fix Bug fixes Soon This Pull Request will be merged within the next couple of betas labels Sep 29, 2024
@jani270 jani270 removed the Bug Fix Bug fixes label Sep 29, 2024
hannibal002
hannibal002 requested changes Sep 29, 2024
View reviewed changes
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.

Added the option to choose the color of the Living Metal Helper highlight. - MTOnline

doesnt work for me

@hannibal002
Copy link
Owner

Please add an additional config option to disable the wooded button feature (default enabled in the config)
also use a render logic that shows the location of the buttons even when close by.

@hannibal002 hannibal002 merged commit e4e8a31 into hannibal002:beta Sep 29, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Sep 29, 2024
@hannibal002 hannibal002 changed the title Feature: West Village/Dreadfarm/Living Cave features Feature + Fix: West Village/Dreadfarm/Living Cave features Oct 1, 2024
Tryp0xd pushed a commit to Tryp0xd/SkyHanni that referenced this pull request Oct 3, 2024
@ItsEmpa @hannibal002
@MTOnline69 @DavidArthurCole @CalMWolfs @j10a1n15 @lunaynx @martimavocado @ILike2WatchMemes @minhperry @superhize
fix merge (#1)
2784225 
* Version 0.27 Beta 13

* Feature: West Village/Dreadfarm/Living Cave features (hannibal002#2616)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Jasper Gemstones not in Powder Mining Filter (hannibal002#2618)

* changed todo

* added parameter `/shcopylocation pathfind`

* Fix a massive bug (hannibal002#2626)

* Fix: Typos in readme (hannibal002#2629)

* Fix: Custom Scoreboard Carnival (hannibal002#2631)

* formatting

* Fix: Add more Pablo patterns (hannibal002#2636)

* Fix: Minister in Calendar Color Reset (hannibal002#2632)

* Fix: Strays Wrongly Counting as Unique (hannibal002#2627)

* Fix: Item trackers saying removed item name from item name (hannibal002#2620)

* fix time format showing empty string for sub 1s

* fixed composter data collection

* Improvement: Add ignored crops for lane features (hannibal002#2622)

* Improvement: Change "efficient miner" to "spread" in mineshaft pity breakdown (hannibal002#2633)

* Backend: Rename keystore file to specify it is for skyhanni (hannibal002#2619)

* Fix: Superpair Data (hannibal002#2566)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>

* Improvement: Added cooldown to Carnival NPC click (hannibal002#2628)

* Automatically stating pathfind after clicking the hypixel reminder ch… (hannibal002#2635)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Improvement: Pathfind Rendering (hannibal002#2634)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Backend: Alert Clock Offsets (hannibal002#2623)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>

* fixed typo in broodmother message

* fixed errors when path is zero

* Version 0.27 Beta 14

* Improvement: Slight Touch up for Hoppity Event Summary (hannibal002#2638)

* code cleanup

* Fix: Highlight in Bazaar (hannibal002#2640)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Flare expire warning (hannibal002#2643)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Ender node tracker (hannibal002#2644)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* Fix: Powder Tracker not tracking items (hannibal002#2645)

* Fix: Preconditions to debug commands (hannibal002#2641)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>

* Fix: Dummies and Damage Indicator (hannibal002#2646)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

* fixed wrong feature toggle

* Improvement: Superpair Experimentation data always visible (hannibal002#2647)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>

* Backend: Detekt Fixes Part 5 (hannibal002#2617)

---------

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: MTOnline69 <97001154+MTOnline69@users.noreply.github.com>
Co-authored-by: David Cole <40234707+DavidArthurCole@users.noreply.github.com>
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Co-authored-by: Luna <me@lunya.dev>
Co-authored-by: martimavocado <39881008+martimavocado@users.noreply.github.com>
Co-authored-by: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Co-authored-by: minhperry <46137516+minhperry@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Co-authored-by: CalMWolfs <cwolfson58@gmail.com>
Co-authored-by: HiZe <super@hize.be>
Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 hannibal002 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.27
Development

Successfully merging this pull request may close these issues.
3 participants
@MTOnline69 @hannibal002 @jani270