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

Unstable 0.16.1.0

Browse Source
This commit is contained in:
Markus Isberg
2022-01-27 00:30:32 +09:00
parent 7d6421a548
commit b259af5911
161 changed files with 1913 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Serialization/SerializableProperty.cs
+13 -1
View File
@@ -556,7 +556,14 @@ namespace Barotrauma
switch (Name)
{
case nameof(Powered.Voltage):
if (parentObject is Powered powered) { value = powered.Voltage; return true; }
{
if (parentObject is Powered powered) { value = powered.Voltage; return true; }
}
break;
case nameof(Powered.CurrPowerConsumption):
{
if (parentObject is Powered powered) { value = powered.CurrPowerConsumption; return true; }
}
break;
case nameof(PowerContainer.Charge):
{
@@ -568,6 +575,11 @@ namespace Barotrauma
if (parentObject is PowerContainer powerContainer) { value = powerContainer.ChargePercentage; return true; }
}
break;
case nameof(PowerContainer.RechargeRatio):
{
if (parentObject is PowerContainer powerContainer) { value = powerContainer.RechargeRatio; return true; }
}
break;
case nameof(Reactor.AvailableFuel):
{ if (parentObject is Reactor reactor) { value = reactor.AvailableFuel; return true; } }
break;
Barotrauma/BarotraumaShared/SharedSource/Serialization/XMLExtensions.cs
+22
View File
@@ -262,6 +262,28 @@ namespace Barotrauma
return val;
}
public static double GetAttributeDouble(this XElement element, string name, double defaultValue)
{
if (element?.Attribute(name) == null) { return defaultValue; }
double val = defaultValue;
try
{
string strVal = element.Attribute(name).Value;
if (strVal.LastOrDefault() == 'f')
{
strVal = strVal.Substring(0, strVal.Length - 1);
}
val = double.Parse(strVal, CultureInfo.InvariantCulture);
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "!", e);
}
return val;
}
public static float[] GetAttributeFloatArray(this XElement element, string name, float[] defaultValue)
{
if (element?.Attribute(name) == null) { return defaultValue; }