diff --git a/NewHorizons/External/SerializableData/MColor.cs b/NewHorizons/External/SerializableData/MColor.cs index 9c1d2fa1..156c2cd6 100644 --- a/NewHorizons/External/SerializableData/MColor.cs +++ b/NewHorizons/External/SerializableData/MColor.cs @@ -14,12 +14,9 @@ namespace NewHorizons.External.SerializableData this.a = a; } - public MColor(Color color) + public static MColor FromColor(Color color) { - r = (int)(color.r * 255); - g = (int)(color.g * 255); - b = (int)(color.b * 255); - a = (int)(color.a * 255); + return new MColor((int)(color.r * 255), (int)(color.g * 255), (int)(color.b * 255), (int)(color.a * 255)); } /// diff --git a/NewHorizons/NewHorizonsApi.cs b/NewHorizons/NewHorizonsApi.cs index b8cbb254..4518f9fe 100644 --- a/NewHorizons/NewHorizonsApi.cs +++ b/NewHorizons/NewHorizonsApi.cs @@ -107,7 +107,7 @@ namespace NewHorizons .Select((pair) => new EntryPositionInfo() { id = pair.Key, position = pair.Value }) .ToArray(), curiosities = curiousityColours - .Select((pair) => new CuriosityColorInfo() { id = pair.Key, color = new MColor(pair.Value.colour), highlightColor = new MColor(pair.Value.highlight) }) + .Select((pair) => new CuriosityColorInfo() { id = pair.Key, color = MColor.FromColor(pair.Value.colour), highlightColor = MColor.FromColor(pair.Value.highlight) }) .ToArray() };