Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cyborg health alert and damage examining (#20084)

Browse Source 
* Option for alt health alert and no overlay

* Fancy borg health indicator

* Borg damage examine localization

* EENENGHHHH ENNNGHHH

* Requested code changes

* Legal sound

* Revert "Legal sound"

This reverts commit 35715c88898aeb78dfe800319852c230395fdd7e.

I misunderstood what Sloth meant

* Annoying buzzer is back
This commit is contained in:
Doru991
2023-09-15 06:14:47 +03:00
committed by GitHub
parent c25b769132
commit eaecdb4336
15 changed files with 153 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Shared/Mobs/Components/MobThresholdsComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.FixedPoint;
using Content.Shared.Alert;
using Content.Shared.FixedPoint;
using Content.Shared.Mobs.Systems;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
@@ -9,7 +10,7 @@ namespace Content.Shared.Mobs.Components;
[Access(typeof(MobThresholdSystem))]
public sealed partial class MobThresholdsComponent : Component
{
[DataField("thresholds", required:true)]
[DataField("thresholds", required: true)]
public SortedDictionary<FixedPoint2, MobState> Thresholds = new();
[DataField("triggersAlerts")]
@@ -18,6 +19,24 @@ public sealed partial class MobThresholdsComponent : Component
[DataField("currentThresholdState")]
public MobState CurrentThresholdState;
/// <summary>
/// The health alert that should be displayed for player controlled entities.
/// Used for alternate health alerts (silicons, for example)
/// </summary>
[DataField("stateAlertDict")]
public Dictionary<MobState, AlertType> StateAlertDict = new()
{
{MobState.Alive, AlertType.HumanHealth},
{MobState.Critical, AlertType.HumanCrit},
{MobState.Dead, AlertType.HumanDead},
};
/// <summary>
/// Whether or not this entity should display damage overlays (robots don't feel pain, black out etc.)
/// </summary>
[DataField("showOverlays")]
public bool ShowOverlays = true;
/// <summary>
/// Whether or not this entity can be revived out of a dead state.
/// </summary>
@@ -34,13 +53,25 @@ public sealed class MobThresholdsComponentState : ComponentState
public MobState CurrentThresholdState;
public Dictionary<MobState, AlertType> StateAlertDict = new()
{
{MobState.Alive, AlertType.HumanHealth},
{MobState.Critical, AlertType.HumanCrit},
{MobState.Dead, AlertType.HumanDead},
};
public bool ShowOverlays;
public bool AllowRevives;
public MobThresholdsComponentState(Dictionary<FixedPoint2, MobState> unsortedThresholds, bool triggersAlerts, MobState currentThresholdState, bool allowRevives)
public MobThresholdsComponentState(Dictionary<FixedPoint2, MobState> unsortedThresholds, bool triggersAlerts, MobState currentThresholdState,
Dictionary<MobState, AlertType> stateAlertDict, bool showOverlays, bool allowRevives)
{
UnsortedThresholds = unsortedThresholds;
TriggersAlerts = triggersAlerts;
CurrentThresholdState = currentThresholdState;
StateAlertDict = stateAlertDict;
ShowOverlays = showOverlays;
AllowRevives = allowRevives;
}
}

26
Content.Shared/Mobs/Systems/MobThresholdSystem.cs
View File

@@ -1,10 +1,11 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Alert;
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Shared.Mobs.Components;
using Robust.Shared.GameStates;
using Robust.Shared.Utility;
namespace Content.Shared.Mobs.Systems;
@@ -34,6 +35,8 @@ public sealed class MobThresholdSystem : EntitySystem
args.State = new MobThresholdsComponentState(thresholds,
component.TriggersAlerts,
component.CurrentThresholdState,
component.StateAlertDict,
component.ShowOverlays,
component.AllowRevives);
}
@@ -341,28 +344,37 @@ public sealed class MobThresholdSystem : EntitySystem
if (!threshold.TriggersAlerts)
return;
var dict = threshold.StateAlertDict;
var healthAlert = AlertType.HumanHealth;
var critAlert = AlertType.HumanCrit;
var deadAlert = AlertType.HumanDead;
dict.TryGetValue(MobState.Alive, out healthAlert);
dict.TryGetValue(MobState.Critical, out critAlert);
dict.TryGetValue(MobState.Dead, out deadAlert);
switch (currentMobState)
{
case MobState.Alive:
{
var severity = _alerts.GetMinSeverity(AlertType.HumanHealth);
var severity = _alerts.GetMinSeverity(healthAlert);
if (TryGetIncapPercentage(target, damageable.TotalDamage, out var percentage))
{
severity = (short) MathF.Floor(percentage.Value.Float() *
_alerts.GetSeverityRange(AlertType.HumanHealth));
severity += _alerts.GetMinSeverity(AlertType.HumanHealth);
_alerts.GetSeverityRange(healthAlert));
severity += _alerts.GetMinSeverity(healthAlert);
}
_alerts.ShowAlert(target, AlertType.HumanHealth, severity);
_alerts.ShowAlert(target, healthAlert, severity);
break;
}
case MobState.Critical:
{
_alerts.ShowAlert(target, AlertType.HumanCrit);
_alerts.ShowAlert(target, critAlert);
break;
}
case MobState.Dead:
{
_alerts.ShowAlert(target, AlertType.HumanDead);
_alerts.ShowAlert(target, deadAlert);
break;
}
case MobState.Invalid: