From 6c3169a0ed6e9f0f9e1e7d668993e04861f63540 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 01:56:45 +0300
Subject: [PATCH] Remove PP wedge and logic for gameplay layout

---
 osu.Game/Screens/Play/HUD/ArgonRightWedge.cs | 29 --------------------
 osu.Game/Skinning/ArgonSkin.cs               | 18 ------------
 2 files changed, 47 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ArgonRightWedge.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs b/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs
deleted file mode 100644
index 6d01fecf13..0000000000
--- a/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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,
-            };
-        }
-    }
-}
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index f850ae9cbd..3262812d24 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -120,8 +120,6 @@ namespace osu.Game.Skinning
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
                                 var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
                                 var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
-                                var rightWedge = container.OfType<ArgonRightWedge>().FirstOrDefault();
-                                var ppCounter = container.OfType<ArgonPerformancePointsCounter>().FirstOrDefault();
                                 var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
                                 var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
 
@@ -162,20 +160,6 @@ namespace osu.Game.Skinning
                                         }
                                     }
 
-                                    if (rightWedge != null)
-                                    {
-                                        rightWedge.Anchor = Anchor.TopRight;
-                                        rightWedge.Origin = Anchor.TopRight;
-                                        rightWedge.Position = new Vector2(180, 20);
-
-                                        if (ppCounter != null)
-                                        {
-                                            ppCounter.Anchor = Anchor.TopRight;
-                                            ppCounter.Origin = Anchor.TopRight;
-                                            ppCounter.Position = new Vector2(rightWedge.X - 240, rightWedge.Y + 8);
-                                        }
-                                    }
-
                                     var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
 
                                     if (hitError != null)
@@ -222,8 +206,6 @@ namespace osu.Game.Skinning
                                     new ArgonAccuracyCounter(),
                                     new ArgonComboWedge(),
                                     new ArgonComboCounter(),
-                                    new ArgonRightWedge(),
-                                    new ArgonPerformancePointsCounter(),
                                     new BarHitErrorMeter(),
                                     new BarHitErrorMeter(),
                                     new ArgonSongProgress(),