v1.2.6.0 (Winter Update)

2023-12-14 16:11:27 +02:00
parent af8cc89fce
commit b91e85559d
375 changed files with 7771 additions and 2874 deletions
@@ -43,7 +43,7 @@ namespace Barotrauma
                {
                    mainElement = mainElement.FirstElement();
                    prefabs.Clear();
-                    DebugConsole.NewMessage($"Overriding all background creatures with '{configPath}'", Color.Yellow);
+                    DebugConsole.NewMessage($"Overriding all background creatures with '{configPath}'", Color.MediumPurple);
                }
                else if (prefabs.Any())
                {
@@ -1,10 +1,9 @@
 using Barotrauma.Networking;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using FarseerPhysics;

 namespace Barotrauma
 {
@@ -53,7 +52,7 @@ namespace Barotrauma
                foreach (InterestingPosition pos in PositionsOfInterest)
                {
                    Color color = Color.Yellow;
-                    if (pos.PositionType == PositionType.Cave)
+                    if (pos.PositionType == PositionType.Cave || pos.PositionType == PositionType.AbyssCave)
                    {
                        color = Color.DarkOrange;
                    }
@@ -61,6 +60,10 @@ namespace Barotrauma
                    {
                        color = Color.LightGray;
                    }
+                    if (!pos.IsValid)
+                    {
+                        color = Color.Red;
+                    }
                    
                    GUI.DrawRectangle(spriteBatch, new Vector2(pos.Position.X - 15.0f, -pos.Position.Y - 15.0f), new Vector2(30.0f, 30.0f), color, true);
                }
@@ -162,6 +162,8 @@ namespace Barotrauma
            CanBeVisible =
                Sprite != null ||
                Prefab.DeformableSprite != null ||
+                ParticleEmitters is { Length: > 0 } ||
+                (GameMain.DebugDraw && Triggers is { Count: > 0 }) ||
                Prefab.OverrideProperties.Any(p => p != null && (p.Sprites.Any() || p.DeformableSprite != null));
        }

@@ -23,7 +23,14 @@ namespace Barotrauma
        private Rectangle currentGridIndices;

        public bool ForceRefreshVisibleObjects;
-        
+
+        partial void RemoveProjSpecific()
+        {
+            visibleObjectsBack.Clear();
+            visibleObjectsMid.Clear();
+            visibleObjectsFront.Clear();
+        }
+
        partial void UpdateProjSpecific(float deltaTime)
        {
            foreach (LevelObject obj in visibleObjectsBack)