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

v1.4.4.1 (Blood in the Water Update)

Browse Source
This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Screens/CharacterEditor/CharacterEditorScreen.cs
+219 -270
View File
File diff suppressed because it is too large Load Diff
Barotrauma/BarotraumaClient/ClientSource/Screens/CharacterEditor/Wizard.cs
+17 -5
View File
@@ -13,7 +13,7 @@ namespace Barotrauma.CharacterEditor
// Ragdoll data
private Identifier name;
private bool isHumanoid;
private bool canEnterSubmarine = true;
private CanEnterSubmarine canEnterSubmarine = CanEnterSubmarine.True;
private bool canWalk;
private string texturePath;
private string xmlPath;
@@ -153,6 +153,7 @@ namespace Barotrauma.CharacterEditor
};
var topGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.99f, 1), frame.RectTransform, Anchor.Center)) { AbsoluteSpacing = 2 };
var fields = new List<GUIComponent>();
GUITextBox nameField = null;
GUITextBox texturePathElement = null;
GUITextBox xmlPathElement = null;
GUIDropDown contentPackageDropDown = null;
@@ -177,7 +178,7 @@ namespace Barotrauma.CharacterEditor
{
case 0:
new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), mainElement.RectTransform, Anchor.CenterLeft), TextManager.Get("Name"));
var nameField = new GUITextBox(new RectTransform(new Vector2(0.7f, 1), mainElement.RectTransform, Anchor.CenterRight), Name.Value ?? GetCharacterEditorTranslation("DefaultName").Value) { CaretColor = Color.White };
nameField = new GUITextBox(new RectTransform(new Vector2(0.7f, 1), mainElement.RectTransform, Anchor.CenterRight), Name.Value ?? GetCharacterEditorTranslation("DefaultName").Value) { CaretColor = Color.White };
string ProcessText(string text) => text.RemoveWhitespace().CapitaliseFirstInvariant();
Name = ProcessText(nameField.Text).ToIdentifier();
nameField.OnTextChanged += (tb, text) =>
@@ -204,9 +205,14 @@ namespace Barotrauma.CharacterEditor
var l = new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), mainElement.RectTransform, Anchor.CenterLeft), GetCharacterEditorTranslation("CanEnterSubmarines"));
var t = new GUITickBox(new RectTransform(new Vector2(0.7f, 1), mainElement.RectTransform, Anchor.CenterRight), string.Empty)
{
Selected = CanEnterSubmarine,
//TODO: allow ternary selection (true, false, partial)
Selected = CanEnterSubmarine == CanEnterSubmarine.True,
Enabled = !IsCopy,
OnSelected = (tB) => CanEnterSubmarine = tB.Selected
OnSelected = (tB) =>
{
CanEnterSubmarine = tB.Selected ? CanEnterSubmarine.True : CanEnterSubmarine.False;
return true;
}
};
if (!t.Enabled)
{
@@ -409,6 +415,12 @@ namespace Barotrauma.CharacterEditor
return false;
}
if (Name.Value.IsNullOrWhiteSpace())
{
nameField?.Flash(useRectangleFlash: true);
return false;
}
string evaluatedTexturePath = ContentPath.FromRaw(
contentPackageDropDown.SelectedData as ContentPackage,
TexturePath).Value;
@@ -905,7 +917,7 @@ namespace Barotrauma.CharacterEditor
get => Instance.isHumanoid;
set => Instance.isHumanoid = value;
}
public bool CanEnterSubmarine
public CanEnterSubmarine CanEnterSubmarine
{
get => Instance.canEnterSubmarine;
set => Instance.canEnterSubmarine = value;