1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 17:35:10 +08:00

Merge branch 'master' into bindable-valuechanged

This commit is contained in:
Dean Herbert 2019-02-22 17:14:05 +09:00 committed by GitHub
commit 2c9e6adfd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

View File

@ -56,6 +56,7 @@ namespace osu.Game.Tests.Visual
});
[Test]
[Ignore("polling is threaded, and it's very hard to hook into it correctly")]
public void TestInstantPolling()
{
createPoller(true);
@ -105,9 +106,12 @@ namespace osu.Game.Tests.Visual
});
private void checkCount(int checkValue)
{
AddAssert($"count is {checkValue}", () =>
{
Logger.Log($"value is {count}");
AddAssert($"count is {checkValue}", () => count == checkValue);
return count == checkValue;
});
}
private void createPoller(bool instant) => AddStep("create poller", () =>

View File

@ -58,5 +58,7 @@ namespace osu.Game.Rulesets.Judgements
/// <param name="result">The <see cref="JudgementResult"/> to find the numeric health increase for.</param>
/// <returns>The numeric health increase of <paramref name="result"/>.</returns>
public double HealthIncreaseFor(JudgementResult result) => HealthIncreaseFor(result.Type);
public override string ToString() => $"AffectsCombo:{AffectsCombo} MaxResult:{MaxResult} MaxScore:{MaxNumericResult}";
}
}

View File

@ -55,5 +55,7 @@ namespace osu.Game.Rulesets.Judgements
{
Judgement = judgement;
}
public override string ToString() => $"{Type} (Score:{Judgement.NumericResultFor(this)} HP:{Judgement.HealthIncreaseFor(this)} {Judgement})";
}
}