Add `StatUtils` and required methods #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

tsunyoku wants to merge 94 commits into Natelytle:master from tsunyoku:add-stats

osu.Android.props

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
         <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1227.1" />
+        <PackageReference Include="ppy.osu.Framework.Android" Version="2024.110.0" />
       </ItemGroup>
       <PropertyGroup>
         <!-- Fody does not handle Android build well, and warns when unchanged.
@@ Expand Down @@

osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     // See the LICENCE file in the repository root for full licence text.
     using System;
+    using System.Collections.Generic;
     using osu.Game.Rulesets.Judgements;
     using osu.Game.Rulesets.Scoring;
     using osu.Game.Scoring;
@@ Expand All / @@ -20,20 +21,73 @@ public partial class CatchScoreProcessor : ScoreProcessor @@
             private const int combo_cap = 200;
             private const double combo_base = 4;
+            private double fruitTinyScale;
             public CatchScoreProcessor()
                 : base(new CatchRuleset())
             {
             }
+            protected override void Reset(bool storeResults)
+            {
+                base.Reset(storeResults);
+                // large ticks are *purposefully* not counted to match stable
+                int fruitTinyScaleDivisor = MaximumResultCounts.GetValueOrDefault(HitResult.SmallTickHit) + MaximumResultCounts.GetValueOrDefault(HitResult.Great);
+                fruitTinyScale = fruitTinyScaleDivisor == 0
+                    ? 0
+                    : (double)MaximumResultCounts.GetValueOrDefault(HitResult.SmallTickHit) / fruitTinyScaleDivisor;
+            }
             protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
             {
-                return 600000 * comboProgress
-                       + 400000 * Accuracy.Value * accuracyProgress
+                const int max_tiny_droplets_portion = 400000;
+                double comboPortion = 1000000 - max_tiny_droplets_portion + max_tiny_droplets_portion * (1 - fruitTinyScale);
+                double dropletsPortion = max_tiny_droplets_portion * fruitTinyScale;
+                double dropletsHit = MaximumResultCounts.GetValueOrDefault(HitResult.SmallTickHit) == 0
+                    ? 0
+                    : (double)ScoreResultCounts.GetValueOrDefault(HitResult.SmallTickHit) / MaximumResultCounts.GetValueOrDefault(HitResult.SmallTickHit);
+                return comboPortion * comboProgress
+                       + dropletsPortion * dropletsHit
                        + bonusPortion;
             }
+            public override int GetBaseScoreForResult(HitResult result)
+            {
+                switch (result)
+                {
+                    // dirty hack to emulate accuracy on stable weighting every object equally in accuracy portion
+                    case HitResult.Great:
+                    case HitResult.LargeTickHit:
+                    case HitResult.SmallTickHit:
+                        return 300;
+                    case HitResult.LargeBonus:
+                        return 200;
+                }
+                return base.GetBaseScoreForResult(result);
+            }
             protected override double GetComboScoreChange(JudgementResult result)
