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

Short delay before the "pressure increasing" message is displayed (because clients may briefly be outside the sub before they get in sync with the server)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-11-24 18:53:21 +02:00
parent e79ad3dceb
commit f4f58622e1
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
+22 -8
View File
@@ -18,7 +18,8 @@ namespace Barotrauma
private static GUIProgressBar oxygenBar, healthBar; private static GUIProgressBar oxygenBar, healthBar;
private static bool oxyMsgShown, pressureMsgShown; private static bool oxyMsgShown, pressureMsgShown;
private static float pressureMsgTimer;
public static float damageOverlayTimer { get; private set; } public static float damageOverlayTimer { get; private set; }
@@ -63,6 +64,22 @@ namespace Barotrauma
public static void Update(float deltaTime, Character character) public static void Update(float deltaTime, Character character)
{ {
if (!pressureMsgShown)
{
float pressureFactor = (character.AnimController.CurrentHull == null) ?
100.0f : Math.Min(character.AnimController.CurrentHull.LethalPressure, 100.0f);
if (character.PressureProtection > 0.0f) pressureFactor = 0.0f;
if (pressureFactor > 0.0f)
{
pressureMsgTimer += deltaTime;
}
else
{
pressureMsgTimer = 0.0f;
}
}
if (oxygenBar != null) if (oxygenBar != null)
{ {
oxygenBar.Update(deltaTime); oxygenBar.Update(deltaTime);
@@ -335,14 +352,11 @@ namespace Barotrauma
{ {
float indicatorAlpha = ((float)Math.Sin(character.PressureTimer * 0.1f) + 1.0f) * 0.5f; float indicatorAlpha = ((float)Math.Sin(character.PressureTimer * 0.1f) + 1.0f) * 0.5f;
indicatorAlpha = MathHelper.Clamp(indicatorAlpha, 0.1f, pressureFactor / 100.0f); indicatorAlpha = MathHelper.Clamp(indicatorAlpha, 0.1f, pressureFactor / 100.0f);
if (indicatorAlpha > 0.1f) if (pressureMsgTimer > 0.5f && !pressureMsgShown)
{ {
if (!pressureMsgShown) GUI.AddMessage(InfoTextManager.GetInfoText("PressureInfo"), new Vector2(40.0f, healthBar.Rect.Y - 60.0f), Alignment.Left, Color.White, 5.0f);
{ pressureMsgShown = true;
GUI.AddMessage(InfoTextManager.GetInfoText("PressureInfo"), new Vector2(40.0f, healthBar.Rect.Y - 60.0f), Alignment.Left, Color.White, 5.0f);
pressureMsgShown = true;
}
} }
spriteBatch.Draw(statusIcons.Texture, new Vector2(10.0f, healthBar.Rect.Y - 60.0f), new Rectangle(0, 24, 24, 25), Color.White * indicatorAlpha); spriteBatch.Draw(statusIcons.Texture, new Vector2(10.0f, healthBar.Rect.Y - 60.0f), new Rectangle(0, 24, 24, 25), Color.White * indicatorAlpha);