From ff2c5b446e9787494d1ad9690036904a3bf43ddf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 1 Apr 2020 16:05:52 +0900
Subject: [PATCH] Fix column lights positioned incorrectly

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 5 +++++
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs          | 1 +
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs    | 1 +
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs                | 4 ++++
 osu.Game/Skinning/LegacySkin.cs                            | 3 +++
 5 files changed, 14 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b4bf6b1652..7e8f720e99 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -42,6 +42,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
                                 || Stage == null || Column.Index == Stage.Columns.Count - 1;
 
+            float lightPosition = skin.GetConfig<LegacyManiaSkinConfigurationLookup, float>(
+                                      new LegacyManiaSkinConfigurationLookup(Stage?.Columns.Count ?? 4, LegacyManiaSkinConfigurationLookups.LightPosition))?.Value
+                                  ?? 0;
+
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -67,6 +71,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                 {
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Bottom = lightPosition },
                     Child = light = new Sprite
                     {
                         Anchor = Anchor.BottomCentre,
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 56d2652e76..0d0c4943ef 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Skinning
         public readonly float[] ColumnWidth;
 
         public float HitPosition = 124.8f; // (480 - 402) * 1.6f
+        public float LightPosition = 107.2f; // (480 - 413) * 1.6f
         public bool ShowJudgementLine = true;
 
         public LegacyManiaSkinConfiguration(int keys)
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 67895a69e4..49e4faa269 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Skinning
         LeftLineWidth,
         RightLineWidth,
         HitPosition,
+        LightPosition,
         HitTargetImage,
         ShowJudgementLine,
         KeyImage,
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 2c6b76847d..dabdd0a980 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -91,6 +91,10 @@ namespace osu.Game.Skinning
                         currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
                         break;
 
+                    case "LightPosition":
+                        currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * size_scale_factor;
+                        break;
+
                     case "JudgementLine":
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7d0fa2489e..eafbdd4ee5 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -141,6 +141,9 @@ namespace osu.Game.Skinning
                         case LegacyManiaSkinConfigurationLookups.HitPosition:
                             return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
 
+                        case LegacyManiaSkinConfigurationLookups.LightPosition:
+                            return SkinUtils.As<TValue>(new Bindable<float>(existing.LightPosition));
+
                         case LegacyManiaSkinConfigurationLookups.ShowJudgementLine:
                             return SkinUtils.As<TValue>(new Bindable<bool>(existing.ShowJudgementLine));
                     }