-                => GetBaseScoreForResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+            {
+                double baseIncrease = 0;
+                switch (result.Type)
+                {
+                    case HitResult.Great:
+                        baseIncrease = 300;
+                        break;
+                    case HitResult.LargeTickHit:
+                        baseIncrease = 100;
+                        break;
+                }
+                return baseIncrease * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+            }
             public override ScoreRank RankFromAccuracy(double accuracy)
             {
@@ Expand Down @@

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneEditorAutoplayFastStreams.cs

-Original file line number
+Diff line change
@@ -0,0 +1,51 @@
+    // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+    // See the LICENCE file in the repository root for full licence text.
+    using System.Linq;
+    using NUnit.Framework;
+    using osu.Framework.Testing;
+    using osu.Game.Beatmaps;
+    using osu.Game.Rulesets.Osu.Objects;
+    using osu.Game.Rulesets.Osu.Objects.Drawables;
+    using osu.Game.Tests.Beatmaps;
+    using osu.Game.Tests.Visual;
+    namespace osu.Game.Rulesets.Osu.Tests.Editor
+    {
+        /// <summary>
+        /// This test covers autoplay working correctly in the editor on fast streams.
+        /// Might seem like a weird test, but frame stability being toggled can cause autoplay to operation incorrectly.
+        /// This is clearly a bug with the autoplay algorithm, but is worked around at an editor level for now.
+        /// </summary>
+        public partial class TestSceneEditorAutoplayFastStreams : EditorTestScene
+        {
+            protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+            {
+                var testBeatmap = new TestBeatmap(ruleset, false);
+                testBeatmap.HitObjects.AddRange(new[]
+                {
+                    new HitCircle { StartTime = 500 },
+                    new HitCircle { StartTime = 530 },
+                    new HitCircle { StartTime = 560 },
+                    new HitCircle { StartTime = 590 },
+                    new HitCircle { StartTime = 620 },
+                });
+                return testBeatmap;
+            }
+            protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+            [Test]
+            public void TestAllHit()
+            {
+                AddStep("start playback", () => EditorClock.Start());
+                AddUntilStep("wait for all hit", () =>
+                {
+                    DrawableHitCircle[] hitCircles = Editor.ChildrenOfType<DrawableHitCircle>().OrderBy(s => s.HitObject.StartTime).ToArray();
+                    return hitCircles.Length == 5 && hitCircles.All(h => h.IsHit);
+                });
+            }
+        }
+    }

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuComposerSelection.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -46,10 +46,12 @@ public void TestSelectAfterFadedOut() @@
                 moveMouseToObject(() => slider);
                 AddStep("seek after end", () => EditorClock.Seek(750));
+                AddUntilStep("wait for seek", () => !EditorClock.IsSeeking);
                 AddStep("left click", () => InputManager.Click(MouseButton.Left));
                 AddAssert("slider not selected", () => EditorBeatmap.SelectedHitObjects.Count == 0);
                 AddStep("seek to visible", () => EditorClock.Seek(650));
+                AddUntilStep("wait for seek", () => !EditorClock.IsSeeking);
                 AddStep("left click", () => InputManager.Click(MouseButton.Left));
                 AddUntilStep("slider selected", () => EditorBeatmap.SelectedHitObjects.Single() == slider);
             }
@@ Expand Down @@

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,6 +11,7 @@
  
    using osu.Framework.Bindables;

    using osu.Framework.Graphics;

    using osu.Framework.Graphics.Containers;

    using osu.Framework.Layout;

    using osu.Game.Audio;

    using osu.Game.Graphics.Containers;

    using osu.Game.Rulesets.Objects;

    @@ -66,6 +67,8 @@ public partial class DrawableSlider : DrawableOsuHitObject
  
            private Container<DrawableSliderRepeat> repeatContainer;

            private PausableSkinnableSound slidingSample;

            private readonly LayoutValue drawSizeLayout;

            public DrawableSlider()

                : this(null)

            {

    @@ -82,6 +85,7 @@ public DrawableSlider([CanBeNull] Slider s = null)
  
                    AlwaysPresent = true,

                    Alpha = 0

                };

                AddLayout(drawSizeLayout = new LayoutValue(Invalidation.DrawSize | Invalidation.MiscGeometry));

            }

            [BackgroundDependencyLoader]

    @@ -246,21 +250,20 @@ protected override void Update()
  
                Ball.UpdateProgress(completionProgress);

                SliderBody?.UpdateProgress(HeadCircle.IsHit ? completionProgress : 0);

                foreach (DrawableHitObject hitObject in NestedHitObjects)

                {

                    if (hitObject is ITrackSnaking s)

                        s.UpdateSnakingPosition(HitObject.Path.PositionAt(SliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(SliderBody?.SnakedEnd ?? 0));

                }

                foreach (DrawableSliderRepeat repeat in repeatContainer)

                    repeat.UpdateSnakingPosition(HitObject.Path.PositionAt(SliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(SliderBody?.SnakedEnd ?? 0));

                Size = SliderBody?.Size ?? Vector2.Zero;

                OriginPosition = SliderBody?.PathOffset ?? Vector2.Zero;

                if (DrawSize != Vector2.Zero)

                if (!drawSizeLayout.IsValid)

                {

                    var childAnchorPosition = Vector2.Divide(OriginPosition, DrawSize);

                    Vector2 pos = Vector2.Divide(OriginPosition, DrawSize);

                    foreach (var obj in NestedHitObjects)

                        obj.RelativeAnchorPosition = childAnchorPosition;

                    Ball.RelativeAnchorPosition = childAnchorPosition;

                        obj.RelativeAnchorPosition = pos;

                    Ball.RelativeAnchorPosition = pos;

                    drawSizeLayout.Validate();

                }

            }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
     namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
-        public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
+        public partial class DrawableSliderRepeat : DrawableOsuHitObject
         {
             public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
@@ Expand Down @@

osu.Game.Rulesets.Osu/Objects/Drawables/ITrackSnaking.cs

This file was deleted.

osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs

-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
     // See the LICENCE file in the repository root for full licence text.
+    using System;
     using System.Linq;
     using NUnit.Framework;
     using osu.Framework.Allocation;
@@ Expand Down Expand Up / @@ -182,9 +183,63 @@ public void TestScoreUpgradeFailed() @@
                 AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000002));
             }
+            [Test]
+            public void TestCustomRulesetScoreNotSubjectToUpgrades([Values] bool available)
+            {
+                RulesetInfo rulesetInfo = null!;
+                ScoreInfo scoreInfo = null!;
+                TestBackgroundDataStoreProcessor processor = null!;
+                AddStep("Add unavailable ruleset", () => Realm.Write(r => r.Add(rulesetInfo = new RulesetInfo
+                {
+                    ShortName = Guid.NewGuid().ToString(),
+                    Available = available
+                })));
+                AddStep("Add score for unavailable ruleset", () => Realm.Write(r => r.Add(scoreInfo = new ScoreInfo(
+                    ruleset: rulesetInfo,
+                    beatmap: r.All<BeatmapInfo>().First())
+                {
+                    TotalScoreVersion = 30000001
+                })));
+                AddStep("Run background processor", () => Add(processor = new TestBackgroundDataStoreProcessor()));
+                AddUntilStep("Wait for completion", () => processor.Completed);
+                AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.BackgroundReprocessingFailed), () => Is.False);
+                AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000001));
+            }
+            [Test]
+            public void TestNonLegacyScoreNotSubjectToUpgrades()
+            {
+                ScoreInfo scoreInfo = null!;
+                TestBackgroundDataStoreProcessor processor = null!;
+                AddStep("Add score which requires upgrade (and has beatmap)", () =>
+                {
+                    Realm.Write(r =>
+                    {
+                        r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: r.All<BeatmapInfo>().First())
+                        {
+                            TotalScoreVersion = 30000005,
+                            LegacyTotalScore = 123456,
+                        });
+                    });
+                });
+                AddStep("Run background processor", () => Add(processor = new TestBackgroundDataStoreProcessor()));
+                AddUntilStep("Wait for completion", () => processor.Completed);
+                AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.BackgroundReprocessingFailed), () => Is.False);
+                AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000005));
+            }
             public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor
             {
                 protected override int TimeToSleepDuringGameplay => 10;
+                public bool Completed => ProcessingTask.IsCompleted;
             }
         }
     }

osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     using osu.Framework.Graphics;
     using osu.Framework.Graphics.Shapes;
     using osu.Framework.Testing;
+    using osu.Framework.Threading;
     using osu.Game.Rulesets.Judgements;
     using osu.Game.Rulesets.Objects;
     using osu.Game.Rulesets.Osu.Judgements;
@@ Expand Down Expand Up / @@ -159,5 +160,15 @@ private void applyPerfectHit() @@
                     Type = HitResult.Perfect
                 });
             }
+            [Test]
+            public void TestSimulateDrain()
+            {
+                ScheduledDelegate del = null!;
+                AddStep("simulate drain", () => del = Scheduler.AddDelayed(() => healthProcessor.Health.Value -= 0.00025f * Time.Elapsed, 0, true));
+                AddUntilStep("wait until zero", () => healthProcessor.Health.Value == 0);
+                AddStep("cancel drain", () => del.Cancel());
+            }
         }
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `StatUtils` and required methods #2

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Add StatUtils and required methods #2

Are you sure you want to change the base?

Uh oh!

Add StatUtils and required methods #2

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Add `StatUtils` and required methods #2

Add `StatUtils` and required methods #2