Unstable v0.19.5.0

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Sonar.cs

@@ -64,6 +64,8 @@ namespace Barotrauma.Items.Components
         private const float MinZoom = 1.0f, MaxZoom = 4.0f;
         private float zoom = 1.0f;
 
+        /// <remarks>Accessed through event actions. Do not remove even if there are no references in code.</remarks>
+        public bool UseDirectionalPing => useDirectionalPing;
         private bool useDirectionalPing = false;
         private Vector2 pingDirection = new Vector2(1.0f, 0.0f);
         private bool useMineralScanner;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/BooleanOperatorComponent/BooleanOperatorComponent.cs

@@ -82,9 +82,14 @@ namespace Barotrauma.Items.Components
         public sealed override void Update(float deltaTime, Camera cam)
         {
             int receivedInputs = 0;
+            bool allInputsTimedOut = true;
             for (int i = 0; i < timeSinceReceived.Length; i++)
             {
-                if (timeSinceReceived[i] <= timeFrame) { receivedInputs += 1; }
+                if (timeSinceReceived[i] <= timeFrame) 
+                { 
+                    allInputsTimedOut = false;
+                    receivedInputs += 1; 
+                }
                 timeSinceReceived[i] += deltaTime;
             }
 
@@ -93,7 +98,7 @@ namespace Barotrauma.Items.Components
             if (string.IsNullOrEmpty(signalOut))
             {
                 //deactivate the component if state is false and there's no false output (will be woken up by non-zero signals in ReceiveSignal)
-                if (!state) { IsActive = false; }
+                if (!state && allInputsTimedOut) { IsActive = false; }
                 return;
             }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/WaterDetector.cs

@@ -58,6 +58,9 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public bool WaterDetected => isInWater;
+        public int WaterPercentage => GetWaterPercentage(item.CurrentHull);
+
         public WaterDetector(Item item, ContentXElement element)
             : base(item, element)
         {

Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs

@@ -2179,7 +2179,7 @@ namespace Barotrauma
         /// <summary>
         /// Note: This function generates garbage and might be a bit too heavy to be used once per frame.
         /// </summary>
-        public List<T> GetConnectedComponents<T>(bool recursive = false, bool allowTraversingBackwards = true) where T : ItemComponent
+        public List<T> GetConnectedComponents<T>(bool recursive = false, bool allowTraversingBackwards = true, Func<Connection, bool> connectionFilter = null) where T : ItemComponent
         {
             List<T> connectedComponents = new List<T>();
 
@@ -2195,6 +2195,7 @@ namespace Barotrauma
 
             foreach (Connection c in connectionPanel.Connections)
             {
+                if (connectionFilter != null && !connectionFilter.Invoke(c)) { continue; }
                 var recipients = c.Recipients;
                 foreach (Connection recipient in recipients)
                 {

Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs

@@ -807,9 +807,6 @@ namespace Barotrauma
             //only used if the item doesn't have a name/description defined in the currently selected language
             string fallbackNameIdentifier = ConfigElement.GetAttributeString("fallbacknameidentifier", "");
 
-            //works the same as nameIdentifier, but just replaces the description
-            Identifier descriptionIdentifier = ConfigElement.GetAttributeIdentifier("descriptionidentifier", "");
-
             name = TextManager.Get(nameIdentifier.IsEmpty
                     ? $"EntityName.{Identifier}"
                     : $"EntityName.{nameIdentifier}",
@@ -858,18 +855,7 @@ namespace Barotrauma
 
             SerializableProperty.DeserializeProperties(this, ConfigElement);
 
-            if (descriptionIdentifier != Identifier.Empty)
-            {
-                Description = TextManager.Get($"EntityDescription.{descriptionIdentifier}").Fallback(Description);
-            }
-            else if (nameIdentifier == Identifier.Empty)
-            {
-                Description = TextManager.Get($"EntityDescription.{Identifier}").Fallback(Description);
-            }
-            else
-            {
-                Description = TextManager.Get($"EntityDescription.{nameIdentifier}").Fallback(Description);
-            }
+            LoadDescription(ConfigElement);
 
             var allowDroppingOnSwapWith = ConfigElement.GetAttributeIdentifierArray("allowdroppingonswapwith", Array.Empty<Identifier>());
             AllowDroppingOnSwapWith = allowDroppingOnSwapWith.ToImmutableHashSet();
@@ -1320,12 +1306,8 @@ namespace Barotrauma
             throw new InvalidOperationException("Can't call ItemPrefab.CreateInstance");
         }
 
-        private bool disposed = false;
         public override void Dispose()
         {
-            if (disposed) { return; }
-            disposed = true;
-            Prefabs.Remove(this);
             Item.RemoveByPrefab(this);
         }