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

Characters don't consume oxygen from hulls if their OxygenAvailable is higher than the amount of oxygen in the hull (= if they're wearing a diving mask or a suit)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-18 19:40:25 +03:00
parent 9be44dc479
commit 6c80a02354
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+15 -4
View File
@@ -1425,12 +1425,23 @@ namespace Barotrauma
if (!AnimController.HeadInWater && AnimController.CurrentHull != null) if (!AnimController.HeadInWater && AnimController.CurrentHull != null)
{ {
//don't decrease the amount of oxygen in the hull if the character has more oxygen available than the hull
//(i.e. if the character has some external source of oxygen)
if (OxygenAvailable * 0.98f < AnimController.CurrentHull.OxygenPercentage)
{
AnimController.CurrentHull.Oxygen -= Hull.OxygenConsumptionSpeed * deltaTime;
}
hullAvailableOxygen = AnimController.CurrentHull.OxygenPercentage; hullAvailableOxygen = AnimController.CurrentHull.OxygenPercentage;
AnimController.CurrentHull.Oxygen -= Hull.OxygenConsumptionSpeed * deltaTime;
} }
OxygenAvailable += Math.Sign(hullAvailableOxygen - oxygenAvailable) * deltaTime * 50.0f; if (hullAvailableOxygen < OxygenAvailable)
{
OxygenAvailable -= Math.Max(deltaTime * 50.0f, oxygenAvailable - hullAvailableOxygen);
}
else
{
OxygenAvailable += Math.Min(deltaTime * 50.0f, hullAvailableOxygen - oxygenAvailable);
}
} }
partial void UpdateOxygenProjSpecific(float prevOxygen); partial void UpdateOxygenProjSpecific(float prevOxygen);