From 7126a60b7a92440852abd591f556e88d5d13a008 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 4 Apr 2019 11:12:05 +0300 Subject: [PATCH] (558e47075) -Reduced condition loss per use for plastiseal (-100 to -25), reduced the effect a bit (TODO: add more plastiseal to subs) -Reduced condition loss per use for antibiotic glue (-100 -> -50) -Implemented crafting recipes for antidotes -Made spacing more uniform in medical xml --- .../Source/Characters/AI/Objectives/AIObjectiveCombat.cs | 3 +-- .../Source/Items/Components/Signal/LightComponent.cs | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs index b6d020d2a..0d4f621fd 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs @@ -132,8 +132,7 @@ namespace Barotrauma { if (!character.SelectedItems.Contains(Weapon)) { - var slots = Weapon.AllowedSlots.FindAll(s => s == InvSlotType.LeftHand || s == InvSlotType.RightHand || s == (InvSlotType.LeftHand | InvSlotType.RightHand)); - if (character.Inventory.TryPutItem(Weapon, character, slots)) + if (character.Inventory.TryPutItem(Weapon, 3, true, false, character)) { Weapon.Equip(character); } diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs index 7845f609c..eebf1146a 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs @@ -26,6 +26,10 @@ namespace Barotrauma.Items.Components private float blinkTimer; + private bool itemLoaded; + + private float blinkTimer; + public PhysicsBody ParentBody; [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]