(af16ecdfa) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Deconstructor.cs

@@ -9,6 +9,10 @@ namespace Barotrauma.Items.Components
 {
     partial class Deconstructor : Powered, IServerSerializable, IClientSerializable
     {
+        public GUIButton ActivateButton
+        {
+            get { return activateButton; }
+        }
         private GUIButton activateButton;
         private GUIComponent inputInventoryHolder, outputInventoryHolder;
         private GUICustomComponent inputInventoryOverlay;
@@ -44,7 +48,6 @@ namespace Barotrauma.Items.Components
                 Visible = false,
                 CanBeFocused = false
             };
-
             outputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.3f), paddedFrame.RectTransform), style: null);
         }
 
@@ -71,7 +74,7 @@ namespace Barotrauma.Items.Components
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
             inSufficientPowerWarning.Visible = powerConsumption > 0 && voltage < minVoltage;
-            activateButton.Enabled = !inSufficientPowerWarning.Visible;
+            //activateButton.Enabled = !inSufficientPowerWarning.Visible;
         }
 
         private bool ToggleActive(GUIButton button, object obj)

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs

@@ -15,6 +15,10 @@ namespace Barotrauma.Items.Components
 
         private GUIFrame selectedItemFrame;
         
+        public GUIButton ActivateButton
+        {
+            get { return activateButton; }
+        }
         private GUIButton activateButton;
 
         private GUITextBox itemFilterBox;
@@ -22,6 +26,10 @@ namespace Barotrauma.Items.Components
         private GUIComponent inputInventoryHolder, outputInventoryHolder;
         private GUICustomComponent inputInventoryOverlay, outputInventoryOverlay;
 
+        public FabricationRecipe SelectedItem
+        {
+            get { return selectedItem; }
+        }
         private FabricationRecipe selectedItem;
 
         private GUIComponent inSufficientPowerWarning;
@@ -73,7 +81,31 @@ namespace Barotrauma.Items.Components
             {
                 CanBeFocused = false
             };
-            
+
+            CreateRecipes();
+
+            activateButton = new GUIButton(new RectTransform(new Vector2(0.8f, 0.07f), paddedFrame.RectTransform),
+                TextManager.Get("FabricatorCreate"), style: "GUIButtonLarge")
+            {
+                OnClicked = StartButtonClicked,
+                UserData = selectedItem,
+                Enabled = false
+            };
+
+            inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform), TextManager.Get("FabricatorNoPower"),
+                textColor: Color.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow")
+            {
+                HoverColor = Color.Black,
+                IgnoreLayoutGroups = true,
+                Visible = false,
+                CanBeFocused = false
+            };
+        }
+
+        partial void CreateRecipes()
+        {
+            itemList.Content.RectTransform.ClearChildren();
+
             foreach (FabricationRecipe fi in fabricationRecipes)
             {
                 GUIFrame frame = new GUIFrame(new RectTransform(new Point(itemList.Rect.Width, 30), itemList.Content.RectTransform), style: null)
@@ -101,23 +133,6 @@ namespace Barotrauma.Items.Components
                     };
                 }
             }
-
-            activateButton = new GUIButton(new RectTransform(new Vector2(0.8f, 0.07f), paddedFrame.RectTransform),
-                TextManager.Get("FabricatorCreate"), style: "GUIButtonLarge")
-            {
-                OnClicked = StartButtonClicked,
-                UserData = selectedItem,
-                Enabled = false
-            };
-
-            inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform), TextManager.Get("FabricatorNoPower"),
-                textColor: Color.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow")
-            {
-                HoverColor = Color.Black,
-                IgnoreLayoutGroups = true,
-                Visible = false,
-                CanBeFocused = false
-            };
         }
 
         partial void OnItemLoadedProjSpecific()
@@ -241,6 +256,7 @@ namespace Barotrauma.Items.Components
                 }
             }
         }
+
         private void DrawOutputOverLay(SpriteBatch spriteBatch, GUICustomComponent overlayComponent)
         {
             overlayComponent.RectTransform.SetAsLastChild();
@@ -363,6 +379,29 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        public void HighlightRecipe(string identifier, Color color)
+        {
+            foreach (GUIComponent child in itemList.Content.Children)
+            {
+                FabricationRecipe recipe = child.UserData as FabricationRecipe;
+                if (recipe?.DisplayName == null) { continue; }
+                if (recipe.TargetItem.Identifier == identifier)
+                {
+                    if (child.FlashTimer > 0.0f) return;
+                    child.Flash(color, 1.5f, false);
+
+                    for (int i = 0; i < child.CountChildren; i++)
+                    {
+                        var grandChild = child.GetChild(i);
+                        if (grandChild is GUITextBlock) continue;
+                        grandChild.Flash(color, 1.5f, false);
+                    }
+
+                    return;
+                }
+            }
+        }
+
         private bool StartButtonClicked(GUIButton button, object obj)
         {
             if (selectedItem == null) { return false; }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs

@@ -10,6 +10,10 @@ namespace Barotrauma.Items.Components
 {
     partial class Pump : Powered, IServerSerializable, IClientSerializable
     {
+        public GUIScrollBar IsActiveSlider
+        {
+            get { return isActiveSlider; }
+        }
         private GUIScrollBar isActiveSlider;
         private GUIScrollBar pumpSpeedSlider;
         private GUITickBox powerIndicator;
@@ -49,7 +53,6 @@ namespace Barotrauma.Items.Components
             };
             var sliderHandle = isActiveSlider.GetChild<GUIButton>();
             sliderHandle.RectTransform.NonScaledSize = new Point(84, sliderHandle.Rect.Height);
-            
             isActiveSlider.OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
             {
                 bool active = scrollBar.BarScroll < 0.5f;

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs

@@ -11,7 +11,16 @@ namespace Barotrauma.Items.Components
 {
     partial class Reactor : Powered, IServerSerializable, IClientSerializable
     {
+        public GUIScrollBar AutoTempSlider
+        {
+            get { return autoTempSlider; }
+        }
         private GUIScrollBar autoTempSlider;
+
+        public GUIScrollBar OnOffSwitch
+        {
+            get { return onOffSwitch; }
+        }
         private GUIScrollBar onOffSwitch;
 
         private const int GraphSize = 25;
@@ -27,7 +36,16 @@ namespace Barotrauma.Items.Components
 
         private Sprite graphLine;
 
+        public GUIScrollBar FissionRateScrollBar
+        {
+            get { return fissionRateScrollBar; }
+        }
         private GUIScrollBar fissionRateScrollBar;
+
+        public GUIScrollBar TurbineOutputScrollBar
+        {
+            get { return turbineOutputScrollBar; }
+        }
         private GUIScrollBar turbineOutputScrollBar;
 
         private float[] outputGraph = new float[GraphSize];

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Sonar.cs

@@ -20,6 +20,10 @@ namespace Barotrauma.Items.Components
         private bool unsentChanges;
         private float networkUpdateTimer;
 
+        public GUITickBox ActiveTickBox
+        {
+            get { return activeTickBox; }
+        }
         private GUITickBox activeTickBox, passiveTickBox;
         private GUITextBlock signalWarningText;