Update "Argon" skin gameplay counters to new design

osu.Game.Tests/Skins/SkinDeserialisationTest.cs

@@ -54,7 +54,9 @@ public class SkinDeserialisationTest
             // Covers key counters
             "Archives/modified-argon-pro-20230618.osk",
             // Covers "Argon" health display
-            "Archives/modified-argon-pro-20231001.osk"
+            "Archives/modified-argon-pro-20231001.osk",
+            // Covers "Argon" score/combo/accuracy/pp counters, and wedges
+            "Archives/modified-argon-pro-20231026.osk"
         };
 
         /// <summary>

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

@@ -16,7 +16,6 @@
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -30,7 +29,7 @@ public partial class TestScenePerformancePointsCounter : OsuTestScene
 
         private int iteration;
         private Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
-        private PerformancePointsCounter counter;
+        private ArgonPerformancePointsCounter counter;
 
         [SetUpSteps]
         public void SetUpSteps() => AddStep("create components", () =>
@@ -66,7 +65,7 @@ public void SetUpSteps() => AddStep("create components", () =>
 
         private void createCounter() => AddStep("Create counter", () =>
         {
-            dependencyContainer.Child = counter = new PerformancePointsCounter
+            dependencyContainer.Child = counter = new ArgonPerformancePointsCounter
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

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

@@ -17,6 +17,7 @@ public partial class TestSceneSkinnableAccuracyCounter : SkinnableHUDComponentTe
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
 
+        protected override Drawable CreateArgonImplementation() => new ArgonAccuracyCounter();
         protected override Drawable CreateDefaultImplementation() => new DefaultAccuracyCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyAccuracyCounter();
 

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

@@ -17,6 +17,7 @@ public partial class TestSceneSkinnableComboCounter : SkinnableHUDComponentTestS
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
 
+        protected override Drawable CreateArgonImplementation() => new ArgonComboCounter();
         protected override Drawable CreateDefaultImplementation() => new DefaultComboCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyComboCounter();
 

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

@@ -21,7 +21,7 @@ public partial class TestSceneSkinnableHealthDisplay : SkinnableHUDComponentTest
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
-        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f) };
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f), BarLength = { Value = 1f } };
         protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay { Scale = new Vector2(0.6f) };
         protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay { Scale = new Vector2(0.6f) };
 

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

@@ -17,6 +17,7 @@ public partial class TestSceneSkinnableScoreCounter : SkinnableHUDComponentTestS
         [Cached(typeof(ScoreProcessor))]
         private ScoreProcessor scoreProcessor = TestGameplayState.Create(new OsuRuleset()).ScoreProcessor;
 
+        protected override Drawable CreateArgonImplementation() => new ArgonScoreCounter();
         protected override Drawable CreateDefaultImplementation() => new DefaultScoreCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyScoreCounter();
 

osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs

@@ -0,0 +1,62 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class ArgonPerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+        }
+
+        protected override IHasText CreateText() => new TextComponent();
+
+        private partial class TextComponent : CompositeDrawable, IHasText
+        {
+            private readonly OsuSpriteText text;
+
+            public LocalisableString Text
+            {
+                get => text.Text;
+                set => text.Text = value;
+            }
+
+            public TextComponent()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChild = new FillFlowContainer
+                {
+                    Direction = FillDirection.Vertical,
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = BeatmapsetsStrings.ShowScoreboardHeaderspp.ToUpper(),
+                            Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
+                        },
+                        text = new OsuSpriteText
+                        {
+                            Font = OsuFont.Torus.With(size: 16.8f, weight: FontWeight.Regular),
+                        }
+                    }
+                };
+            }
+        }
+    }
+}

osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs

@@ -0,0 +1,18 @@
+// 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 osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        protected override OsuSpriteText CreateSpriteText()
+            => base.CreateSpriteText().With(s => s.Font = OsuFont.Default.With(size: 19.2f));
+    }
+}

osu.Game/Screens/Play/HUD/ArgonComboCounter.cs

