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

…me-2024.816.0 Bump ppy.osu.Game from 2024.718.0 to 2024.816.0
Beamographic · Aug 17, 2024 · 64fbde5 · 64fbde5
2 parents 9e25066 + fb6a46a
commit 64fbde5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -33,6 +33,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.718.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
   </ItemGroup>
 </Project>