Faction Test 100.10.0.0

2022-12-07 17:46:02 +02:00
parent de250b4a64
commit e0c3754621
19 changed files with 147 additions and 62 deletions
@@ -238,6 +238,15 @@ namespace Barotrauma
            }
        }

+        public bool IsInTargetSlot(Item item)
+        {
+            if (container?.Inventory is ItemInventory inventory && TargetSlot is not null)
+            {
+                return inventory.IsInSlot(item, (int)TargetSlot);
+            }
+            return false;
+        }
+
        public override void Reset()
        {
            base.Reset();
@@ -115,6 +115,8 @@ namespace Barotrauma
                        {
                            objective.TargetSlot = container.FindSuitableSubContainerIndex(OXYGEN_SOURCE);
                        }
+                        // Only remove the oxygen source being replaced
+                        objective.RemoveExistingPredicate = i => objective.IsInTargetSlot(i);
                        return objective;
                    },
                    onAbandon: () =>