Build 0.18.5.0

2022-06-03 22:29:04 +09:00
parent 64db1a6a44
commit 6be757a45b
72 changed files with 869 additions and 439 deletions
@@ -270,7 +270,11 @@ namespace Barotrauma.Items.Components
            {
                Body?.SetTransform(Body.SimPosition + ConvertUnits.ToSimUnits(amount), 0.0f);
            }
-
+            if (linkedGap != null)
+            {
+                RefreshLinkedGap();
+                linkedGap.Rect = item.Rect;
+            }
 #if CLIENT
            UpdateConvexHulls();
 #endif
@@ -41,6 +41,8 @@ namespace Barotrauma.Items.Components

        private Character prevEquipper;

+        public override bool IsAttached => Attached;
+
        private bool attachable, attached, attachedByDefault;
        private Voronoi2.VoronoiCell attachTargetCell;
        private PhysicsBody body;
@@ -71,6 +73,7 @@ namespace Barotrauma.Items.Components
            set
            {
                attached = value;
+                item.CheckCleanable();
                item.SetActiveSprite();
            }
        }
@@ -4,7 +4,6 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;

 namespace Barotrauma.Items.Components
 {
@@ -20,6 +19,8 @@ namespace Barotrauma.Items.Components

        private CoroutineHandle pickingCoroutine;

+        public virtual bool IsAttached => false;
+
        public List<InvSlotType> AllowedSlots
        {
            get { return allowedSlots; }
@@ -94,7 +94,7 @@ namespace Barotrauma.Items.Components
            get; set;
        }

-        [Serialize(true, IsPropertySaveable.No, description: "Can the item hit broken doors.")]
+        [Serialize(true, IsPropertySaveable.No, description: "Can the item hit doors.")]
        public bool HitItems { get; set; }

        [Serialize(false, IsPropertySaveable.No, description: "Can the item hit broken doors.")]
@@ -187,7 +187,7 @@ namespace Barotrauma.Items.Components
        [Serialize(false, IsPropertySaveable.No)]
        public bool RemoveContainedItemsOnDeconstruct { get; set; }

-        private readonly ImmutableArray<SlotRestrictions> slotRestrictions;
+        private ImmutableArray<SlotRestrictions> slotRestrictions;

        readonly List<ISerializableEntity> targets = new List<ISerializableEntity>();

@@ -215,13 +215,21 @@ namespace Barotrauma.Items.Components

        public override bool RecreateGUIOnResolutionChange => true;

-        public List<RelatedItem> ContainableItems { get; }
+        public List<RelatedItem> ContainableItems { get; private set; }

        public ItemContainer(Item item, ContentXElement element)
            : base(item, element)
+        {
+            LoadContainableRestrictions(element);
+            InitProjSpecific(element);
+        }
+
+        public void LoadContainableRestrictions(ContentXElement element)
        {
            int totalCapacity = capacity;

+            ContainableItems?.Clear();
+
            foreach (var subElement in element.Elements())
            {
                switch (subElement.Name.ToString().ToLowerInvariant())
@@ -242,7 +250,7 @@ namespace Barotrauma.Items.Components
                }
            }
            Inventory = new ItemInventory(item, this, totalCapacity, SlotsPerRow);
-           
+
            List<SlotRestrictions> newSlotRestrictions = new List<SlotRestrictions>(totalCapacity);
            for (int i = 0; i < capacity; i++)
            {
@@ -253,7 +261,7 @@ namespace Barotrauma.Items.Components
            foreach (var subElement in element.Elements())
            {
                if (subElement.Name.ToString().ToLowerInvariant() != "subcontainer") { continue; }
-       
+
                int subCapacity = subElement.GetAttributeInt("capacity", 1);
                int subMaxStackSize = subElement.GetAttributeInt("maxstacksize", maxStackSize);

@@ -281,7 +289,6 @@ namespace Barotrauma.Items.Components
            capacity = totalCapacity;
            slotRestrictions = newSlotRestrictions.ToImmutableArray();
            System.Diagnostics.Debug.Assert(totalCapacity == slotRestrictions.Length);
-            InitProjSpecific(element);
        }

        public int GetMaxStackSize(int slotIndex)
@@ -114,6 +114,20 @@ namespace Barotrauma.Items.Components
            private set;
        } = true;

+        [Serialize(false, IsPropertySaveable.No)]
+        public bool NonInteractableWhenFlippedX
+        {
+            get;
+            set;
+        }
+
+        [Serialize(false, IsPropertySaveable.No)]
+        public bool NonInteractableWhenFlippedY
+        {
+            get;
+            set;
+        }
+
        public Controller(Item item, ContentXElement element)
            : base(item, element)
        {
@@ -571,6 +585,18 @@ namespace Barotrauma.Items.Components
            }
        }

+        public override void OnItemLoaded()
+        {
+            if (item.FlippedX && NonInteractableWhenFlippedX)
+            {
+                item.NonInteractable = true;
+            }
+            else if (item.FlippedY && NonInteractableWhenFlippedY)
+            {
+                item.NonInteractable = true;
+            }
+        }
+
        public override void Reset()
        {
            base.Reset();
@@ -435,7 +435,7 @@ namespace Barotrauma.Items.Components

 #if CLIENT
            sw.Stop();
-            GameMain.PerformanceCounter.AddElapsedTicks("GridUpdate", sw.ElapsedTicks);
+            GameMain.PerformanceCounter.AddElapsedTicks("Update:Power", sw.ElapsedTicks);
            sw.Restart();
 #endif

@@ -592,7 +592,7 @@ namespace Barotrauma.Items.Components

 #if CLIENT
            sw.Stop();
-            GameMain.PerformanceCounter.AddElapsedTicks("PowerUpdate", sw.ElapsedTicks);
+            GameMain.PerformanceCounter.AddElapsedTicks("Update:Power", sw.ElapsedTicks);
 #endif
        }

@@ -17,7 +17,6 @@ namespace Barotrauma
        Beard,
        Moustache,
        FaceAttachment,
-        JobIndicator,
        Husk,
        Herpes
    }
@@ -128,7 +127,6 @@ namespace Barotrauma
                case WearableType.Beard:
                case WearableType.Moustache:
                case WearableType.FaceAttachment:
-                case WearableType.JobIndicator:
                case WearableType.Husk:
                case WearableType.Herpes:
                    Limb = LimbType.Head;