(42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool.

2019-05-16 05:58:15 +03:00
parent 18b6775457
commit 257889b9cc
39 changed files with 505 additions and 639 deletions
@@ -106,6 +106,18 @@ namespace Barotrauma
            subObjectives.Add(objective);
        }

+        public void RemoveSubObjective<T>(ref T objective) where T : AIObjective
+        {
+            if (objective != null)
+            {
+                if (subObjectives.Contains(objective))
+                {
+                    subObjectives.Remove(objective);
+                }
+                objective = null;
+            }
+        }
+
        public void SortSubObjectives()
        {
            if (subObjectives.None()) { return; }
@@ -11,9 +11,10 @@ namespace Barotrauma
    class AIObjectiveCombat : AIObjective
    {
        public override string DebugTag => "combat";
-        public bool useCoolDown = true;

-        const float CoolDown = 10.0f;
+        private readonly CombatMode initialMode;
+
+        const float coolDown = 10.0f;

        public Character Enemy { get; private set; }
        
@@ -25,14 +26,7 @@ namespace Barotrauma
            {
                _weapon = value;
                _weaponComponent = null;
-                if (reloadWeaponObjective != null)
-                {
-                    if (subObjectives.Contains(reloadWeaponObjective))
-                    {
-                        subObjectives.Remove(reloadWeaponObjective);
-                    }
-                    reloadWeaponObjective = null;
-                }
+                RemoveSubObjective(ref reloadWeaponObjective);
            }
        }
        private ItemComponent _weaponComponent;
@@ -40,6 +34,7 @@ namespace Barotrauma
        {
            get
            {
+                if (Weapon == null) { return null; }
                if (_weaponComponent == null)
                {
                    _weaponComponent =
@@ -64,6 +59,8 @@ namespace Barotrauma

        private Hull retreatTarget;
        private float coolDownTimer;
+        private IEnumerable<FarseerPhysics.Dynamics.Body> myBodies;
+        private float aimTimer;

        public enum CombatMode
        {
@@ -78,7 +75,7 @@ namespace Barotrauma
            : base(character, objectiveManager, priorityModifier)
        {
            Enemy = enemy;
-            coolDownTimer = CoolDown;
+            coolDownTimer = coolDown;
            findSafety = objectiveManager.GetObjective<AIObjectiveFindSafety>();
            if (findSafety != null)
            {
@@ -86,6 +83,7 @@ namespace Barotrauma
                findSafety.unreachable.Clear();
            }
            Mode = mode;
+            initialMode = Mode;
            if (Enemy == null)
            {
                Mode = CombatMode.Retreat;
@@ -104,7 +102,7 @@ namespace Barotrauma

        public override bool IsCompleted()
        {
-            bool completed = (Enemy != null && (Enemy.Removed || Enemy.IsDead)) || (useCoolDown && coolDownTimer <= 0);
+            bool completed = (Enemy != null && (Enemy.Removed || Enemy.IsDead)) || (initialMode != CombatMode.Offensive && coolDownTimer <= 0);
            if (completed)
            {
                if (objectiveManager.CurrentOrder == this && Enemy != null && Enemy.IsDead)
@@ -121,58 +119,73 @@ namespace Barotrauma

        protected override void Act(float deltaTime)
        {
-            if (useCoolDown)
+            if (initialMode != CombatMode.Offensive)
            {
                coolDownTimer -= deltaTime;
            }
            if (abandon) { return; }
-            Arm(deltaTime);
-            Move(deltaTime);
+            TryArm();
+            if (reloadWeaponObjective == null || !subObjectives.Contains(reloadWeaponObjective))
+            {
+                Move();
+                OperateWeapon(deltaTime);
+            }
        }

-        private void Arm(float deltaTime)
+        private void Move()
        {
            switch (Mode)
            {
                case CombatMode.Offensive:
-                case CombatMode.Defensive:
-                    if (Weapon != null && !character.Inventory.Items.Contains(_weapon) || _weaponComponent != null && !_weaponComponent.HasRequiredContainedItems(false))
-                    {
-                        Weapon = null;
-                    }
-                    if (Weapon == null)
-                    {
-                        Weapon = GetWeapon();
-                    }
-                    if (Weapon == null)
-                    {
-                        Mode = CombatMode.Retreat;
-                    }
-                    if (Equip())
-                    {
-                        if (Reload(deltaTime))
-                        {
-                            Attack(deltaTime);
-                        }
-                    }
+                    Engage();
                    break;
+                case CombatMode.Defensive:
                case CombatMode.Retreat:
+                    Retreat();
                    break;
                default:
                    throw new NotImplementedException();
            }
        }

-        private void Move(float deltaTime)
+        private void TryArm()
+        {
+            if (Weapon != null)
+            {
+                if (!character.Inventory.Items.Contains(Weapon) || WeaponComponent == null)
+                {
+                    Weapon = null;
+                }
+                else if (!WeaponComponent.HasRequiredContainedItems(false))
+                {
+                    //if (!Reload())
+                    //{
+                    //    Weapon = null;
+                    //    Mode = CombatMode.Retreat;
+                    //}
+                    //return;
+                    Weapon = null;
+                }
+            }
+            if (Weapon == null)
+            {
+                Weapon = GetWeapon();
+            }
+            Mode = Weapon == null ? CombatMode.Retreat : initialMode;
+        }
+
+        private void OperateWeapon(float deltaTime)
        {
            switch (Mode)
            {
                case CombatMode.Offensive:
-                    Engage(deltaTime);
-                    break;
                case CombatMode.Defensive:
+                    if (Equip())
+                    {
+                        Attack(deltaTime);
+                    }
+                    break;
                case CombatMode.Retreat:
-                    Retreat(deltaTime);
                    break;
                default:
                    throw new NotImplementedException();
@@ -253,6 +266,7 @@ namespace Barotrauma
                    Weapon.Drop(character);
                }
            }
+            return true;
        }

        private bool Equip()
@@ -263,9 +277,11 @@ namespace Barotrauma
                if (character.Inventory.TryPutItem(Weapon, character, slots))
                {
                    Weapon.Equip(character);
+                    aimTimer = Rand.Range(0.5f, 1f);
                }
                else
                {
+                    Weapon = null;
                    Mode = CombatMode.Retreat;
                    return false;
                }
@@ -273,16 +289,10 @@ namespace Barotrauma
            return true;
        }

-        private void Retreat(float deltaTime)
+        private void Retreat()
        {
-            if (followTargetObjective != null)
-            {
-                if (subObjectives.Contains(followTargetObjective))
-                {
-                    subObjectives.Remove(followTargetObjective);
-                }
-                followTargetObjective = null;
-            }
+            RemoveSubObjective(ref followTargetObjective);
+            RemoveSubObjective(ref reloadWeaponObjective);
            if (retreatObjective != null && retreatObjective.Target != retreatTarget)
            {
                retreatObjective = null;
@@ -294,16 +304,14 @@ namespace Barotrauma
            TryAddSubObjective(ref retreatObjective, () => new AIObjectiveGoTo(retreatTarget, character, objectiveManager, false, true));
        }

-        private void Engage(float deltaTime)
+        private void Engage()
        {
            retreatTarget = null;
-            if (retreatObjective != null)
+            RemoveSubObjective(ref retreatObjective);
+            RemoveSubObjective(ref reloadWeaponObjective);
+            if (followTargetObjective != null && followTargetObjective.Target != Enemy)
            {
-                if (subObjectives.Contains(retreatObjective))
-                {
-                    subObjectives.Remove(retreatObjective);
-                }
-                retreatObjective = null;
+                followTargetObjective = null;
            }
            TryAddSubObjective(ref followTargetObjective,
                constructor: () => new AIObjectiveGoTo(Enemy, character, objectiveManager, repeat: true, getDivingGearIfNeeded: true)
@@ -318,35 +326,44 @@ namespace Barotrauma
                },
                onAbandon: () =>
                {
-                    SteeringManager.Reset();
                    Mode = CombatMode.Retreat;
+                    SteeringManager.Reset();
                });
        }

-        private bool Reload(float deltaTime)
+        private bool Reload()
        {
-            if (WeaponComponent != null && WeaponComponent.requiredItems.ContainsKey(RelatedItem.RelationType.Contained))
+            // TODO: reload all ammunition
+            if (WeaponComponent == null) { return false; }
+            if (WeaponComponent.requiredItems.ContainsKey(RelatedItem.RelationType.Contained))
            {
                var containedItems = Weapon.ContainedItems;
+                RelatedItem item = null;
+                Item ammunition = null;
                foreach (RelatedItem requiredItem in WeaponComponent.requiredItems[RelatedItem.RelationType.Contained])
                {
-                    Item containedItem = containedItems.FirstOrDefault(it => it.Condition > 0.0f && requiredItem.MatchesItem(it));
-                    if (containedItem == null)
-                    {
-                        TryAddSubObjective(ref reloadWeaponObjective, 
-                            constructor: () => new AIObjectiveContainItem(character, requiredItem.Identifiers, Weapon.GetComponent<ItemContainer>(), objectiveManager),
-                            onAbandon: () => 
-                            {
-                                SteeringManager.Reset();
-                                Mode = CombatMode.Retreat;
-                            });
-                    }
+                    item = requiredItem;
+                    ammunition = containedItems.FirstOrDefault(it => it.Condition > 0.0f && requiredItem.MatchesItem(it));
+                    if (ammunition != null) { return true; }
+                }
+                if (ammunition == null)
+                {
+                    retreatTarget = null;
+                    RemoveSubObjective(ref retreatObjective);
+                    RemoveSubObjective(ref followTargetObjective);
+                    TryAddSubObjective(ref reloadWeaponObjective,
+                        constructor: () => new AIObjectiveContainItem(character, item.Identifiers, Weapon.GetComponent<ItemContainer>(), objectiveManager),
+                        onAbandon: () =>
+                        {
+                            Weapon = null;
+                            Mode = CombatMode.Retreat;
+                            SteeringManager.Reset();
+                        });
                }
            }
-            return reloadWeaponObjective == null || reloadWeaponObjective.IsCompleted();
+            return true;
        }

-        private IEnumerable<FarseerPhysics.Dynamics.Body> myBodies;
        private void Attack(float deltaTime)
        {
            float squaredDistance = Vector2.DistanceSquared(character.Position, Enemy.Position);
@@ -371,6 +388,16 @@ namespace Barotrauma
                    character.SetInput(InputType.Aim, false, true);
                }
            }
+            bool isFacing = character.AnimController.Dir > 0 && Enemy.WorldPosition.X > character.WorldPosition.X || character.AnimController.Dir < 0 && Enemy.WorldPosition.X < character.WorldPosition.X;
+            if (!isFacing)
+            {
+                aimTimer = Rand.Range(1f, 1.5f);
+            }
+            if (aimTimer > 0)
+            {
+                aimTimer -= deltaTime;
+                return;
+            }
            if (WeaponComponent is MeleeWeapon meleeWeapon)
            {
                if (squaredDistance <= meleeWeapon.Range * meleeWeapon.Range)
@@ -385,14 +412,14 @@ namespace Barotrauma
                {
                    if (squaredDistance > repairTool.Range * repairTool.Range) { return; }
                }
-                if (VectorExtensions.Angle(VectorExtensions.Forward(Weapon.body.TransformedRotation), Enemy.Position - character.Position) < MathHelper.PiOver4)
+                if (VectorExtensions.Angle(VectorExtensions.Forward(Weapon.body.TransformedRotation), Enemy.Position - Weapon.Position) < MathHelper.PiOver4)
                {
                    if (myBodies == null)
                    {
                        myBodies = character.AnimController.Limbs.Select(l => l.body.FarseerBody);
                    }
                    var collisionCategories = Physics.CollisionCharacter | Physics.CollisionWall;
-                    var pickedBody = Submarine.PickBody(character.SimPosition, Enemy.SimPosition, myBodies, collisionCategories);
+                    var pickedBody = Submarine.PickBody(Weapon.SimPosition, Enemy.SimPosition, myBodies, collisionCategories);
                    if (pickedBody != null)
                    {
                        Character target = null;
@@ -404,10 +431,11 @@ namespace Barotrauma
                        {
                            target = limb.character;
                        }
-                        if (target != null && target == Enemy)
+                        if (target != null && (target == Enemy || !HumanAIController.IsFriendly(target)))
                        {
                            character.SetInput(InputType.Shoot, false, true);
                            Weapon.Use(deltaTime, character);
+                            aimTimer = Rand.Range(0.25f, 0.5f);
                        }
                    }
                }
@@ -29,7 +29,7 @@ namespace Barotrauma

        protected override IEnumerable<Character> GetList() => Character.CharacterList;

-        protected override AIObjective ObjectiveConstructor(Character target) => new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier) { useCoolDown = false };
+        protected override AIObjective ObjectiveConstructor(Character target) => new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier);

        protected override float TargetEvaluation()
        {
@@ -725,6 +725,31 @@ namespace Barotrauma
            {
 #if DEBUG
                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
+#endif
+                abandon = true;
+                return;
+            }
+            Vector2 gapDiff = Leak.WorldPosition - character.WorldPosition;
+            // TODO: use the collider size/reach?
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            {
+                HumanAIController.AnimController.Crouching = true;
+            }
+            float reach = ConvertUnits.ToSimUnits(repairTool.Range);
+            bool canOperate = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach;
+            if (canOperate)
+            {
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: "", requireEquip: true, operateTarget: Leak));
+            }
+            else
+            {
+                TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character, objectiveManager) { CloseEnough = reach * 0.75f });
+            }
+            var repairTool = weldingTool.GetComponent<RepairTool>();
+            if (repairTool == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
 #endif
                abandon = true;
                return;
@@ -73,21 +73,6 @@ namespace Barotrauma
            }
        }

-        public override void Update(float deltaTime)
-        {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    SetRandom();
-                }
-            }
-        }
-
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -174,6 +174,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -4,6 +4,7 @@ using System;
 using System.Linq;
 using Barotrauma.Extensions;
 using FarseerPhysics;
