Merge pull request #13322 from Pasi4K5/seed-for-all-random-mods

Add seed option for all random mods

osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Utils;
@@ -17,8 +18,11 @@ namespace osu.Game.Rulesets.Mania.Mods
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
+            Seed.Value ??= RNG.Next();
+            var rng = new Random((int)Seed.Value);
+
             var availableColumns = ((ManiaBeatmap)beatmap).TotalColumns;
-            var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(item => RNG.Next()).ToList();
+            var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(item => rng.Next()).ToList();
 
             beatmap.HitObjects.OfType<ManiaHitObject>().ForEach(h => h.Column = shuffledColumns[h.Column]);
         }

osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs

@@ -3,15 +3,9 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -42,13 +36,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private Random rng;
 
-        [SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(OsuModRandomSettingsControl))]
-        public Bindable<int?> Seed { get; } = new Bindable<int?>
-        {
-            Default = null,
-            Value = null
-        };
-
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             if (!(beatmap is OsuBeatmap osuBeatmap))
@@ -289,82 +276,5 @@ namespace osu.Game.Rulesets.Osu.Mods
                 AngleRad = 0;
             }
         }
-
-        public class OsuModRandomSettingsControl : SettingsItem<int?>
-        {
-            protected override Drawable CreateControl() => new SeedControl
-            {
-                RelativeSizeAxes = Axes.X,
-                Margin = new MarginPadding { Top = 5 }
-            };
-
-            private sealed class SeedControl : CompositeDrawable, IHasCurrentValue<int?>
-            {
-                private readonly BindableWithCurrent<int?> current = new BindableWithCurrent<int?>();
-
-                public Bindable<int?> Current
-                {
-                    get => current;
-                    set
-                    {
-                        current.Current = value;
-                        seedNumberBox.Text = value.Value.ToString();
-                    }
-                }
-
-                private readonly OsuNumberBox seedNumberBox;
-
-                public SeedControl()
-                {
-                    AutoSizeAxes = Axes.Y;
-
-                    InternalChildren = new[]
-                    {
-                        new GridContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            ColumnDimensions = new[]
-                            {
-                                new Dimension(),
-                                new Dimension(GridSizeMode.Absolute, 2),
-                                new Dimension(GridSizeMode.Relative, 0.25f)
-                            },
-                            RowDimensions = new[]
-                            {
-                                new Dimension(GridSizeMode.AutoSize)
-                            },
-                            Content = new[]
-                            {
-                                new Drawable[]
-                                {
-                                    seedNumberBox = new OsuNumberBox
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        CommitOnFocusLost = true
-                                    }
-                                }
-                            }
-                        }
-                    };
-
-                    seedNumberBox.Current.BindValueChanged(e =>
-                    {
-                        int? value = null;
-
-                        if (int.TryParse(e.NewValue, out var intVal))
-                            value = intVal;
-
-                        current.Value = value;
-                    });
-                }
-
-                protected override void Update()
-                {
-                    if (current.Value == null)
-                        seedNumberBox.Text = current.Current.Value.ToString();
-                }
-            }
-        }
     }
 }

osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs

@@ -20,10 +20,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             var taikoBeatmap = (TaikoBeatmap)beatmap;
 
+            Seed.Value ??= RNG.Next();
+            var rng = new Random((int)Seed.Value);
+
             foreach (var obj in taikoBeatmap.HitObjects)
             {
                 if (obj is Hit hit)
-                    hit.Type = RNG.Next(2) == 0 ? HitType.Centre : HitType.Rim;
+                    hit.Type = rng.Next(2) == 0 ? HitType.Centre : HitType.Rim;
             }
         }
     }

osu.Game/Rulesets/Mods/ModRandom.cs

@@ -1,8 +1,15 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -13,5 +20,89 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.Conversion;
         public override IconUsage? Icon => OsuIcon.Dice;
         public override double ScoreMultiplier => 1;
+
+        [SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(ModRandomSettingsControl))]
+        public Bindable<int?> Seed { get; } = new Bindable<int?>
+        {
+            Default = null,
+            Value = null
+        };
+
+        private class ModRandomSettingsControl : SettingsItem<int?>
+        {
+            protected override Drawable CreateControl() => new SeedControl
+            {
+                RelativeSizeAxes = Axes.X,
+                Margin = new MarginPadding { Top = 5 }
+            };
+
+            private sealed class SeedControl : CompositeDrawable, IHasCurrentValue<int?>
+            {
+                private readonly BindableWithCurrent<int?> current = new BindableWithCurrent<int?>();
+
+                public Bindable<int?> Current
+                {
+                    get => current;
+                    set
+                    {
+                        current.Current = value;
+                        seedNumberBox.Text = value.Value.ToString();
+                    }
+                }
+
+                private readonly OsuNumberBox seedNumberBox;
+
+                public SeedControl()
+                {
+                    AutoSizeAxes = Axes.Y;
+
+                    InternalChildren = new[]
+                    {
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(),
+                                new Dimension(GridSizeMode.Absolute, 2),
+                                new Dimension(GridSizeMode.Relative, 0.25f)
+                            },
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize)
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    seedNumberBox = new OsuNumberBox
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        CommitOnFocusLost = true
+                                    }
+                                }
+                            }
+                        }
+                    };
+
+                    seedNumberBox.Current.BindValueChanged(e =>
+                    {
+                        int? value = null;
+
+                        if (int.TryParse(e.NewValue, out var intVal))
+                            value = intVal;
+
+                        current.Value = value;
+                    });
+                }
+
+                protected override void Update()
+                {
+                    if (current.Value == null)
+                        seedNumberBox.Text = current.Current.Value.ToString();
+                }
+            }
+        }
     }
 }