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: Arachne kill timer #1993

Merged
merged 12 commits into from
Sep 7, 2024
Merged

Feature: Arachne kill timer #1993

merged 12 commits into from
Sep 7, 2024

Conversation

MTOnline69
Copy link
Contributor

@MTOnline69 MTOnline69 commented Jun 4, 2024 •
edited by hannibal002
Loading

What

Shows how long it took to kill Arachne after the fight ends. Enabled by default.

This is an improved version of DulkirMod's one, which has the following issues:

  • The message doesn't send at all if you have bits available.
  • The message often sends massively incorrect times, e.g. when:
    • You switch servers.
    • You damage Arachne but aren't in the Sanctuary when it dies.
    • You go in and out of the Sanctuary.
  • The timer ends slightly after Arachne dies.
  • Ugly DulkirMod Prefix

Has a slight dependency on repoPatterns in ArachneChatMessageHider.kt

Images

image

Changelog New Features

  • Added Arachne Kill Timer. - MTOnline
    • Shows how long it took to kill Arachne when the fight ends.

CalMWolfs
CalMWolfs requested changes Jun 4, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

just a few minor things I noticed

src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt Outdated Show resolved Hide resolved
src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt Outdated Show resolved Hide resolved
@MTOnline69 MTOnline69 requested a review from CalMWolfs June 4, 2024 13:01
CalMWolfs
CalMWolfs approved these changes Jun 4, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment •
edited
Loading

Choose a reason for hiding this comment

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

worked fine, pushed a bit of code cleanup and made the text blue so that it is a bit easier to see

image

@hannibal002 hannibal002 added this to the Version 0.27 milestone Jun 4, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 5, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 5, 2024

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

@CalMWolfs
Merge branch 'refs/heads/beta' into fork/MTOnline69/arachne-timer
7765972 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@CalMWolfs
fix merge
7ea0fe7
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 5, 2024

Conflicts have been resolved! 🎉

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

github-actions bot commented Jun 6, 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 Jun 6, 2024
@CalMWolfs
Merge branch 'refs/heads/beta' into fork/MTOnline69/arachne-timer
9f5121f 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
#	src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 6, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 6, 2024
@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Aug 26, 2024
hannibal002
hannibal002 requested changes Sep 7, 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 feature works as expected. Please add regex tests for easier maintaining the class in the future.

src/main/java/at/hannibal2/skyhanni/features/combat/mobs/ArachneKillTimer.kt Show resolved Hide resolved
hannibal002
hannibal002 approved these changes Sep 7, 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.

GitHub is perfect

image

@hannibal002 hannibal002 merged commit 9888071 into hannibal002:beta Sep 7, 2024
1 check passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Sep 7, 2024
MTOnline69 added a commit to MTOnline69/SkyHanni that referenced this pull request Sep 11, 2024
@MTOnline69 @CalMWolfs @hannibal002
Feature: Arachne kill timer (hannibal002#1993)
41132d9 
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
@MTOnline69 MTOnline69 deleted the arachne-timer branch September 14, 2024 22:37
@MTOnline69 MTOnline69 restored the arachne-timer branch September 14, 2024 22:37
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

@CalMWolfs CalMWolfs CalMWolfs 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.
4 participants
@MTOnline69 @hannibal002 @CalMWolfs @jani270