vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build 0.18.13.0

Browse Source
This commit is contained in:
Markus Isberg
2022-07-01 12:16:36 +09:00
parent 8e6c601162
commit 497045de7e
79 changed files with 717 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs
View File

@@ -629,16 +629,18 @@ namespace Barotrauma
bool isFlagsAttribute = value.GetType().IsDefined(typeof(FlagsAttribute), false);
bool hasNoneOption = false;
foreach (object enumValue in Enum.GetValues(value.GetType()))
{
if (isFlagsAttribute && !MathHelper.IsPowerOfTwo((int)enumValue)) { continue; }
hasNoneOption |= (int)enumValue == 0;
enumDropDown.AddItem(enumValue.ToString(), enumValue);
if (((int)enumValue != 0 || (int)value == 0) && ((Enum)value).HasFlag((Enum)enumValue))
{
enumDropDown.SelectItem(enumValue);
}
}
enumDropDown.MustSelectAtLeastOne = !hasNoneOption;
enumDropDown.OnSelected += (selected, val) =>
{
if (SetPropertyValue(property, entity, string.Join(", ", enumDropDown.SelectedDataMultiple.Select(d => d.ToString()))))
@@ -1441,7 +1443,21 @@ namespace Barotrauma
if (component.GetType() == parentObject.GetType() && component != parentObject)
{
SafeAdd(component, property);
property.PropertyInfo.SetValue(component, value);
if (value is string stringValue && Enum.TryParse(property.PropertyType, stringValue, out var enumValue))
{
property.PropertyInfo.SetValue(component, enumValue);
}
else
{
try
{
property.PropertyInfo.SetValue(component, value);
}
catch (ArgumentException e)
{
DebugConsole.ThrowError($"Failed to set the value of the property \"{property.Name}\" to {value?.ToString() ?? "null"}", e);
}
}
}
}
break;