h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:18:22 +08:00
Code Issues Releases Wiki Activity

change the order of attributes

Browse Source 
+ simplifying the bug fix
This commit is contained in:
Givikap120 2023-12-14 14:31:19 +02:00
parent 8698835db2
commit c2373bb37b
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
View File

@ -89,8 +89,8 @@ namespace osu.Game.Overlays.Mods
if (originalDifficulty == null || adjustedDifficulty == null)
return;
attemptAdd("AR", bd => bd.ApproachRate);
attemptAdd("OD", bd => bd.OverallDifficulty);
attemptAdd("AR", bd => bd.ApproachRate);
attemptAdd("CS", bd => bd.CircleSize);
attemptAdd("HP", bd => bd.DrainRate);

2
osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
View File

@ -95,8 +95,8 @@ namespace osu.Game.Overlays.Mods
{
circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
});
}

13
osu.Game/Screens/Select/Details/AdvancedStats.cs
View File

@ -124,15 +124,13 @@ namespace osu.Game.Screens.Select.Details
{
IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
BeatmapDifficulty originalDifficulty = null;
BeatmapDifficulty adjustedDifficulty = null;
IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
if (baseDifficulty != null &&
(mods.Value.Any(m => m is IApplicableToDifficulty) || mods.Value.Any(m => m is IApplicableToRate)))
if (baseDifficulty != null)
{
originalDifficulty = new BeatmapDifficulty(baseDifficulty);
BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(baseDifficulty);
foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
mod.ApplyToDifficulty(originalDifficulty);
@ -151,13 +149,6 @@ namespace osu.Game.Screens.Select.Details
}
}
// update tooltip anyway
else if (baseDifficulty != null)
{
originalDifficulty = new BeatmapDifficulty(baseDifficulty);
rateAdjustTooltip.UpdateAttributes(originalDifficulty, originalDifficulty);
}
switch (ruleset.OnlineID)
{
case 3: