Merge pull request #252 from taulazer/dependabot/nuget/ppy.osu.Game-2…

…022.127.0 Bump ppy.osu.Game from 2022.108.0 to 2022.127.0
taulazer · Jan 27, 2022 · ae1ab0d · ae1ab0d
2 parents 5d346f2 + 3ec1d71
commit ae1ab0d
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 30 deletions.
diff --git a/osu.Game.Rulesets.Tau.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Tau.Tests/TestSceneGameplayCursor.cs
@@ -26,7 +26,7 @@ public TestSceneGameplayCursor()
                 Origin = Anchor.Centre,
             });
 
-            Add(cursor = new TauCursor(CreateBeatmap(new TauRuleset().RulesetInfo).BeatmapInfo.BaseDifficulty));
+            Add(cursor = new TauCursor(CreateBeatmap(new TauRuleset().RulesetInfo).BeatmapInfo.Difficulty));
 
             AddStep("Reset cursor", () => { InputManager.MoveMouseTo(cursor, new Vector2(0, -50)); });
             AddStep("Hide paddle", () => { cursor.Hide(); });

diff --git a/osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs b/osu.Game.Rulesets.Tau.Tests/TestScenePaddleDistribution.cs
@@ -27,7 +27,7 @@ public void TestManyDistributionEvents()
         public void TestAroundCentre()
         {
             var beatmap = new TestBeatmap(new TauRuleset().RulesetInfo);
-            var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
+            var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.Difficulty.CircleSize, 75, 25, 10);
             createTest(Enumerable.Range(0, (int)angleRange).Select(i => new HitEvent(i / 50f, HitResult.Perfect, new Beat(), new Beat(), new Vector2((i - (angleRange / 2)), 0))).ToList());
         }
 
@@ -64,7 +64,7 @@ public static List<HitEvent> CreateDistributedHitEvents()
         {
             var hitEvents = new List<HitEvent>();
             var beatmap = new TestBeatmap(new TauRuleset().RulesetInfo);
-            var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
+            var angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.Difficulty.CircleSize, 75, 25, 10);
 
             for (int i = 0; i < 100; i++)
             {

diff --git a/osu.Game.Rulesets.Tau.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Tau.Tests/TestSceneResumeOverlay.cs
@@ -22,7 +22,7 @@ public TestSceneResumeOverlay()
                 Children = new Drawable[]
                 {
                     cursor = new CursorContainer(),
-                    resume = new TauResumeOverlay(CreateBeatmap(new TauRuleset().RulesetInfo).BeatmapInfo.BaseDifficulty)
+                    resume = new TauResumeOverlay(CreateBeatmap(new TauRuleset().RulesetInfo).BeatmapInfo.Difficulty)
                     {
                         GameplayCursor = cursor
                     }

diff --git a/osu.Game.Rulesets.Tau.Tests/TestSceneTauPlayfield.cs b/osu.Game.Rulesets.Tau.Tests/TestSceneTauPlayfield.cs
@@ -21,7 +21,7 @@ public TestSceneTauPlayfield()
                 Beatmap.Value.Track.Start();
             });
 
