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

(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-04 11:10:14 +03:00
parent 371bcb11c1
commit b08a31a68f
63 changed files with 1069 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs
+5 -4
View File
@@ -28,11 +28,12 @@ namespace Barotrauma
public readonly string[] AllowedContainerIdentifiers;
public readonly string[] AllowedContainerTags;
public ContainedItemSprite(XElement element, string path = "", bool lazyLoad = false)
public ContainedItemSprite(XElement element, string path = "")
{
Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
Sprite = new Sprite(element, path);
AllowedContainerIdentifiers = element.GetAttributeStringArray("allowedcontaineridentifiers", new string[0], convertToLowerInvariant: true);
AllowedContainerTags = element.GetAttributeStringArray("allowedcontainertags", new string[0], convertToLowerInvariant: true);
}
public bool MatchesContainer(Item container)
@@ -100,9 +101,9 @@ namespace Barotrauma
/// </summary>
public List<PropertyConditional> AnimationConditionals { get; private set; } = new List<PropertyConditional>();
public DecorativeSprite(XElement element, string path = "", bool lazyLoad = false)
public DecorativeSprite(XElement element, string path = "")
{
Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
Sprite = new Sprite(element, path);
SerializableProperty.DeserializeProperties(this, element);
foreach (XElement subElement in element.Elements())