+using Barotrauma.Items.Components;

 namespace Barotrauma
 {
@@ -14,6 +15,7 @@ namespace Barotrauma
        public Item Item { get; private set; }

        private AIObjectiveGoTo goToObjective;
+        private AIObjectiveContainItem refuelObjective;
        private float previousCondition = -1;
        private RepairTool repairTool;

@@ -71,11 +73,46 @@ namespace Barotrauma
                }
            }
            // Only continue when the get item sub objectives have been completed.
-            if (subObjectives.Any(so => so is AIObjectiveGetItem)) { return; }
+            if (subObjectives.Any()) { return; }
            if (repairTool == null)
            {
                FindRepairTool();
            }
+            if (repairTool != null)
+            {
+                var containedItems = repairTool.Item.ContainedItems;
+                if (containedItems == null)
+                {
+#if DEBUG
+                    DebugConsole.ThrowError("AIObjectiveRepairItem failed - the item \"" + repairTool + "\" has no proper inventory");
+#endif
+                    abandon = true;
+                    return;
+                }
+                // Drop empty tanks
+                foreach (Item containedItem in containedItems)
+                {
+                    if (containedItem == null) { continue; }
+                    if (containedItem.Condition <= 0.0f)
+                    {
+                        containedItem.Drop(character);
+                    }
+                }
+                RelatedItem item = null;
+                Item fuel = null;
+                foreach (RelatedItem requiredItem in repairTool.requiredItems[RelatedItem.RelationType.Contained])
+                {
+                    item = requiredItem;
+                    fuel = containedItems.FirstOrDefault(it => it.Condition > 0.0f && requiredItem.MatchesItem(it));
+                    if (fuel != null) { break; }
+                }
+                if (fuel == null)
+                {
+                    RemoveSubObjective(ref goToObjective);
+                    TryAddSubObjective(ref refuelObjective, () => new AIObjectiveContainItem(character, item.Identifiers, repairTool.Item.GetComponent<ItemContainer>(), objectiveManager));
+                    return;
+                }
+            }
            if (character.CurrentHull == Item.CurrentHull && character.CanInteractWith(Item))
            {
                if (repairTool != null)
@@ -112,6 +149,7 @@ namespace Barotrauma
            }
            else
            {
+                RemoveSubObjective(ref refuelObjective);
                // If cannot reach the item, approach it.
                TryAddSubObjective(ref goToObjective,
                    constructor: () =>
@@ -203,7 +203,9 @@ namespace Barotrauma

            if (startNode == null)
            {
+#if DEBUG
                DebugConsole.NewMessage("Pathfinding error, couldn't find a start node. "+ errorMsgStr, Color.DarkRed);
+#endif

                return new SteeringPath(true);
            }
@@ -253,7 +255,9 @@ namespace Barotrauma

            if (endNode == null)
            {
+#if DEBUG
                DebugConsole.NewMessage("Pathfinding error, couldn't find an end node. " + errorMsgStr, Color.DarkRed);
+#endif
                return new SteeringPath(true);
            }

@@ -281,7 +285,9 @@ namespace Barotrauma

            if (startNode == null || endNode == null)
            {
+#if DEBUG
                DebugConsole.NewMessage("Pathfinding error, couldn't find matching pathnodes to waypoints.", Color.DarkRed);
+#endif
                return new SteeringPath(true);
            }

@@ -924,6 +924,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);
@@ -212,6 +212,33 @@ namespace Barotrauma.Items.Components
            }
        }

