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

Fix argon health bar showing "miss" bar for bananas #26561

Merged
merged 2 commits into from
Jan 16, 2024
+12 −2
Merged

Fix argon health bar showing "miss" bar for bananas #26561

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a6025
Add helper method to bypass judgement woes
peppy Jan 16, 2024
2be8d66
Fix argon health bar showing "miss" bar for bananas
peppy Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix argon health bar showing "miss" bar for bananas
@peppy
peppy committed Jan 16, 2024

Verified

This commit was signed with the committer’s verified signature.
peppy Dean Herbert
SSH Key Fingerprint: JpqoMLwRkRQ8dD332SMMgI6dQJotIiCBtDwT/3XF9mA
Verified
Learn about vigilant mode
commit 2be8d66d4c75cee98d9aa0e5b60c99f475bb555c
7 changes: 6 additions & 1 deletion osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
View file
Original file line number Diff line number Diff line change
@@ -136,7 +136,12 @@ protected override void LoadComplete()
BarHeight.BindValueChanged(_ => updateContentSize(), true);
}

private void onNewJudgement(JudgementResult result) => pendingMissAnimation |= !result.IsHit;
private void onNewJudgement(JudgementResult result)
{
// Check the health increase because cases like osu!catch bananas fire `IgnoreMiss`,
// which counts as a miss but doesn't actually subtract any health.
pendingMissAnimation |= !result.IsHit && result.HealthIncrease < 0;
}

protected override void Update()
{