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

(9a14162c6) Disabled spontaneous deterioration on items that are not being used. TODO: adjust all deterioration rates and delays

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-07 21:43:35 +03:00
parent 3d3975e07c
commit be76bd53e9
9 changed files with 82 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs
View File

@@ -17,8 +17,8 @@ namespace Barotrauma.Items.Components
{
get { return outputContainer; }
}
public Deconstructor(Item item, XElement element)
public Deconstructor(Item item, XElement element)
: base(item, element)
{
InitProjSpecific(element);
@@ -53,7 +53,13 @@ namespace Barotrauma.Items.Components
return;
}
if (voltage < minVoltage) return;
if (voltage < minVoltage) { return; }
var repairable = item.GetComponent<Repairable>();
if (repairable != null)
{
repairable.LastActiveTime = (float)Timing.TotalTime + 10.0f;
}
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
@@ -73,8 +79,7 @@ namespace Barotrauma.Items.Components
float percentageHealth = targetItem.Condition / targetItem.Prefab.Health;
if (percentageHealth <= deconstructProduct.MinCondition || percentageHealth > deconstructProduct.MaxCondition) continue;
var itemPrefab = MapEntityPrefab.Find(null, deconstructProduct.ItemIdentifier) as ItemPrefab;
if (itemPrefab == null)
if (!(MapEntityPrefab.Find(null, deconstructProduct.ItemIdentifier) is ItemPrefab itemPrefab))
{
DebugConsole.ThrowError("Tried to deconstruct item \"" + targetItem.Name + "\" but couldn't find item prefab \"" + deconstructProduct.ItemIdentifier + "\"!");
continue;

2
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Engine.cs
View File

@@ -113,7 +113,7 @@ namespace Barotrauma.Items.Components
#endif
}
voltage = 0.0f;
voltage -= deltaTime;
}
private void UpdatePropellerDamage(float deltaTime)

10
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
View File

@@ -18,14 +18,14 @@ namespace Barotrauma.Items.Components
private FabricationRecipe fabricatedItem;
private float timeUntilReady;
private float requiredTime;
private Character user;
private ItemContainer inputContainer, outputContainer;
private float progressState;
public Fabricator(Item item, XElement element)
public Fabricator(Item item, XElement element)
: base(item, element)
{
foreach (XElement subElement in element.Elements())
@@ -174,6 +174,12 @@ namespace Barotrauma.Items.Components
if (voltage < minVoltage) { return; }
var repairable = item.GetComponent<Repairable>();
if (repairable != null)
{
repairable.LastActiveTime = (float)Timing.TotalTime + 10.0f;
}
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
if (powerConsumption <= 0) { voltage = 1.0f; }

2
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs
View File

@@ -81,7 +81,7 @@ namespace Barotrauma.Items.Components
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
}
voltage = 0.0f;
voltage -= deltaTime;
}
public override bool Pick(Character picker)

1
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs
View File

@@ -73,6 +73,7 @@ namespace Barotrauma.Items.Components
public override void UpdateBroken(float deltaTime, Camera cam)
{
powerDownTimer += deltaTime;
CurrFlow = 0.0f;
}
private void GetVents()

8
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Pump.cs
View File

@@ -19,10 +19,10 @@ namespace Barotrauma.Items.Components
public float FlowPercentage
{
get { return flowPercentage; }
set
set
{
if (!MathUtils.IsValid(flowPercentage)) return;
flowPercentage = MathHelper.Clamp(value,-100.0f,100.0f);
flowPercentage = MathHelper.Clamp(value, -100.0f, 100.0f);
flowPercentage = MathUtils.Round(flowPercentage, 1.0f);
}
}
@@ -86,8 +86,8 @@ namespace Barotrauma.Items.Components
item.CurrentHull.WaterVolume += currFlow;
if (item.CurrentHull.WaterVolume > item.CurrentHull.Volume) { item.CurrentHull.Pressure += 0.5f; }
voltage = 0.0f;
voltage -= deltaTime;
}
partial void UpdateProjSpecific(float deltaTime);

44
Barotrauma/BarotraumaShared/Source/Items/Components/Repairable.cs
View File

@@ -15,6 +15,8 @@ namespace Barotrauma.Items.Components
private float deteriorationTimer;
public float LastActiveTime;
[Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 100.0f, DecimalCount = 2, ToolTip = "How fast the condition of the item deteriorates per second.")]
public float DeteriorationSpeed
{
@@ -113,6 +115,8 @@ namespace Barotrauma.Items.Components
{
UpdateProjSpecific(deltaTime);
if (!ShouldDeteriorate()) { return; }
if (CurrentFixer == null)
{
if (item.Condition > 0.0f)
@@ -179,8 +183,48 @@ namespace Barotrauma.Items.Components
}
}
partial void UpdateProjSpecific(float deltaTime);
private bool ShouldDeteriorate()
{
if (LastActiveTime > Timing.TotalTime) { return true; }
foreach (ItemComponent ic in item.Components)
{
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; }
}
else if (ic is Engine engine)
{
//engines don't deteriorate if they're not running
if (Math.Abs(engine.Force) < 1.0f) { return false; }
}
else if (ic is Pump pump)
{
//pumps don't deteriorate if they're not running
if (Math.Abs(pump.FlowPercentage) < 1.0f) { return false; }
}
else if (ic is Reactor reactor)
{
//reactors don't deteriorate if they're not powered up
if (reactor.Temperature < 0.1f) { return false; }
}
else if (ic is OxygenGenerator oxyGenerator)
{
//oxygen generators don't deteriorate if they're not running
if (oxyGenerator.CurrFlow < 0.1f) { return false; }
}
else if (ic is Powered powered)
{
if (powered.Voltage < powered.MinVoltage) { return false; }
}
}
return true;
}
private void UpdateFixAnimation(Character character)
{
character.AnimController.UpdateUseItem(false, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((item.Condition / item.MaxCondition) % 0.1f));

2
Barotrauma/BarotraumaShared/Source/Items/Components/Signal/LightComponent.cs
View File

@@ -254,7 +254,7 @@ namespace Barotrauma.Items.Components
UpdateAITarget(item.AiTarget);
}
voltage = 0.0f;
voltage -= deltaTime;
}
#if CLIENT

18
Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs
View File

@@ -282,10 +282,17 @@ namespace Barotrauma.Items.Components
{
//use linked projectile containers in case they have to react to the turret being launched somehow
//(play a sound, spawn more projectiles)
Item linkedItem = e as Item;
if (linkedItem == null) continue;
if (!(e is Item linkedItem)) continue;
ItemContainer projectileContainer = linkedItem.GetComponent<ItemContainer>();
if (projectileContainer != null) linkedItem.Use(deltaTime, null);
if (projectileContainer != null)
{
linkedItem.Use(deltaTime, null);
var repairable = linkedItem.GetComponent<Repairable>();
if (repairable != null)
{
repairable.LastActiveTime = (float)Timing.TotalTime + 1.0f;
}
}
}
var projectiles = GetLoadedProjectiles(true);
@@ -417,9 +424,8 @@ namespace Barotrauma.Items.Components
int maxProjectileCount = 0;
foreach (MapEntity e in item.linkedTo)
{
var projectileContainer = e as Item;
if (projectileContainer == null) continue;
if (!(e is Item projectileContainer)) continue;
var containedItems = projectileContainer.ContainedItems;
if (containedItems != null)
{