RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only drain health in non-break times

This commit is contained in:
smoogipoo 2019-12-25 14:49:17 +09:00
parent 977fb3d1bf
commit b348abcd07
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,11 @@ public class HealthProcessor : JudgementProcessor
/// </summary>
public readonly BindableDouble Health = new BindableDouble(1) { MinValue = 0, MaxValue = 1 };
/// <summary>
/// Whether gameplay is currently in a break.
/// </summary>
public readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
/// <summary>
/// Whether this ScoreProcessor has already triggered the failed state.
/// </summary>
@ -53,7 +58,8 @@ protected override void Update()
{
base.Update();
Health.Value -= drainRate * Time.Elapsed;
if (!IsBreakTime.Value)
Health.Value -= drainRate * Time.Elapsed;
}
protected override void ApplyResultInternal(JudgementResult result)

2
osu.Game/Screens/Play/Player.cs
View File

@ -272,6 +272,8 @@ private void addOverlayComponents(Container target, WorkingBeatmap working)
DrawableRuleset.Overlays.Add(ScoreProcessor);
DrawableRuleset.Overlays.Add(HealthProcessor);
HealthProcessor.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
}
private void updatePauseOnFocusLostState() =>