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

Remove catch tiny droplet portion

This commit is contained in:
Dan Balasescu 2023-05-22 12:02:44 +09:00
parent 25d72d370e
commit c291d6fc82
1 changed files with 2 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
View File

@ -2,8 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Scoring;
@ -14,13 +12,6 @@ public partial class CatchScoreProcessor : ScoreProcessor
private const int combo_cap = 200;
private const double combo_base = 4;
private double tinyDropletScale;
private int maximumTinyDroplets;
private int hitTinyDroplets;
private int maximumBasicJudgements;
private int currentBasicJudgements;
public CatchScoreProcessor()
: base(new CatchRuleset())
{
@ -28,73 +19,12 @@ public CatchScoreProcessor()
protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
{
double fruitHitsRatio = maximumTinyDroplets == 0 ? 0 : (double)hitTinyDroplets / maximumTinyDroplets;
const int tiny_droplets_portion = 400000;
return ((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * comboProgress
+ tiny_droplets_portion * tinyDropletScale * fruitHitsRatio
return 600000 * comboProgress
+ 400000 * Accuracy.Value * accuracyProgress
+ bonusPortion;
}
protected override double GetComboScoreChange(JudgementResult result)
=> Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
protected override void ApplyScoreChange(JudgementResult result)
{
base.ApplyScoreChange(result);
if (result.HitObject is TinyDroplet)
hitTinyDroplets++;
if (result.Type.IsBasic())
currentBasicJudgements++;
}
protected override void RemoveScoreChange(JudgementResult result)
{
base.RemoveScoreChange(result);
if (result.HitObject is TinyDroplet)
hitTinyDroplets--;
if (result.Type.IsBasic())
currentBasicJudgements--;
}
protected override void Reset(bool storeResults)
{
base.Reset(storeResults);
if (storeResults)
{
maximumTinyDroplets = hitTinyDroplets;
maximumBasicJudgements = currentBasicJudgements;
if (maximumTinyDroplets + maximumBasicJudgements == 0)
tinyDropletScale = 0;
else
tinyDropletScale = (double)maximumTinyDroplets / (maximumTinyDroplets + maximumBasicJudgements);
}
hitTinyDroplets = 0;
currentBasicJudgements = 0;
}
public override void WriteScoreProcessorStatistics(IDictionary<string, object> statistics)
{
base.WriteScoreProcessorStatistics(statistics);
statistics.Add(nameof(hitTinyDroplets), hitTinyDroplets);
statistics.Add(nameof(currentBasicJudgements), currentBasicJudgements);
}
public override void ReadScoreProcessorStatistics(IReadOnlyDictionary<string, object> statistics)
{
base.ReadScoreProcessorStatistics(statistics);
hitTinyDroplets = (int)statistics.GetValueOrDefault(nameof(hitTinyDroplets), 0);
currentBasicJudgements = (int)statistics.GetValueOrDefault(nameof(currentBasicJudgements), 0);
}
}
}