vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Powered ItemComponents (not components deriving from Powered) never resetting their voltage after receiving power, causing them to stay powered indefinitely. Closes #247

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-05 22:31:55 +02:00
parent 74cd265952
commit ec302e099b
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Engine.cs
+2 -2
View File
@@ -61,9 +61,9 @@ namespace Barotrauma.Items.Components
public override void Update(float deltaTime, Camera cam) public override void Update(float deltaTime, Camera cam)
{ {
base.Update(deltaTime, cam); UpdateOnActiveEffects(deltaTime);
currPowerConsumption = Math.Abs(targetForce)/100.0f * powerConsumption; currPowerConsumption = Math.Abs(targetForce) / 100.0f * powerConsumption;
if (powerConsumption == 0.0f) voltage = 1.0f; if (powerConsumption == 0.0f) voltage = 1.0f;
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs
+1 -3
View File
@@ -60,9 +60,7 @@ namespace Barotrauma.Items.Components
currPowerConsumption = powerConsumption; currPowerConsumption = powerConsumption;
hasPower = voltage > minVoltage; if (voltage > minVoltage)
if (hasPower)
{ {
ApplyStatusEffects(ActionType.OnActive, deltaTime, null); ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
} }
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace Barotrauma.Items.Components
public override void Update(float deltaTime, Camera cam) public override void Update(float deltaTime, Camera cam)
{ {
base.Update(deltaTime, cam); UpdateOnActiveEffects(deltaTime);
CurrFlow = 0.0f; CurrFlow = 0.0f;
currPowerConsumption = powerConsumption; currPowerConsumption = powerConsumption;
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Radar.cs
+1 -1
View File
@@ -109,7 +109,7 @@ namespace Barotrauma.Items.Components
{ {
currPowerConsumption = powerConsumption; currPowerConsumption = powerConsumption;
base.Update(deltaTime, cam); UpdateOnActiveEffects(deltaTime);
if (voltage >= minVoltage || powerConsumption <= 0.0f) if (voltage >= minVoltage || powerConsumption <= 0.0f)
{ {
Barotrauma/BarotraumaShared/Source/Items/Components/Power/Powered.cs
+8 -1
View File
@@ -86,7 +86,7 @@ namespace Barotrauma.Items.Components
if (connection.IsPower) voltage = power; if (connection.IsPower) voltage = power;
} }
public override void Update(float deltaTime, Camera cam) protected void UpdateOnActiveEffects(float deltaTime)
{ {
if (currPowerConsumption == 0.0f) if (currPowerConsumption == 0.0f)
{ {
@@ -121,6 +121,13 @@ namespace Barotrauma.Items.Components
#endif #endif
} }
public override void Update(float deltaTime, Camera cam)
{
UpdateOnActiveEffects(deltaTime);
voltage = 0.0f;
}
} }
} }
Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs
+1 -1
View File
@@ -124,7 +124,7 @@ namespace Barotrauma.Items.Components
public override void Update(float deltaTime, Camera cam) public override void Update(float deltaTime, Camera cam)
{ {
base.Update(deltaTime, cam); UpdateOnActiveEffects(deltaTime);
#if CLIENT #if CLIENT
light.ParentSub = item.Submarine; light.ParentSub = item.Submarine;