From 12ff51f686cfd884200dabed1f2ef87dc7f08d91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 17:21:24 +0900
Subject: [PATCH 1/2] Fix key count being incorrectly adjusted by hard/easy
mods
---
.../Screens/Select/Details/AdvancedStats.cs | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index b7f60a8370..56c400e869 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -117,9 +117,20 @@ namespace osu.Game.Screens.Select.Details
mod.ApplyToDifficulty(adjustedDifficulty);
}
- // Account for mania differences
- firstValue.Title = (Beatmap?.Ruleset?.ID ?? 0) == 3 ? "Key Amount" : "Circle Size";
- firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
+ switch (Beatmap?.Ruleset?.ID ?? 0)
+ {
+ case 3:
+ // Account for mania differences locally for now
+ // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes
+ firstValue.Title = "Key Count";
+ firstValue.Value = (baseDifficulty?.CircleSize ?? 0, null);
+ break;
+
+ default:
+ firstValue.Title = "Circle Size";
+ firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
+ break;
+ }
starDifficulty.Value = ((float)(Beatmap?.StarDifficulty ?? 0), null);
From 2498709d0626c388c0a1d4801db7c743585a6618 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 19:46:57 +0900
Subject: [PATCH 2/2] Fix navigation test crashing when raw input is disabled
---
osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
index 471f67b7b6..0908e527a6 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
+using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@@ -65,10 +66,14 @@ namespace osu.Game.Tests.Visual.Menus
game.Dispose();
}
+ // see MouseSettings
+ var frameworkConfig = host.Dependencies.Get<FrameworkConfigManager>();
+ frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).Disabled = false;
+
game = new TestOsuGame(LocalStorage, API);
game.SetHost(host);
- // todo: this can be removed once we can run audio trakcs without a device present
+ // todo: this can be removed once we can run audio tracks without a device present
// see https://github.com/ppy/osu/issues/1302
game.LocalConfig.Set(OsuSetting.IntroSequence, IntroSequence.Circles);