mirror of
https://github.com/ppy/osu.git
synced 2026-06-01 21:00:33 +08:00
fixed naming incconvinence
This commit is contained in:
@@ -266,7 +266,7 @@ namespace osu.Game.Overlays.Mods
|
||||
Ruleset ruleset = gameRuleset.Value.CreateInstance();
|
||||
adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
|
||||
|
||||
haveRateChangedValues = !isDifferentArOd(originalDifficulty, adjustedDifficulty);
|
||||
haveRateChangedValues = isDifferentArOd(originalDifficulty, adjustedDifficulty);
|
||||
|
||||
approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
|
||||
overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
|
||||
@@ -279,13 +279,13 @@ namespace osu.Game.Overlays.Mods
|
||||
|
||||
private bool isDifferentArOd(BeatmapDifficulty? a, BeatmapDifficulty? b)
|
||||
{
|
||||
if (a == null && b == null) return true;
|
||||
if (a == null || b == null) return false;
|
||||
if (a == null && b == null) return false;
|
||||
if (a == null || b == null) return true;
|
||||
|
||||
if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return false;
|
||||
if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return false;
|
||||
if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return true;
|
||||
if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return true;
|
||||
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
private void updateCollapsedState()
|
||||
|
||||
@@ -137,7 +137,7 @@ namespace osu.Game.Screens.Select.Details
|
||||
rate = mod.ApplyToRate(0, rate);
|
||||
adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
|
||||
|
||||
haveRateChangedValues = !isDifferentArOd(originalDifficulty, adjustedDifficulty);
|
||||
haveRateChangedValues = isDifferentArOd(originalDifficulty, adjustedDifficulty);
|
||||
}
|
||||
|
||||
switch (BeatmapInfo?.Ruleset.OnlineID)
|
||||
@@ -204,13 +204,13 @@ namespace osu.Game.Screens.Select.Details
|
||||
|
||||
private bool isDifferentArOd(BeatmapDifficulty a, BeatmapDifficulty b)
|
||||
{
|
||||
if (a == null && b == null) return true;
|
||||
if (a == null || b == null) return false;
|
||||
if (a == null && b == null) return false;
|
||||
if (a == null || b == null) return true;
|
||||
|
||||
if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return false;
|
||||
if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return false;
|
||||
if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return true;
|
||||
if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return true;
|
||||
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
public LocalisableString TooltipText
|
||||
|
||||
Reference in New Issue
Block a user