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

Merge branch 'master' into bindable-valuechanged

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/TestCasePollingComponent.cs
View File

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

2
osu.Game/Rulesets/Judgements/Judgement.cs
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> /// <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> /// <returns>The numeric health increase of <paramref name="result"/>.</returns>
public double HealthIncreaseFor(JudgementResult result) => HealthIncreaseFor(result.Type); public double HealthIncreaseFor(JudgementResult result) => HealthIncreaseFor(result.Type);
public override string ToString() => $"AffectsCombo:{AffectsCombo} MaxResult:{MaxResult} MaxScore:{MaxNumericResult}";
} }
} }

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

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