+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
+        struct ObstacleDebugInfo
+        {
+            public Vector2 Point1;
+            public Vector2 Point2;
+
+            public Vector2? Intersection;
+
+            public float Dot;
+
+            public Vector2 AvoidStrength;
+
+            public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength)
+            {
+                Point1 = edge.Point1;
+                Point2 = edge.Point2;
+                Intersection = intersection;
+                Dot = dot;
+                AvoidStrength = avoidStrength;
+            }
+        }
+
        //edge point 1, edge point 2, avoid strength
        private List<ObstacleDebugInfo> debugDrawObstacles = new List<ObstacleDebugInfo>();

@@ -152,8 +152,7 @@ namespace Barotrauma.Items.Components
                ParentSub = item.CurrentHull?.Submarine,
                Position = item.Position,
                CastShadows = castShadows,
-                IsBackground = drawBehindSubs,
-                SpriteScale = Vector2.One * item.Scale
+                IsBackground = drawBehindSubs
            };
 #endif

@@ -1820,6 +1820,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; }
@@ -455,6 +455,25 @@ namespace Barotrauma
            }
        }

+        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 override Rectangle Rect
        {
            get
@@ -20,8 +20,6 @@ namespace Barotrauma

        public float Rotation;

-        private int spriteIndex;
-
        public LevelObjectPrefab ActivePrefab;

        public PhysicsBody PhysicsBody
@@ -42,15 +40,6 @@ namespace Barotrauma
            set { Triggers.ForEach(t => t.NeedsNetworkSyncing = false); }
        }

-        public Sprite Sprite
-        {
-            get { return spriteIndex < 0 || Prefab.Sprites.Count == 0 ? null : Prefab.Sprites[spriteIndex % Prefab.Sprites.Count]; }
-        }
-        public Sprite SpecularSprite
-        {
-            get { return spriteIndex < 0 || Prefab.SpecularSprites.Count == 0 ? null : Prefab.SpecularSprites[spriteIndex % Prefab.SpecularSprites.Count]; }
-        }
-
        public LevelObject(LevelObjectPrefab prefab, Vector3 position, float scale, float rotation = 0.0f)
        {
            Triggers = new List<LevelTrigger>();
@@ -60,8 +49,6 @@ namespace Barotrauma
            Scale = scale;
            Rotation = rotation;

-            spriteIndex = ActivePrefab.Sprites.Any() ? Rand.Int(ActivePrefab.Sprites.Count, Rand.RandSync.Server) : -1;
-
            if (prefab.PhysicsBodyElement != null)
            {
                PhysicsBody = new PhysicsBody(prefab.PhysicsBodyElement, ConvertUnits.ToSimUnits(new Vector2(position.X, position.Y)), Scale);
@@ -166,7 +166,7 @@ namespace Barotrauma
                Vector2.Zero, Vector2.Zero, Vector2.Zero, Vector2.Zero
            };

-            Sprite sprite = newObject.Sprite ?? newObject.Prefab.DeformableSprite?.Sprite;
+            Sprite sprite = newObject.Prefab.Sprite ?? newObject.Prefab.DeformableSprite?.Sprite;

            //calculate the positions of the corners of the rotated sprite
            if (sprite != null)
@@ -43,18 +43,18 @@ namespace Barotrauma
            SeaFloor = 4,
            MainPath = 8
        }
-
-        public List<Sprite> Sprites
+        
+        public Sprite Sprite
        {
            get;
            private set;
-        } = new List<Sprite>();
+        }

-        public List<Sprite> SpecularSprites
+        public Sprite SpecularSprite
        {
            get;
            private set;
-        } = new List<Sprite>();
+        }

        public DeformableSprite DeformableSprite
        {
@@ -319,7 +319,7 @@ namespace Barotrauma
            //use the maximum width of the sprite as the minimum surface width if no value is given
            if (element != null && !element.Attributes("minsurfacewidth").Any())
            {
-                if (Sprites.Any()) MinSurfaceWidth = Sprites[0].size.X * MaxSize;
+                if (Sprite != null) MinSurfaceWidth = Sprite.size.X * MaxSize;
                if (DeformableSprite != null) MinSurfaceWidth = Math.Max(MinSurfaceWidth, DeformableSprite.Size.X * MaxSize);
            }
        }
@@ -331,10 +331,10 @@ namespace Barotrauma
                switch (subElement.Name.ToString().ToLowerInvariant())
                {
                    case "sprite":
-                        Sprites.Add( new Sprite(subElement, lazyLoad: true));
+                        Sprite = new Sprite(subElement, lazyLoad: true);
                        break;
                    case "specularsprite":
-                        SpecularSprites.Add(new Sprite(subElement, lazyLoad: true));
+                        SpecularSprite = new Sprite(subElement, lazyLoad: true);
                        break;
                    case "deformablesprite":
                        DeformableSprite = new DeformableSprite(subElement, lazyLoad: true);
@@ -358,9 +358,9 @@ namespace Barotrauma
                    case "overrideproperties":
                        var propertyOverride = new LevelObjectPrefab(subElement);
                        OverrideProperties[OverrideProperties.Count - 1] = propertyOverride;
-                        if (!propertyOverride.Sprites.Any() && propertyOverride.DeformableSprite == null)
+                        if (propertyOverride.Sprite == null && propertyOverride.DeformableSprite == null)
                        {
-                            propertyOverride.Sprites = Sprites;
+                            propertyOverride.Sprite = Sprite;
                            propertyOverride.DeformableSprite = DeformableSprite;
                        }
                        break;