Merge pull request #461 from LumpBloom7/dependabot/nuget/ppy.osu.Game…

…-2023.605.0 Bump ppy.osu.Game from 2023.510.0 to 2023.605.0
LumpBloom7 · Jun 5, 2023 · 8037ee0 · 8037ee0
2 parents fa91c7b + 90ae36c
commit 8037ee0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 37 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs
@@ -57,7 +57,7 @@ public override IEnumerable<string> LookupNames
             }
 
 #nullable enable
-            public override HitSampleInfo With(Optional<string> newName = default, Optional<string?> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+            public override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
             {
                 return new SentakkiHitSampleInfo(newName.GetOr(Name), newVolume.GetOr(Volume));
             }

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SentakkiLanedHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/SentakkiLanedHitObject.cs
@@ -50,7 +50,7 @@ public HitSampleInfo[] CreateBreakSample()
 
             return new[]
             {
-                new SentakkiHitSampleInfo("Break", GetSampleInfo().Volume)
+                new SentakkiHitSampleInfo("Break", CreateHitSampleInfo().Volume)
             };
         }
     }

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SlideBody.cs b/osu.Game.Rulesets.Sentakki/Objects/SlideBody.cs
@@ -45,7 +45,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok
 
             CreateSlideCheckpoints();
             if (NestedHitObjects.Any())
-                NestedHitObjects.First().Samples.Add(new SentakkiHitSampleInfo("slide", GetSampleInfo().Volume));
+                NestedHitObjects.First().Samples.Add(new SentakkiHitSampleInfo("slide", CreateHitSampleInfo().Volume));
         }
 
         protected void CreateSlideCheckpoints()

diff --git a/osu.Game.Rulesets.Sentakki/Scoring/SentakkiScoreProcessor.cs b/osu.Game.Rulesets.Sentakki/Scoring/SentakkiScoreProcessor.cs
@@ -1,4 +1,5 @@
-using osu.Game.Rulesets.Scoring;
+using System;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Sentakki.Scoring
 {
@@ -9,7 +10,11 @@ public SentakkiScoreProcessor(SentakkiRuleset ruleset)
         {
         }
 
-        protected override double DefaultAccuracyPortion => 0.9;
-        protected override double DefaultComboPortion => 0.1;
+        protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
+        {
+            return (200000 * comboProgress)
+                   + (800000 * Math.Pow(Accuracy.Value, 2 + (2 * Accuracy.Value)) * accuracyProgress)
+                   + bonusPortion;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Sentakki/SentakkiRuleset.cs b/osu.Game.Rulesets.Sentakki/SentakkiRuleset.cs
@@ -139,40 +139,24 @@ public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) =
             new KeyBinding(InputKey.Number8, SentakkiAction.Key8),
         };
 
-        public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
+        public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
-            new StatisticRow
+            new StatisticItem(SentakkiStatisticsStrings.TimingDistribution, () => new HitEventTimingDistributionGraph(score.HitEvents)
             {
-                Columns = new[]
-                {
-                    new StatisticItem(SentakkiStatisticsStrings.TimingDistribution, () => new HitEventTimingDistributionGraph(score.HitEvents)
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Height = 250
-                    }, true)
-                }
-            },
-            new StatisticRow
+                RelativeSizeAxes = Axes.X,
+                Height = 250
+            }, true),
+
+            new StatisticItem(SentakkiStatisticsStrings.JudgementChart, () => new JudgementChart(score.HitEvents.Where(e => e.HitObject is SentakkiHitObject).ToList())
             {
-                Columns = new[]
-                {
-                    new StatisticItem(SentakkiStatisticsStrings.JudgementChart, () => new JudgementChart(score.HitEvents.Where(e => e.HitObject is SentakkiHitObject).ToList())
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Size = new Vector2(1, 250)
-                    }, true),
-                }
-            },
-            new StatisticRow
+                RelativeSizeAxes = Axes.X,
+                Size = new Vector2(1, 250)
+            }, true),
+
+            new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
             {
-                Columns = new[]
-                {
-                    new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
-                    {
-                        new UnstableRate(score.HitEvents)
-                    }), true)
-                }
-            }
+                new UnstableRate(score.HitEvents)
+            }), true)
         };
 
         public override Drawable CreateIcon() => new SentakkiIcon(this);

diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
@@ -9,7 +9,7 @@
         <AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ppy.osu.Game" Version="2023.510.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2023.605.0"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->