Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -577,8 +577,8 @@ namespace Barotrauma
}
else
{
hull1.LethalPressure = 0.0f;
hull2.LethalPressure = 0.0f;
hull1.LethalPressure -= Hull.PressureDropSpeed * deltaTime;
hull2.LethalPressure -= Hull.PressureDropSpeed * deltaTime;
}
}
}
@@ -642,7 +642,7 @@ namespace Barotrauma
}
else
{
hull1.LethalPressure += ((Submarine != null && Submarine.AtDamageDepth) ? 100.0f : 10.0f) * deltaTime;
hull1.LethalPressure += ((Submarine != null && Submarine.AtDamageDepth) ? 100.0f : Hull.PressureBuildUpSpeed) * deltaTime;
}
}
else
@@ -657,7 +657,7 @@ namespace Barotrauma
}
if (hull1.WaterVolume >= hull1.Volume / Hull.MaxCompress)
{
hull1.LethalPressure += ((Submarine != null && Submarine.AtDamageDepth) ? 100.0f : 10.0f) * deltaTime;
hull1.LethalPressure += ((Submarine != null && Submarine.AtDamageDepth) ? 100.0f : Hull.PressureBuildUpSpeed) * deltaTime;
}
}
}