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

…me-2022.501.0 Bump ppy.osu.Game from 2022.424.1 to 2022.501.0
Beamographic · May 1, 2022 · 1dbce1d · 1dbce1d
2 parents e2058b2 + 07f319a
commit 1dbce1d
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Rush.Tests.dll"
+                "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Rush.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
@@ -19,7 +19,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Release/net5.0/osu.Game.Rulesets.Rush.Tests.dll"
+                "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Release/net6.0/osu.Game.Rulesets.Rush.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
@@ -31,7 +31,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Development/net5.0/osu.Game.Rulesets.Rush.Tests.dll"
+                "${workspaceRoot}/osu.Game.Rulesets.Rush.Tests/bin/Development/net6.0/osu.Game.Rulesets.Rush.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Development)",

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHit.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHit.cs
@@ -15,7 +15,7 @@ public class DrawableDualHit : DrawableRushHitObject<DualHit>
     {
         private readonly Container<DrawableDualHitPart> airHitContainer;
         private readonly Container<DrawableDualHitPart> groundHitContainer;
-        private readonly SkinnableDrawable skinnedJoin;
+        private readonly DualHitJoinPiece skinnedJoin;
 
         public DrawableDualHitPart Air => airHitContainer.Child;
         public DrawableDualHitPart Ground => groundHitContainer.Child;
@@ -35,7 +35,7 @@ public DrawableDualHit(DualHit hitObject)
 
             AddRangeInternal(new Drawable[]
             {
-                skinnedJoin = new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.DualHitJoin), _ => new DualHitJoinPiece()),
+                skinnedJoin = new DualHitJoinPiece(),
                 airHitContainer = new Container<DrawableDualHitPart> { Anchor = Anchor.TopCentre },
                 groundHitContainer = new Container<DrawableDualHitPart> { Anchor = Anchor.BottomCentre },
             });

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHitPart.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHitPart.cs
@@ -26,7 +26,7 @@ public DrawableDualHitPart(DualHitPart hitObject)
         {
             Size = new Vector2(RushPlayfield.HIT_TARGET_SIZE);
 
-            AddInternal(new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.DualHitPart), _ => new DualHitPartPiece()));
+            AddInternal(new DualHitPartPiece());
         }
 
         public new bool UpdateResult(bool userTriggered) => base.UpdateResult(userTriggered);

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableHeart.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableHeart.cs
@@ -38,10 +38,10 @@ public DrawableHeart(Heart hitObject)
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.4f),
                 NewBeat = (b, t, e, a) => this.ScaleTo(1.5f).Then().ScaleTo(1f, t.BeatLength, Easing.Out),
-                Child = new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.Heart), _ => new HeartPiece
+                Child = new HeartPiece
                 {
                     RelativeSizeAxes = Axes.Both,
-                })
+                }
             });
         }
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBoss.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBoss.cs
@@ -20,7 +20,7 @@ public class DrawableMiniBoss : DrawableRushHitObject<MiniBoss>
         private const float base_sprite_scale = 1f;
         private const float target_sprite_scale = 1.1f;
 
-        private readonly SkinnableDrawable mainPiece;
+        private readonly MiniBossPiece mainPiece;
 
         private readonly Container<DrawableMiniBossTick> ticks;
 
@@ -38,7 +38,7 @@ public DrawableMiniBoss(MiniBoss hitObject)
 
             AddRangeInternal(new Drawable[]
             {
-                mainPiece = new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.Miniboss), _ => new MiniBossPiece())
+                mainPiece = new MiniBossPiece()
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMinion.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMinion.cs
@@ -37,7 +37,7 @@ public DrawableMinion(Minion hitObject = null)
         {
             Size = new Vector2(RushPlayfield.HIT_TARGET_SIZE);
 
-            AddInternal(minionPiece = new SkinnableDrawable(new RushSkinComponent(Component), _ => new MinionPiece())
+            AddInternal(minionPiece = new MinionPiece()
             {
                 RelativeSizeAxes = Axes.Both
             });

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableSawblade.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableSawblade.cs
@@ -46,7 +46,7 @@ public DrawableSawblade(Sawblade hitObject)
                     Anchor = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     Size = new Vector2(0.8f),
-                    Child = sawblade = new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.Sawblade), _ => new SawbladePiece())
+                    Child = sawblade = new SawbladePiece()
                     {
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs
@@ -27,9 +27,9 @@ public class DrawableStarSheet : DrawableLanedHit<StarSheet>
         private readonly Container<DrawableStarSheetHead> headContainer;
         private readonly Container<DrawableStarSheetTail> tailContainer;
 
-        public Drawable BodyDrawable => bodyContainer.Child.Drawable;
+        public Drawable BodyDrawable => bodyContainer.Child;
 
-        private readonly Container<SkinnableDrawable> bodyContainer;
+        private readonly Container bodyContainer;
 
         private readonly Drawable holdCap;
 
@@ -61,17 +61,18 @@ public DrawableStarSheet(StarSheet hitObject)
 
             AddRangeInternal(new[]
             {
-                bodyContainer = new Container<SkinnableDrawable>
+                bodyContainer = new Container
                 {
                     Masking = true,
                     RelativeSizeAxes = Axes.Both,
-                    Child = new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.StarSheetBody), _ => new StarSheetBodyPiece())
+                    Child = new StarSheetBodyPiece()
                 },
                 headContainer = new Container<DrawableStarSheetHead> { RelativeSizeAxes = Axes.Both },
                 tailContainer = new Container<DrawableStarSheetTail> { RelativeSizeAxes = Axes.Both },
-                holdCap = new SkinnableDrawable(new RushSkinComponent(RushSkinComponents.StarSheetHold), _ => new StarSheetCapStarPiece())
+                holdCap = new StarSheetCapStarPiece()
                 {
                     Origin = Anchor.Centre,
+                    Anchor = Anchor.CentreLeft,
                 }
             });
         }
@@ -210,7 +211,6 @@ protected override void Update()
             if (Head.IsHit && !Tail.IsHit)
             {
                 holdCap.X = DrawWidth * (float)Progress;
-                holdCap.Y = DrawHeight / 2f;
                 holdCap.Show();
             }
             else

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetCap.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetCap.cs
@@ -29,11 +29,11 @@ protected DrawableStarSheetCap(TObject hitObject)
             Size = new Vector2(DrawableStarSheet.NOTE_SHEET_SIZE * 1.1f);
             Origin = Anchor.Centre;
 
-            AddInternal(new SkinnableDrawable(new RushSkinComponent(Component), _ => new StarSheetCapStarPiece())
+            AddInternal(new StarSheetCapStarPiece()
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
+                //RelativeSizeAxes = Axes.Both,
             });
         }
 

diff --git a/osu.Game.Rulesets.Rush/UI/LanePlayfield.cs b/osu.Game.Rulesets.Rush/UI/LanePlayfield.cs
@@ -42,10 +42,10 @@ public LanePlayfield(LanedHitLane type)
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.Centre,
                     Size = new Vector2(RushPlayfield.HIT_TARGET_SIZE),
-                    Child = new SkinnableDrawable(new RushSkinComponent(isAirLane ? RushSkinComponents.AirHitTarget : RushSkinComponents.GroundHitTarget), _ => new HitTarget
+                    Child = new HitTarget
                     {
                         RelativeSizeAxes = Axes.Both,
-                    }, confineMode: ConfineMode.ScaleToFit),
+                    },
                 },
                 effectsContainer = new Container(),
                 judgementContainer = new JudgementContainer<DrawableJudgement>(),

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="2022.424.1" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.501.0" />
   </ItemGroup>
 </Project>