Unstable 0.17.1.0
This commit is contained in:
@@ -162,7 +162,7 @@ namespace Barotrauma
|
||||
Identifier variantOf = MainElement.VariantOf();
|
||||
if (!variantOf.IsEmpty)
|
||||
{
|
||||
VariantFile = doc;
|
||||
VariantFile = new XDocument(doc);
|
||||
#warning TODO: determine that CreateVariantXML is equipped to do this
|
||||
XElement newRoot = CreateVariantXml(MainElement, CharacterPrefab.FindBySpeciesName(variantOf).ConfigElement);
|
||||
var oldElement = MainElement;
|
||||
@@ -477,12 +477,15 @@ namespace Barotrauma
|
||||
[Serialize(0f, IsPropertySaveable.Yes), Editable(MinValueFloat = 0, MaxValueFloat = 10, DecimalCount = 2)]
|
||||
public float ConstantHealthRegeneration { get; private set; }
|
||||
|
||||
[Serialize(0f, IsPropertySaveable.Yes), Editable(MinValueFloat = 0, MaxValueFloat = 10, DecimalCount = 2)]
|
||||
[Serialize(0f, IsPropertySaveable.Yes), Editable(MinValueFloat = 0, MaxValueFloat = 100, DecimalCount = 2)]
|
||||
public float HealthRegenerationWhenEating { get; private set; }
|
||||
|
||||
[Serialize(false, IsPropertySaveable.Yes), Editable]
|
||||
public bool StunImmunity { get; set; }
|
||||
|
||||
[Serialize(false, IsPropertySaveable.Yes), Editable]
|
||||
public bool PoisonImmunity { get; set; }
|
||||
|
||||
[Serialize(false, IsPropertySaveable.Yes, description: "Can afflictions affect the face/body tint of the character."), Editable]
|
||||
public bool ApplyAfflictionColors { get; private set; }
|
||||
|
||||
|
||||
@@ -956,7 +956,7 @@ namespace Barotrauma
|
||||
Deformations = new Dictionary<SpriteDeformationParams, XElement>();
|
||||
foreach (var deformationElement in element.GetChildElements("spritedeformation"))
|
||||
{
|
||||
string typeName = deformationElement.GetAttributeString("typename", null) ?? deformationElement.GetAttributeString("type", "");
|
||||
string typeName = deformationElement.GetAttributeString("type", null) ?? deformationElement.GetAttributeString("typename", string.Empty);
|
||||
SpriteDeformationParams deformation = null;
|
||||
switch (typeName.ToLowerInvariant())
|
||||
{
|
||||
@@ -982,7 +982,7 @@ namespace Barotrauma
|
||||
}
|
||||
if (deformation != null)
|
||||
{
|
||||
deformation.TypeName = typeName;
|
||||
deformation.Type = typeName;
|
||||
}
|
||||
Deformations.Add(deformation, deformationElement);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user