Score -> ScoreInfo

This commit is contained in:
smoogipoo
2018-11-28 18:33:01 +09:00
parent 5b409a5ae5
commit 219929eb47
42 changed files with 211 additions and 211 deletions

View File

@ -17,21 +17,21 @@ namespace osu.Game.Rulesets.Difficulty
protected readonly Ruleset Ruleset;
protected readonly IBeatmap Beatmap;
protected readonly Score Score;
protected readonly ScoreInfo ScoreInfo;
protected double TimeRate { get; private set; } = 1;
protected PerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, Score score)
protected PerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo scoreInfo)
{
Ruleset = ruleset;
Score = score;
ScoreInfo = scoreInfo;
beatmap.Mods.Value = score.Mods;
beatmap.Mods.Value = scoreInfo.Mods;
Beatmap = beatmap.GetPlayableBeatmap(ruleset.RulesetInfo);
Attributes = ruleset.CreateDifficultyCalculator(beatmap).Calculate(score.Mods);
Attributes = ruleset.CreateDifficultyCalculator(beatmap).Calculate(scoreInfo.Mods);
ApplyMods(score.Mods);
ApplyMods(scoreInfo.Mods);
}
protected virtual void ApplyMods(Mod[] mods)

View File

@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToRulesetContainer<T>
where T : HitObject
{
protected virtual Score CreateReplayScore(Beatmap<T> beatmap) => new Score { Replay = new Replay() };
protected virtual ScoreInfo CreateReplayScore(Beatmap<T> beatmap) => new ScoreInfo { Replay = new Replay() };
public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;

View File

@ -73,7 +73,7 @@ namespace osu.Game.Rulesets
public abstract DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap);
public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, Score score) => null;
public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo scoreInfo) => null;
public virtual HitObjectComposer CreateHitObjectComposer() => null;

View File

@ -158,15 +158,15 @@ namespace osu.Game.Rulesets.Scoring
/// <summary>
/// Retrieve a score populated with data for the current play this processor is responsible for.
/// </summary>
public virtual void PopulateScore(Score score)
public virtual void PopulateScore(ScoreInfo scoreInfo)
{
score.TotalScore = TotalScore;
score.Combo = Combo;
score.MaxCombo = HighestCombo;
score.Accuracy = Accuracy;
score.Rank = Rank;
score.Date = DateTimeOffset.Now;
score.Health = Health;
scoreInfo.TotalScore = TotalScore;
scoreInfo.Combo = Combo;
scoreInfo.MaxCombo = HighestCombo;
scoreInfo.Accuracy = Accuracy;
scoreInfo.Rank = Rank;
scoreInfo.Date = DateTimeOffset.Now;
scoreInfo.Health = Health;
}
}