Build 0.18.0.0

2022-05-13 00:55:52 +09:00
parent 15d18e6ff6
commit 7547a9b78a
218 changed files with 3881 additions and 2192 deletions
@@ -164,6 +164,8 @@ namespace Barotrauma.Items.Components
        public bool SwingWhenAiming { get; set; }
        [Editable, Serialize(false, IsPropertySaveable.No, description: "Should the item swing around when it's being used (for example, when firing a weapon or a welding tool).")]
        public bool SwingWhenUsing { get; set; }
+        [Editable, Serialize(false, IsPropertySaveable.No)]
+        public bool DisableHeadRotation { get; set; }

        [ConditionallyEditable(ConditionallyEditable.ConditionType.Attachable, MinValueFloat = 0.0f, MaxValueFloat = 0.999f, DecimalCount = 3), Serialize(0.55f, IsPropertySaveable.No, description: "Sprite depth that's used when the item is NOT attached to a wall.")]
        public float SpriteDepthWhenDropped
@@ -180,11 +182,12 @@ namespace Barotrauma.Items.Components
            Pusher = null;
            if (element.GetAttributeBool("blocksplayers", false))
            {
-                Pusher = new PhysicsBody(item.body.width, item.body.height, item.body.radius, item.body.Density)
+                Pusher = new PhysicsBody(item.body.width, item.body.height, item.body.radius, 
+                    item.body.Density,
+                    BodyType.Dynamic,
+                    Physics.CollisionItemBlocking, 
+                    Physics.CollisionCharacter | Physics.CollisionProjectile)
                {
-                    BodyType = BodyType.Dynamic,
-                    CollidesWith = Physics.CollisionCharacter | Physics.CollisionProjectile,
-                    CollisionCategories = Physics.CollisionItemBlocking,
                    Enabled = false,
                    UserData = this
                };
@@ -79,11 +79,18 @@ namespace Barotrauma.Items.Components
            IsActive = true;
        }

-        public override void Move(Vector2 amount)
+        public override void Move(Vector2 amount, bool ignoreContacts = false)
        {
            if (trigger != null && amount.LengthSquared() > 0.00001f)
            {
-                trigger.SetTransform(item.SimPosition, 0.0f);
+                if (ignoreContacts)
+                {
+                    trigger.SetTransformIgnoreContacts(item.SimPosition, 0.0f);
+                }
+                else
+                {
+                    trigger.SetTransform(item.SimPosition, 0.0f);
+                }
            }
        }

@@ -119,17 +126,19 @@ namespace Barotrauma.Items.Components
            }

            var body = item.body ?? holdable.Body;
-            
+
            if (body != null)
            {
-                trigger = new PhysicsBody(body.width, body.height, body.radius, body.Density)
+                trigger = new PhysicsBody(body.width, body.height, body.radius, 
+                    body.Density,
+                    BodyType.Static,
+                    Physics.CollisionWall,
+                    Physics.CollisionNone,
+                    findNewContacts: false)
                {
                    UserData = item
                };
                trigger.FarseerBody.SetIsSensor(true);
-                trigger.FarseerBody.BodyType = BodyType.Static;
-                trigger.FarseerBody.CollisionCategories = Physics.CollisionWall;
-                trigger.FarseerBody.CollidesWith = Physics.CollisionNone;
            }
        }

@@ -111,8 +111,9 @@ namespace Barotrauma.Items.Components

            ActivateNearbySleepingCharacters();
            reloadTimer = reload;
-            reloadTimer /= (1f + character.GetStatValue(StatTypes.MeleeAttackSpeed));
-            reloadTimer /= (1f + item.GetQualityModifier(Quality.StatType.StrikingSpeedMultiplier));
+            reloadTimer /= 1f + character.GetStatValue(StatTypes.MeleeAttackSpeed);
+            reloadTimer /= 1f + item.GetQualityModifier(Quality.StatType.StrikingSpeedMultiplier);
+            character.AnimController.LockFlippingUntil = (float)Timing.TotalTime + reloadTimer;

            item.body.FarseerBody.CollisionCategories = Physics.CollisionProjectile;
            item.body.FarseerBody.CollidesWith = Physics.CollisionCharacter | Physics.CollisionWall | Physics.CollisionItemBlocking;
@@ -216,6 +217,10 @@ namespace Barotrauma.Items.Components
                {
                    hitPos = MathUtils.WrapAnglePi(Math.Min(hitPos + deltaTime * 3f, MathHelper.PiOver4));
                    ac.HoldItem(deltaTime, item, handlePos, aimPos, Vector2.Zero, aim: false, hitPos, holdAngle + hitPos, aimMelee: true);
+                    if (ac.InWater)
+                    {
+                        ac.LockFlippingUntil = (float)Timing.TotalTime + Reload;
+                    }
                }
                else
                {
@@ -71,6 +71,7 @@ namespace Barotrauma.Items.Components
            //return if someone is already trying to pick the item
            if (pickTimer > 0.0f) { return false; }
            if (picker == null || picker.Inventory == null) { return false; }
+            if (!picker.Inventory.AccessibleWhenAlive && !picker.Inventory.AccessibleByOwner) { return false; }

            if (PickingTime > 0.0f)
            {
@@ -226,7 +227,7 @@ namespace Barotrauma.Items.Components
            {
                foreach (Connection c in connectionPanel.Connections)
                {
-                    foreach (Wire w in c.Wires)
+                    foreach (Wire w in c.Wires.ToArray())
                    {
                        if (w == null) continue;
                        w.Item.Drop(character);
@@ -40,7 +40,7 @@ namespace Barotrauma.Items.Components

        public override bool Use(float deltaTime, Character character = null)
        {
-            if (character == null || character.Removed) return false;
+            if (character == null || character.Removed) { return false; }
            if (!character.IsKeyDown(InputType.Aim) || character.Stun > 0.0f) { return false; }

            IsActive = true;
@@ -55,12 +55,11 @@ namespace Barotrauma.Items.Components
                if (UsableIn == UseEnvironment.Water) { return true; }
            }

-            Vector2 dir = Vector2.Normalize(character.CursorPosition - character.Position);
-            //move upwards if the cursor is at the position of the character
-            if (!MathUtils.IsValid(dir)) dir = Vector2.UnitY;
-
+            Vector2 dir = character.CursorPosition - character.Position;
+            if (!MathUtils.IsValid(dir)) { return true; }
+            float length = 200;
+            dir = dir.ClampLength(length) / length;
            Vector2 propulsion = dir * Force * character.PropulsionSpeedMultiplier;
-
            if (character.AnimController.InWater && Force > 0.0f) { character.AnimController.TargetMovement = dir; }

            foreach (Limb limb in character.AnimController.Limbs)