mirror of https://github.com/ppy/osu
Apply various inspections
This commit is contained in:
parent
4df1eb1b37
commit
a04f9aaef7
|
@ -238,12 +238,12 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
|
||||||
{
|
{
|
||||||
BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
|
BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
|
||||||
|
|
||||||
double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
|
double preempt = adjustedDifficulty.ApproachRate < 6 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
|
||||||
|
|
||||||
preempt /= rate;
|
preempt /= rate;
|
||||||
adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
|
adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
|
||||||
|
|
||||||
return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
|
return adjustedDifficulty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -334,9 +334,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
|
||||||
{
|
{
|
||||||
BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
|
BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
|
||||||
|
|
||||||
double preempt = adjustedDifficulty.ApproachRate < 5 ?
|
double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
|
||||||
(1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
|
|
||||||
(1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
|
|
||||||
preempt /= rate;
|
preempt /= rate;
|
||||||
adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
|
adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
|
||||||
|
|
||||||
|
@ -344,7 +342,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
|
||||||
hitwindow /= rate;
|
hitwindow /= rate;
|
||||||
adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
|
adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
|
||||||
|
|
||||||
return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
|
return adjustedDifficulty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -273,7 +273,7 @@ public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyIn
|
||||||
hitwindow /= rate;
|
hitwindow /= rate;
|
||||||
adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
|
adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
|
||||||
|
|
||||||
return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
|
return adjustedDifficulty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue