Don't break colors

This commit is contained in:
Nick 2023-07-21 12:39:34 -04:00
parent 6aef5c76f6
commit 664f946322
2 changed files with 3 additions and 6 deletions

View File

@ -14,12 +14,9 @@ namespace NewHorizons.External.SerializableData
this.a = a; this.a = a;
} }
public MColor(Color color) public static MColor FromColor(Color color)
{ {
r = (int)(color.r * 255); return new MColor((int)(color.r * 255), (int)(color.g * 255), (int)(color.b * 255), (int)(color.a * 255));
g = (int)(color.g * 255);
b = (int)(color.b * 255);
a = (int)(color.a * 255);
} }
/// <summary> /// <summary>

View File

@ -107,7 +107,7 @@ namespace NewHorizons
.Select((pair) => new EntryPositionInfo() { id = pair.Key, position = pair.Value }) .Select((pair) => new EntryPositionInfo() { id = pair.Key, position = pair.Value })
.ToArray(), .ToArray(),
curiosities = curiousityColours 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() .ToArray()
}; };