(d16942d30) Simplify.

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -121,90 +121,7 @@ namespace Barotrauma
                             MainLimb.PullJointWorldAnchorB = Collider.SimPosition;
                             MainLimb.PullJointEnabled = true;
                         }
-                        character.SelectedConstruction = character.MemState[0].SelectedItem;
                     }
-
-                    if (character.MemState[0].Animation == AnimController.Animation.CPR)
-                    {
-                        character.AnimController.Anim = AnimController.Animation.CPR;
-                    }
-                    else if (character.AnimController.Anim == AnimController.Animation.CPR)
-                    {
-                        character.AnimController.Anim = AnimController.Animation.None;
-                    }
-
-                    Vector2 newVelocity = Collider.LinearVelocity;
-                    Vector2 newPosition = Collider.SimPosition;
-                    float newRotation = Collider.Rotation;
-                    float newAngularVelocity = Collider.AngularVelocity;
-                    Collider.CorrectPosition(character.MemState, out newPosition, out newVelocity, out newRotation, out newAngularVelocity);
-
-                    newVelocity = newVelocity.ClampLength(100.0f);
-                    if (!MathUtils.IsValid(newVelocity)) { newVelocity = Vector2.Zero; }
-                    overrideTargetMovement = newVelocity.LengthSquared() > 0.01f ? newVelocity : Vector2.Zero;
-
-                    Collider.LinearVelocity = newVelocity;
-                    Collider.AngularVelocity = newAngularVelocity;
-
-                    float distSqrd = Vector2.DistanceSquared(newPosition, Collider.SimPosition);
-                    float errorTolerance = character.AllowInput ? 0.01f : 0.2f;
-                    if (distSqrd > errorTolerance)
-                    {
-                        if (distSqrd > 10.0f || !character.AllowInput)
-                        {
-                            Collider.TargetRotation = newRotation;
-                            SetPosition(newPosition, lerp: distSqrd < 5.0f, ignorePlatforms: false);
-                        }
-                        else
-                        {
-                            Collider.TargetRotation = newRotation;
-                            Collider.TargetPosition = newPosition;
-                            Collider.MoveToTargetPosition(true);
-                        }
-                    }
-                    
-                    //unconscious/dead characters can't correct their position using AnimController movement
-                    // -> we need to correct it manually
-                    if (!character.AllowInput)
-                    {
-                        float mainLimbDistSqrd = Vector2.DistanceSquared(MainLimb.PullJointWorldAnchorA, Collider.SimPosition);
-                        float mainLimbErrorTolerance = 0.1f;
-                        //if the main limb is roughly at the correct position and the collider isn't moving (much at least),
-                        //don't attempt to correct the position.
-                        if (mainLimbDistSqrd > mainLimbErrorTolerance || Collider.LinearVelocity.LengthSquared() > 0.05f)
-                        {
-                            MainLimb.PullJointWorldAnchorB = Collider.SimPosition;
-                            MainLimb.PullJointEnabled = true;
-                        }
-                    }
-                }
-                character.MemLocalState.Clear();
-            }
-            else
-            {
-                //remove states with a timestamp (there may still timestamp-based states 
-                //in the list if the controlled character switches from timestamp-based interpolation to ID-based)
-                character.MemState.RemoveAll(m => m.Timestamp > 0.0f);
-                
-                for (int i = 0; i < character.MemLocalState.Count; i++)
-                {
-                    if (character.Submarine == null)
-                    {
-                        //transform in-sub coordinates to outside coordinates
-                        if (character.MemLocalState[i].Position.Y > lowestSubPos)
-                        {                            
-                            character.MemLocalState[i].TransformInToOutside();
-                        }
-                    }
-                    else if (currentHull?.Submarine != null)
-                    {
-                        //transform outside coordinates to in-sub coordinates
-                        if (character.MemLocalState[i].Position.Y < lowestSubPos)
-                        {
-                            character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
-                        }
-                    }
-
                 }
                 character.MemLocalState.Clear();
             }

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -74,17 +74,12 @@ namespace Barotrauma
         public CrewManager(XElement element, bool isSinglePlayer)
             : this(isSinglePlayer)
         {
-            if (GameMain.Client != null)
+            if (!isSinglePlayer)
             {
-                //let the server create random conversations in MP
+                DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace);
                 return;
             }
-            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
+            if (string.IsNullOrEmpty(text)) { return; }
-                c.AIController is HumanAIController &&
-                !c.IsDead &&
-                c.SpeechImpediment <= 100.0f);
-            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
-        }
 
                 var characterInfo = new CharacterInfo(subElement);
                 characterInfos.Add(characterInfo);
@@ -95,6 +90,7 @@ namespace Barotrauma
                     break;
                 }
             }
+            ChatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
         }
 
         partial void InitProjectSpecific()
@@ -242,24 +238,27 @@ namespace Barotrauma
 
         public IEnumerable<Character> GetCharacters()
         {
-            if (characterInfos.Contains(characterInfo))
+            if (character?.Inventory == null) return null;
-            {
-                DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
-                return;
-            }
 
-            characterInfos.Add(characterInfo);
+            var radioItem = character.Inventory.Items.FirstOrDefault(it => it != null && it.GetComponent<WifiComponent>() != null);
+            if (radioItem == null) return null;
+            if (requireEquipped && !character.HasEquippedItem(radioItem)) return null;
+
+            return radioItem.GetComponent<WifiComponent>();
         }
 
         public IEnumerable<CharacterInfo> GetCharacterInfos()
         {
-            if (character == null)
+            if (GameMain.Client != null)
             {
-                DebugConsole.ThrowError("Tried to remove a null character from CrewManager.\n" + Environment.StackTrace);
+                //let the server create random conversations in MP
                 return;
             }
-            characters.Remove(character);
+            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
-            if (removeInfo) characterInfos.Remove(character.Info);
+                c.AIController is HumanAIController &&
+                !c.IsDead &&
+                c.SpeechImpediment <= 100.0f);
+            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
         }
 
         public void AddCharacter(Character character)
@@ -633,183 +632,9 @@ namespace Barotrauma
             {
                 characterListBox.BarScroll = roundedPos;
             }
-            var characterArea = new GUIButton(new RectTransform(new Point(characterInfoWidth, frame.Rect.Height), frame.RectTransform, Anchor.CenterLeft), style: "GUITextBox")
+            soundIcon.Visible = !muted && !mutedLocally;
-            {
+            soundIconDisabled.Visible = muted || mutedLocally;
-                UserData = character,
+            soundIconDisabled.ToolTip = TextManager.Get(mutedLocally ? "MutedLocally" : "MutedGlobally");
-                Color = frame.Color,
-                SelectedColor = frame.SelectedColor,
-                HoverColor = frame.HoverColor,
-                ToolTip = characterToolTip
-            };
-
-            var soundIcon = new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) },
-                "GUISoundIcon")
-            {
-                UserData = "soundicon",
-                CanBeFocused = false,
-                Visible = true
-            };
-            soundIcon.Color = new Color(soundIcon.Color, 0.0f);
-            new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) },
-                "GUISoundIconDisabled")
-            {
-                UserData = "soundicondisabled",
-                CanBeFocused = true,
-                Visible = false
-            };
-
-            if (isSinglePlayer)
-            {
-                characterArea.OnClicked = CharacterClicked;
-            }
-            else
-            {
-                characterArea.CanBeFocused = false;
-                characterArea.CanBeSelected = false;
-            }
-
-            var characterImage = new GUICustomComponent(new RectTransform(new Point(characterArea.Rect.Height), characterArea.RectTransform, Anchor.CenterLeft),
-                onDraw: (sb, component) => character.Info.DrawIcon(sb, component.Rect.Center.ToVector2(), targetAreaSize: component.Rect.Size.ToVector2()))
-            {
-                CanBeFocused = false,
-                HoverColor = Color.White,
-                SelectedColor = Color.White,
-                ToolTip = characterToolTip
-            };
-
-            var characterName = new GUITextBlock(new RectTransform(new Point(characterArea.Rect.Width - characterImage.Rect.Width - soundIcon.Rect.Width - 10, characterArea.Rect.Height),
-                characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(soundIcon.Rect.Width + 10, 0) },
-                character.Name, textColor: frame.Color, font: GUI.SmallFont, wrap: true)
-            {
-                Color = frame.Color,
-                HoverColor = Color.Transparent,
-                SelectedColor = Color.Transparent,
-                CanBeFocused = false,
-                ToolTip = characterToolTip,
-                AutoScale = true
-            };
-
-            //---------------- order buttons ----------------
-
-            var orderButtonFrame = new GUILayoutGroup(new RectTransform(new Point(100, frame.Rect.Height), frame.RectTransform)
-            { AbsoluteOffset = new Point(characterInfoWidth + spacing, 0) },
-                isHorizontal: true, childAnchor: Anchor.CenterLeft)
-            {
-                AbsoluteSpacing = (int)(10 * GUI.Scale),
-                UserData = "orderbuttons",
-                CanBeFocused = false
-            };
-
-            //listbox for holding the orders inappropriate for this character
-            //(so we can easily toggle their visibility)
-            var wrongOrderList = new GUIListBox(new RectTransform(new Point(50, orderButtonFrame.Rect.Height), orderButtonFrame.RectTransform), isHorizontal: true, style: null)
-            {
-                ScrollBarEnabled = false,
-                ScrollBarVisible = false,
-                Enabled = false,
-                Spacing = spacing,
-                ClampMouseRectToParent = false
-            };
-            wrongOrderList.Content.ClampMouseRectToParent = false;
-
-            for (int i = 0; i < orders.Count; i++)
-            {
-                var order = orders[i];
-                if (order.TargetAllCharacters) continue;
-
-                RectTransform btnParent = (i >= correctOrderCount + neutralOrderCount) ?
-                    wrongOrderList.Content.RectTransform :
-                    orderButtonFrame.RectTransform;
-
-                var btn = new GUIButton(new RectTransform(new Point(iconSize, iconSize), btnParent, Anchor.CenterLeft),
-                    style: null)
-                {
-                    UserData = order
-                };
-
-                new GUIFrame(new RectTransform(new Vector2(1.5f), btn.RectTransform, Anchor.Center), "OuterGlow")
-                {
-                    Color = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.8f,
-                    HoverColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 1.0f,
-                    PressedColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.6f,
-                    UserData = "selected",
-                    CanBeFocused = false,
-                    Visible = false
-                };
-
-                var img = new GUIImage(new RectTransform(Vector2.One, btn.RectTransform), order.Prefab.SymbolSprite);
-                img.Scale = iconSize / (float)img.SourceRect.Width;
-                img.Color = Color.Lerp(order.Color, frame.Color, 0.5f);
-                img.ToolTip = order.Name;
-                img.HoverColor = Color.Lerp(img.Color, Color.White, 0.5f);
-
-                btn.OnClicked += (GUIButton button, object userData) =>
-                {
-                    if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f) return false;
-
-                    if (btn.GetChildByUserData("selected").Visible)
-                    {
-                        SetCharacterOrder(character, Order.PrefabList.Find(o => o.AITag == "dismissed"), null, Character.Controlled);
-                    }
-                    else
-                    {
-                        if (order.ItemComponentType != null || order.ItemIdentifiers.Length > 0 || order.Options.Length > 1)
-                        {
-                            CreateOrderTargetFrame(button, character, order);
-                        }
-                        else
-                        {
-                            SetCharacterOrder(character, order, null, Character.Controlled);
-                        }
-                    }
-                    return true;
-                };
-                btn.UserData = order;
-                btn.ToolTip = order.Name;
-
-                //divider between different groups of orders
-                if (i == correctOrderCount - 1 || i == correctOrderCount + neutralOrderCount - 1)
-                {
-                    //TODO: divider sprite
-                    new GUIFrame(new RectTransform(new Point(8, iconSize), orderButtonFrame.RectTransform), style: "GUIButton");
-                }
-            }
-
-            var toggleWrongOrderBtn = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform),
-                "", style: "UIToggleButton")
-            {
-                UserData = "togglewrongorder",
-                CanBeFocused = false
-            };
-
-            wrongOrderList.RectTransform.NonScaledSize = new Point(
-                wrongOrderList.Content.Children.Sum(c => c.Rect.Width + wrongOrderList.Spacing),
-                wrongOrderList.RectTransform.NonScaledSize.Y);
-            wrongOrderList.RectTransform.SetAsLastChild();
-
-            new GUIFrame(new RectTransform(new Point(
-                wrongOrderList.Rect.Width - toggleWrongOrderBtn.Rect.Width - wrongOrderList.Spacing * 2,
-                wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform),
-                style: null)
-            {
-                CanBeFocused = false
-            };
-
-            //scale to fit the content
-            orderButtonFrame.RectTransform.NonScaledSize = new Point(
-                orderButtonFrame.Children.Sum(c => c.Rect.Width + orderButtonFrame.AbsoluteSpacing),
-                orderButtonFrame.RectTransform.NonScaledSize.Y);
-
-            frame.RectTransform.NonScaledSize = new Point(
-                characterInfoWidth + spacing + (orderButtonFrame.Rect.Width - wrongOrderList.Rect.Width),
-                frame.RectTransform.NonScaledSize.Y);
-
-            characterListBox.RectTransform.NonScaledSize = new Point(
-                characterListBox.Content.Children.Max(c => c.Rect.Width) + wrongOrderList.Rect.Width,
-                characterListBox.RectTransform.NonScaledSize.Y);
-            characterListBox.Content.RectTransform.NonScaledSize = characterListBox.RectTransform.NonScaledSize;
-            characterListBox.UpdateScrollBarSize();
-            return frame;
         }
 
         private IEnumerable<object> KillCharacterAnim(GUIComponent component)
@@ -953,12 +778,6 @@ namespace Barotrauma
                 }
                 return;
             }
-            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
-                c.AIController is HumanAIController &&
-                !c.IsDead &&
-                c.SpeechImpediment <= 100.0f);
-            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
-        }
 
             character.SetOrder(order, option, orderGiver, speak: orderGiver != character);
             if (IsSinglePlayer)
@@ -1016,23 +835,19 @@ namespace Barotrauma
                     }
                 }
             }
-
+            //only one target (or an order with no particular targets), just show options
-            character.SetOrder(order, option, orderGiver, speak: orderGiver != character);
+            else
-            if (IsSinglePlayer)
             {
-                orderGiver?.Speak(
+                orderTargetFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.2f + order.Options.Length * 0.1f, 0.18f), GUI.Canvas)
-                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
+                    { AbsoluteOffset = new Point(orderButton.Rect.Center.X, orderButton.Rect.Bottom) },
-            }
+                    isHorizontal: true, childAnchor: Anchor.BottomLeft)
-            else if (orderGiver != null)
-            {
-                OrderChatMessage msg = new OrderChatMessage(order, option, order.TargetItemComponent?.Item, character, orderGiver);
-                if (GameMain.Client != null)
                 {
-                    GameMain.Client.SendChatMessage(msg);
+                    UserData = character,
-                }
+                    Stretch = true
-            }
+                };
-            DisplayCharacterOrder(character, order);
+                //line connecting the order button to the option buttons
-        }
+                //TODO: sprite
+                new GUIFrame(new RectTransform(new Vector2(0.5f, 1.0f), orderTargetFrame.RectTransform), style: null);
 
         /// <summary>
         /// Create the UI panel that's used to select the target and options for a given order

Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs

@@ -34,6 +34,8 @@ namespace Barotrauma
 
         private GUILayoutGroup subPreviewContainer;
 
+        private GUILayoutGroup subPreviewContainer;
+
         private GUIButton loadGameButton;
         
         public Action<Submarine, string, string> StartNewGame;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveChargeBatteries.cs

@@ -9,17 +9,6 @@ namespace Barotrauma
     {
         public override string DebugTag => "charge batteries";
         private IEnumerable<PowerContainer> batteryList;
-        private IEnumerable<PowerContainer> BatteryList
-        {
-            get
-            {
-                if (batteryList == null)
-                {
-                    batteryList = Item.ItemList.Select(i => i.GetComponent<PowerContainer>()).Where(b => b != null);
-                }
-                return batteryList;
-            }
-        }
 
         public AIObjectiveChargeBatteries(Character character, AIObjectiveManager objectiveManager, string option, float priorityModifier) 
             : base(character, objectiveManager, priorityModifier, option) { }
@@ -48,7 +37,14 @@ namespace Barotrauma
         }
 
         protected override float TargetEvaluation() => targets.Max(t => 100 - t.ChargePercentage);
