Skip to content

Commit 114b33e

Browse files
committed
Fix for game version 1.25.x
1 parent 46c1d85 commit 114b33e

File tree

5 files changed

+18
-24
lines changed

5 files changed

+18
-24
lines changed
Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
using UnityEngine;
22

3-
namespace ExtendedColorSchemes
3+
namespace ExtendedColorSchemes;
4+
5+
public class ColorSchemeWithEditableName : PlayerSaveData.ColorScheme
46
{
5-
public class ColorSchemeWithEditableName : PlayerSaveData.ColorScheme
6-
{
7-
public string colorSchemeName;
8-
public bool supportsEnvironmentColorBoost;
9-
public Color environmentColor0Boost;
10-
public Color environmentColor1Boost;
7+
public readonly string ColorSchemeName;
8+
public readonly bool SupportsEnvironmentColorBoost;
119

12-
public ColorSchemeWithEditableName(string colorSchemeName, string colorSchemeId, Color saberAColor, Color saberBColor, Color environmentColor0, Color environmentColor1, Color obstaclesColor, bool supportsEnvironmentColorBoost, Color environmentColor0Boost, Color environmentColor1Boost)
13-
: base(colorSchemeId, saberAColor, saberBColor, environmentColor0, environmentColor1, obstaclesColor)
14-
{
15-
this.colorSchemeName = colorSchemeName;
16-
this.supportsEnvironmentColorBoost = supportsEnvironmentColorBoost;
17-
this.environmentColor0Boost = environmentColor0Boost;
18-
this.environmentColor1Boost = environmentColor1Boost;
19-
}
10+
public ColorSchemeWithEditableName(string colorSchemeName, string colorSchemeId, Color saberAColor, Color saberBColor, Color environmentColor0, Color environmentColor1, Color obstaclesColor, bool supportsEnvironmentColorBoost, Color environmentColor0Boost, Color environmentColor1Boost)
11+
: base(colorSchemeId, saberAColor, saberBColor, environmentColor0, environmentColor1, obstaclesColor, environmentColor0Boost, environmentColor1Boost)
12+
{
13+
ColorSchemeName = colorSchemeName;
14+
SupportsEnvironmentColorBoost = supportsEnvironmentColorBoost;
2015
}
21-
}
16+
}

ExtendedColorSchemes/Converters/ColorSchemeWithEditableNameConverter.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,17 @@ internal class ColorSchemeWithEditableNameConverter : ValueConverter<ColorScheme
5555

5656
return Value.From(new Dictionary<string, Value?>
5757
{
58-
{"colorSchemeName", Value.From(obj.colorSchemeName)},
58+
{"colorSchemeName", Value.From(obj.ColorSchemeName)},
5959
{"colorSchemeId", Value.From(obj.colorSchemeId)},
6060
{"saberAColor", CustomValueTypeConverter<Color>.Serialize(obj.saberAColor)},
6161
{"saberBColor", CustomValueTypeConverter<Color>.Serialize(obj.saberBColor)},
6262
{"environmentColor0", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor0)},
6363
{"environmentColor1", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor1)},
6464
{"obstaclesColor", CustomValueTypeConverter<Color>.Serialize(obj.obstaclesColor)},
65-
{"supportsEnvironmentColorBoost", Value.From(obj.supportsEnvironmentColorBoost)},
65+
{"supportsEnvironmentColorBoost", Value.From(obj.SupportsEnvironmentColorBoost)},
6666
{"environmentColor0Boost", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor0Boost)},
6767
{"environmentColor1Boost", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor1Boost)}
6868
});
6969
}
7070
}
71-
7271
}

ExtendedColorSchemes/HarmonyPatches/ColorSchemesSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ internal static void Prefix(ref ColorScheme[] colorSchemes)
3535
$"User{i + NumberOfDefaultUserColorSchemes}",
3636
$"_UNLOCALIZED_",
3737
true,
38-
!string.IsNullOrWhiteSpace(savedColorScheme?.colorSchemeName) ? savedColorScheme?.colorSchemeName : regex.Replace(translation, (i + NumberOfDefaultUserColorSchemes).ToString()),
38+
!string.IsNullOrWhiteSpace(savedColorScheme?.ColorSchemeName) ? savedColorScheme?.ColorSchemeName : regex.Replace(translation, (i + NumberOfDefaultUserColorSchemes).ToString()),
3939
first.isEditable,
4040
savedColorScheme?.saberAColor ?? first.saberAColor,
4141
savedColorScheme?.saberBColor ?? first.saberBColor,
4242
savedColorScheme?.environmentColor0 ?? first.environmentColor0,
4343
savedColorScheme?.environmentColor1 ?? first.environmentColor1,
44-
savedColorScheme?.supportsEnvironmentColorBoost ?? firstWithBoostColors?.supportsEnvironmentColorBoost ?? first.supportsEnvironmentColorBoost,
44+
savedColorScheme?.SupportsEnvironmentColorBoost ?? firstWithBoostColors?.supportsEnvironmentColorBoost ?? first.supportsEnvironmentColorBoost,
4545
savedColorScheme?.environmentColor0Boost ?? firstWithBoostColors?.environmentColor0Boost ?? first.environmentColor0Boost,
4646
savedColorScheme?.environmentColor1Boost ?? firstWithBoostColors?.environmentColor1Boost ?? first.environmentColor1Boost,
4747
savedColorScheme?.obstaclesColor ?? first.obstaclesColor));

ExtendedColorSchemes/HarmonyPatches/PlayerDataFileManagerSO.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private static void GetColorSchemes(ColorSchemesSettings colorSchemesSettings, r
6363
{
6464
ColorSchemeWithEditableName? savedColorScheme = Plugin.Config.colorSchemes.FirstOrDefault(x => x.colorSchemeId == colorScheme.colorSchemeId);
6565
ColorSchemeWithEditableName colorSchemeWithEditableName = new(
66-
savedColorScheme?.colorSchemeName ?? string.Empty,
66+
savedColorScheme?.ColorSchemeName ?? string.Empty,
6767
colorScheme.colorSchemeId,
6868
colorScheme.saberAColor,
6969
colorScheme.saberBColor,

ExtendedColorSchemes/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"id": "ExtendedColorSchemes",
44
"name": "ExtendedColorSchemes",
55
"author": "Meivyn",
6-
"version": "1.1.0",
6+
"version": "1.1.1",
77
"description": "Adds additional custom slots to color schemes.",
8-
"gameVersion": "1.24.0",
8+
"gameVersion": "1.25.0",
99
"dependsOn": {
1010
"BSIPA": "^4.2.1"
1111
}

0 commit comments

Comments
 (0)