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

Merge remote-tracking branch 'upstream/release' into multiplayer-lounge

This commit is contained in:
Dean Herbert 2018-05-28 10:48:33 +09:00
parent 95315e46f0 b2b3976e9d
commit 3c3412791c
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit a191c104b8e254e81a1a7bb1c200ccdf02628796
Subproject commit 84fdfc77a86d581638e69f5e8061c118de4b30f9

16
osu.Game.Tests/Visual/TestCaseAutoplay.cs
View File

@ -5,6 +5,7 @@
using System.Linq;
using osu.Game.Beatmaps;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
namespace osu.Game.Tests.Visual
@ -15,7 +16,20 @@ public class TestCaseAutoplay : TestCasePlayer
protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
{
beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
return base.CreatePlayer(beatmap, ruleset);
return new ScoreAccessiblePlayer
{
InitialBeatmap = beatmap,
AllowPause = false,
AllowLeadIn = false,
AllowResults = false,
};
}
protected override bool ContinueCondition(Player player) => base.ContinueCondition(player) && ((ScoreAccessiblePlayer)player).ScoreProcessor.TotalScore > 0;
private class ScoreAccessiblePlayer : Player
{
public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
}
}
}

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

@ -70,7 +70,7 @@ public class Player : ScreenWithBeatmapBackground, IProvideCursor
private SampleChannel sampleRestart;
private ScoreProcessor scoreProcessor;
protected ScoreProcessor ScoreProcessor;
protected RulesetContainer RulesetContainer;
private HUDOverlay hudOverlay;
@ -149,7 +149,7 @@ private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
userAudioOffset.ValueChanged += v => offsetClock.Offset = v;
userAudioOffset.TriggerChange();
scoreProcessor = RulesetContainer.CreateScoreProcessor();
ScoreProcessor = RulesetContainer.CreateScoreProcessor();
Children = new Drawable[]
{
@ -176,7 +176,7 @@ private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
RelativeSizeAxes = Axes.Both,
Child = RulesetContainer
},
new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, scoreProcessor)
new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -184,7 +184,7 @@ private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
Breaks = beatmap.Breaks
},
RulesetContainer.Cursor?.CreateProxy() ?? new Container(),
hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, working, offsetClock, adjustableClock)
hudOverlay = new HUDOverlay(ScoreProcessor, RulesetContainer, working, offsetClock, adjustableClock)
{
Clock = Clock, // hud overlay doesn't want to use the audio clock directly
ProcessCustomClock = false,
@ -225,11 +225,11 @@ private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
initializeStoryboard(false);
// Bind ScoreProcessor to ourselves
scoreProcessor.AllJudged += onCompletion;
scoreProcessor.Failed += onFail;
ScoreProcessor.AllJudged += onCompletion;
ScoreProcessor.Failed += onFail;
foreach (var mod in Beatmap.Value.Mods.Value.OfType<IApplicableToScoreProcessor>())
mod.ApplyToScoreProcessor(scoreProcessor);
mod.ApplyToScoreProcessor(ScoreProcessor);
}
private void applyRateFromMods()
@ -254,7 +254,7 @@ public void Restart()
private void onCompletion()
{
// Only show the completion screen if the player hasn't failed
if (scoreProcessor.HasFailed || onCompletionEvent != null)
if (ScoreProcessor.HasFailed || onCompletionEvent != null)
return;
ValidForResume = false;
@ -272,7 +272,7 @@ private void onCompletion()
Beatmap = Beatmap.Value.BeatmapInfo,
Ruleset = ruleset
};
scoreProcessor.PopulateScore(score);
ScoreProcessor.PopulateScore(score);
score.User = RulesetContainer.Replay?.User ?? api.LocalUser.Value;
Push(new Results(score));
});

6
osu.Game/Tests/Visual/TestCasePlayer.cs
View File

@ -44,7 +44,7 @@ private void load(RulesetStore rulesets)
{
Player p = null;
AddStep(ruleset.RulesetInfo.Name, () => p = loadPlayerFor(ruleset));
AddUntilStep(() => p.IsLoaded);
AddUntilStep(() => ContinueCondition(p));
}
else
{
@ -52,11 +52,13 @@ private void load(RulesetStore rulesets)
{
Player p = null;
AddStep(r.Name, () => p = loadPlayerFor(r));
AddUntilStep(() => p.IsLoaded);
AddUntilStep(() => ContinueCondition(p));
}
}
}
protected virtual bool ContinueCondition(Player player) => player.IsLoaded;
protected virtual IBeatmap CreateBeatmap(Ruleset ruleset) => new TestBeatmap(ruleset.RulesetInfo);
private Player loadPlayerFor(RulesetInfo ri) => loadPlayerFor(ri.CreateInstance());