sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-21 21:47:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move preempt back to CreateDifficultyAttributes

Browse Source
This commit is contained in:
MBmasher 2021-11-21 23:43:09 +11:00
parent afbec94124
commit a57c277a58
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
{ {
private const double difficulty_multiplier = 0.0675; private const double difficulty_multiplier = 0.0675;
private double hitWindowGreat; private double hitWindowGreat;
private double preempt;
public OsuDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap) public OsuDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
: base(ruleset, beatmap) : base(ruleset, beatmap)
@ -60,6 +59,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double starRating = basePerformance > 0.00001 ? Math.Cbrt(1.12) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0; double starRating = basePerformance > 0.00001 ? Math.Cbrt(1.12) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0;
double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
double drainRate = beatmap.Difficulty.DrainRate; double drainRate = beatmap.Difficulty.DrainRate;
int maxCombo = beatmap.HitObjects.Count; int maxCombo = beatmap.HitObjects.Count;
@ -110,14 +110,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate; hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
return new Skill[] return new Skill[]
{ {
new Aim(mods, true), new Aim(mods, true),
new Aim(mods, false), new Aim(mods, false),
new Speed(mods, hitWindowGreat), new Speed(mods, hitWindowGreat),
new Flashlight(mods, preempt) new Flashlight(mods)
}; };
} }

4
osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs
View File

@ -16,11 +16,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
/// </summary> /// </summary>
public class Flashlight : OsuStrainSkill public class Flashlight : OsuStrainSkill
{ {
public Flashlight(Mod[] mods, double preemptTime) public Flashlight(Mod[] mods)
: base(mods) : base(mods)
{ {
this.mods = mods; this.mods = mods;
this.preemptTime = preemptTime;
} }
private double skillMultiplier => 0.09; private double skillMultiplier => 0.09;
@ -30,7 +29,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private readonly Mod[] mods; private readonly Mod[] mods;
private bool hidden; private bool hidden;
private readonly double preemptTime;
private const double max_opacity_bonus = 0.7; private const double max_opacity_bonus = 0.7;
private const double hidden_bonus = 0.5; private const double hidden_bonus = 0.5;