Merge branch 'master' into Fix-crafted-air-star-sheet

Beamographic · Dec 4, 2022 · 6f22c48 · 6f22c48
2 parents 97edebf + 55fe673
commit 6f22c48
Show file tree

Hide file tree

Showing 53 changed files with 60 additions and 69 deletions.
diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneFeverBar.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneFeverBar.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
-    public class TestSceneFeverBar : OsuTestScene
+    public partial class TestSceneFeverBar : OsuTestScene
     {
         [Cached]
         private readonly FeverProcessor feverProcessor = new FeverProcessor();

diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneGround.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneGround.cs
@@ -7,7 +7,7 @@
 
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
-    public class TestSceneGround : OsuTestScene
+    public partial class TestSceneGround : OsuTestScene
     {
         public TestSceneGround()
         {

diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneMiniBoss.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneMiniBoss.cs
@@ -10,7 +10,7 @@
 
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
-    public class TestSceneMiniBoss : TestSceneRushPlayer
+    public partial class TestSceneMiniBoss : TestSceneRushPlayer
     {
         private const float mini_boss_time = 600f;
 

diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneOsuGame.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneRushAutoplay.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneRushAutoplay.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
-    public class TestSceneRushAutoplay : TestSceneRushPlayer
+    public partial class TestSceneRushAutoplay : TestSceneRushPlayer
     {
         protected override bool Autoplay => true;
     }

diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneRushPlayer.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneRushPlayer.cs
@@ -11,7 +11,7 @@
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
     [TestFixture]
-    public class TestSceneRushPlayer : PlayerTestScene
+    public partial class TestSceneRushPlayer : PlayerTestScene
     {
         private readonly BindableBool pausedBindable = new BindableBool();
 
@@ -40,7 +40,7 @@ private void load()
             pausedBindable.ValueChanged += e => Player?.SetGameplayClockPaused(e.NewValue);
         }
 
-        protected class RushPlayer : TestPlayer
+        protected partial class RushPlayer : TestPlayer
         {
             public void SetGameplayClockPaused(bool value)
             {

diff --git a/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs b/osu.Game.Rulesets.Rush.Tests/Visual/TestSceneTouchInputHandling.cs
@@ -17,7 +17,7 @@
 
 namespace osu.Game.Rulesets.Rush.Tests.Visual
 {
-    public class TestSceneTouchInputHandling : OsuManualInputManagerTestScene
+    public partial class TestSceneTouchInputHandling : OsuManualInputManagerTestScene
     {
         protected override Ruleset CreateRuleset() => new RushRuleset();
 
@@ -153,7 +153,7 @@ public void ReleaseAllTouches()
         private void moveTouchToDrawable(TouchSource source, Drawable drawable) => InputManager.MoveTouchTo(new Touch(source, drawable.ScreenSpaceDrawQuad.Centre));
         private void endTouch(TouchSource source) => InputManager.EndTouch(new Touch(source, Vector2.Zero));
 
-        private class TouchRegion : Box, IKeyBindingTouchHandler
+        private partial class TouchRegion : Box, IKeyBindingTouchHandler
         {
             public override bool HandlePositionalInput => true;
 

diff --git a/osu.Game.Rulesets.Rush.Tests/osu.Game.Rulesets.Rush.Tests.csproj b/osu.Game.Rulesets.Rush.Tests/osu.Game.Rulesets.Rush.Tests.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

diff --git a/osu.Game.Rulesets.Rush/Input/RushInputManager.cs b/osu.Game.Rulesets.Rush/Input/RushInputManager.cs
@@ -14,7 +14,7 @@
 
 namespace osu.Game.Rulesets.Rush.Input
 {
-    public class RushInputManager : RulesetInputManager<RushAction>
+    public partial class RushInputManager : RulesetInputManager<RushAction>
     {
         protected override bool MapMouseToLatestTouch => false;
         public new RushFramedReplayInputHandler ReplayInputHandler => (RushFramedReplayInputHandler)base.ReplayInputHandler;

diff --git a/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs b/osu.Game.Rulesets.Rush/Mods/RushModFlashlight.cs
@@ -46,7 +46,7 @@ public override void ApplyToDrawableRuleset(DrawableRuleset<RushHitObject> drawa
             base.ApplyToDrawableRuleset(drawableRuleset);
         }
 
-        private class RushFlashlight : Flashlight
+        private partial class RushFlashlight : Flashlight
         {
             private readonly LayoutValue flashlightProperties = new LayoutValue(Invalidation.DrawSize);
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHit.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHit.cs
@@ -8,11 +8,10 @@
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Input;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableDualHit : DrawableRushHitObject<DualHit>
+    public partial class DrawableDualHit : DrawableRushHitObject<DualHit>
     {
         private readonly Container<DrawableDualHitPart> airHitContainer;
         private readonly Container<DrawableDualHitPart> groundHitContainer;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHitPart.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableDualHitPart.cs
@@ -6,13 +6,12 @@
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Rush.UI;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableDualHitPart : DrawableLanedHit<DualHitPart>
+    public partial class DrawableDualHitPart : DrawableLanedHit<DualHitPart>
     {
         public override bool DisplayExplosion => true;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableFeverBonus.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableFeverBonus.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableFeverBonus : DrawableRushHitObject<FeverBonus>
+    public partial class DrawableFeverBonus : DrawableRushHitObject<FeverBonus>
     {
         public override bool DisplayExplosion => false;
         public override bool DisplayResult => false;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableHeart.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableHeart.cs
@@ -6,12 +6,11 @@
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Rush.UI;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableHeart : DrawableLanedHit<Heart>
+    public partial class DrawableHeart : DrawableLanedHit<Heart>
     {
         [Resolved]
         private RushPlayfield playfield { get; set; }

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableLanedHit.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableLanedHit.cs
@@ -15,7 +15,7 @@
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
     [Cached(typeof(IDrawableLanedHit))]
-    public class DrawableLanedHit<TLanedHit> : DrawableRushHitObject<TLanedHit>, IDrawableLanedHit
+    public partial class DrawableLanedHit<TLanedHit> : DrawableRushHitObject<TLanedHit>, IDrawableLanedHit
         where TLanedHit : LanedHit
     {
         public virtual Color4 LaneAccentColour => HitObject.Lane == LanedHitLane.Air ? AIR_ACCENT_COLOUR : GROUND_ACCENT_COLOUR;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBoss.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBoss.cs
@@ -11,12 +11,11 @@
 using osu.Game.Rulesets.Rush.Input;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableMiniBoss : DrawableRushHitObject<MiniBoss>
+    public partial class DrawableMiniBoss : DrawableRushHitObject<MiniBoss>
     {
         private const float base_sprite_scale = 1f;
         private const float target_sprite_scale = 1.1f;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBossTick.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMiniBossTick.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableMiniBossTick : DrawableRushHitObject<MiniBossTick>
+    public partial class DrawableMiniBossTick : DrawableRushHitObject<MiniBossTick>
     {
         public override bool DisplayResult => false;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMinion.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableMinion.cs
@@ -8,13 +8,12 @@
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Rush.UI;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableMinion : DrawableLanedHit<Minion>
+    public partial class DrawableMinion : DrawableLanedHit<Minion>
     {
         protected virtual RushSkinComponents Component => RushSkinComponents.Minion;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushHitObject.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushHitObject.cs
@@ -22,7 +22,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public abstract class DrawableRushHitObject : DrawableHitObject<RushHitObject>, IKeyBindingHandler<RushAction>
+    public abstract partial class DrawableRushHitObject : DrawableHitObject<RushHitObject>, IKeyBindingHandler<RushAction>
     {
         public static readonly Color4 AIR_ACCENT_COLOUR = new Color4(0.35f, 0.75f, 1f, 1f);
         public static readonly Color4 GROUND_ACCENT_COLOUR = new Color4(1f, 0.4f, 1f, 1f);
@@ -150,7 +150,7 @@ protected override void ClearNestedHitObjects()
         }
     }
 
-    public abstract class DrawableRushHitObject<TObject> : DrawableRushHitObject
+    public abstract partial class DrawableRushHitObject<TObject> : DrawableRushHitObject
         where TObject : RushHitObject
     {
         public new TObject HitObject => (TObject)base.HitObject;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs
@@ -7,7 +7,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableRushJudgement : DrawableJudgement
+    public partial class DrawableRushJudgement : DrawableJudgement
     {
         private const float judgement_time = 250f;
         private const float judgement_movement = 300;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableSawblade.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableSawblade.cs
@@ -9,13 +9,12 @@
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Rush.UI;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableSawblade : DrawableLanedHit<Sawblade>
+    public partial class DrawableSawblade : DrawableLanedHit<Sawblade>
     {
         [Resolved]
         private RushPlayfield playfield { get; set; }

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheet.cs
@@ -13,11 +13,10 @@
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Rush.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableStarSheet : DrawableLanedHit<StarSheet>
+    public partial class DrawableStarSheet : DrawableLanedHit<StarSheet>
     {
         public const float NOTE_SHEET_SIZE = RushPlayfield.HIT_TARGET_SIZE * 0.75f;
         public const float REQUIRED_COMPLETION = 0.75f;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetCap.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetCap.cs
@@ -8,12 +8,11 @@
 using osu.Game.Rulesets.Rush.Input;
 using osu.Game.Rulesets.Rush.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public abstract class DrawableStarSheetCap<TObject> : DrawableLanedHit<TObject>
+    public abstract partial class DrawableStarSheetCap<TObject> : DrawableLanedHit<TObject>
         where TObject : LanedHit
     {
         protected abstract RushSkinComponents Component { get; }

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetHead.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetHead.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableStarSheetHead : DrawableStarSheetCap<StarSheetHead>
+    public partial class DrawableStarSheetHead : DrawableStarSheetCap<StarSheetHead>
     {
         protected override RushSkinComponents Component => RushSkinComponents.StarSheetHead;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetTail.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/DrawableStarSheetTail.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables
 {
-    public class DrawableStarSheetTail : DrawableStarSheetCap<StarSheetTail>
+    public partial class DrawableStarSheetTail : DrawableStarSheetCap<StarSheetTail>
     {
         protected override RushSkinComponents Component => RushSkinComponents.StarSheetTail;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/DualHitJoinPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/DualHitJoinPiece.cs
@@ -8,7 +8,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class DualHitJoinPiece : Box
+    public partial class DualHitJoinPiece : Box
     {
         public DualHitJoinPiece()
         {

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/DualHitPartPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/DualHitPartPiece.cs
@@ -17,7 +17,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class DualHitPartPiece : CompositeDrawable
+    public partial class DualHitPartPiece : CompositeDrawable
     {
         private const double rotation_time = 1000;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/HeartPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/HeartPiece.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class HeartPiece : PoolableDrawable
+    public partial class HeartPiece : PoolableDrawable
     {
         public HeartPiece()
         {

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/MiniBossPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/MiniBossPiece.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class MiniBossPiece : CompositeDrawable
+    public partial class MiniBossPiece : CompositeDrawable
     {
         private readonly TextureAnimation normalAnimation;
         private readonly TextureAnimation hitAnimation;

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/MinionPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/MinionPiece.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class MinionPiece : CompositeDrawable
+    public partial class MinionPiece : CompositeDrawable
     {
         private readonly TextureAnimation animation;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/SawbladePiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/SawbladePiece.cs
@@ -16,7 +16,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class SawbladePiece : CompositeDrawable
+    public partial class SawbladePiece : CompositeDrawable
     {
         private const double rotation_time = 1000;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/StarSheetBodyPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/StarSheetBodyPiece.cs
@@ -14,7 +14,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class StarSheetBodyPiece : CompositeDrawable
+    public partial class StarSheetBodyPiece : CompositeDrawable
     {
         private const float border_size = 1f / 8f;
 

diff --git a/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/StarSheetCapStarPiece.cs b/osu.Game.Rulesets.Rush/Objects/Drawables/Pieces/StarSheetCapStarPiece.cs
@@ -17,7 +17,7 @@
 
 namespace osu.Game.Rulesets.Rush.Objects.Drawables.Pieces
 {
-    public class StarSheetCapStarPiece : CompositeDrawable, IHasAccentColour
+    public partial class StarSheetCapStarPiece : CompositeDrawable, IHasAccentColour
     {
         private const double rotation_time = 1000;
 

diff --git a/osu.Game.Rulesets.Rush/RushRuleset.cs b/osu.Game.Rulesets.Rush/RushRuleset.cs
@@ -134,7 +134,7 @@ protected override IEnumerable<HitResult> GetValidHitResults()
             _ => base.GetDisplayNameForHitResult(result)
         };
 
-        public class RushIcon : CompositeDrawable
+        public partial class RushIcon : CompositeDrawable
         {
             public RushIcon()
             {

diff --git a/osu.Game.Rulesets.Rush/Scoring/RushHealthProcessor.cs b/osu.Game.Rulesets.Rush/Scoring/RushHealthProcessor.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Rush.Scoring
 {
-    public class RushHealthProcessor : HealthProcessor
+    public partial class RushHealthProcessor : HealthProcessor
     {
         public double PlayerHealthPercentage { get; }
 

diff --git a/osu.Game.Rulesets.Rush/Scoring/RushScoreProcessor.cs b/osu.Game.Rulesets.Rush/Scoring/RushScoreProcessor.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Rush.Scoring
 {
-    public class RushScoreProcessor : ScoreProcessor
+    public partial class RushScoreProcessor : ScoreProcessor
     {
         public RushScoreProcessor(RushRuleset ruleset) : base(ruleset) { }