fix errors

taulazer · Jan 20, 2025 · 4f8f172 · 4f8f172
1 parent a6ef26e
commit 4f8f172
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 12 deletions.
diff --git a/osu.Game.Rulesets.Tau.Tests/Conversion/TauConversionTestScene.cs b/osu.Game.Rulesets.Tau.Tests/Conversion/TauConversionTestScene.cs
@@ -23,7 +23,7 @@ public void TestConversion()
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = hitObjects.ToList()
                 },

diff --git a/osu.Game.Rulesets.Tau.Tests/Conversion/TestSceneBeatConversion.cs b/osu.Game.Rulesets.Tau.Tests/Conversion/TestSceneBeatConversion.cs
@@ -31,8 +31,18 @@ private class AngledHitObject : HitObject, IHasAngle
 
         private class PositionalHitObject : HitObject, IHasPosition
         {
-            public float X => Position.X;
-            public float Y => Position.Y;
+            public float X
+            {
+                get => Position.X;
+                set => Position = new Vector2(value, Position.Y);
+            }
+
+            public float Y
+            {
+                get => Position.Y;
+                set => Position = new Vector2(Position.X, value);
+            }
+
             public Vector2 Position { get; set; }
         }
 

diff --git a/osu.Game.Rulesets.Tau.Tests/Conversion/TestSceneSliderConversion.cs b/osu.Game.Rulesets.Tau.Tests/Conversion/TestSceneSliderConversion.cs
@@ -49,8 +49,18 @@ private class ConvertSlider : HitObject, IHasPathWithRepeats, IHasPosition
 
             public IList<IList<HitSampleInfo>> NodeSamples { get; } = new List<IList<HitSampleInfo>>();
 
-            public float X => Position.X;
-            public float Y => Position.Y;
+            public float X
+            {
+                get => Position.X;
+                set => Position = new Vector2(value, Position.Y);
+            }
+
+            public float Y
+            {
+                get => Position.Y;
+                set => Position = new Vector2(Position.X, value);
+            }
+
             public Vector2 Position { get; set; }
         }
     }

diff --git a/osu.Game.Rulesets.Tau.Tests/Mods/TestSceneAutoplay.cs b/osu.Game.Rulesets.Tau.Tests/Mods/TestSceneAutoplay.cs
@@ -15,7 +15,7 @@ public void TestAutoplay()
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {

diff --git a/osu.Game.Rulesets.Tau.Tests/Mods/TestSceneHardRock.cs b/osu.Game.Rulesets.Tau.Tests/Mods/TestSceneHardRock.cs
@@ -15,7 +15,7 @@ public void TestHardRock()
             CreateModTest(new ModTestData()
             {
                 Mod = new TauModHardRock(),
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {

diff --git a/osu.Game.Rulesets.Tau.Tests/Mods/TestSceneShowoff.cs b/osu.Game.Rulesets.Tau.Tests/Mods/TestSceneShowoff.cs
@@ -17,7 +17,7 @@ public void TestAutoplay()
             {
                 Autoplay = false,
                 Mod = new TauModShowoffAutoplay(),
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {

diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneAutoplayBeat.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneAutoplayBeat.cs
@@ -41,7 +41,7 @@ public void TestAutoplay(float duration, int amount)
             {
                 Autoplay = false,
                 Mod = new TauModAutoplay(),
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = hitObjects
                 },

diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneAutoplaySlider.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneAutoplaySlider.cs
@@ -38,7 +38,7 @@ public void TestAutoplay(float duration, int amount)
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = hitObjects
                 },
@@ -85,7 +85,7 @@ public void TestAutoplayWithRepeats(int amount, int repeats)
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = new Beatmap
+                CreateBeatmap = () => new Beatmap
                 {
                     HitObjects = hitObjects
                 },

diff --git a/osu.Game.Rulesets.Tau.sln.DotSettings b/osu.Game.Rulesets.Tau.sln.DotSettings
@@ -738,6 +738,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

diff --git a/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs b/osu.Game.Rulesets.Tau/Statistics/PaddleDistributionGraph.cs
@@ -40,7 +40,7 @@ public partial class PaddleDistributionGraph : CompositeDrawable
 
         public PaddleDistributionGraph(IReadOnlyList<HitEvent> hitEvents, IBeatmap beatmap)
         {
-            beatHitEvents = hitEvents.Where(e => e.HitObject.HitWindows is not HitWindows.EmptyHitWindows && e.HitObject is Beat && e.Result.IsHit()).ToList();
+            beatHitEvents = hitEvents.Where(e => e.HitObject.HitWindows != HitWindows.Empty && e.HitObject is Beat && e.Result.IsHit()).ToList();
             sliderHitEvents = hitEvents.Where(e => e.HitObject is Slider && e.Result.IsHit()).ToList(); // Note that this will only count the end of the sliders.
             properties.SetRange(beatmap.Difficulty.CircleSize);
         }