Unstable 0.16.1.0

2022-01-27 00:30:32 +09:00
parent 7d6421a548
commit b259af5911
161 changed files with 1913 additions and 638 deletions
@@ -237,10 +237,13 @@ namespace Barotrauma.Items.Components
            }
        }

+        private bool loadedFromXml;
        public override void Load(XElement componentElement, bool usePrefabValues, IdRemap idRemap)
        {
            base.Load(componentElement, usePrefabValues, idRemap);

+            loadedFromXml = true;
+
            if (usePrefabValues)
            {
                //this needs to be loaded regardless
@@ -536,7 +539,16 @@ namespace Barotrauma.Items.Components
                else
                {
                    attachTargetCell = GetAttachTargetCell(150.0f);
-                    if (attachTargetCell != null) { IsActive = true; }
+                    if (attachTargetCell != null && attachTargetCell.IsDestructible) 
+                    {
+                        attachTargetCell.OnDestroyed += () =>
+                        {
+                            if (attachTargetCell != null && attachTargetCell.CellType != Voronoi2.CellType.Solid)
+                            {
+                                Drop(dropConnectedWires: true, dropper: null);
+                            }
+                        };
+                    }
                }
            }

@@ -562,7 +574,7 @@ namespace Barotrauma.Items.Components

        public void DeattachFromWall()
        {
-            if (!attachable) return;
+            if (!attachable) { return; }

            Attached = false;
            attachTargetCell = null;
@@ -733,15 +745,6 @@ namespace Barotrauma.Items.Components

        public override void Update(float deltaTime, Camera cam)
        {
-            if (attachTargetCell != null)
-            {
-                if (attachTargetCell.CellType != Voronoi2.CellType.Solid)
-                {
-                    Drop(dropConnectedWires: true, dropper: null);
-                }
-                return;
-            }
-
            if (item.body == null || !item.body.Enabled) { return; }
            if (picker == null || !picker.HasEquippedItem(item))
            {
@@ -838,15 +841,25 @@ namespace Barotrauma.Items.Components

        public override void OnItemLoaded()
        {
-            if (item.Submarine != null && item.Submarine.Loading) return;
+            if (item.Submarine != null && item.Submarine.Loading) { return; }
            OnMapLoaded();
            item.SetActiveSprite();
        }

        public override void OnMapLoaded()
        {
-            if (!attachable) return;
+            if (!attachable) { return; }
            
+            //a mod has overridden the item, and the base item didn't have a Holdable component = a mod made the item movable/detachable
+            if (item.Prefab.IsOverride && !loadedFromXml)
+            {
+                if (attachedByDefault)
+                {
+                    AttachToWall();
+                    return;
+                }
+            }
+
            if (Attached)
            {
                AttachToWall();
@@ -51,7 +51,11 @@ namespace Barotrauma.Items.Components
 #else
                if (deattachTimer >= DeattachDuration)
                {
-                    holdable.DeattachFromWall();
+                    if (holdable.Attached)
+                    {
+                        GameAnalyticsManager.AddDesignEvent("ResourceCollected:" + (GameMain.GameSession?.GameMode?.Name ?? "none") + ":" + item.Prefab.Identifier);
+                        holdable.DeattachFromWall();
+                    }
                    trigger.Enabled = false;
                }
 #endif
@@ -855,6 +855,10 @@ namespace Barotrauma.Items.Components
                    {
                        currentTargets.Add(structure);
                    }
+                    if (character != null)
+                    {
+                        currentTargets.Add(character);
+                    }
                    effect.Apply(actionType, deltaTime, item, currentTargets);
                }
                else if (effect.HasTargetType(StatusEffect.TargetType.Character))