@@ -0,0 +1,29 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonComboCounter : ComboCounter
+    {
+        [BackgroundDependencyLoader]
+        private void load(ScoreProcessor scoreProcessor)
+        {
+            Current.BindTo(scoreProcessor.Combo);
+        }
+
+        protected override OsuSpriteText CreateSpriteText()
+            => base.CreateSpriteText().With(s => s.Font = FontUsage.Default.With(size: 36f));
+
+        protected override LocalisableString FormatCount(int count)
+        {
+            return $@"{count}x";
+        }
+    }
+}

osu.Game/Screens/Play/HUD/ArgonComboWedge.cs

@@ -0,0 +1,27 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonComboWedge : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new ArgonWedgePiece
+            {
+                WedgeWidth = { Value = 186 },
+                WedgeHeight = { Value = 33 },
+            };
+        }
+    }
+}

osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs

@@ -11,6 +11,7 @@
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -28,15 +29,15 @@ public partial class ArgonHealthDisplay : HealthDisplay, ISerialisableDrawable
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource("Bar height")]
-        public BindableFloat BarHeight { get; } = new BindableFloat(20)
+        public BindableFloat BarHeight { get; } = new BindableFloat(30)
         {
             MinValue = 0,
             MaxValue = 64,
             Precision = 1
         };
 
         [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
+        public BindableFloat BarLength { get; } = new BindableFloat(0.35f)
         {
             MinValue = 0.2f,
             MaxValue = 1,
@@ -100,36 +101,45 @@ private void load()
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = new Container
+            InternalChildren = new[]
             {
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
+                new Circle
                 {
-                    background = new BackgroundPath
-                    {
-                        PathRadius = main_path_radius,
-                    },
-                    glowBar = new BarPath
-                    {
-                        BarColour = Color4.White,
-                        GlowColour = main_bar_glow_colour,
-                        Blending = BlendingParameters.Additive,
-                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
-                        PathRadius = 40f,
-                        // Kinda hacky, but results in correct positioning with increased path radius.
-                        Margin = new MarginPadding(-30f),
-                        GlowPortion = 0.9f,
-                    },
-                    mainBar = new BarPath
+                    Position = new Vector2(-4f, main_path_radius - 1.5f),
+                    Size = new Vector2(50f, 3f),
+                },
+                new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Margin = new MarginPadding { Left = 50f },
+                    Children = new Drawable[]
                     {
-                        AutoSizeAxes = Axes.None,
-                        RelativeSizeAxes = Axes.Both,
-                        Blending = BlendingParameters.Additive,
-                        BarColour = main_bar_colour,
-                        GlowColour = main_bar_glow_colour,
-                        PathRadius = main_path_radius,
-                        GlowPortion = 0.6f,
-                    },
+                        background = new BackgroundPath
+                        {
+                            PathRadius = main_path_radius,
+                        },
+                        glowBar = new BarPath
+                        {
+                            BarColour = Color4.White,
+                            GlowColour = main_bar_glow_colour,
+                            Blending = BlendingParameters.Additive,
+                            Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                            PathRadius = 40f,
+                            // Kinda hacky, but results in correct positioning with increased path radius.
+                            Margin = new MarginPadding(-30f),
+                            GlowPortion = 0.9f,
+                        },
+                        mainBar = new BarPath
+                        {
+                            AutoSizeAxes = Axes.None,
+                            RelativeSizeAxes = Axes.Both,
+                            Blending = BlendingParameters.Additive,
+                            BarColour = main_bar_colour,
+                            GlowColour = main_bar_glow_colour,
+                            PathRadius = main_path_radius,
+                            GlowPortion = 0.6f,
+                        },
+                    }
                 }
             };
         }

osu.Game/Screens/Play/HUD/ArgonRightWedge.cs

@@ -0,0 +1,29 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonRightWedge : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new ArgonWedgePiece
+            {
+                WedgeWidth = { Value = 274 },
+                WedgeHeight = { Value = 40 },
+                InvertShear = { Value = true },
+                EndOpacity = 0.5f,
+            };
+        }
+    }
+}