Merge pull request #385 from LumpBloom7/dependabot/nuget/ppy.osu.Game…

…-2022.901.0 Bump ppy.osu.Game from 2022.821.0 to 2022.901.0
LumpBloom7 · Aug 31, 2022 · f6bca81 · f6bca81
2 parents 17f4b7a + 6438230
commit f6bca81
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 20 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Configuration/RingColorOption.cs b/osu.Game.Rulesets.Sentakki/Configuration/RingColorOption.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Sentakki.Localisation;
 

diff --git a/osu.Game.Rulesets.Sentakki/Localisation/Mods/SentakkiModMirrorStrings.cs b/osu.Game.Rulesets.Sentakki/Localisation/Mods/SentakkiModMirrorStrings.cs
@@ -17,7 +17,7 @@ public static class SentakkiModMirrorStrings
         /// <summary>
         /// "⇆ Mirror horizontally"
         /// </summary>
-        public static LocalisableString MirrorHorizonally => new TranslatableString(getKey(@"mirror_horizontally"), @"⇆ Mirror horizontally");
+        public static LocalisableString MirrorHorizontally => new TranslatableString(getKey(@"mirror_horizontally"), @"⇆ Mirror horizontally");
         public static LocalisableString MirrorHorizontallyDescription => new TranslatableString(getKey(@"mirror_horizontally_description"), @"Mirror entire playfield across the y-axis");
 
         private static string getKey(string key) => $"{prefix}:{key}";

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModAutoTouch.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModAutoTouch.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Sentakki.Mods
@@ -14,7 +16,7 @@ public class SentakkiModAutoTouch : Mod, IApplicableToDrawableHitObject
         public override string Acronym => "AT";
         public override IconUsage? Icon => OsuIcon.PlayStyleTouch;
         public override ModType Type => ModType.Automation;
-        public override string Description => @"Focus on the laned notes. Touch notes and Slide bodies will be automatically completed.";
+        public override LocalisableString Description => SentakkiModAutoTouchStrings.ModDescription;
         public override double ScoreMultiplier => .5f;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModAutoplay)).ToArray();
 

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs
@@ -3,11 +3,13 @@
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Sentakki.Judgements;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osu.Game.Rulesets.Sentakki.UI;
 using osu.Game.Rulesets.Sentakki.UI.Components;
@@ -18,7 +20,7 @@ namespace osu.Game.Rulesets.Sentakki.Mods
     public class SentakkiModChallenge : Mod, IApplicableToDrawableRuleset<SentakkiHitObject>, IApplicableToHealthProcessor
     {
         public override string Name => "Challenge";
-        public override string Description => "You only get a small margin for errors.";
+        public override LocalisableString Description => SentakkiModChallengeStrings.ModDescription;
         public override string Acronym => "C";
 
         public override IconUsage? Icon => FontAwesome.Solid.HeartBroken;
@@ -48,7 +50,7 @@ public enum Lives
             [Description("300")] ThreeHundred = 300,
         }
 
