Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions ExtendedColorSchemes/ColorSchemeWithEditableName.cs
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
using UnityEngine;

namespace ExtendedColorSchemes
namespace ExtendedColorSchemes;

public class ColorSchemeWithEditableName : PlayerSaveData.ColorScheme
{
public class ColorSchemeWithEditableName : PlayerSaveData.ColorScheme
{
public string colorSchemeName;
public bool supportsEnvironmentColorBoost;
public Color environmentColor0Boost;
public Color environmentColor1Boost;
public readonly string ColorSchemeName;
public readonly bool SupportsEnvironmentColorBoost;

public ColorSchemeWithEditableName(string colorSchemeName, string colorSchemeId, Color saberAColor, Color saberBColor, Color environmentColor0, Color environmentColor1, Color obstaclesColor, bool supportsEnvironmentColorBoost, Color environmentColor0Boost, Color environmentColor1Boost)
: base(colorSchemeId, saberAColor, saberBColor, environmentColor0, environmentColor1, obstaclesColor)
{
this.colorSchemeName = colorSchemeName;
this.supportsEnvironmentColorBoost = supportsEnvironmentColorBoost;
this.environmentColor0Boost = environmentColor0Boost;
this.environmentColor1Boost = environmentColor1Boost;
}
public ColorSchemeWithEditableName(string colorSchemeName, string colorSchemeId, Color saberAColor, Color saberBColor, Color environmentColor0, Color environmentColor1, Color obstaclesColor, bool supportsEnvironmentColorBoost, Color environmentColor0Boost, Color environmentColor1Boost)
: base(colorSchemeId, saberAColor, saberBColor, environmentColor0, environmentColor1, obstaclesColor, environmentColor0Boost, environmentColor1Boost)
{
ColorSchemeName = colorSchemeName;
SupportsEnvironmentColorBoost = supportsEnvironmentColorBoost;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,17 @@ internal class ColorSchemeWithEditableNameConverter : ValueConverter<ColorScheme

return Value.From(new Dictionary<string, Value?>
{
{"colorSchemeName", Value.From(obj.colorSchemeName)},
{"colorSchemeName", Value.From(obj.ColorSchemeName)},
{"colorSchemeId", Value.From(obj.colorSchemeId)},
{"saberAColor", CustomValueTypeConverter<Color>.Serialize(obj.saberAColor)},
{"saberBColor", CustomValueTypeConverter<Color>.Serialize(obj.saberBColor)},
{"environmentColor0", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor0)},
{"environmentColor1", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor1)},
{"obstaclesColor", CustomValueTypeConverter<Color>.Serialize(obj.obstaclesColor)},
{"supportsEnvironmentColorBoost", Value.From(obj.supportsEnvironmentColorBoost)},
{"supportsEnvironmentColorBoost", Value.From(obj.SupportsEnvironmentColorBoost)},
{"environmentColor0Boost", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor0Boost)},
{"environmentColor1Boost", CustomValueTypeConverter<Color>.Serialize(obj.environmentColor1Boost)}
});
}
}

}
4 changes: 2 additions & 2 deletions ExtendedColorSchemes/HarmonyPatches/ColorSchemesSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ internal static void Prefix(ref ColorScheme[] colorSchemes)
$"User{i + NumberOfDefaultUserColorSchemes}",
$"_UNLOCALIZED_",
true,
!string.IsNullOrWhiteSpace(savedColorScheme?.colorSchemeName) ? savedColorScheme?.colorSchemeName : regex.Replace(translation, (i + NumberOfDefaultUserColorSchemes).ToString()),
!string.IsNullOrWhiteSpace(savedColorScheme?.ColorSchemeName) ? savedColorScheme?.ColorSchemeName : regex.Replace(translation, (i + NumberOfDefaultUserColorSchemes).ToString()),
first.isEditable,
savedColorScheme?.saberAColor ?? first.saberAColor,
savedColorScheme?.saberBColor ?? first.saberBColor,
savedColorScheme?.environmentColor0 ?? first.environmentColor0,
savedColorScheme?.environmentColor1 ?? first.environmentColor1,
savedColorScheme?.supportsEnvironmentColorBoost ?? firstWithBoostColors?.supportsEnvironmentColorBoost ?? first.supportsEnvironmentColorBoost,
savedColorScheme?.SupportsEnvironmentColorBoost ?? firstWithBoostColors?.supportsEnvironmentColorBoost ?? first.supportsEnvironmentColorBoost,
savedColorScheme?.environmentColor0Boost ?? firstWithBoostColors?.environmentColor0Boost ?? first.environmentColor0Boost,
savedColorScheme?.environmentColor1Boost ?? firstWithBoostColors?.environmentColor1Boost ?? first.environmentColor1Boost,
savedColorScheme?.obstaclesColor ?? first.obstaclesColor));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private static void GetColorSchemes(ColorSchemesSettings colorSchemesSettings, r
{
ColorSchemeWithEditableName? savedColorScheme = Plugin.Config.colorSchemes.FirstOrDefault(x => x.colorSchemeId == colorScheme.colorSchemeId);
ColorSchemeWithEditableName colorSchemeWithEditableName = new(
savedColorScheme?.colorSchemeName ?? string.Empty,
savedColorScheme?.ColorSchemeName ?? string.Empty,
colorScheme.colorSchemeId,
colorScheme.saberAColor,
colorScheme.saberBColor,
Expand Down
4 changes: 2 additions & 2 deletions ExtendedColorSchemes/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"id": "ExtendedColorSchemes",
"name": "ExtendedColorSchemes",
"author": "Meivyn",
"version": "1.1.0",
"version": "1.1.1",
"description": "Adds additional custom slots to color schemes.",
"gameVersion": "1.24.0",
"gameVersion": "1.25.0",
"dependsOn": {
"BSIPA": "^4.2.1"
}
Expand Down