From fde99f5373b69ac31daf96b0c83c19c3260c3823 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 10 Apr 2019 13:22:57 +0300 Subject: [PATCH] (586e37096) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev --- .../BarotraumaShared/Source/Items/Item.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/Items/Item.cs b/Barotrauma/BarotraumaShared/Source/Items/Item.cs index d052a8610..9e78d920e 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Item.cs @@ -1432,13 +1432,13 @@ namespace Barotrauma selectHit = picker.IsKeyHit(ic.SelectKey); #if CLIENT - //if the cursor is on a UI component, disable interaction with the left mouse button - //to prevent accidentally selecting items when clicking UI elements - if (picker == Character.Controlled && GUI.MouseOn != null) - { - if (GameMain.Config.KeyBind(ic.PickKey).MouseButton == 0) pickHit = false; - if (GameMain.Config.KeyBind(ic.SelectKey).MouseButton == 0) selectHit = false; - } + //if the cursor is on a UI component, disable interaction with the left mouse button + //to prevent accidentally selecting items when clicking UI elements + if (picker == Character.Controlled && GUI.MouseOn != null) + { + if (GameMain.Config.KeyBind(ic.PickKey).MouseButton == 0) pickHit = false; + if (GameMain.Config.KeyBind(ic.SelectKey).MouseButton == 0) selectHit = false; + } #endif } } @@ -1608,6 +1608,7 @@ namespace Barotrauma if (remove) { Spawner?.AddToRemoveQueue(this); } } + List texts = new List(); public List GetHUDTexts(Character character) { texts.Clear(); @@ -1616,14 +1617,13 @@ namespace Barotrauma if (string.IsNullOrEmpty(ic.DisplayMsg)) continue; if (!ic.CanBePicked && !ic.CanBeSelected) continue; if (ic is Holdable holdable && !holdable.CanBeDeattached()) continue; - - Color color = Color.Red; + + Color color = Color.Gray; bool hasRequiredSkillsAndItems = ic.HasRequiredSkills(character) && ic.HasRequiredItems(character, false); if (hasRequiredSkillsAndItems) { - color = Color.Orange; + color = Color.Cyan; } - // TODO: Blue color if the item is selected texts.Add(new ColoredText(ic.DisplayMsg, color, false)); }