Merge pull request #128 from EzzPrograms/master

Bump ppy.osu.Game to 2020.1009.0
taulazer · Oct 10, 2020 · 040cf49 · 040cf49
2 parents 915bc03 + c57c155
commit 040cf49
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 25 deletions.
diff --git a/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs b/osu.Game.Rulesets.Tau/Beatmaps/TauBeatmapConverter.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Tau.Beatmaps
 {
     public class TauBeatmapConverter : BeatmapConverter<TauHitObject>
     {
-        public override bool CanConvert() => true;
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasPosition);
 
         public TauBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
             : base(beatmap, ruleset)

diff --git a/osu.Game.Rulesets.Tau/Edit/TauSelectionHandler.cs b/osu.Game.Rulesets.Tau/Edit/TauSelectionHandler.cs
@@ -8,14 +8,14 @@ public class TauSelectionHandler : SelectionHandler
     {
         public override bool HandleMovement(MoveSelectionEvent moveEvent)
         {
-            foreach (var h in SelectedHitObjects.OfType<TauHitObject>())
+            foreach (var h in EditorBeatmap.SelectedHitObjects.OfType<TauHitObject>())
             {
                 if (h is HardBeat)
                     continue;
 
                 h.Angle = ScreenSpaceDrawQuad.Centre.GetDegreesFromPosition(moveEvent.ScreenSpacePosition);
 
-                EditorBeatmap?.UpdateHitObject(h);
+                EditorBeatmap?.Update(h);
             }
 
             return true;

diff --git a/osu.Game.Rulesets.Tau/Judgements/TauJudgement.cs b/osu.Game.Rulesets.Tau/Judgements/TauJudgement.cs
@@ -6,20 +6,5 @@ namespace osu.Game.Rulesets.Tau.Judgements
     public class TauJudgement : Judgement
     {
         public override HitResult MaxResult => HitResult.Great;
-
-        protected override int NumericResultFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.Great:
-                    return 300;
-
-                case HitResult.Good:
-                    return 100;
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Tau/Scoring/TauScoreProcessor.cs b/osu.Game.Rulesets.Tau/Scoring/TauScoreProcessor.cs
@@ -4,6 +4,5 @@ namespace osu.Game.Rulesets.Tau.Scoring
 {
     public class TauScoreProcessor : ScoreProcessor
     {
-        public override HitWindows CreateHitWindows() => new TauHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Tau/TauDifficultyCalculator.cs b/osu.Game.Rulesets.Tau/TauDifficultyCalculator.cs
@@ -20,7 +20,7 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
                 StarRating = beatmap.BeatmapInfo.StarDifficulty,
                 Mods = mods,
                 Skills = skills,
-                MaxCombo = beatmap.HitObjects.Count(),
+                MaxCombo = beatmap.HitObjects.Count,
             };
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Array.Empty<DifficultyHitObject>();

diff --git a/osu.Game.Rulesets.Tau/TauRuleset.cs b/osu.Game.Rulesets.Tau/TauRuleset.cs
@@ -159,5 +159,15 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
         public override HitObjectComposer CreateHitObjectComposer() => new TauHitObjectComposer(this);
 
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new BeatmapProcessor(beatmap);
+
+        protected override IEnumerable<HitResult> GetValidHitResults()
+        {
+            return new[]
+            {
+                HitResult.Great,
+                HitResult.Good,
+                HitResult.Miss,
+            };
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs b/osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs
@@ -27,19 +27,19 @@ private void load()
                 new SettingsCheckbox
                 {
                     LabelText = "Show Visualizer",
-                    Bindable = config.GetBindable<bool>(TauRulesetSettings.ShowVisualizer)
+                    Current = config.GetBindable<bool>(TauRulesetSettings.ShowVisualizer)
                 },
                 new SettingsSlider<float>
                 {
                     LabelText = "Playfield dim",
-                    Bindable = config.GetBindable<float>(TauRulesetSettings.PlayfieldDim),
+                    Current = config.GetBindable<float>(TauRulesetSettings.PlayfieldDim),
                     KeyboardStep = 0.01f,
                     DisplayAsPercentage = true
                 },
                 new SettingsSlider<float>
                 {
                     LabelText = "Beat Size",
-                    Bindable = config.GetBindable<float>(TauRulesetSettings.BeatSize),
+                    Current = config.GetBindable<float>(TauRulesetSettings.BeatSize),
                     KeyboardStep = 1f
                 }
             };

diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
@@ -14,10 +14,10 @@
     <EmbeddedResource Include="Resources\**"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2020.923.0"/>
+    <PackageReference Include="ppy.osu.Game" Version="2020.1009.0"/>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay"/>
     <Folder Include="Resources\Textures"/>
   </ItemGroup>
-</Project>
+</Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,5 @@ namespace osu.Game.Rulesets.Tau.Scoring @@
     {
         public class TauScoreProcessor : ScoreProcessor
         {
-            public override HitWindows CreateHitWindows() => new TauHitWindows();
         }
     }