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

Fixes & Improvements: Hoppity Rework #2488

Merged
merged 32 commits into from
Sep 20, 2024

Conversation

DavidArthurCole
Copy link
Contributor

@DavidArthurCole DavidArthurCole commented Sep 9, 2024

What

This PR involved an almost total rework of the chat detection that is inherent to the Hoppity "module":

Removes the 200ms delay that was added to Hoppity Compact in the early days when the number of messages was indeterminate (or, not always exactly 3).

See details and images below, but all "types" of rabbits found now consist of exactly three messages to spin them off, so the delay is no longer needed.

* The one exception to the "three-message rule" is when waypoint sharing is enabled, however this is still being accounted for separately and within the module itself.


This PR also addresses the "issue" that had been raised previously by hannibal (see here) about using LorenzChatEvent() to fake messages for:

  • Side Dish Eggs
  • All-time Milestone "Eggs"
  • Factory Milestone "Eggs"
  • Stray Rabbits that also count as "real" rabbits (Fish the Rabbit and El Dorado)

Instead of doing that, it's using an event registry now for EggFoundEvent(), and leaving it up to the modules to determine what to do with that. This was most prevalent for the Compact Hoppity stuff.


Images

Meal (Normal):
meal_egg

Bought:
bought_egg

Side Dish+ (the same logic here applies to Factory and Shop milestones, since they all use a manually-created chat event for type declaration):
side_egg

Strays (again, contrived third message, but - also the messageCount can be ignored):
image

Changelog Fixes

  • Fixed an issue where Fish the Rabbit and El Dorado did not have compacted chat messages. - Daveed

Changelog Improvements

  • Improved the responsiveness of Hoppity Chat Compacting. - Daveed

Changelog Technical Details

  • Removed the use of LorenzChatEvent() for 'manually' adding data to Hoppity Chat Compact. - Daveed
    • Now uses EggFoundEvent().

@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Sep 9, 2024
@jani270 jani270 added this to the Version 0.27 milestone Sep 9, 2024
@DavidArthurCole DavidArthurCole marked this pull request as draft September 14, 2024 18:42
@DavidArthurCole
Copy link
Contributor Author

So I wasn't actually accounting for waypoint sharing in the "every hoppity message consists of 3" - but that's fixed now, so...

@DavidArthurCole DavidArthurCole marked this pull request as ready for review September 14, 2024 19:03
@DavidArthurCole
Copy link
Contributor Author

Nvm now purchased rabbits broke, which is dope considering I didn't touch those at all 🔥

@hannibal002 hannibal002 added the Waiting on Hypixel Stuff that cant be tested right now label Sep 17, 2024
@DavidArthurCole DavidArthurCole changed the title Improvement: Remove "Compact Hoppity" Delay Improvements: Hoppity Rework Sep 18, 2024
@DavidArthurCole DavidArthurCole changed the title Improvements: Hoppity Rework Fixes & Improvements: Hoppity Rework Sep 18, 2024
@github-actions github-actions bot added the Bug Fix Bug fixes label Sep 18, 2024
@DavidArthurCole
Copy link
Contributor Author

I'm realizing this PR's scope creeped rather massively as I found more and more small issues with Hoppity's, but uhhh yeah there are now fixes & improvements. Still testing a couple things out before I'm 100% confident on some of the assumptions made - need next hoppity to come around to verify that event firing won't overlap.

@hannibal002 hannibal002 removed the Waiting on Hypixel Stuff that cant be tested right now label Sep 20, 2024
@hannibal002 hannibal002 merged commit a267da2 into hannibal002:beta Sep 20, 2024
4 checks passed
@github-actions github-actions bot removed Soon This Pull Request will be merged within the next couple of betas Bug Fix Bug fixes labels Sep 20, 2024
@DavidArthurCole DavidArthurCole deleted the HoppityCompactTimer branch September 20, 2024 19:56
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