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

Rename UpdateJudgement -> OnNewJugement + rename judgement parameter.

This commit is contained in:
smoogipooo 2017-03-24 11:32:48 +09:00
parent 59ba497952
commit 2a6da0751d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Modes.Catch/Scoring/CatchScoreProcessor.cs
View File

@ -19,7 +19,7 @@ public CatchScoreProcessor(HitRenderer<CatchBaseHit, CatchJudgement> hitRenderer
{
}
protected override void UpdateCalculations(CatchJudgement newJudgement)
protected override void OnNewJugement(CatchJudgement judgement)
{
}
}

2
osu.Game.Modes.Mania/Scoring/ManiaScoreProcessor.cs
View File

@ -19,7 +19,7 @@ public ManiaScoreProcessor(HitRenderer<ManiaBaseHit, ManiaJudgement> hitRenderer
{
}
protected override void UpdateCalculations(ManiaJudgement newJudgement)
protected override void OnNewJugement(ManiaJudgement judgement)
{
}
}

2
osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
View File

@ -28,7 +28,7 @@ protected override void Reset()
Accuracy.Value = 1;
}
protected override void UpdateCalculations(OsuJudgement judgement)
protected override void OnNewJugement(OsuJudgement judgement)
{
if (judgement != null)
{

14
osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -179,21 +179,21 @@ protected override void ComputeTargets(Beatmap<TaikoHitObject> beatmap)
maxComboPortion = comboPortion;
}
protected override void UpdateCalculations(TaikoJudgement newJudgement)
protected override void OnNewJugement(TaikoJudgement judgement)
{
bool isTick = newJudgement is TaikoDrumRollTickJudgement;
bool isTick = judgement is TaikoDrumRollTickJudgement;
// Don't consider ticks as a type of hit that counts towards map completion
if (!isTick)
totalHits++;
// Apply score changes
if (newJudgement.Result == HitResult.Hit)
if (judgement.Result == HitResult.Hit)
{
double baseValue = newJudgement.ResultValueForScore;
double baseValue = judgement.ResultValueForScore;
// Add bonus points for hitting an accented hit object with the second key
if (newJudgement.SecondHit)
if (judgement.SecondHit)
baseValue += baseValue * accentedHitScale;
// Add score to portions
@ -212,7 +212,7 @@ protected override void UpdateCalculations(TaikoJudgement newJudgement)
}
// Apply HP changes
switch (newJudgement.Result)
switch (judgement.Result)
{
case HitResult.Miss:
// Missing ticks shouldn't drop HP
@ -220,7 +220,7 @@ protected override void UpdateCalculations(TaikoJudgement newJudgement)
Health.Value += hpIncreaseMiss;
break;
case HitResult.Hit:
switch (newJudgement.TaikoResult)
switch (judgement.TaikoResult)
{
case TaikoHitResult.Good:
Health.Value += hpIncreaseGood;

6
osu.Game/Modes/Scoring/ScoreProcessor.cs
View File

@ -143,7 +143,7 @@ protected void AddJudgement(TJudgement judgement)
{
Judgements.Add(judgement);
UpdateCalculations(judgement);
OnNewJugement(judgement);
judgement.ComboAtHit = (ulong)Combo.Value;
@ -158,7 +158,7 @@ protected override void Reset()
/// <summary>
/// Update any values that potentially need post-processing on a judgement change.
/// </summary>
/// <param name="newJudgement">A new Judgement that triggered this calculation. May be null.</param>
protected abstract void UpdateCalculations(TJudgement newJudgement);
/// <param name="judgement">The judgement that triggered this calculation.</param>
protected abstract void OnNewJugement(TJudgement judgement);
}
}