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

Backend: Add dungeon phases #1865

Merged
merged 23 commits into from
Oct 11, 2024
Merged

Backend: Add dungeon phases #1865

merged 23 commits into from
Oct 11, 2024

Conversation

martimavocado
Copy link
Contributor

@martimavocado martimavocado commented May 22, 2024 •
edited by hannibal002
Loading

What

Adds dungeon phase detection

Changelog Technical Details

  • Added dungeon phase detection. - martimavocado

@Nealkitt Nealkitt mentioned this pull request May 23, 2024
Closed
@catgirlseraid
Copy link
Contributor

change phasePatternGroup to patternGroup 🥺

@martimavocado
Copy link
Contributor Author

change phasePatternGroup to patternGroup 🥺

there's already a patternGroup though do i just make phasePatternGroup a subgroup inside patternGroup? or i could just add boss.message to every key in the new patterns i added and ditch phasePatternGroup

@martimavocado martimavocado marked this pull request as ready for review June 15, 2024 14:40
hannibal002
hannibal002 requested changes Jun 16, 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.

please add regex tests to all patterns

@hannibal002 hannibal002 added this to the Version 0.27 milestone Jun 16, 2024
@martimavocado
Copy link
Contributor Author

please add regex tests to all patterns

is there a point in doing this for most of these patterns? only one isn't checking for an exact string. i don't mind doing this, just curious as to why

@hannibal002 hannibal002 changed the title Technical: Add dungeon phases Backend: Add dungeon phases Jul 2, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 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 Sep 7, 2024
@martimavocado
Merge remote-tracking branch 'hannibal002/beta' into dungeon-phases
f603736 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@martimavocado
add more regex tests
fee8daa
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Sep 19, 2024
@CalMWolfs CalMWolfs self-requested a review October 8, 2024 11:16
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Oct 8, 2024
hannibal002
hannibal002 requested changes Oct 9, 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.

Please move the code from DungeonAPI into a new class DungeonBossAPI or similar, and change the name of the event and the enum to indlicate that this is not the dungeon phase but the boss phase.

hannibal002
hannibal002 requested changes Oct 11, 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.

the phase doesnt reset to null after leaving dungeon

@hannibal002 hannibal002 merged commit a1c8bfd into hannibal002:beta Oct 11, 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 Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Thunderblade73 Thunderblade73 Thunderblade73 left review comments

@hannibal002 hannibal002 hannibal002 approved these changes

@CalMWolfs CalMWolfs Awaiting requested review from CalMWolfs

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

Successfully merging this pull request may close these issues.
5 participants
@martimavocado @catgirlseraid @hannibal002 @Thunderblade73 @CalMWolfs