diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs deleted file mode 100644 index e8ade9e5c6..0000000000 --- a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) ppy Pty Ltd . 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; -using osuTK; - -namespace osu.Game.Screens.Play.HUD -{ - public partial class ArgonScoreWedge : CompositeDrawable, ISerialisableDrawable - { - public bool UsesFixedAnchor { get; set; } - - [BackgroundDependencyLoader] - private void load() - { - AutoSizeAxes = Axes.Both; - - InternalChildren = new Drawable[] - { - new ArgonWedgePiece - { - WedgeWidth = { Value = 380 }, - WedgeHeight = { Value = 72 }, - }, - new ArgonWedgePiece - { - WedgeWidth = { Value = 380 }, - WedgeHeight = { Value = 72 }, - Position = new Vector2(4, 5) - }, - }; - } - } -} diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs index b78abdffd7..ddb375778c 100644 --- a/osu.Game/Skinning/ArgonSkin.cs +++ b/osu.Game/Skinning/ArgonSkin.cs @@ -117,7 +117,7 @@ namespace osu.Game.Skinning { var health = container.OfType().FirstOrDefault(); var healthLine = container.OfType().FirstOrDefault(); - var scoreWedge = container.OfType().FirstOrDefault(); + var wedgePieces = container.OfType().ToArray(); var score = container.OfType().FirstOrDefault(); var accuracy = container.OfType().FirstOrDefault(); var combo = container.OfType().FirstOrDefault(); @@ -144,15 +144,13 @@ namespace osu.Game.Skinning healthLine.Size = new Vector2(45, 3); } - if (scoreWedge != null) - { - scoreWedge.Position = new Vector2(-50, 15); + foreach (var wedgePiece in wedgePieces) + wedgePiece.Position += new Vector2(-50, 15); - if (score != null) - { - score.Origin = Anchor.TopRight; - score.Position = new Vector2(components_x_offset + 200, scoreWedge.Y + 30); - } + if (score != null) + { + score.Origin = Anchor.TopRight; + score.Position = new Vector2(components_x_offset + 200, wedgePieces.Last().Y + 30); } if (accuracy != null) @@ -210,7 +208,15 @@ namespace osu.Game.Skinning { Children = new Drawable[] { - new ArgonScoreWedge(), + new ArgonWedgePiece + { + Size = new Vector2(380, 72), + }, + new ArgonWedgePiece + { + Size = new Vector2(380, 72), + Position = new Vector2(4, 5) + }, new ArgonScoreCounter(), new ArgonHealthDisplay(), new BoxElement(),