Merge pull request #11424 from peppy/fix-transform-mutation-mod-selection

osu.Android.props

@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.106.0" />
   </ItemGroup>
 </Project>

osu.Game/Overlays/Mods/ModButton.cs

@@ -52,9 +52,10 @@ namespace osu.Game.Overlays.Mods
             if (newIndex == selectedIndex) return false;
 
             int direction = newIndex < selectedIndex ? -1 : 1;
+
             bool beforeSelected = Selected;
 
-            Mod modBefore = SelectedMod ?? Mods[0];
+            Mod previousSelection = SelectedMod ?? Mods[0];
 
             if (newIndex >= Mods.Length)
                 newIndex = -1;
@@ -65,40 +66,45 @@ namespace osu.Game.Overlays.Mods
                 return false;
 
             selectedIndex = newIndex;
-            Mod modAfter = SelectedMod ?? Mods[0];
 
-            if (beforeSelected != Selected)
+            Mod newSelection = SelectedMod ?? Mods[0];
+
+            Schedule(() =>
             {
-                iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
+                if (beforeSelected != Selected)
-                iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
-            }
-
-            if (modBefore != modAfter)
-            {
-                const float rotate_angle = 16;
-
-                foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
-                backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
-
-                backgroundIcon.Mod = modAfter;
-
-                using (BeginDelayedSequence(mod_switch_duration, true))
                 {
-                    foregroundIcon
+                    iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
-                        .RotateTo(-rotate_angle * direction)
+                    iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
-                        .RotateTo(0f, mod_switch_duration, mod_switch_easing);
-
-                    backgroundIcon
-                        .RotateTo(rotate_angle * direction)
-                        .RotateTo(0f, mod_switch_duration, mod_switch_easing);
-
-                    Schedule(() => displayMod(modAfter));
                 }
-            }
 
-            foregroundIcon.Selected.Value = Selected;
+                if (previousSelection != newSelection)
+                {
+                    const float rotate_angle = 16;
+
+                    foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
+                    backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
+
+                    backgroundIcon.Mod = newSelection;
+
+                    using (BeginDelayedSequence(mod_switch_duration, true))
+                    {
+                        foregroundIcon
+                            .RotateTo(-rotate_angle * direction)
+                            .RotateTo(0f, mod_switch_duration, mod_switch_easing);
+
+                        backgroundIcon
+                            .RotateTo(rotate_angle * direction)
+                            .RotateTo(0f, mod_switch_duration, mod_switch_easing);
+
+                        Schedule(() => displayMod(newSelection));
+                    }
+                }
+
+                foregroundIcon.Selected.Value = Selected;
+            });
 
             SelectionChanged?.Invoke(SelectedMod);
+
             return true;
         }
 

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -249,7 +249,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Deselect All",
-                                                Action = DeselectAll,
+                                                Action = deselectAll,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -318,7 +318,7 @@ namespace osu.Game.Overlays.Mods
             sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
-        public void DeselectAll()
+        private void deselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
                 section.DeselectAll();
@@ -331,7 +331,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(Type[] modTypes, bool immediate = false)
+        private void deselectTypes(Type[] modTypes, bool immediate = false)
         {
             if (modTypes.Length == 0) return;
 
@@ -438,7 +438,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                DeselectTypes(selectedMod.IncompatibleMods, true);
+                deselectTypes(selectedMod.IncompatibleMods, true);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -9,6 +9,7 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
@@ -42,6 +43,8 @@ namespace osu.Game.Screens.Select
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
+        private ModAutoplay getAutoplayMod() => Ruleset.Value.CreateInstance().GetAutoplayMod();
+
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
@@ -50,10 +53,10 @@ namespace osu.Game.Screens.Select
 
             if (removeAutoModOnResume)
             {
-                var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod()?.GetType();
+                var autoType = getAutoplayMod()?.GetType();
 
                 if (autoType != null)
-                    ModSelect.DeselectTypes(new[] { autoType }, true);
+                    Mods.Value = Mods.Value.Where(m => m.GetType() != autoType).ToArray();
 
                 removeAutoModOnResume = false;
             }
@@ -81,12 +84,9 @@ namespace osu.Game.Screens.Select
             // Ctrl+Enter should start map with autoplay enabled.
             if (GetContainingInputManager().CurrentState?.Keyboard.ControlPressed == true)
             {
-                var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
+                var autoplayMod = getAutoplayMod();
-                var autoType = auto?.GetType();
 
-                var mods = Mods.Value;
+                if (autoplayMod == null)
-
-                if (autoType == null)
                 {
                     notifications?.Post(new SimpleNotification
                     {
@@ -95,9 +95,11 @@ namespace osu.Game.Screens.Select
                     return false;
                 }
 
-                if (mods.All(m => m.GetType() != autoType))
+                var mods = Mods.Value;
+
+                if (mods.All(m => m.GetType() != autoplayMod.GetType()))
                 {
-                    Mods.Value = mods.Append(auto).ToArray();
+                    Mods.Value = mods.Append(autoplayMod).ToArray();
                     removeAutoModOnResume = true;
                 }
             }

osu.Game/osu.Game.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />

osu.iOS.props

@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.106.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />