v0.19.0.0 (unstable)

2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
@@ -691,12 +691,30 @@ namespace Barotrauma.Items.Components
                {
                    item.Drop(character);
                    item.SetTransform(ConvertUnits.ToSimUnits(GetAttachPosition(character)), 0.0f, findNewHull: false);
+                    //the light source won't get properly updated if lighting is disabled (even though the light sprite is still drawn when lighting is disabled)
+                    //so let's ensure the light source is up-to-date
+                    RefreshLightSources(item);
                }
                AttachToWall();
            }
            return true;
+
+            static void RefreshLightSources(Item item)
+            {
+                item.body?.UpdateDrawPosition();
+                foreach (var light in item.GetComponents<LightComponent>())
+                {
+                    light.SetLightSourceTransform();
+                }
+                item.GetComponent<ItemContainer>()?.SetContainedItemPositions();
+                foreach (var containedItem in item.ContainedItems)
+                {
+                    RefreshLightSources(containedItem);
+                }
+            }
        }

+
        public override bool SecondaryUse(float deltaTime, Character character = null)
        {
            return true;
@@ -1,12 +1,10 @@
-using Barotrauma.Networking;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;

 namespace Barotrauma.Items.Components
 {
@@ -292,7 +290,6 @@ namespace Barotrauma.Items.Components
            item.body.PhysEnabled = false;
        }

-
        private bool OnCollision(Fixture f1, Fixture f2, Contact contact)
        {
            if (User == null || User.Removed)
@@ -419,7 +416,18 @@ namespace Barotrauma.Items.Components
                else if (target.UserData is Item targetItem && targetItem.Prefab.DamagedByMeleeWeapons && targetItem.Condition > 0)
                {
                    if (targetItem.Removed) { return; }
-                    Attack.DoDamage(User, targetItem, item.WorldPosition, 1.0f);
+                    var attackResult = Attack.DoDamage(User, targetItem, item.WorldPosition, 1.0f);
+#if CLIENT
+                    if (attackResult.Damage > 0.0f)
+                    {
+                        Character.Controlled?.UpdateHUDProgressBar(targetItem,
+                            targetItem.WorldPosition,
+                            targetItem.Condition / targetItem.MaxCondition,
+                            emptyColor: GUIStyle.HealthBarColorLow,
+                            fullColor: GUIStyle.HealthBarColorHigh,
+                            textTag: targetItem.Name);
+                    }
+#endif
                }
                else if (target.UserData is Holdable holdable && holdable.CanPush)
                {
@@ -169,7 +169,7 @@ namespace Barotrauma.Items.Components
                //attempting to pick does not select the item, so if it is selected at this point, another ItemComponent
                //must have been selected and we should not keep deattaching (happens when for example interacting with
                //an electrical component while holding both a screwdriver and a wrench).
-                if (picker.SelectedConstruction == item || 
+                if (picker.IsAnySelectedItem(item)||
                    picker.IsKeyDown(InputType.Aim) || 
                    !picker.CanInteractWith(item) ||
                    item.Removed || item.ParentInventory != null)
@@ -187,7 +187,7 @@ namespace Barotrauma.Items.Components
                    !string.IsNullOrWhiteSpace(PickingMsg) ? PickingMsg : this is Door ? "progressbar.opening" : "progressbar.deattaching");
 #endif
                
-                picker.AnimController.UpdateUseItem(true, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((pickTimer / 10.0f) % 0.1f));
+                picker.AnimController.UpdateUseItem(!picker.IsClimbing, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((pickTimer / 10.0f) % 0.1f));
                pickTimer += CoroutineManager.DeltaTime;

                yield return CoroutineStatus.Running;
@@ -208,7 +208,7 @@ namespace Barotrauma.Items.Components
        {
            if (picker != null)
            {
-                picker.AnimController.Anim = AnimController.Animation.None;
+                picker.AnimController.StopUsingItem();
                picker.PickingItem = null;
            }
            if (pickingCoroutine != null)
@@ -18,6 +18,7 @@ namespace Barotrauma.Items.Components
        };

        private readonly HashSet<Identifier> fixableEntities;
+        private readonly HashSet<Identifier> nonFixableEntities;
        private Vector2 pickedPosition;
        private float activeTimer;

@@ -135,6 +136,7 @@ namespace Barotrauma.Items.Components
            }

            fixableEntities = new HashSet<Identifier>();
+            nonFixableEntities = new HashSet<Identifier>();
            foreach (var subElement in element.Elements())
            {
                switch (subElement.Name.ToString().ToLowerInvariant())
@@ -147,7 +149,16 @@ namespace Barotrauma.Items.Components
                        }
                        else
                        {
-                            fixableEntities.Add(subElement.GetAttributeIdentifier("identifier", ""));
+                            foreach (Identifier id in subElement.GetAttributeIdentifierArray("identifier", Array.Empty<Identifier>()))
+                            {
+                                fixableEntities.Add(id);
+                            }
+                        }
+                        break;
+                    case "nonfixable":
+                        foreach (Identifier id in subElement.GetAttributeIdentifierArray("identifier", Array.Empty<Identifier>()))
+                        {
+                            nonFixableEntities.Add(id);
                        }
                        break;
                }
@@ -523,6 +534,7 @@ namespace Barotrauma.Items.Components
                if (sectionIndex < 0) { return false; }

                if (!fixableEntities.Contains("structure") && !fixableEntities.Contains(targetStructure.Prefab.Identifier)) { return true; }
+                if (nonFixableEntities.Contains(targetStructure.Prefab.Identifier) || nonFixableEntities.Any(t => targetStructure.Tags.Contains(t))) { return false; }

                ApplyStatusEffectsOnTarget(user, deltaTime, ActionType.OnUse, structure: targetStructure);
                FixStructureProjSpecific(user, deltaTime, targetStructure, sectionIndex);