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

v0.14.6.0

Browse Source
This commit is contained in:
Joonas Rikkonen
2021-06-17 17:54:52 +03:00
parent 3f324b14e8
commit c27e2ea5ab
348 changed files with 13156 additions and 4266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Items/Components/StatusHUD.cs
+28 -17
View File
@@ -17,15 +17,6 @@ namespace Barotrauma.Items.Components
TextManager.Get("CatastrophicBleeding")
};
private static readonly string[] HealthTexts =
{
TextManager.Get("NoInjuries"),
TextManager.Get("MinorInjuries"),
TextManager.Get("Injuries"),
TextManager.Get("MajorInjuries"),
TextManager.Get("CriticalInjuries")
};
private static readonly string[] OxygenTexts =
{
TextManager.Get("OxygenNormal"),
@@ -55,6 +46,8 @@ namespace Barotrauma.Items.Components
private Character equipper;
private bool isEquippable;
public IEnumerable<Character> VisibleCharacters
{
get
@@ -64,14 +57,28 @@ namespace Barotrauma.Items.Components
}
}
public override void OnItemLoaded()
{
isEquippable = item.GetComponent<Pickable>() != null;
if (!isEquippable) { IsActive = true; }
}
public override void Update(float deltaTime, Camera cam)
{
base.Update(deltaTime, cam);
if (equipper == null || equipper.Removed)
Entity refEntity = equipper;
if (isEquippable)
{
IsActive = false;
return;
if (equipper == null || equipper.Removed)
{
IsActive = false;
return;
}
}
else
{
refEntity = item;
}
if (updateTimer > 0.0f)
@@ -85,11 +92,11 @@ namespace Barotrauma.Items.Components
{
if (c == equipper || !c.Enabled || c.Removed) { continue; }
float dist = Vector2.DistanceSquared(equipper.WorldPosition, c.WorldPosition);
float dist = Vector2.DistanceSquared(refEntity.WorldPosition, c.WorldPosition);
if (dist < Range * Range)
{
Vector2 diff = c.WorldPosition - equipper.WorldPosition;
if (Submarine.CheckVisibility(equipper.SimPosition, equipper.SimPosition + ConvertUnits.ToSimUnits(diff)) == null)
Vector2 diff = c.WorldPosition - refEntity.WorldPosition;
if (Submarine.CheckVisibility(refEntity.SimPosition, refEntity.SimPosition + ConvertUnits.ToSimUnits(diff)) == null)
{
visibleCharacters.Add(c);
}
@@ -147,9 +154,13 @@ namespace Barotrauma.Items.Components
List<string> texts = new List<string>();
List<Color> textColors = new List<Color>();
texts.Add(target.Info == null ? target.DisplayName : target.Info.DisplayName);
textColors.Add(GUI.Style.TextColor);
Color nameColor = GUI.Style.TextColor;
if (Character.Controlled != null && target.TeamID != Character.Controlled.TeamID)
{
nameColor = target.TeamID == CharacterTeamType.FriendlyNPC ? Color.SkyBlue : GUI.Style.Red;
}
textColors.Add(nameColor);
if (target.IsDead)
{