-            AddStep("Load playfield", () => SetContents(_ => new TauPlayfield(Beatmap.Value.BeatmapInfo.BaseDifficulty)
+            AddStep("Load playfield", () => SetContents(_ => new TauPlayfield(Beatmap.Value.BeatmapInfo.Difficulty)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

diff --git a/osu.Game.Rulesets.Tau.Tests/VisualTestRunner.cs b/osu.Game.Rulesets.Tau.Tests/VisualTestRunner.cs
@@ -10,7 +10,7 @@ public static class VisualTestRunner
         [STAThread]
         public static int Main(string[] args)
         {
-            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions { BindIPC = true }))
             {
                 host.Run(new OsuTestBrowser());
 

diff --git a/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs b/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs
@@ -39,7 +39,7 @@ protected override IEnumerable<TauHitObject> ConvertHitObject(HitObject original
                     if (!CanConvertToSliders)
                         goto default;
 
-                    if (pathData.Duration < IBeatmapDifficultyInfo.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / SliderDivisionLevel)
+                    if (pathData.Duration < IBeatmapDifficultyInfo.DifficultyRange(Beatmap.BeatmapInfo.Difficulty.ApproachRate, 1800, 1200, 450) / SliderDivisionLevel)
                         goto default;
 
                     var nodes = new List<SliderNode>();
@@ -83,7 +83,7 @@ protected override IEnumerable<TauHitObject> ConvertHitObject(HitObject original
                         goto default;
 
                     // Spinners should only be converted to sliders if duration is sufficiently long
-                    if (durationData.Duration < IBeatmapDifficultyInfo.DifficultyRange(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / 2)
+                    if (durationData.Duration < IBeatmapDifficultyInfo.DifficultyRange(Beatmap.BeatmapInfo.Difficulty.ApproachRate, 1800, 1200, 450) / 2)
                         goto default;
 
                     var sliderNodes = new List<SliderNode>();
@@ -143,7 +143,7 @@ private IEnumerable<SliderNode> createNodeFromTicks(HitObject original)
             if (isRepeatSpam)
                 yield break;
 
-            var difficulty = Beatmap.BeatmapInfo.BaseDifficulty;
+            var difficulty = Beatmap.BeatmapInfo.Difficulty;
 
             var controlPointInfo = Beatmap.ControlPointInfo;
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(original.StartTime);

diff --git a/osu.Game.Rulesets.Tau/Mods/TauModFlashlight.cs b/osu.Game.Rulesets.Tau/Mods/TauModFlashlight.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Tau.Objects;
 using osuTK;
@@ -14,17 +15,33 @@ public class TauModFlashlight : ModFlashlight<TauHitObject>
     {
         public override double ScoreMultiplier => 1.12;
 
-        private const float default_flashlight_size = 180;
+        public override float DefaultFlashlightSize => 180;
 
-        private TauFlashlight flashlight;
+        [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
+        public override BindableNumber<float> SizeMultiplier { get; } = new BindableNumber<float>
+        {
+            MinValue = 0.5f,
+            MaxValue = 1.5f,
+            Default = 1f,
+            Value = 1f,
+            Precision = 0.1f
+        };
+
+        [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
+        public override BindableBool ComboBasedSize { get; } = new BindableBool
+        {
+            Default = true,
+            Value = true
+        };
 
-        public override Flashlight CreateFlashlight() => flashlight = new TauFlashlight();
+        protected override Flashlight CreateFlashlight() => new TauFlashlight(this);
 
         private class TauFlashlight : Flashlight, IRequireHighFrequencyMousePosition
         {
-            public TauFlashlight()
+
+            public TauFlashlight(TauModFlashlight modFlashlight) : base(modFlashlight)
             {
-                FlashlightSize = new Vector2(0, getSizeFor(0));
+                FlashlightSize = new Vector2(0, GetSizeFor(0));
             }
 
             protected override bool OnMouseMove(MouseMoveEvent e)
@@ -40,20 +57,9 @@ protected override bool OnMouseMove(MouseMoveEvent e)
                 return base.OnMouseMove(e);
             }
 
-            private float getSizeFor(int combo)
-            {
-                if (combo > 200)
-                    return default_flashlight_size * 0.8f;
-
-                if (combo > 100)
-                    return default_flashlight_size * 0.9f;
-
-                return default_flashlight_size;
-            }
-
             protected override void OnComboChange(ValueChangedEvent<int> e)
             {
-                this.TransformTo(nameof(FlashlightSize), new Vector2(0, getSizeFor(e.NewValue)), FLASHLIGHT_FADE_DURATION);
+                this.TransformTo(nameof(FlashlightSize), new Vector2(0, GetSizeFor(e.NewValue)), FLASHLIGHT_FADE_DURATION);
             }
 
             protected override string FragmentShader => "CircularFlashlight";

diff --git a/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs b/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs
@@ -29,7 +29,7 @@ public PaddleDistributionGraph(IReadOnlyList<HitEvent> hitEvents, IBeatmap beatm
         {
             this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.HitObject is Beat && e.Result.IsHit()).ToList();
 
-            angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.CircleSize, 75, 25, 10);
+            angleRange = (float)IBeatmapDifficultyInfo.DifficultyRange(beatmap.BeatmapInfo.Difficulty.CircleSize, 75, 25, 10);
         }
 
         [BackgroundDependencyLoader]

diff --git a/osu.Game.Rulesets.Tau/UI/DrawableTauRuleset.cs b/osu.Game.Rulesets.Tau/UI/DrawableTauRuleset.cs
@@ -22,9 +22,9 @@ public DrawableTauRuleset(TauRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mo
         {
         }
 
-        protected override ResumeOverlay CreateResumeOverlay() => new TauResumeOverlay(Beatmap.BeatmapInfo.BaseDifficulty);
+        protected override ResumeOverlay CreateResumeOverlay() => new TauResumeOverlay(Beatmap.BeatmapInfo.Difficulty);
 
-        protected override Playfield CreatePlayfield() => new TauPlayfield(Beatmap.BeatmapInfo.BaseDifficulty);
+        protected override Playfield CreatePlayfield() => new TauPlayfield(Beatmap.BeatmapInfo.Difficulty);
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new TauFramedReplayInputHandler(replay);
 

diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
@@ -14,7 +14,7 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2022.108.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.127.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />