(ff4df7194) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-05-16 06:24:39 +03:00
parent 880b7b1c02
commit dc2f96443a
14 changed files with 366 additions and 142 deletions
@@ -152,6 +152,32 @@ namespace Barotrauma

                }

+                if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120);
+                character.MemState.Clear();
+            }
+        }
+        
+        partial void ImpactProjSpecific(float impact, Body body)
+        {
+            float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f);
+
+            if (body.UserData is Limb limb && character.Stun <= 0f)
+            {
+                if (impact > 3.0f) { PlayImpactSound(limb); }
+            }
+            else if (body.UserData is Limb || body == Collider.FarseerBody)
+            {
+                if (!character.IsRemotePlayer && impact > ImpactTolerance)
+                {
+                    SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider);
+                }
+            }
+            if (Character.Controlled == character)
+            {
+                GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f);
+            }
+        }
+
                if (character.MemState.Count < 1) return;

                overrideTargetMovement = Vector2.Zero;
@@ -74,12 +74,17 @@ namespace Barotrauma
        public CrewManager(XElement element, bool isSinglePlayer)
            : this(isSinglePlayer)
        {
-            if (!isSinglePlayer)
+            if (GameMain.Client != null)
            {
-                DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace);
+                //let the server create random conversations in MP
                return;
            }
-            if (string.IsNullOrEmpty(text)) { return; }
+            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
+                c.AIController is HumanAIController &&
+                !c.IsDead &&
+                c.SpeechImpediment <= 100.0f);
+            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
+        }

                var characterInfo = new CharacterInfo(subElement);
                characterInfos.Add(characterInfo);
@@ -90,7 +95,6 @@ namespace Barotrauma
                    break;
                }
            }
-            ChatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
        }

        partial void InitProjectSpecific()
@@ -239,27 +243,24 @@ namespace Barotrauma

        public IEnumerable<Character> GetCharacters()
        {
-            if (character?.Inventory == null) return null;
+            if (characterInfos.Contains(characterInfo))
+            {
+                DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
+                return;
+            }

-            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>();
+            characterInfos.Add(characterInfo);
        }

        public IEnumerable<CharacterInfo> GetCharacterInfos()
        {
-            if (GameMain.Client != null)
+            if (character == null)
            {
-                //let the server create random conversations in MP
+                DebugConsole.ThrowError("Tried to remove a null character from CrewManager.\n" + Environment.StackTrace);
                return;
            }
-            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
-                c.AIController is HumanAIController &&
-                !c.IsDead &&
-                c.SpeechImpediment <= 100.0f);
-            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
+            characters.Remove(character);
+            if (removeInfo) characterInfos.Remove(character.Info);
        }

        public void AddCharacter(Character character)
@@ -633,9 +634,183 @@ namespace Barotrauma
            {
                characterListBox.BarScroll = roundedPos;
            }
-            soundIcon.Visible = !muted && !mutedLocally;
-            soundIconDisabled.Visible = muted || mutedLocally;
-            soundIconDisabled.ToolTip = TextManager.Get(mutedLocally ? "MutedLocally" : "MutedGlobally");
+            var characterArea = new GUIButton(new RectTransform(new Point(characterInfoWidth, frame.Rect.Height), frame.RectTransform, Anchor.CenterLeft), style: "GUITextBox")
+            {
+                UserData = character,
+                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)
@@ -779,6 +954,12 @@ 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)
@@ -836,19 +1017,23 @@ namespace Barotrauma
                    }
                }
            }
-            //only one target (or an order with no particular targets), just show options
-            else
+
+            character.SetOrder(order, option, orderGiver, speak: orderGiver != character);
+            if (IsSinglePlayer)
            {
-                orderTargetFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.2f + order.Options.Length * 0.1f, 0.18f), GUI.Canvas)
-                    { AbsoluteOffset = new Point(orderButton.Rect.Center.X, orderButton.Rect.Bottom) },
-                    isHorizontal: true, childAnchor: Anchor.BottomLeft)
+                orderGiver?.Speak(
+                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
+            }
+            else if (orderGiver != null)
+            {
+                OrderChatMessage msg = new OrderChatMessage(order, option, order.TargetItemComponent?.Item, character, orderGiver);
+                if (GameMain.Client != null)
                {
-                    UserData = character,
-                    Stretch = true
-                };
-                //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);
+                    GameMain.Client.SendChatMessage(msg);
+                }
+            }
+            DisplayCharacterOrder(character, order);
+        }

        /// <summary>
        /// Create the UI panel that's used to select the target and options for a given order
