0c97520276
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)
This then resulted in TryIndex() getting modified to log errors (94f98073b0), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
91 lines
3.0 KiB
C#
91 lines
3.0 KiB
C#
using Content.Shared.Atmos.Rotting;
|
|
using Content.Shared.Damage;
|
|
using Content.Shared.Inventory.Events;
|
|
using Content.Shared.Mobs.Components;
|
|
using Content.Shared.Overlays;
|
|
using Content.Shared.StatusIcon;
|
|
using Content.Shared.StatusIcon.Components;
|
|
using Robust.Shared.Prototypes;
|
|
using System.Linq;
|
|
|
|
namespace Content.Client.Overlays;
|
|
|
|
/// <summary>
|
|
/// Shows a healthy icon on mobs.
|
|
/// </summary>
|
|
public sealed class ShowHealthIconsSystem : EquipmentHudSystem<ShowHealthIconsComponent>
|
|
{
|
|
[Dependency] private readonly IPrototypeManager _prototypeMan = default!;
|
|
|
|
[ViewVariables]
|
|
public HashSet<string> DamageContainers = new();
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<DamageableComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
|
|
SubscribeLocalEvent<ShowHealthIconsComponent, AfterAutoHandleStateEvent>(OnHandleState);
|
|
}
|
|
|
|
protected override void UpdateInternal(RefreshEquipmentHudEvent<ShowHealthIconsComponent> component)
|
|
{
|
|
base.UpdateInternal(component);
|
|
|
|
foreach (var damageContainerId in component.Components.SelectMany(x => x.DamageContainers))
|
|
{
|
|
DamageContainers.Add(damageContainerId);
|
|
}
|
|
}
|
|
|
|
protected override void DeactivateInternal()
|
|
{
|
|
base.DeactivateInternal();
|
|
|
|
DamageContainers.Clear();
|
|
}
|
|
|
|
private void OnHandleState(Entity<ShowHealthIconsComponent> ent, ref AfterAutoHandleStateEvent args)
|
|
{
|
|
RefreshOverlay();
|
|
}
|
|
|
|
private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetStatusIconsEvent args)
|
|
{
|
|
if (!IsActive)
|
|
return;
|
|
|
|
var healthIcons = DecideHealthIcons(entity);
|
|
|
|
args.StatusIcons.AddRange(healthIcons);
|
|
}
|
|
|
|
private IReadOnlyList<HealthIconPrototype> DecideHealthIcons(Entity<DamageableComponent> entity)
|
|
{
|
|
var damageableComponent = entity.Comp;
|
|
|
|
if (damageableComponent.DamageContainerID == null ||
|
|
!DamageContainers.Contains(damageableComponent.DamageContainerID))
|
|
{
|
|
return Array.Empty<HealthIconPrototype>();
|
|
}
|
|
|
|
var result = new List<HealthIconPrototype>();
|
|
|
|
// Here you could check health status, diseases, mind status, etc. and pick a good icon, or multiple depending on whatever.
|
|
if (damageableComponent?.DamageContainerID == "Biological")
|
|
{
|
|
if (TryComp<MobStateComponent>(entity, out var state))
|
|
{
|
|
// Since there is no MobState for a rotting mob, we have to deal with this case first.
|
|
if (HasComp<RottingComponent>(entity) && _prototypeMan.Resolve(damageableComponent.RottingIcon, out var rottingIcon))
|
|
result.Add(rottingIcon);
|
|
else if (damageableComponent.HealthIcons.TryGetValue(state.CurrentState, out var value) && _prototypeMan.Resolve(value, out var icon))
|
|
result.Add(icon);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|