h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 12:35:34 +08:00
Code Issues Releases Wiki Activity

Merge pull request #26561 from peppy/fix-catch-banana-health-bar

Browse Source 
Fix argon health bar showing "miss" bar for bananas
This commit is contained in:
Bartłomiej Dach 2024-01-16 11:04:38 +01:00 committed by GitHub
commit cde0c0b2ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Judgements/JudgementResult.cs
View File

@ -94,6 +94,11 @@ namespace osu.Game.Rulesets.Judgements
/// </summary> /// </summary>
public bool IsHit => Type.IsHit(); public bool IsHit => Type.IsHit();
/// <summary>
/// The increase in health resulting from this judgement result.
/// </summary>
public double HealthIncrease => Judgement.HealthIncreaseFor(this);
/// <summary> /// <summary>
/// Creates a new <see cref="JudgementResult"/>. /// Creates a new <see cref="JudgementResult"/>.
/// </summary> /// </summary>

2
osu.Game/Rulesets/Scoring/HealthProcessor.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
/// <param name="result">The <see cref="JudgementResult"/>.</param> /// <param name="result">The <see cref="JudgementResult"/>.</param>
/// <returns>The health increase.</returns> /// <returns>The health increase.</returns>
protected virtual double GetHealthIncreaseFor(JudgementResult result) => result.Judgement.HealthIncreaseFor(result); protected virtual double GetHealthIncreaseFor(JudgementResult result) => result.HealthIncrease;
/// <summary> /// <summary>
/// The default conditions for failing. /// The default conditions for failing.

7
osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
View File

@ -136,7 +136,12 @@ namespace osu.Game.Screens.Play.HUD
BarHeight.BindValueChanged(_ => updateContentSize(), true); 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() protected override void Update()
{ {