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

Unstable 0.17.2.0

Browse Source
This commit is contained in:
Markus Isberg
2022-03-30 00:06:59 +09:00
parent 4206f6db42
commit 2968e23ae8
100 changed files with 654 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,13 +390,13 @@ namespace Barotrauma
}
GUIComponent propertyField = null;
if (value is bool boolVal)
if (value is bool)
{
propertyField = CreateBoolField(entity, property, boolVal, displayName, toolTip);
propertyField = CreateBoolField(entity, property, (bool)value, displayName, toolTip);
}
else if (value is string stringVal)
else if (value is string)
{
propertyField = CreateStringField(entity, property, stringVal, displayName, toolTip);
propertyField = CreateStringField(entity, property, (string)value, displayName, toolTip);
}
else if (value.GetType().IsEnum)
{
@@ -1277,7 +1277,7 @@ namespace Barotrauma
public void CreateTextPicker(string textTag, ISerializableEntity entity, SerializableProperty property, GUITextBox textBox)
{
var msgBox = new GUIMessageBox("", "", new LocalizedString[] { TextManager.Get("Ok") }, new Vector2(0.2f, 0.5f), new Point(300, 400));
var msgBox = new GUIMessageBox("", "", new LocalizedString[] { TextManager.Get("Cancel") }, new Vector2(0.2f, 0.5f), new Point(300, 400));
msgBox.Buttons[0].OnClicked = msgBox.Close;
var textList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.8f), msgBox.Content.RectTransform, Anchor.TopCenter))
@@ -1307,18 +1307,6 @@ namespace Barotrauma
UserData = tagTextPair.Key.ToString()
};
}
if (entity is IHasExtraTextPickerEntries hasExtraTextPickerEntries)
{
foreach (string extraEntry in hasExtraTextPickerEntries.GetExtraTextPickerEntries())
{
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), textList.Content.RectTransform) { MinSize = new Point(0, 20) },
ToolBox.LimitString(extraEntry, GUIStyle.Font, textList.Content.Rect.Width), GUIStyle.Green)
{
UserData = extraEntry
};
}
}
}
private void TrySendNetworkUpdate(ISerializableEntity entity, SerializableProperty property)
@@ -1457,12 +1445,4 @@ namespace Barotrauma
}
}
}
/// <summary>
/// Implement this interface to insert extra entires to the text pickers created for the SerializableEntityEditors of the entity
/// </summary>
interface IHasExtraTextPickerEntries
{
public IEnumerable<string> GetExtraTextPickerEntries();
}
}