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

Build 0.20.9.0

Browse Source
This commit is contained in:
Markus Isberg
2022-12-01 21:59:53 +02:00
parent df805574c4
commit 31d2dc658e
66 changed files with 953 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterHUD.cs
+31 -11
View File
@@ -9,7 +9,7 @@ using System.Linq;
namespace Barotrauma
{
class CharacterHUD
partial class CharacterHUD
{
const float BossHealthBarDuration = 120.0f;
@@ -99,8 +99,8 @@ namespace Barotrauma
}
}
public static bool ShouldRecreateHudTexts { get; set; } = true;
private static bool heldDownShiftWhenGotHudTexts;
public static bool RecreateHudTexts { get; set; } = true;
private static bool lastHudTextsContextual;
private static float timeHealthWindowClosed;
public static bool IsCampaignInterfaceOpen =>
@@ -218,7 +218,7 @@ namespace Barotrauma
if (focusedItemOverlayTimer <= 0.0f)
{
focusedItem = null;
ShouldRecreateHudTexts = true;
RecreateHudTexts = true;
}
}
}
@@ -340,7 +340,7 @@ namespace Barotrauma
if (focusedItem != character.FocusedItem)
{
focusedItemOverlayTimer = Math.Min(1.0f, focusedItemOverlayTimer);
ShouldRecreateHudTexts = true;
RecreateHudTexts = true;
}
focusedItem = character.FocusedItem;
}
@@ -364,14 +364,14 @@ namespace Barotrauma
if (!GUI.DisableItemHighlights && !Inventory.DraggingItemToWorld)
{
bool shiftDown = PlayerInput.IsShiftDown();
if (ShouldRecreateHudTexts || heldDownShiftWhenGotHudTexts != shiftDown)
bool hudTextsContextual = PlayerInput.IsShiftDown();
if (RecreateHudTexts || lastHudTextsContextual != hudTextsContextual)
{
ShouldRecreateHudTexts = true;
heldDownShiftWhenGotHudTexts = shiftDown;
RecreateHudTexts = true;
lastHudTextsContextual = hudTextsContextual;
}
var hudTexts = focusedItem.GetHUDTexts(character, ShouldRecreateHudTexts);
ShouldRecreateHudTexts = false;
var hudTexts = focusedItem.GetHUDTexts(character, RecreateHudTexts);
RecreateHudTexts = false;
int dir = Math.Sign(focusedItem.WorldPosition.X - character.WorldPosition.X);
@@ -790,5 +790,25 @@ namespace Barotrauma
Vector2 drawPos = objectiveEntity.Entity.WorldPosition;// + Vector2.UnitX * objectiveEntity.Sprite.size.X * 1.5f;
GUI.DrawIndicator(spriteBatch, drawPos, cam, 100.0f, objectiveEntity.Sprite, objectiveEntity.Color * iconAlpha);
}
static partial void RecreateHudTextsIfControllingProjSpecific(Character character)
{
if (character == Character.Controlled)
{
RecreateHudTexts = true;
}
}
static partial void RecreateHudTextsIfFocusedProjSpecific(params Item[] items)
{
foreach (var item in items)
{
if (item == Character.Controlled?.FocusedItem)
{
RecreateHudTexts = true;
break;
}
}
}
}
}