diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index 4ec18f9b01..59188f02f9 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -16,8 +16,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
public readonly LegacyManiaSkinConfigurationLookups Lookup;
///
- /// The intended index for the configuration.
+ /// The column which is being looked up.
/// May be null if the configuration does not apply to a .
+ /// Note that this is the absolute index across all stages.
///
public readonly int? ColumnIndex;
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 6f934d1a92..c9e96ab3f1 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -15,15 +15,20 @@ namespace osu.Game.Skinning
///
public readonly int TotalColumns;
- public readonly int? TargetColumn;
+ ///
+ /// The column which is being looked up.
+ /// May be null if the configuration does not apply to a specific column.
+ /// Note that this is the absolute index across all stages.
+ ///
+ public readonly int? ColumnIndex;
public readonly LegacyManiaSkinConfigurationLookups Lookup;
- public LegacyManiaSkinConfigurationLookup(int totalColumns, LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
+ public LegacyManiaSkinConfigurationLookup(int totalColumns, LegacyManiaSkinConfigurationLookups lookup, int? columnIndex = null)
{
TotalColumns = totalColumns;
Lookup = lookup;
- TargetColumn = targetColumn;
+ ColumnIndex = columnIndex;
}
}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e1a630b643..646746a0f3 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -134,12 +134,12 @@ namespace osu.Game.Skinning
switch (maniaLookup.Lookup)
{
case LegacyManiaSkinConfigurationLookups.ColumnWidth:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(new Bindable(existing.ColumnWidth[maniaLookup.TargetColumn.Value]));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(new Bindable(existing.ColumnWidth[maniaLookup.ColumnIndex.Value]));
case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(new Bindable(existing.ColumnSpacing[maniaLookup.TargetColumn.Value]));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(new Bindable(existing.ColumnSpacing[maniaLookup.ColumnIndex.Value]));
case LegacyManiaSkinConfigurationLookups.HitPosition:
return SkinUtils.As(new Bindable(existing.HitPosition));
@@ -157,15 +157,15 @@ namespace osu.Game.Skinning
return SkinUtils.As(getManiaImage(existing, "LightingN"));
case LegacyManiaSkinConfigurationLookups.ExplosionScale:
- Debug.Assert(maniaLookup.TargetColumn != null);
+ Debug.Assert(maniaLookup.ColumnIndex != null);
if (GetConfig(SkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
return SkinUtils.As(new Bindable(1));
- if (existing.ExplosionWidth[maniaLookup.TargetColumn.Value] != 0)
- return SkinUtils.As(new Bindable(existing.ExplosionWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+ if (existing.ExplosionWidth[maniaLookup.ColumnIndex.Value] != 0)
+ return SkinUtils.As(new Bindable(existing.ExplosionWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
- return SkinUtils.As(new Bindable(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+ return SkinUtils.As(new Bindable(existing.ColumnWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
return SkinUtils.As(getCustomColour(existing, "ColourColumnLine"));
@@ -174,53 +174,53 @@ namespace osu.Game.Skinning
return SkinUtils.As(getCustomColour(existing, "ColourJudgementLine"));
case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getCustomColour(existing, $"Colour{maniaLookup.TargetColumn + 1}"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getCustomColour(existing, $"Colour{maniaLookup.ColumnIndex + 1}"));
case LegacyManiaSkinConfigurationLookups.ColumnLightColour:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getCustomColour(existing, $"ColourLight{maniaLookup.TargetColumn + 1}"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getCustomColour(existing, $"ColourLight{maniaLookup.ColumnIndex + 1}"));
case LegacyManiaSkinConfigurationLookups.MinimumColumnWidth:
return SkinUtils.As(new Bindable(existing.MinimumColumnWidth));
case LegacyManiaSkinConfigurationLookups.NoteImage:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}"));
case LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}H"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}H"));
case LegacyManiaSkinConfigurationLookups.HoldNoteTailImage:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}T"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}T"));
case LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}L"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}L"));
case LegacyManiaSkinConfigurationLookups.HoldNoteLightImage:
return SkinUtils.As(getManiaImage(existing, "LightingL"));
case LegacyManiaSkinConfigurationLookups.HoldNoteLightScale:
- Debug.Assert(maniaLookup.TargetColumn != null);
+ Debug.Assert(maniaLookup.ColumnIndex != null);
if (GetConfig(SkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
return SkinUtils.As(new Bindable(1));
- if (existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] != 0)
- return SkinUtils.As(new Bindable(existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+ if (existing.HoldNoteLightWidth[maniaLookup.ColumnIndex.Value] != 0)
+ return SkinUtils.As(new Bindable(existing.HoldNoteLightWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
- return SkinUtils.As(new Bindable(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+ return SkinUtils.As(new Bindable(existing.ColumnWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
case LegacyManiaSkinConfigurationLookups.KeyImage:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getManiaImage(existing, $"KeyImage{maniaLookup.ColumnIndex}"));
case LegacyManiaSkinConfigurationLookups.KeyImageDown:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}D"));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(getManiaImage(existing, $"KeyImage{maniaLookup.ColumnIndex}D"));
case LegacyManiaSkinConfigurationLookups.LeftStageImage:
return SkinUtils.As(getManiaImage(existing, "StageLeft"));
@@ -238,12 +238,12 @@ namespace osu.Game.Skinning
return SkinUtils.As(getManiaImage(existing, "StageHint"));
case LegacyManiaSkinConfigurationLookups.LeftLineWidth:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(new Bindable(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value]));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(new Bindable(existing.ColumnLineWidth[maniaLookup.ColumnIndex.Value]));
case LegacyManiaSkinConfigurationLookups.RightLineWidth:
- Debug.Assert(maniaLookup.TargetColumn != null);
- return SkinUtils.As(new Bindable(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value + 1]));
+ Debug.Assert(maniaLookup.ColumnIndex != null);
+ return SkinUtils.As(new Bindable(existing.ColumnLineWidth[maniaLookup.ColumnIndex.Value + 1]));
case LegacyManiaSkinConfigurationLookups.Hit0:
case LegacyManiaSkinConfigurationLookups.Hit50: