From b2b4baa0c359313aab0ecda67db95885659e879d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:59:44 +0000
Subject: [PATCH 1/2] Bump ppy.osu.Game from 2024.718.0 to 2024.816.0

Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2024.718.0 to 2024.816.0.
- [Release notes](https://github.com/ppy/osu/releases)
- [Commits](https://github.com/ppy/osu/compare/2024.718.0...2024.816.0)

---
updated-dependencies:
- dependency-name: ppy.osu.Game
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../osu.Game.Rulesets.Rush.csproj             | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
index 2d79afa..965e23b 100644
--- a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
+++ b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
@@ -1,38 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup Label="Project">
-    <Configurations>Debug;Release;Development</Configurations>
-    <TargetFramework>net8.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
-    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
-  </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)' == 'Release' ">
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
-        <AssemblyTitle>rush for osu!</AssemblyTitle>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
-        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
-         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
-         and we change that based on the build configuration for separation purposes.
-         Therefore prepend the AssemblyName to embedded resources names instead. -->
-    <EmbeddedResource Include="Resources\**">
-      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.718.0" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <Configurations>Debug;Release;Development</Configurations>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)' == 'Release' ">
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
+        <AssemblyTitle>rush for osu!</AssemblyTitle>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
+        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
+         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
+         and we change that based on the build configuration for separation purposes.
+         Therefore prepend the AssemblyName to embedded resources names instead. -->
+    <EmbeddedResource Include="Resources\**">
+      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
+  </ItemGroup>
+</Project>

From fb6a46a0df59350a42c4fbe6060fb898910cfb87 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Sat, 17 Aug 2024 12:17:37 +0200
Subject: [PATCH 2/2] Update to accommodate lazer update

---
 .../Drawables/DrawableRushJudgement.cs        |  6 --
 osu.Game.Rulesets.Rush/UI/RushPlayfield.cs    | 12 ++-
 .../osu.Game.Rulesets.Rush.csproj             | 76 +++++++++----------
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs
index 0cbf015..91c04ae 100644
--- a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs
+++ b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs
@@ -13,12 +13,6 @@ public partial class DrawableRushJudgement : DrawableJudgement
         private const float judgement_movement = 300;
 
         public DrawableRushJudgement()
-            : this(null, null)
-        {
-        }
-
-        public DrawableRushJudgement(JudgementResult result, DrawableRushHitObject judgedObject)
-            : base(result, judgedObject)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Rush/UI/RushPlayfield.cs b/osu.Game.Rulesets.Rush/UI/RushPlayfield.cs
index d132afb..5dafbcc 100644
--- a/osu.Game.Rulesets.Rush/UI/RushPlayfield.cs
+++ b/osu.Game.Rulesets.Rush/UI/RushPlayfield.cs
@@ -18,6 +18,8 @@
 using osu.Game.Rulesets.Rush.Objects.Drawables;
 using osu.Game.Rulesets.Rush.UI.Fever;
 using osu.Game.Rulesets.Rush.UI.Ground;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
@@ -62,7 +64,7 @@ public IEnumerable<DrawableHitObject> AllAliveHitObjects
             }
         }
 
-        private DrawablePool<DrawableRushJudgement> judgementPool;
+        private JudgementPooler<DrawableRushJudgement> judgementPool;
         private DrawablePool<DefaultHitExplosion> explosionPool;
         private DrawablePool<StarSheetHitExplosion> sheetExplosionPool;
         private DrawablePool<HeartHitExplosion> heartExplosionPool;
@@ -126,7 +128,11 @@ private void load()
 
             AddRangeInternal(new Drawable[]
             {
-                judgementPool = new DrawablePool<DrawableRushJudgement>(5),
+                judgementPool = new JudgementPooler<DrawableRushJudgement>(new[]{
+                    HitResult.Great,
+                    HitResult.Good,
+                    HitResult.Miss
+                }),
                 explosionPool = new DrawablePool<DefaultHitExplosion>(15),
                 sheetExplosionPool = new DrawablePool<StarSheetHitExplosion>(10),
                 heartExplosionPool = new DrawablePool<HeartHitExplosion>(2),
@@ -201,7 +207,7 @@ private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
             // Display judgement results in a drawable for objects that allow it.
             if (rushJudgedObject.DisplayResult)
             {
-                DrawableRushJudgement judgementDrawable = judgementPool.Get(j => j.Apply(result, judgedObject));
+                DrawableRushJudgement judgementDrawable = judgementPool.Get(result.Type, j => j.Apply(result, judgedObject));
                 LanedHitLane judgementLane = LanedHitLane.Air;
 
                 // TODO: showing judgements based on the judged object suggests that
diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
index 965e23b..c002929 100644
--- a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
+++ b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
@@ -1,38 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup Label="Project">
-    <Configurations>Debug;Release;Development</Configurations>
-    <TargetFramework>net8.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
-    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
-  </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)' == 'Release' ">
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
-        <AssemblyTitle>rush for osu!</AssemblyTitle>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
-        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
-         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
-         and we change that based on the build configuration for separation purposes.
-         Therefore prepend the AssemblyName to embedded resources names instead. -->
-    <EmbeddedResource Include="Resources\**">
-      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <Configurations>Debug;Release;Development</Configurations>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)' == 'Release' ">
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
+        <AssemblyTitle>rush for osu!</AssemblyTitle>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
+        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
+         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
+         and we change that based on the build configuration for separation purposes.
+         Therefore prepend the AssemblyName to embedded resources names instead. -->
+    <EmbeddedResource Include="Resources\**">
+      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
+  </ItemGroup>
+</Project>