ScoreInfo scoreInfo -> ScoreInfo score

This commit is contained in:
Dean Herbert
2018-11-30 15:18:52 +09:00
parent 271dcded3c
commit 831cd3ed59
25 changed files with 135 additions and 135 deletions

View File

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

View File

@ -73,7 +73,7 @@ namespace osu.Game.Rulesets
public abstract DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap);
public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo scoreInfo) => null;
public virtual PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => 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(ScoreInfo scoreInfo)
public virtual void PopulateScore(ScoreInfo score)
{
scoreInfo.TotalScore = TotalScore;
scoreInfo.Combo = Combo;
scoreInfo.MaxCombo = HighestCombo;
scoreInfo.Accuracy = Accuracy;
scoreInfo.Rank = Rank;
scoreInfo.Date = DateTimeOffset.Now;
scoreInfo.Health = Health;
score.TotalScore = TotalScore;
score.Combo = Combo;
score.MaxCombo = HighestCombo;
score.Accuracy = Accuracy;
score.Rank = Rank;
score.Date = DateTimeOffset.Now;
score.Health = Health;
}
}