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

…-2022.126.0 Bump ppy.osu.Game from 2022.118.0 to 2022.127.0
LumpBloom7 · Jan 27, 2022 · 7029cd2 · 7029cd2
2 parents 5efae64 + d9b6ce2
commit 7029cd2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs b/osu.Game.Rulesets.Sentakki.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());
                 return 0;

diff --git a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverter.cs b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverter.cs
@@ -43,7 +43,7 @@ protected override Beatmap<SentakkiHitObject> ConvertBeatmap(IBeatmap original,
             // But we initialize to defaults so HR can adjust HitWindows in a controlled manner
             // We clone beforehand to avoid altering the original (it really should be readonly :P)
             convertedBeatmap.BeatmapInfo = convertedBeatmap.BeatmapInfo.Clone();
-            convertedBeatmap.BeatmapInfo.BaseDifficulty = new BeatmapDifficulty();
+            convertedBeatmap.BeatmapInfo.Difficulty = new BeatmapDifficulty();
 
             return convertedBeatmap;
         }

diff --git a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiPatternGenerator.cs b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiPatternGenerator.cs
@@ -25,7 +25,7 @@ public class SentakkiPatternGenerator
         public SentakkiPatternGenerator(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
-            var difficulty = beatmap.BeatmapInfo.BaseDifficulty;
+            var difficulty = beatmap.BeatmapInfo.Difficulty;
             int seed = ((int)MathF.Round(difficulty.DrainRate + difficulty.CircleSize) * 20) + (int)(difficulty.OverallDifficulty * 41.2) + (int)MathF.Round(difficulty.ApproachRate);
             rng = new Random(seed);
         }
@@ -195,7 +195,7 @@ private IEnumerable<SentakkiHitObject> createTapsFromTicks(HitObject original)
             if (isRepeatSpam)
                 yield break;
 
-            var difficulty = beatmap.BeatmapInfo.BaseDifficulty;
+            var difficulty = beatmap.BeatmapInfo.Difficulty;
 
             var controlPointInfo = (LegacyControlPointInfo)beatmap.ControlPointInfo;
 

diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs b/osu.Game.Rulesets.Sentakki/UI/Components/LiveCounter.cs
@@ -74,7 +74,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint,
             float panicDurationMultiplier = 1 * MathF.Pow(0.75f, panicLevel);
             float beatMagnitude = 0.1f + (0.05f * panicLevel);
 
-            if (beatIndex % (int)((int)timingPoint.TimeSignature * Math.Max(panicDurationMultiplier, 0.5f)) == 0)
+            if (beatIndex % (int)(timingPoint.TimeSignature.Numerator * Math.Max(panicDurationMultiplier, 0.5f)) == 0)
                 this.ScaleTo(1 + beatMagnitude, 200 * panicDurationMultiplier)
                     .Then().ScaleTo(1, 120 * panicDurationMultiplier)
                     .Then().ScaleTo(1 + beatMagnitude, 160 * panicDurationMultiplier)

diff --git a/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs b/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs
@@ -127,7 +127,7 @@ protected override void PopIn()
             messageText.Text = "Get ready!";
 
             var currentTimingPoint = beatmap.Value.Beatmap.ControlPointInfo.TimingPointAt(beatmap.Value.Track.CurrentTime);
-            barLength = (int)currentTimingPoint.TimeSignature;
+            barLength = currentTimingPoint.TimeSignature.Numerator;
             beatlength = currentTimingPoint.BeatLength;
 
             // Reset the countdown, plus a second for preparation

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.118.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2022.127.0"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->