Merge pull request #325 from Beamographic/dependabot/nuget/ppy.osu.Ga…

…me-2023.1008.0 Bump ppy.osu.Game from 2023.717.0 to 2023.1008.0
Beamographic · Oct 8, 2023 · 48669d1 · 48669d1
2 parents efdbde3 + 81e9d60
commit 48669d1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -198,7 +198,7 @@ dotnet_diagnostic.IDE0068.severity = none
 dotnet_diagnostic.IDE0069.severity = none
 
 #Redundant usings
-dotnet_diagnostic.IDE0005.severity = error
+dotnet_diagnostic.IDE0005.severity = silent
 
 # Banned APIs
 dotnet_diagnostic.RS0030.severity = error

diff --git a/osu.Game.Rulesets.Rush/Judgements/RushJudgement.cs b/osu.Game.Rulesets.Rush/Judgements/RushJudgement.cs
@@ -25,6 +25,9 @@ public class RushJudgement : Judgement
         /// <returns>The numeric health points increase of <paramref name="result"/> and <paramref name="playerCollided"/>.</returns>
         protected virtual double HealthPointIncreaseFor(HitResult result, bool playerCollided) => 0.0;
 
-        protected sealed override double HealthIncreaseFor(HitResult result) => throw new NotSupportedException($"Use the Rush!-specific version: {nameof(HealthPointIncreaseFor)}");
+        // Temporary measure to prevent crashes due to HealthDisplay using this method
+        // No miss animation though.
+        protected sealed override double HealthIncreaseFor(HitResult result) => 0.0;
+        // protected sealed override double HealthIncreaseFor(HitResult result) => throw new NotSupportedException($"Use the Rush!-specific version: {nameof(HealthPointIncreaseFor)}");
     }
 }
diff --git a/osu.Game.Rulesets.Rush/UI/DrawableRushRuleset.cs b/osu.Game.Rulesets.Rush/UI/DrawableRushRuleset.cs
@@ -38,13 +38,12 @@ public partial class DrawableRushRuleset : DrawableScrollingRuleset<RushHitObjec
 
         protected override bool UserScrollSpeedAdjustment => true;
 
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;
-
         public DrawableRushRuleset(RushRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
         {
             Direction.Value = ScrollingDirection.Left;
             TimeRange.Value = 800;
+            VisualisationMethod = ScrollVisualisationMethod.Constant;
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

diff --git a/osu.Game.Rulesets.Rush/UI/Ground/DefaultGround.cs b/osu.Game.Rulesets.Rush/UI/Ground/DefaultGround.cs
@@ -98,7 +98,7 @@ protected override void UpdateAfterChildren()
             // Tests don't have scrolling info yet
             if (scrollingInfo is null) return;
 
-            var groundX = scrollingInfo.Algorithm.PositionAt(0f, Time.Current, scrollingInfo.TimeRange.Value, DrawWidth - RushPlayfield.HIT_TARGET_OFFSET) % slats_spacing;
+            var groundX = scrollingInfo.Algorithm.Value.PositionAt(0f, Time.Current, scrollingInfo.TimeRange.Value, DrawWidth - RushPlayfield.HIT_TARGET_OFFSET) % slats_spacing;
 
             // This is to ensure that the ground is still visible before the start of the track
             if (groundX > 0)

diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
@@ -33,6 +33,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2023.717.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1008.0" />
   </ItemGroup>
 </Project>