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

Barotrauma/BarotraumaClient/Source/GUI/GUI.cs

@@ -656,28 +656,6 @@ namespace Barotrauma
                 msg.Timer -= deltaTime;                
                 msg.Pos += msg.Velocity * deltaTime;                
             }
-            
-            foreach (GUIMessage msg in messages)
-            {
-                if (!msg.WorldSpace) continue;
-                msg.Timer -= deltaTime;                
-                msg.Pos += msg.Velocity * deltaTime;                
-            }
-            
-            foreach (GUIMessage msg in messages)
-            {
-                if (!msg.WorldSpace) continue;
-                msg.Timer -= deltaTime;                
-                msg.Pos += msg.Velocity * deltaTime;                
-            }
-            
-            foreach (GUIMessage msg in messages)
-            {
-                if (!msg.WorldSpace) continue;
-                msg.Timer -= deltaTime;                
-                msg.Pos += msg.Velocity * deltaTime;                
-            }
-        }
 
             messages.RemoveAll(m => m.Timer <= 0.0f);
         }
@@ -751,10 +729,6 @@ namespace Barotrauma
                 Vector2 textSize = font.MeasureString(text);
                 DrawRectangle(sb, pos - Vector2.One * backgroundPadding, textSize + Vector2.One * 2.0f * backgroundPadding, (Color)backgroundColor, true);
             }
-            else
-            {
-                sb.Draw(t, new Rectangle(rect.X + thickness, rect.Y, rect.Width - thickness * 2, thickness), null, clr, 0.0f, Vector2.Zero, SpriteEffects.None, depth);
-                sb.Draw(t, new Rectangle(rect.X + thickness, rect.Y + rect.Height - thickness, rect.Width - thickness * 2, thickness), null, clr, 0.0f, Vector2.Zero, SpriteEffects.None, depth);
 
             font.DrawString(sb, text, pos, color);
         }

Barotrauma/BarotraumaClient/Source/GUI/VideoPlayer.cs

@@ -74,7 +74,7 @@ namespace Barotrauma
             videoFrame = new GUIFrame(new RectTransform(new Point(width + borderSize, height + borderSize), background.RectTransform, Anchor.Center, Pivot.Center) { AbsoluteOffset = new Point((int)(-100 / (GUI.Scale * 0.6f)), 0) }, "SonarFrame");
             //videoFrame.RectTransform.AbsoluteOffset = new Point(-borderSize, 0);
 
