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

v0.10.5.1

Browse Source
This commit is contained in:
Juan Pablo Arce
2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Serialization/SerializableProperty.cs
+12 -4
View File
@@ -702,8 +702,8 @@ namespace Barotrauma
{
if (!subElement.Name.ToString().Equals("upgrade", StringComparison.OrdinalIgnoreCase)) { continue; }
var upgradeVersion = new Version(subElement.GetAttributeString("gameversion", "0.0.0.0"));
if (savedVersion >= upgradeVersion) { continue; }
if (savedVersion >= upgradeVersion) { continue; }
foreach (XAttribute attribute in subElement.Attributes())
{
string attributeName = attribute.Name.ToString().ToLowerInvariant();
@@ -756,9 +756,17 @@ namespace Barotrauma
if (entity is Item item2)
{
XElement componentElement = subElement.FirstElement();
if (componentElement == null) continue;
if (componentElement == null) { continue; }
ItemComponent itemComponent = item2.Components.First(c => c.Name == componentElement.Name.ToString());
if (itemComponent == null) continue;
if (itemComponent == null) { continue; }
foreach (XAttribute attribute in componentElement.Attributes())
{
string attributeName = attribute.Name.ToString().ToLowerInvariant();
if (itemComponent.SerializableProperties.TryGetValue(attributeName, out SerializableProperty property))
{
FixValue(property, itemComponent, attribute);
}
}
foreach (XElement element in componentElement.Elements())
{
switch (element.Name.ToString().ToLowerInvariant())
Barotrauma/BarotraumaShared/SharedSource/Serialization/XMLExtensions.cs
+20 -10
View File
@@ -140,20 +140,20 @@ namespace Barotrauma
if (element.Attribute(name) == null) continue;
float val;
try
{
if (!Single.TryParse(element.Attribute(name).Value, NumberStyles.Float, CultureInfo.InvariantCulture, out val))
string strVal = element.Attribute(name).Value;
if (strVal.LastOrDefault() == 'f')
{
continue;
strVal = strVal.Substring(0, strVal.Length - 1);
}
val = float.Parse(strVal, CultureInfo.InvariantCulture);
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "!", e);
continue;
}
return val;
}
@@ -165,13 +165,14 @@ namespace Barotrauma
if (element?.Attribute(name) == null) return defaultValue;
float val = defaultValue;
try
{
if (!Single.TryParse(element.Attribute(name).Value, NumberStyles.Float, CultureInfo.InvariantCulture, out val))
string strVal = element.Attribute(name).Value;
if (strVal.LastOrDefault() == 'f')
{
return defaultValue;
strVal = strVal.Substring(0, strVal.Length - 1);
}
val = float.Parse(strVal, CultureInfo.InvariantCulture);
}
catch (Exception e)
{
@@ -189,7 +190,12 @@ namespace Barotrauma
try
{
val = Single.Parse(attribute.Value, CultureInfo.InvariantCulture);
string strVal = attribute.Value;
if (strVal.LastOrDefault() == 'f')
{
strVal = strVal.Substring(0, strVal.Length - 1);
}
val = float.Parse(strVal, CultureInfo.InvariantCulture);
}
catch (Exception e)
{
@@ -212,8 +218,12 @@ namespace Barotrauma
{
try
{
float val = Single.Parse(splitValue[i], CultureInfo.InvariantCulture);
floatValue[i] = val;
string strVal = splitValue[i];
if (strVal.LastOrDefault() == 'f')
{
strVal = strVal.Substring(0, strVal.Length - 1);
}
floatValue[i] = float.Parse(strVal, CultureInfo.InvariantCulture);
}
catch (Exception e)
{