v1.3.0.1 (Epic Store release)

This commit is contained in:
Regalis11
2024-03-28 18:34:33 +02:00
parent 81ca8637be
commit 3791670c42
269 changed files with 13160 additions and 2966 deletions
@@ -5,10 +5,12 @@ using System.Collections.Immutable;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using System.Xml;
using System.Xml.Linq;
using Barotrauma.Extensions;
using File = Barotrauma.IO.File;
using FileStream = Barotrauma.IO.FileStream;
using Path = Barotrauma.IO.Path;
@@ -841,6 +843,13 @@ namespace Barotrauma
return vector;
}
private static readonly ImmutableDictionary<Identifier, Color> monoGameColors =
typeof(Color)
.GetProperties(BindingFlags.Static | BindingFlags.Public)
.Where(p => p.PropertyType == typeof(Color))
.Select(p => (p.Name.ToIdentifier(), p.GetValueFromStaticProperty<Color>()))
.ToImmutableDictionary();
public static Color ParseColor(string stringColor, bool errorMessages = true)
{
if (stringColor.StartsWith("gui.", StringComparison.OrdinalIgnoreCase))
@@ -864,6 +873,11 @@ namespace Barotrauma
return Color.White;
}
if (monoGameColors.TryGetValue(stringColor.ToIdentifier(), out var monoGameColor))
{
return monoGameColor;
}
string[] strComponents = stringColor.Split(',');
Color color = Color.White;