Skip to content

Commit

Permalink
Showing 3 changed files with 5 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -11,12 +11,7 @@ namespace osu.Game.Rulesets.Rush.Judgements
/// </summary>
public class CollisionDamagingJudgement : RushJudgement
{
protected override double HealthPointIncreaseFor(HitResult result, bool playerCollided)
{
if (result == MinResult && playerCollided)
return -10.0;

return 0.0;
}
protected override double HealthPointIncreaseFor(HitResult result, bool playerCollided) =>
result == MinResult && playerCollided ? -10.0 : 0.0;
}
}
9 changes: 2 additions & 7 deletions osu.Game.Rulesets.Rush/Judgements/HeartJudgement.cs
Original file line number Diff line number Diff line change
@@ -9,12 +9,7 @@ public class HeartJudgement : RushJudgement
{
public override HitResult MaxResult => HitResult.LargeBonus;

protected override double HealthPointIncreaseFor(HitResult result, bool collided)
{
if (result == MinResult && !collided)
return 0.0;

return 50.0;
}
protected override double HealthPointIncreaseFor(HitResult result, bool collided) =>
result == MinResult && !collided ? 0.0 : 50.0;
}
}
6 changes: 1 addition & 5 deletions osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHit.cs
Original file line number Diff line number Diff line change
@@ -116,11 +116,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
ApplyResult(r =>
{
var lowestResult = Air.Result.Type < Ground.Result.Type ? Air.Result.Type : Ground.Result.Type;

if (!Air.IsHit && !Ground.IsHit)
r.Type = r.Judgement.MinResult;
else
r.Type = lowestResult;
r.Type = !Air.IsHit && !Ground.IsHit ? r.Judgement.MinResult : lowestResult;
});
}

0 comments on commit 8d92702

Please sign in to comment.