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

(f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-08 19:17:50 +03:00
parent 5a9b681c13
commit 71d546ff7f
7 changed files with 115 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Repairable.cs
+21 -8
View File
@@ -66,6 +66,14 @@ namespace Barotrauma.Items.Components
set;
}
//if enabled, the deterioration timer will always run regardless if the item is being used or not
[Serialize(false, false)]
public bool DeteriorateAlways
{
get;
set;
}
private Character currentFixer;
public Character CurrentFixer
{
@@ -190,38 +198,43 @@ namespace Barotrauma.Items.Components
if (LastActiveTime > Timing.TotalTime) { return true; }
foreach (ItemComponent ic in item.Components)
{
if (ic is PowerTransfer pt)
if (ic is Fabricator || ic is Deconstructor)
{
//fabricators and deconstructors rely on LastActiveTime
return false;
}
else if (ic is PowerTransfer pt)
{
//power transfer items (junction boxes, relays) don't deteriorate if they're no carrying any power
if (Math.Abs(pt.CurrPowerConsumption) < 0.1f) { return false; }
if (Math.Abs(pt.CurrPowerConsumption) > 0.1f) { return true; }
}
else if (ic is Engine engine)
{
//engines don't deteriorate if they're not running
if (Math.Abs(engine.Force) < 1.0f) { return false; }
if (Math.Abs(engine.Force) > 1.0f) { return true; }
}
else if (ic is Pump pump)
{
//pumps don't deteriorate if they're not running
if (Math.Abs(pump.FlowPercentage) < 1.0f) { return false; }
if (Math.Abs(pump.FlowPercentage) > 1.0f) { return true; }
}
else if (ic is Reactor reactor)
{
//reactors don't deteriorate if they're not powered up
if (reactor.Temperature < 0.1f) { return false; }
if (reactor.Temperature > 0.1f) { return true; }
}
else if (ic is OxygenGenerator oxyGenerator)
{
//oxygen generators don't deteriorate if they're not running
if (oxyGenerator.CurrFlow < 0.1f) { return false; }
if (oxyGenerator.CurrFlow > 0.1f) { return true; }
}
else if (ic is Powered powered)
{
if (powered.Voltage < powered.MinVoltage) { return false; }
if (powered.Voltage >= powered.MinVoltage) { return true; }
}
}
return true;
return DeteriorateAlways;
}
private void UpdateFixAnimation(Character character)