@@ -316,9 +316,9 @@ namespace Barotrauma.Items.Components
            }

            Steering steering = item.GetComponent<Steering>();
-            if (steering != null && steering.DockingModeEnabled)
+            if (steering != null && steering.DockingModeEnabled && steering.ActiveDockingSource != null)
            {
-                float dockingDist = Vector2.Distance(steering.DockingSource.Item.WorldPosition, steering.DockingTarget.Item.WorldPosition);
+                float dockingDist = Vector2.Distance(steering.ActiveDockingSource.Item.WorldPosition, steering.DockingTarget.Item.WorldPosition);
                if (prevDockingDist > steering.DockingAssistThreshold && dockingDist <= steering.DockingAssistThreshold)
                {
                    zoom = Math.Max(zoom, MathHelper.Lerp(MinZoom, MaxZoom, 0.25f));
@@ -599,7 +599,7 @@ namespace Barotrauma.Items.Components
            float scale = displayScale * zoom;

            Steering steering = item.GetComponent<Steering>();
-            if (steering != null && steering.DockingModeEnabled)
+            if (steering != null && steering.DockingModeEnabled && steering.ActiveDockingSource != null)
            {
                DrawDockingIndicator(spriteBatch, steering, ref transducerCenter);
            }
@@ -633,21 +633,21 @@ namespace Barotrauma.Items.Components
        {
            float scale = displayScale * zoom;
            
-            Vector2 worldFocusPos = (steering.DockingSource.Item.WorldPosition + steering.DockingTarget.Item.WorldPosition) / 2.0f;
+            Vector2 worldFocusPos = (steering.ActiveDockingSource.Item.WorldPosition + steering.DockingTarget.Item.WorldPosition) / 2.0f;
            worldFocusPos.X = steering.DockingTarget.Item.WorldPosition.X;

            DisplayOffset = Vector2.Lerp(DisplayOffset, worldFocusPos - transducerCenter, 0.1f);
            transducerCenter += DisplayOffset;

-            Vector2 sourcePortDiff = (steering.DockingSource.Item.WorldPosition - transducerCenter) * scale;
+            Vector2 sourcePortDiff = (steering.ActiveDockingSource.Item.WorldPosition - transducerCenter) * scale;
            Vector2 sourcePortPos = new Vector2(sourcePortDiff.X, -sourcePortDiff.Y);
            Vector2 targetPortDiff = (steering.DockingTarget.Item.WorldPosition - transducerCenter) * scale;
            Vector2 targetPortPos = new Vector2(targetPortDiff.X, -targetPortDiff.Y);

            Vector2 midPos = (sourcePortPos + targetPortPos) / 2.0f;

-            System.Diagnostics.Debug.Assert(steering.DockingSource.IsHorizontal == steering.DockingTarget.IsHorizontal);
-            Vector2 diff = steering.DockingTarget.Item.WorldPosition - steering.DockingSource.Item.WorldPosition;
+            System.Diagnostics.Debug.Assert(steering.ActiveDockingSource.IsHorizontal == steering.DockingTarget.IsHorizontal);
+            Vector2 diff = steering.DockingTarget.Item.WorldPosition - steering.ActiveDockingSource.Item.WorldPosition;
            float dist = diff.Length();
            bool readyToDock = 
                Math.Abs(diff.X) < steering.DockingTarget.DistanceTolerance.X &&
@@ -657,7 +657,7 @@ namespace Barotrauma.Items.Components
            Vector2 normalizedDockingDir = Vector2.Normalize(dockingDir);
            if (!dynamicDockingIndicator)
            {
-                if (steering.DockingSource.IsHorizontal)
+                if (steering.ActiveDockingSource.IsHorizontal)
                {
                    normalizedDockingDir = new Vector2(Math.Sign(normalizedDockingDir.X), 0.0f);
                }
@@ -709,7 +709,7 @@ namespace Barotrauma.Items.Components
                float indicatorSectorLength = (float)(midLength / Math.Cos(indicatorSector));

                    bool withinSector =
-                    (Math.Abs(diff.X) < steering.DockingSource.DistanceTolerance.X && Math.Abs(diff.Y) < steering.DockingSource.DistanceTolerance.Y) ||
+                    (Math.Abs(diff.X) < steering.ActiveDockingSource.DistanceTolerance.X && Math.Abs(diff.Y) < steering.ActiveDockingSource.DistanceTolerance.Y) ||
                    Vector2.Dot(normalizedDockingDir, MathUtils.RotatePoint(normalizedDockingDir, indicatorSector)) <
                    Vector2.Dot(normalizedDockingDir, Vector2.Normalize(dockingDir));

@@ -76,8 +76,9 @@ namespace Barotrauma.Items.Components
            get;
            set;
        }
-        
-        public DockingPort DockingSource, DockingTarget;
+
+        public List<DockingPort> DockingSources = new List<DockingPort>();
+        public DockingPort ActiveDockingSource, DockingTarget;

        private bool searchedConnectedDockingPort;

@@ -357,17 +358,24 @@ namespace Barotrauma.Items.Components

        private void FindConnectedDockingPort()
        {
-            DockingSource =
-                (item.linkedTo.FirstOrDefault(l => l is Item item && item.GetComponent<DockingPort>() != null) as Item)?.GetComponent<DockingPort>();
-            if (DockingSource == null)
+           foreach (MapEntity linkedTo in item.linkedTo)
            {
-                var dockingConnection = item.Connections.FirstOrDefault(c => c.Name == "toggle_docking");
-                if (dockingConnection != null)
+                if (linkedTo is Item item)
                {
-                    var connectedPorts = item.GetConnectedComponentsRecursive<DockingPort>(dockingConnection);
-                    DockingSource = connectedPorts.Find(p => p.Item.Submarine == item.Submarine);
+                    var port = item.GetComponent<DockingPort>();
+                    if (port != null)
+                    {
+                        DockingSources.Add(port);
+                    }
                }
            }
+
+            var dockingConnection = item.Connections.FirstOrDefault(c => c.Name == "toggle_docking");
+            if (dockingConnection != null)
+            {
+                var connectedPorts = item.GetConnectedComponentsRecursive<DockingPort>(dockingConnection);
+                DockingSources.AddRange(connectedPorts.Where(p => p.Item.Submarine != null && !p.Item.Submarine.IsOutpost));
+            }            
        }

        /// <summary>
@@ -560,10 +568,10 @@ namespace Barotrauma.Items.Components
            dockingContainer.Visible = DockingModeEnabled;
            statusContainer.Visible = !DockingModeEnabled;

-            if (DockingModeEnabled)
+            if (DockingModeEnabled && ActiveDockingSource != null)
            {
-                if (Math.Abs(DockingSource.Item.WorldPosition.X - DockingTarget.Item.WorldPosition.X) < DockingSource.DistanceTolerance.X &&
-                    Math.Abs(DockingSource.Item.WorldPosition.Y - DockingTarget.Item.WorldPosition.Y) < DockingSource.DistanceTolerance.Y)
+                if (Math.Abs(ActiveDockingSource.Item.WorldPosition.X - DockingTarget.Item.WorldPosition.X) < ActiveDockingSource.DistanceTolerance.X &&
+                    Math.Abs(ActiveDockingSource.Item.WorldPosition.Y - DockingTarget.Item.WorldPosition.Y) < ActiveDockingSource.DistanceTolerance.Y)
                {
                    dockingButton.Text = dockText;
                    if (dockingButton.FlashTimer <= 0.0f)
@@ -573,7 +581,7 @@ namespace Barotrauma.Items.Components
                    }
                }
            }
-            else if (DockingSource != null && DockingSource.Docked)
+            else if (DockingSources.Any(d => d.Docked))
            {
                dockingButton.Text = undockText;
                dockingContainer.Visible = true;
@@ -722,7 +730,7 @@ namespace Barotrauma.Items.Components
                    if (dist < closestDist)
                    {
                        DockingModeEnabled = true;
-                        DockingSource = sourcePort;
+                        ActiveDockingSource = sourcePort;
                        DockingTarget = targetPort;
                    }
                }
@@ -516,6 +516,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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

            GUI.Draw(Cam, spriteBatch);

+            spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, GameMain.ScissorTestEnable);
+
+            GUI.Draw(Cam, spriteBatch);
+
            GUI.Draw(Cam, spriteBatch);
            
 #if DEBUG