-            textFrame = new GUIFrame(new RectTransform(new Point(width + borderSize, height + borderSize * 2), videoFrame.RectTransform, Anchor.CenterLeft, Pivot.CenterLeft), "SonarFrame");
+            textFrame = new GUIFrame(new RectTransform(new Point(width + borderSize, height + borderSize * 2), videoFrame.RectTransform, Anchor.CenterLeft, Pivot.CenterLeft), "TextFrame");
             textFrame.RectTransform.AbsoluteOffset = new Point(borderSize + videoFrame.Rect.Width, 0);
 
             videoView = new GUICustomComponent(new RectTransform(new Point(width, height), videoFrame.RectTransform, Anchor.Center),

Barotrauma/BarotraumaClient/Source/Items/Item.cs

@@ -467,11 +467,7 @@ namespace Barotrauma
                     {
                         itemsText.Text += TextManager.Get("None");
                     }
-                };
-                new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"))
-                {
-                    ToolTip = TextManager.Get("MirrorEntityYToolTip"),
-                    OnClicked = (button, data) =>
+                    else
                     {
                         for (int i = 0; i < AllowedLinks.Count; i++)
                         {

Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs

@@ -38,12 +38,6 @@ namespace Barotrauma
             this.isMultiplayer = isMultiplayer;
             this.newGameContainer = newGameContainer;
             this.loadGameContainer = loadGameContainer;
-            
-            var columnContainer = new GUILayoutGroup(new RectTransform(Vector2.One, newGameContainer.RectTransform), isHorizontal: true)
-            {
-                Stretch = true,
-                RelativeSpacing = 0.05f
-            };
 
             var columnContainer = new GUILayoutGroup(new RectTransform(Vector2.One, newGameContainer.RectTransform), isHorizontal: true)
             {

Barotrauma/BarotraumaServer/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs

@@ -332,8 +332,7 @@ namespace Barotrauma.Networking
                 }
             }
 
-            //too many events for one packet
-            if (eventsToSync.Count > 200)
+            if (client.NeedsMidRoundSync)
             {
                 msg.Write((byte)ServerNetObject.ENTITY_EVENT_INITIAL);                
                 msg.Write(client.UnreceivedEntityEventCount);
@@ -341,8 +340,7 @@ namespace Barotrauma.Networking
 
                 Write(msg, eventsToSync, out sentEvents, client);
             }
-
-            foreach (NetEntityEvent entityEvent in sentEvents)
+            else
             {
                 msg.Write((byte)ServerNetObject.ENTITY_EVENT);
                 Write(msg, eventsToSync, out sentEvents, client);
@@ -353,7 +351,6 @@ namespace Barotrauma.Networking
                 (entityEvent as ServerEntityEvent).Sent = true;
                 client.EntityEventLastSent[entityEvent.ID] = NetTime.Now;
             }
-            sentEvents = eventsToSync;
         }
 
         /// <summary>

Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs

@@ -813,7 +813,6 @@ namespace Barotrauma
             if (closestBody.UserData is Structure wall && wall.Submarine != null)
             {
                 int sectionIndex = wall.FindSectionIndex(ConvertUnits.ToDisplayUnits(Submarine.LastPickedPosition));
-                int passableHoleCount = GetMinimumPassableHoleCount();
 
                 float sectionDamage = wall.SectionDamage(sectionIndex);
                 for (int i = sectionIndex - 2; i <= sectionIndex + 2; i++)
@@ -1011,7 +1010,7 @@ namespace Barotrauma
                 string targetingTag = null;
                 if (targetCharacter != null)
                 {
-                    if (targetCharacter.Submarine != null && Character.Submarine == null)
+                    if (targetCharacter.IsDead)
                     {
                         targetingTag = "dead";
                         if (targetCharacter.Submarine != Character.Submarine)

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -1894,8 +1894,6 @@ namespace Barotrauma
             }
             speechImpedimentSet = false;
             
-
-
             if (needsAir)
             {
                 bool protectedFromPressure = PressureProtection > 0.0f;            

Barotrauma/BarotraumaShared/Source/Characters/CharacterInfo.cs

@@ -804,7 +804,8 @@ namespace Barotrauma
                 var newItem = Item.Load(itemElement, inventory.Owner.Submarine, createNetworkEvent: true);
                 if (newItem == null) { continue; }
 
-                if (!MathUtils.NearlyEqual(newItem.Condition, newItem.MaxCondition))
+                if (!MathUtils.NearlyEqual(newItem.Condition, newItem.MaxCondition) &&
+                    GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
                 {
                     GameMain.NetworkMember.CreateEntityEvent(newItem, new object[] { NetEntityEvent.Type.Status });
                 }

Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs

@@ -180,7 +180,8 @@ namespace Barotrauma.Items.Components
 #endif
 
                 //items in a bad condition are more sensitive to overvoltage
-                float maxOverVoltage = MathHelper.Lerp(Math.Min(OverloadVoltage, 1.0f), OverloadVoltage, item.Condition / item.MaxCondition);
+                float maxOverVoltage = MathHelper.Lerp(OverloadVoltage * 0.75f, OverloadVoltage, item.Condition / item.MaxCondition);
+                maxOverVoltage = Math.Max(OverloadVoltage, 1.0f);
 
                 //if the item can't be fixed, don't allow it to break
                 if (!item.Repairables.Any() || !CanBeOverloaded) continue;

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1286,11 +1286,7 @@ namespace Barotrauma
             LastSentSignalRecipients.Clear();
             if (connections == null) return;
 
-        public List<T> GetConnectedComponentsRecursive<T>(Connection c) where T : ItemComponent
-        {
-            List<T> connectedComponents = new List<T>();            
-            List<Item> alreadySearched = new List<Item>() { this };
-            GetConnectedComponentsRecursive(c, alreadySearched, connectedComponents);
+            stepsTaken++;
 
             if (!connections.TryGetValue(connectionName, out Connection c)) return;
 

Barotrauma/BarotraumaShared/Source/Map/Map/Location.cs

@@ -129,7 +129,7 @@ namespace Barotrauma
             availableMissions.RemoveAll(m => m.Completed);
         }
 
-        public void Remove()
+        private string RandomName(LocationType type)
         {
             baseName = type.GetRandomName();
             nameFormatIndex = Rand.Int(type.NameFormats.Count, Rand.RandSync.Server);