Merge remote-tracking branch 'upstream/master' into develop

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

@@ -15,6 +15,9 @@ namespace Barotrauma.Items.Components
         private Vector2 detectOffset;
 
         private float updateTimer;
+        
+        [Serialize(false, IsPropertySaveable.No, description: "Has the item currently detected movement. Intended to be used by StatusEffect conditionals (setting this value in XML has no effect).")]
+        public bool MotionDetected { get; set; }
 
         [Flags]
         public enum TargetType
@@ -26,14 +29,25 @@ namespace Barotrauma.Items.Components
             Any = Human | Monster | Wall | Pet,
         }
 
-        [Serialize(false, IsPropertySaveable.No, description: "Has the item currently detected movement. Intended to be used by StatusEffect conditionals (setting this value in XML has no effect).")]
-        public bool MotionDetected { get; set; }
-
+        private bool triggerFromHumans = true;
+        private bool triggerFromPets = true;
+        private bool triggerFromMonsters = true;
+        private TargetType _target;
+        
         [InGameEditable, Serialize(TargetType.Any, IsPropertySaveable.Yes, description: "Which kind of targets can trigger the sensor?", alwaysUseInstanceValues: true)]
         public TargetType Target
         {
-            get;
-            set;
+            get => _target;
+            set
+            {
+                if (_target != value)
+                {
+                    _target = value;
+                    triggerFromHumans = Target.HasFlag(TargetType.Human);
+                    triggerFromPets = Target.HasFlag(TargetType.Pet);
+                    triggerFromMonsters = Target.HasFlag(TargetType.Monster);
+                }
+            }
         }
         
         [Editable, Serialize("", IsPropertySaveable.Yes, description: "Does the sensor react only to certain characters (species names, groups or tags)? Doesn't have an effect, if the Target Type is incorrect.", alwaysUseInstanceValues: true)]
@@ -263,10 +277,7 @@ namespace Barotrauma.Items.Components
                     }
                 }
             }
-
-            bool triggerFromHumans = Target.HasFlag(TargetType.Human);
-            bool triggerFromPets = Target.HasFlag(TargetType.Pet);
-            bool triggerFromMonsters = Target.HasFlag(TargetType.Monster);
+            
             bool hasTriggers = triggerFromHumans || triggerFromPets || triggerFromMonsters;
             if (!hasTriggers) { return; }
             foreach (Character character in Character.CharacterList)
@@ -299,9 +310,6 @@ namespace Barotrauma.Items.Components
         
         public bool TriggersOn(Character character)
         {
-            bool triggerFromHumans = Target.HasFlag(TargetType.Human);
-            bool triggerFromPets = Target.HasFlag(TargetType.Pet);
-            bool triggerFromMonsters = Target.HasFlag(TargetType.Monster);
             bool hasTriggers = triggerFromHumans || triggerFromPets || triggerFromMonsters;
             if (!hasTriggers) { return false; }
             return TriggersOn(character, triggerFromHumans, triggerFromPets, triggerFromMonsters);

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

@@ -80,7 +80,6 @@ namespace Barotrauma.Items.Components
             set
             {
                 isOn = value;
-                CanTransfer = value;
                 if (!isOn)
                 {
                     currPowerConsumption = 0.0f;

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

@@ -96,8 +96,20 @@ namespace Barotrauma.Items.Components
         [Editable, Serialize("> ", IsPropertySaveable.Yes)]
         public string LineStartSymbol { get; set; }
 
-        [Editable, Serialize(false, IsPropertySaveable.No)]
-        public bool Readonly { get; set; }
+        private bool _readonly;
+
+        [Editable, Serialize(false, IsPropertySaveable.Yes)]
+        public bool Readonly 
+        {
+            get => _readonly;
+            set
+            {
+                _readonly = value;
+#if CLIENT
+                RefreshInputElements();
+#endif
+            }
+        }
 
         [Serialize(true, IsPropertySaveable.No)]
         public bool AutoScrollToBottom { get; set; }

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

@@ -231,17 +231,22 @@ namespace Barotrauma.Items.Components
         {
             var should = GameMain.LuaCs.Hook.Call<bool?>("wifiSignalTransmitted", this, signal, sentFromChat);
 
-            if (should != null && should.Value)
-                return;
-
-            if (sentFromChat)
-            {
-                item.LastSentSignalRecipients.Clear();
-            }
+            if (should != null && should.Value) { return; }
 
             bool chatMsgSent = false;
 
             var receivers = GetReceiversInRange();
+            if (sentFromChat)
+            {
+                //if sent from chat, we need to reset the "signal chain" at this point
+                //so we can correctly detect which components the signal has already passed through to avoid infinite loops
+                //only relevant for signals originating from the chat - normally this is handled in Item.SendSignal
+                item.LastSentSignalRecipients.Clear();
+                foreach (WifiComponent receiver in receivers)
+                {
+                    receiver.item.LastSentSignalRecipients.Clear();
+                }
+            }
             foreach (WifiComponent wifiComp in receivers)
             {
                 if (sentFromChat && !wifiComp.LinkToChat) { continue; }