-        protected override IEnumerable<PowerContainer> GetList() => BatteryList;
+        protected override IEnumerable<PowerContainer> GetList()
+        {
+            if (batteryList == null)
+            {
+                batteryList = Item.ItemList.Select(i => i.GetComponent<PowerContainer>()).Where(b => b != null);
+            }
+            return batteryList;
+        }
 
         protected override AIObjective ObjectiveConstructor(PowerContainer battery) 
             => new AIObjectiveOperateItem(battery, character, objectiveManager, Option, false, priorityModifier: PriorityModifier) { IsLoop = true };

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectivePumpWater.cs

@@ -10,17 +10,6 @@ namespace Barotrauma
         public override string DebugTag => "pump water";
         public override bool KeepDivingGearOn => true;
         private IEnumerable<Pump> pumpList;
-        private IEnumerable<Pump> PumpList
-        {
-            get
-            {
-                if (pumpList == null)
-                {
-                    pumpList = character.Submarine.GetItems(true).Select(i => i.GetComponent<Pump>()).Where(p => p != null);
-                }
-                return pumpList;
-            }
-        }
 
         public AIObjectivePumpWater(Character character, AIObjectiveManager objectiveManager, string option, float priorityModifier = 1) 
             : base(character, objectiveManager, priorityModifier, option) { }
@@ -52,8 +41,15 @@ namespace Barotrauma
             }
             return true;
         }
-        protected override IEnumerable<Pump> GetList() => PumpList;
         protected override AIObjective ObjectiveConstructor(Pump pump) => new AIObjectiveOperateItem(pump, character, objectiveManager, Option, false) { IsLoop = true };
         protected override float TargetEvaluation() => targets.Max(t => MathHelper.Lerp(100, 0, t.CurrFlow / t.MaxFlow));
+        protected override IEnumerable<Pump> GetList()
+        {
+            if (pumpList == null)
+            {
+                pumpList = character.Submarine.GetItems(true).Select(i => i.GetComponent<Pump>()).Where(p => p != null);
+            }
+            return pumpList;
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -240,6 +240,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -666,6 +666,19 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        public override void OnItemLoaded()
+        {
+            sonar = item.GetComponent<Sonar>();
+        }
+
+        public override bool Select(Character character)
+        {
+            if (!CanBeSelected) return false;
+
+            user = character;
+            return true;
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
             networkUpdateTimer -= deltaTime;

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1228,6 +1228,10 @@ namespace Barotrauma
             {
                 ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
             }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
             ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
 
             if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -15,7 +15,11 @@ namespace Barotrauma
         public static List<Hull> hullList = new List<Hull>();
         public static List<EntityGrid> EntityGrids { get; } = new List<EntityGrid>();
 
-        public static bool ShowHulls = true;
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
 
         public static bool EditWater, EditFire;
         public const float OxygenDistributionSpeed = 500.0f;
@@ -33,18 +37,43 @@ namespace Barotrauma
         public readonly Dictionary<string, SerializableProperty> properties;
         public Dictionary<string, SerializableProperty> SerializableProperties
         {
-            get { return properties; }
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
         }
 
-        private float lethalPressure;
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
 
         private float surface, drawSurface;
         private float waterVolume;
         private float pressure;
 
-        private float oxygen;
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
 
-        private bool update;
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
 
         public bool Visible = true;
 
@@ -56,654 +85,6 @@ namespace Barotrauma
                 
         public List<Gap> ConnectedGaps;
 
-        public override string Name
-        {
-            get
-            {
-                return "Hull";
-            }
-        }
-        
-        [Editable, Serialize("", true)]
-        public string RoomName
-        {
-            get;
-            set;
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
-        private string roomName;
-        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
-        public string RoomName
-        {
-            get { return roomName; }
-            set
-            {
-                if (roomName == value) { return; }
-                roomName = value;
-                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
-            }
-        }
-
-        public string DisplayName
-        {
-            get;
-            private set;
-        }
-
         private string roomName;
         [Editable, Serialize("", true, translationTextTag: "RoomName.")]
         public string RoomName

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -162,6 +162,21 @@ namespace Barotrauma
             get { return binding; }
         }
 
+        public void SetState()
+        {
+            hit = binding.IsHit();
+            if (hit) hitQueue = true;
+
+            held = binding.IsDown();
+            if (held) heldQueue = true;
+        }
+#endif
+
+        public KeyOrMouse State
+        {
+            get { return binding; }
+        }
+
         public void SetState()
         {
             hit = binding.IsHit();