-        [SettingSource("Number of Lives", "The number of lives you start with.")]
+        [SettingSource(typeof(SentakkiModChallengeStrings), nameof(SentakkiModChallengeStrings.NumberOfLives), nameof(SentakkiModChallengeStrings.NumberOfLivesDescription))]
         public Bindable<Lives> LiveSetting { get; } = new Bindable<Lives>
         {
             Default = Lives.Fifty,

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModClassic.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModClassic.cs
@@ -1,12 +1,14 @@
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Sentakki.Beatmaps;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 
 namespace osu.Game.Rulesets.Sentakki.Mods
 {
     public class SentakkiModClassic : ModClassic, IApplicableToBeatmapConverter
     {
-        public override string Description => "Remove gameplay elements introduced in maimaiDX, for the Finale purists.";
+        public override LocalisableString Description => SentakkiModClassicStrings.ModDescription;
 
         public void ApplyToBeatmapConverter(IBeatmapConverter beatmapConverter)
         {

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModExperimental.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModExperimental.cs
@@ -1,16 +1,18 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Sentakki.Beatmaps;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 
 namespace osu.Game.Rulesets.Sentakki.Mods
 {
     public class SentakkiModExperimental : Mod, IApplicableToBeatmapConverter
     {
         public override string Name => "Experimental";
-        public override string Description => "Some experimental features to be added to future sentakki builds. Autoplay/No-Fail recommended. Replays unsupported.";
+        public override LocalisableString Description => SentakkiModExperimentalStrings.ModDescription;
         public override string Acronym => "Ex";
 
         public override IconUsage? Icon => FontAwesome.Solid.Flask;
@@ -21,21 +23,21 @@ public class SentakkiModExperimental : Mod, IApplicableToBeatmapConverter
 
         public override double ScoreMultiplier => 1.00;
 
-        [SettingSource("Twin notes", "Allow more than one note to share the same times (Requires multitouch)")]
+        [SettingSource(typeof(SentakkiModExperimentalStrings), nameof(SentakkiModExperimentalStrings.TwinNotes), nameof(SentakkiModExperimentalStrings.TwinNotesDescription))]
         public BindableBool EnableTwinNotes { get; } = new BindableBool
         {
             Default = false,
             Value = false
         };
 
-        [SettingSource("Twin slides", "Allow more than one slidebody to share the same time and origin (Requires multitouch)")]
+        [SettingSource(typeof(SentakkiModExperimentalStrings), nameof(SentakkiModExperimentalStrings.TwinSlides), nameof(SentakkiModExperimentalStrings.TwinSlidesDescription))]
         public BindableBool EnableTwinSlides { get; } = new BindableBool
         {
             Default = false,
             Value = false
         };
 
-        [SettingSource("Fan slides", "Allow fan slides to occasionally appear (Requires multitouch)")]
+        [SettingSource(typeof(SentakkiModExperimentalStrings), nameof(SentakkiModExperimentalStrings.FanSlides), nameof(SentakkiModExperimentalStrings.FanSlidesDescription))]
         public BindableBool EnableSlideFans { get; } = new BindableBool
         {
             Default = false,

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModHidden.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModHidden.cs
@@ -6,11 +6,12 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
-using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.OpenGL.Vertices;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables;
 using osu.Game.Rulesets.Sentakki.UI;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Sentakki.Mods
 {
     public class SentakkiModHidden : ModHidden, IApplicableToDrawableRuleset<SentakkiHitObject>
     {
-        public override string Description => "Notes fade out just before you hit them.";
+        public override LocalisableString Description => SentakkiModHiddenStrings.ModDescription;
 
         public override double ScoreMultiplier => 1.06;
 

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModMirror.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModMirror.cs
@@ -1,9 +1,11 @@
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osuTK;
 
@@ -12,21 +14,21 @@ namespace osu.Game.Rulesets.Sentakki.Mods
     public class SentakkiModMirror : Mod, IApplicableAfterBeatmapConversion
     {
         public override string Name => "Mirror";
-        public override string Description => "Flip the playfield horizontally, vertically, or both!";
+        public override LocalisableString Description => SentakkiModMirrorStrings.ModDescription;
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
 
         public override bool RequiresConfiguration => true;
 
-        [SettingSource("⇅ Mirror vertically", "Mirror entire playfield across the x-axis")]
+        [SettingSource(typeof(SentakkiModMirrorStrings), nameof(SentakkiModMirrorStrings.MirrorVertically), nameof(SentakkiModMirrorStrings.MirrorVerticallyDescription))]
         public BindableBool VerticalMirrored { get; } = new BindableBool
         {
             Default = false,
             Value = false
         };
 
-        [SettingSource("⇆ Mirror horizontally", "Mirror entire playfield across the y-axis")]
+        [SettingSource(typeof(SentakkiModMirrorStrings), nameof(SentakkiModMirrorStrings.MirrorHorizontally), nameof(SentakkiModMirrorStrings.MirrorHorizontallyDescription))]
         public BindableBool HorizontalMirrored { get; } = new BindableBool
         {
             Default = false,

diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModSpin.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModSpin.cs
@@ -1,7 +1,9 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Sentakki.Localisation.Mods;
 using osu.Game.Rulesets.Sentakki.UI;
 using osu.Game.Rulesets.UI;
 
@@ -10,15 +12,15 @@ namespace osu.Game.Rulesets.Sentakki.Mods
     public class SentakkiModSpin : Mod, IUpdatableByPlayfield
     {
         public override string Name => "Spin";
-        public override string Description => "Replicate the true washing machine experience.";
+        public override LocalisableString Description => SentakkiModSpinStrings.ModDescription;
         public override string Acronym => "S";
 
         public override IconUsage? Icon => FontAwesome.Solid.RedoAlt;
         public override ModType Type => ModType.Fun;
 
         public override double ScoreMultiplier => 1.00;
 
-        [SettingSource("Revolution Duration", "The duration in seconds to complete a revolution")]
+        [SettingSource(typeof(SentakkiModSpinStrings), nameof(SentakkiModSpinStrings.RevolutionDuration), nameof(SentakkiModSpinStrings.RevolutionDurationDescription))]
         public BindableNumber<int> RevolutionDuration { get; } = new BindableNumber<int>
         {
             MinValue = 3,

diff --git a/osu.Game.Rulesets.Sentakki/SentakkiRuleset.cs b/osu.Game.Rulesets.Sentakki/SentakkiRuleset.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -181,7 +182,7 @@ protected override IEnumerable<HitResult> GetValidHitResults()
             };
         }
 
-        public override string GetDisplayNameForHitResult(HitResult result) => result.GetDisplayNameForSentakkiResult();
+        public override LocalisableString GetDisplayNameForHitResult(HitResult result) => result.GetDisplayNameForSentakkiResult();
 
         public class SentakkiIcon : CompositeDrawable
         {

diff --git a/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs b/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs
@@ -5,6 +5,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -41,7 +42,7 @@ public class SentakkiResumeOverlay : ResumeOverlay
         private static int currentSupporterIndex;
 
         // We don't want the default message
-        protected override string Message => "";
+        protected override LocalisableString Message => "";
 
         private OsuSpriteText messageText;
 

diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
@@ -9,7 +9,7 @@
         <AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ppy.osu.Game" Version="2022.821.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2022.901.0"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->