From ed529052a2b9d38379ce00e87993fc678451ab90 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Tue, 24 May 2016 19:17:42 +0300
Subject: [PATCH] - relaycomponent inherits from powertransfer, so that they're
 included when calculating the load/power for the grid - deactivated
 powertransfer components don't carry power - fixed reactor graph lines going
 over the graph if load > 10 000

---
 Subsurface/Content/Items/blank.png            | Bin 1631 -> 585 bytes
 .../Source/Items/Components/ItemLabel.cs      |   8 +++++-
 .../Items/Components/Machines/Reactor.cs      |  10 ++++++--
 .../Items/Components/Power/PowerContainer.cs  |   2 +-
 .../Items/Components/Power/PowerTransfer.cs   |   2 +-
 .../Items/Components/Signal/RelayComponent.cs |  24 +++++++++++++++---
 6 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/Subsurface/Content/Items/blank.png b/Subsurface/Content/Items/blank.png
index 9a1af98011ac848e82df474fb3263f2d88f0bb6e..8cc7ad79c38beebcb71c29a2ddd7941d0d0985d7 100644
GIT binary patch
delta 551
zcmV+?0@(fE49Nr`iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUad2e*g(^
zNLh0L01m_e01m_fl`9S#0005cNkl<ZI8Qy3*|yv;2n0cro&5NH%=c!omQ>+MJV%y=
zplKQ=zkYn3-g@kFV$LV-F+SfrV(+-_EBbZCo-10<h|Ku?^H&V~uKQcGIH_Npec}*w
z2oBDI=C}yDBJpXh;e`9zfUj6{e-gK&>A%(jU`OJ#05S`3(Xx?&1ZUN1*c00Yqss1m
zHqm>Ks`f=0q$&{LW9Q;bCY(XTCjscJK^es8S4-Z4_5PM21AhiW-2_<-u$xdDeog8P
zV~4&PUDR#3HG@~$bU^v6<((q?(*lfp<u8w|9^46Vu$!%DVpQzRQOPWYf0qn<%;!Pf
zSqM``)ZR;=!mfu#ya_7tYkV<49OH%x$h^PbH?weaeO^B@Pr(mek~X_cWVx4}Qemz-
zwJTEZ0DWrKbFHWP?JO8rku0}Kxy-?iKeR3pcIAv!J%1g1+yr)a7D~RtKoepCpf!kL
zk#t!1Po1sy1lgn6?AX5+eILMl&>&+luJ6HKOaC*G?9$(k?*ltVSdijXIL-<+t8mS=
zR56-O;iOyRTCIFzWa!ub@jiRTummM{;UGx;xrk7Y`cUdmIdwEE)7Tt}y&WFgLtO=O
pXsu&Q&6dDj`4cJN7QFJE_zUowHxz$bxSaq1002ovPDHLkV1kBh0OtSz

delta 1606
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
Ef@UKIB>(^b

diff --git a/Subsurface/Source/Items/Components/ItemLabel.cs b/Subsurface/Source/Items/Components/ItemLabel.cs
index 7837ad5c0..a26acc44e 100644
--- a/Subsurface/Source/Items/Components/ItemLabel.cs
+++ b/Subsurface/Source/Items/Components/ItemLabel.cs
@@ -14,6 +14,12 @@ namespace Barotrauma.Items.Components
             set 
             {
                 if (value == TextBlock.Text || item.Rect.Width < 5) return;
+
+                if (textBlock.Rect.Width != item.Rect.Width  || textBlock.Rect.Height != item.Rect.Height)
+                {
+                    textBlock = null;
+                }
+
                 TextBlock.Text = value;
             }
         }
@@ -57,7 +63,7 @@ namespace Barotrauma.Items.Components
             : base(item, element)
         {
         }
-
+        
         public override void Draw(SpriteBatch spriteBatch, bool editing = false)
         {
             base.Draw(spriteBatch, editing);
diff --git a/Subsurface/Source/Items/Components/Machines/Reactor.cs b/Subsurface/Source/Items/Components/Machines/Reactor.cs
index cbe18715c..f809c0086 100644
--- a/Subsurface/Source/Items/Components/Machines/Reactor.cs
+++ b/Subsurface/Source/Items/Components/Machines/Reactor.cs
@@ -452,11 +452,17 @@ namespace Barotrauma.Items.Components
             spriteBatch.DrawString(GUI.Font, "Grid load: " + (int)load + " kW",
                 new Vector2(x + 600, y + 30), Color.Yellow);
 
+            float maxLoad = 0.0f;
+            foreach (float loadVal in loadGraph)
+            {
+                maxLoad = Math.Max(maxLoad, loadVal);
+            }
+
             DrawGraph(tempGraph, spriteBatch,
-                new Rectangle(x + 30, y + 30, 400, 250), 10000.0f, xOffset, Color.Red);
+                new Rectangle(x + 30, y + 30, 400, 250), Math.Max(10000.0f, maxLoad), xOffset, Color.Red);
 
             DrawGraph(loadGraph, spriteBatch,
-                new Rectangle(x + 30, y + 30, 400, 250), 10000.0f, xOffset, Color.Yellow);
+                new Rectangle(x + 30, y + 30, 400, 250),  Math.Max(10000.0f, maxLoad), xOffset, Color.Yellow);
 
             spriteBatch.DrawString(GUI.Font, "Shutdown Temperature: " + (int)shutDownTemp, new Vector2(x + 450, y + 80), Color.White);
 
diff --git a/Subsurface/Source/Items/Components/Power/PowerContainer.cs b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
index 5ecaa21bd..85ff2bd07 100644
--- a/Subsurface/Source/Items/Components/Power/PowerContainer.cs
+++ b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
@@ -124,7 +124,7 @@ namespace Barotrauma.Items.Components
                 foreach (Connection c2 in c.Recipients)
                 {
                     PowerTransfer pt = c2.Item.GetComponent<PowerTransfer>();
-                    if (pt == null) continue;
+                    if (pt == null || !pt.IsActive) continue;
 
                     gridLoad += pt.PowerLoad; 
                 }
diff --git a/Subsurface/Source/Items/Components/Power/PowerTransfer.cs b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
index d4a8c5198..c443b8e1d 100644
--- a/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
+++ b/Subsurface/Source/Items/Components/Power/PowerTransfer.cs
@@ -130,7 +130,7 @@ namespace Barotrauma.Items.Components
                     //if (it.Updated) continue;
 
                     Powered powered = it.GetComponent<Powered>();
-                    if (powered == null) continue;
+                    if (powered == null || !powered.IsActive) continue;
 
                     if (connectedList.Contains(powered)) continue;
 
diff --git a/Subsurface/Source/Items/Components/Signal/RelayComponent.cs b/Subsurface/Source/Items/Components/Signal/RelayComponent.cs
index 958dffa13..92511b0c5 100644
--- a/Subsurface/Source/Items/Components/Signal/RelayComponent.cs
+++ b/Subsurface/Source/Items/Components/Signal/RelayComponent.cs
@@ -3,7 +3,7 @@ using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
-    class RelayComponent : ItemComponent
+    class RelayComponent : PowerTransfer
     {
         private float maxPower;
 
@@ -17,27 +17,43 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        private bool isOn;
+
         [Editable, HasDefaultValue(false, true)]
         public bool IsOn
         {
-            get; set; 
+            get
+            {
+                return IsActive;
+            }
+            set
+            {
+                isOn = value;
+                IsActive = value;
+                if (!IsActive)
+                {
+                    currPowerConsumption = 0.0f;
+                }
+            }
         }
 
         public RelayComponent(Item item, XElement element)
             : base (item, element)
         {
-            IsActive = true;
-            IsOn = true;
+            IsActive = isOn;
         }
 
         public override void Update(float deltaTime, Camera cam)
         {
+            base.Update(deltaTime, cam);
 
             item.SendSignal(0, IsOn ? "1" : "0", "state_out");
         }
 
         public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item sender, float power=0.0f)
         {
+            if (connection.IsPower && connection.Name.Contains("_out")) return;
+
             if (item.Condition <= 0.0f) return;
 
             if (power > maxPower) item.Condition = 0.0f;