Build 0.18.2.0

This commit is contained in:
Markus Isberg
2022-05-19 23:43:21 +09:00
parent d4f6f4cf88
commit 077917fa5d
115 changed files with 1080 additions and 1763 deletions

View File

@@ -59,7 +59,7 @@ namespace Barotrauma
{
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Float)
if (numInput.InputType == NumberType.Float)
{
numInput.FloatValue = f;
if (flash)
@@ -76,7 +76,7 @@ namespace Barotrauma
{
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Int)
if (numInput.InputType == NumberType.Int)
{
numInput.IntValue = integer;
if (flash)
@@ -127,7 +127,7 @@ namespace Barotrauma
var field = fields[i];
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Float)
if (numInput.InputType == NumberType.Float)
{
numInput.FloatValue = i == 0 ? v2.X : v2.Y;
if (flash)
@@ -145,7 +145,7 @@ namespace Barotrauma
var field = fields[i];
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Float)
if (numInput.InputType == NumberType.Float)
{
switch (i)
{
@@ -174,7 +174,7 @@ namespace Barotrauma
var field = fields[i];
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Float)
if (numInput.InputType == NumberType.Float)
{
switch (i)
{
@@ -206,7 +206,7 @@ namespace Barotrauma
var field = fields[i];
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Int)
if (numInput.InputType == NumberType.Int)
{
switch (i)
{
@@ -246,7 +246,7 @@ namespace Barotrauma
var field = fields[i];
if (field is GUINumberInput numInput)
{
if (numInput.InputType == GUINumberInput.NumberType.Int)
if (numInput.InputType == NumberType.Int)
{
switch (i)
{
@@ -517,7 +517,7 @@ namespace Barotrauma
}
else
{
var numberInput = new GUINumberInput(new RectTransform(new Vector2(inputFieldWidth, 1), frame.RectTransform, Anchor.TopRight), GUINumberInput.NumberType.Int)
var numberInput = new GUINumberInput(new RectTransform(new Vector2(inputFieldWidth, 1), frame.RectTransform, Anchor.TopRight), NumberType.Int)
{
ToolTip = toolTip,
Font = GUIStyle.SmallFont
@@ -554,7 +554,7 @@ namespace Barotrauma
};
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(inputFieldWidth, 1), frame.RectTransform,
Anchor.TopRight), GUINumberInput.NumberType.Float)
Anchor.TopRight), NumberType.Float)
{
ToolTip = toolTip,
Font = GUIStyle.SmallFont
@@ -770,7 +770,7 @@ namespace Barotrauma
new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), element.RectTransform, Anchor.CenterLeft), componentLabel, font: GUIStyle.SmallFont, textAlignment: Alignment.Center);
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(0.7f, 1), element.RectTransform, Anchor.CenterRight),
GUINumberInput.NumberType.Int)
NumberType.Int)
{
Font = GUIStyle.SmallFont
};
@@ -838,7 +838,7 @@ namespace Barotrauma
}
new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), element.RectTransform, Anchor.CenterLeft), componentLabel, font: GUIStyle.SmallFont, textAlignment: Alignment.Center);
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(0.7f, 1), element.RectTransform, Anchor.CenterRight),
GUINumberInput.NumberType.Float)
NumberType.Float)
{
Font = GUIStyle.SmallFont
};
@@ -909,7 +909,7 @@ namespace Barotrauma
new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), element.RectTransform, Anchor.CenterLeft), componentLabel, font: GUIStyle.SmallFont, textAlignment: Alignment.Center);
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(0.7f, 1), element.RectTransform, Anchor.CenterRight),
GUINumberInput.NumberType.Float)
NumberType.Float)
{
Font = GUIStyle.SmallFont
};
@@ -985,7 +985,7 @@ namespace Barotrauma
new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), element.RectTransform, Anchor.CenterLeft), componentLabel, font: GUIStyle.SmallFont, textAlignment: Alignment.Center);
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(0.7f, 1), element.RectTransform, Anchor.CenterRight),
GUINumberInput.NumberType.Float)
NumberType.Float)
{
Font = GUIStyle.SmallFont
};
@@ -1078,7 +1078,7 @@ namespace Barotrauma
};
new GUITextBlock(new RectTransform(new Vector2(0.2f, 1), element.RectTransform, Anchor.CenterLeft) { MinSize = new Point(15, 0) }, GUI.ColorComponentLabels[i], font: GUIStyle.SmallFont, textAlignment: Alignment.Center);
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(0.7f, 1), element.RectTransform, Anchor.CenterRight),
GUINumberInput.NumberType.Int)
NumberType.Int)
{
Font = GUIStyle.SmallFont
};
@@ -1153,7 +1153,7 @@ namespace Barotrauma
var element = new GUIFrame(new RectTransform(new Vector2(0.22f, 1), inputArea.RectTransform) { MinSize = new Point(50, 0), MaxSize = new Point(150, 50) }, style: null);
new GUITextBlock(new RectTransform(new Vector2(0.3f, 1), element.RectTransform, Anchor.CenterLeft), GUI.RectComponentLabels[i], font: GUIStyle.SmallFont, textAlignment: Alignment.Center);
GUINumberInput numberInput = new GUINumberInput(new RectTransform(new Vector2(0.7f, 1), element.RectTransform, Anchor.CenterRight),
GUINumberInput.NumberType.Int)
NumberType.Int)
{
Font = GUIStyle.SmallFont
};