RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add legacy mania combo counter lookups

This commit is contained in:
Salman Ahmed 2023-12-30 05:18:56 +03:00
parent 78cb6b6851
commit ece532b837
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
View File

@ -39,6 +39,7 @@ public class LegacyManiaSkinConfiguration : IHasCustomColours
public float HitPosition = DEFAULT_HIT_POSITION;
public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
public float ComboPosition = 111 * POSITION_SCALE_FACTOR;
public float ScorePosition = 300 * POSITION_SCALE_FACTOR;
public bool ShowJudgementLine = true;
public bool KeysUnderNotes;

2
osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
View File

@ -42,6 +42,7 @@ public enum LegacyManiaSkinConfigurationLookups
LeftLineWidth,
RightLineWidth,
HitPosition,
ComboPosition,
ScorePosition,
LightPosition,
StagePaddingTop,
@ -63,6 +64,7 @@ public enum LegacyManiaSkinConfigurationLookups
JudgementLineColour,
ColumnBackgroundColour,
ColumnLightColour,
ComboBreakColour,
MinimumColumnWidth,
LeftStageImage,
RightStageImage,

4
osu.Game/Skinning/LegacyManiaSkinDecoder.cs
View File

@ -94,6 +94,10 @@ private void flushPendingLines()
currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
break;
case "ComboPosition":
currentConfig.ComboPosition = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
break;
case "ScorePosition":
currentConfig.ScorePosition = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
break;

6
osu.Game/Skinning/LegacySkin.cs
View File

@ -152,6 +152,9 @@ protected override void ParseConfigurationStream(Stream stream)
case LegacyManiaSkinConfigurationLookups.HitPosition:
return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
case LegacyManiaSkinConfigurationLookups.ComboPosition:
return SkinUtils.As<TValue>(new Bindable<float>(existing.ComboPosition));
case LegacyManiaSkinConfigurationLookups.ScorePosition:
return SkinUtils.As<TValue>(new Bindable<float>(existing.ScorePosition));
@ -189,6 +192,9 @@ protected override void ParseConfigurationStream(Stream stream)
Debug.Assert(maniaLookup.ColumnIndex != null);
return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.ColumnIndex + 1}"));
case LegacyManiaSkinConfigurationLookups.ComboBreakColour:
return SkinUtils.As<TValue>(getCustomColour(existing, "ColourBreak"));
case LegacyManiaSkinConfigurationLookups.MinimumColumnWidth:
return SkinUtils.As<TValue>(new Bindable<float>(existing.MinimumColumnWidth));