Unstable 0.1500.1.0 (BaroDev edition)

2021-09-03 21:56:31 +09:00
parent 501e02c026
commit e7b7c1a748
143 changed files with 2928 additions and 1356 deletions
@@ -148,7 +148,7 @@ namespace Barotrauma

        public virtual void UpdateAnim(float deltaTime) { }

-        public virtual void HoldItem(float deltaTime, Item item, Vector2[] handlePos, Vector2 holdPos, Vector2 aimPos, bool aim, float holdAngle, float itemAngleRelativeToHoldAngle = 0.0f) { }
+        public virtual void HoldItem(float deltaTime, Item item, Vector2[] handlePos, Vector2 holdPos, Vector2 aimPos, bool aim, float holdAngle, float itemAngleRelativeToHoldAngle = 0.0f, bool aimingMelee = false) { }

        public virtual void DragCharacter(Character target, float deltaTime) { }

@@ -390,11 +390,17 @@ namespace Barotrauma
                }
                if (eatTimer % 1.0f < 0.5f && (eatTimer - deltaTime * eatSpeed) % 1.0f > 0.5f)
                {
-                    bool CanBeSevered(LimbJoint j) => !j.IsSevered && j.CanBeSevered && j.LimbA != null && !j.LimbA.IsSevered && j.LimbB != null && !j.LimbB.IsSevered;
+                    static bool CanBeSevered(LimbJoint j) => !j.IsSevered && j.CanBeSevered && j.LimbA != null && !j.LimbA.IsSevered && j.LimbB != null && !j.LimbB.IsSevered;
                    //keep severing joints until there is only one limb left
                    var nonSeveredJoints = target.AnimController.LimbJoints.Where(CanBeSevered);
                    if (nonSeveredJoints.None())
                    {
+                        //small monsters don't eat the contents of the character's inventory
+                        if (Mass < target.AnimController.Mass)
+                        {
+                            target.Inventory?.AllItemsMod.ForEach(it => it?.Drop(dropper: null));
+                        }
+
                        //only one limb left, the character is now full eaten
                        Entity.Spawner?.AddToRemoveQueue(target);

@@ -150,6 +150,13 @@ namespace Barotrauma
        private float upperLegLength = 0.0f, lowerLegLength = 0.0f;

        private bool aiming;
+        private bool wasAiming;
+
+        private bool aimingMelee;
+        private bool wasAimingMelee;
+
+        public bool IsAiming => wasAiming;
+        public bool IsAimingMelee => wasAimingMelee;

        private readonly float movementLerp;

@@ -532,7 +539,10 @@ namespace Barotrauma
                limb.Disabled = false;
            }

+            wasAiming = aiming;
            aiming = false;
+            wasAimingMelee = aimingMelee;
+            aimingMelee = false;
            if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer) return;
        }

@@ -1718,7 +1728,7 @@ namespace Barotrauma
        }

        //TODO: refactor this method, it's way too convoluted
-        public override void HoldItem(float deltaTime, Item item, Vector2[] handlePos, Vector2 holdPos, Vector2 aimPos, bool aim, float holdAngle, float itemAngleRelativeToHoldAngle = 0.0f)
+        public override void HoldItem(float deltaTime, Item item, Vector2[] handlePos, Vector2 holdPos, Vector2 aimPos, bool aim, float holdAngle, float itemAngleRelativeToHoldAngle = 0.0f, bool aimingMelee = false)
        {
            if (character.Stun > 0.0f || character.IsIncapacitated)
            {
@@ -1748,6 +1758,8 @@ namespace Barotrauma

            Holdable holdable = item.GetComponent<Holdable>();

+            this.aimingMelee = aimingMelee;
+
            if (!isClimbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero && !character.IsIncapacitated)
            {
                Vector2 mousePos = ConvertUnits.ToSimUnits(character.SmoothedCursorPosition);
@@ -1771,7 +1783,6 @@ namespace Barotrauma

                    aiming = true;
                }
-
            }
            else
            {
@@ -395,12 +395,18 @@ namespace Barotrauma

            if (character.IsHusk && character.Params.UseHuskAppendage)
            {
+                bool inEditor = false;
+#if CLIENT
+                inEditor = Screen.Selected == GameMain.CharacterEditorScreen;
+#endif
+
                var characterPrefab = CharacterPrefab.FindByFilePath(character.ConfigPath);
                if (characterPrefab?.XDocument != null)
                {
                    var mainElement = characterPrefab.XDocument.Root.IsOverride() ? characterPrefab.XDocument.Root.FirstElement() : characterPrefab.XDocument.Root;
                    foreach (var huskAppendage in mainElement.GetChildElements("huskappendage"))
                    {
+                        if (!inEditor && huskAppendage.GetAttributeBool("onlyfromafflictions", false)) { continue; }
                        AfflictionHusk.AttachHuskAppendage(character, huskAppendage.GetAttributeString("affliction", string.Empty), huskAppendage, ragdoll: this);
                    }
                }