(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -64,6 +64,12 @@ namespace Barotrauma
            }
        }

+        public float SonarDisruption
+        {
+            get;
+            set;
+        }
+
        public string SonarLabel;

        public bool Enabled = true;
@@ -127,6 +133,7 @@ namespace Barotrauma
            MaxSightRange = element.GetAttributeFloat("maxsightrange", SightRange);
            MaxSoundRange = element.GetAttributeFloat("maxsoundrange", SoundRange);
            FadeOutTime = element.GetAttributeFloat("fadeouttime", FadeOutTime);
+            SonarDisruption = element.GetAttributeFloat("sonardisruption", 0.0f);
            SonarLabel = element.GetAttributeString("sonarlabel", "");
            string typeString = element.GetAttributeString("type", "Any");
            if (Enum.TryParse(typeString, out TargetType t))
@@ -841,7 +841,7 @@ namespace Barotrauma
        private Limb GetAttackLimb(Vector2 attackWorldPos, Limb ignoredLimb = null)
        {
            AttackContext currentContext = Character.GetAttackContext();
-            var target = wallTarget != null ? wallTarget.Structure : SelectedAiTarget.Entity;
+            var target = wallTarget != null ? wallTarget.Structure : SelectedAiTarget?.Entity;
            Limb selectedLimb = null;
            float currentPriority = 0;
            foreach (Limb limb in Character.AnimController.Limbs)
@@ -163,7 +163,7 @@ namespace Barotrauma
                {
                    Weapon = null;
                }
-                else if (!WeaponComponent.HasRequiredContainedItems(false))
+                else if (!WeaponComponent.HasRequiredContainedItems(character, addMessage: false))
                {
                    // Seek ammunition only if cannot find a new weapon
                    if (!Reload(!HoldPosition, () => GetWeapon(out _) == null))
@@ -234,14 +234,14 @@ namespace Barotrauma
                {
                    if (component is RangedWeapon rw)
                    {
-                        if (ignoreRequiredItems || rw.HasRequiredContainedItems(false))
+                        if (ignoreRequiredItems || rw.HasRequiredContainedItems(character, addMessage: false))
                        {
                            weapons.Add(rw);
                        }
                    }
                    else if (component is MeleeWeapon mw)
                    {
-                        if (ignoreRequiredItems || mw.HasRequiredContainedItems(false))
+                        if (ignoreRequiredItems || mw.HasRequiredContainedItems(character, addMessage: false))
                        {
                            weapons.Add(mw);
                        }
@@ -257,7 +257,7 @@ namespace Barotrauma
                                {
                                    if (statusEffect.Afflictions.Any())
                                    {
-                                        if (ignoreRequiredItems || component.HasRequiredContainedItems(false))
+                                        if (ignoreRequiredItems || component.HasRequiredContainedItems(character, addMessage: false))
                                        {
                                            weapons.Add(component);
                                        }
@@ -284,7 +284,7 @@ namespace Barotrauma
        private bool Equip()
        {
            if (character.LockHands) { return false; }
-            if (!WeaponComponent.HasRequiredContainedItems(false))
+            if (!WeaponComponent.HasRequiredContainedItems(character, addMessage: false))
            {
                Mode = CombatMode.Retreat;
                return false;
@@ -428,7 +428,7 @@ namespace Barotrauma
                    }
                }
            }
-            if (WeaponComponent.HasRequiredContainedItems(false))
+            if (WeaponComponent.HasRequiredContainedItems(character, addMessage: false))
            {
                return true;
            }
@@ -108,6 +108,7 @@ namespace Barotrauma
                        else
                        {
                            move = false;
+                            character.SetInput(extinguisher.Item.IsShootable ? InputType.Shoot : InputType.Use, false, true);
                            extinguisher.Use(deltaTime, character);
                            if (!targetHull.FireSources.Contains(fs))
                            {                                
@@ -4,7 +4,6 @@ using System;
 using System.Linq;
 using Barotrauma.Extensions;
 using FarseerPhysics;
-using Barotrauma.Items.Components;

 namespace Barotrauma
 {
@@ -207,7 +207,7 @@ namespace Barotrauma
            bool remove = false;
            foreach (ItemComponent ic in item.Components)
            {
-                if (!ic.HasRequiredContainedItems(addMessage: false)) { continue; }
+                if (!ic.HasRequiredContainedItems(user: character, addMessage: false)) { continue; }
 #if CLIENT
                ic.PlaySound(ActionType.OnUse, character.WorldPosition, character);
 #endif