tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xeno improvements (#6032)

Browse Source
This commit is contained in:
metalgearsloth
2022-01-06 12:51:53 +11:00
committed by GitHub
parent de0c94414a
commit 4aaa85f84d
13 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Client/MobState/DamageStateVisualizer.cs
View File

@@ -18,34 +18,42 @@ namespace Content.Client.MobState
private int? _originalDrawDepth;
[DataField("normal")]
private string? normal;
private string? _normal;
[DataField("crit")]
private string? crit;
private string? _crit;
[DataField("dead")]
private string? dead;
private string? _dead;
/// <summary>
/// Should noRot be turned off when crit / dead.
/// </summary>
[DataField("rotate")]
private bool _rotate;
void ISerializationHooks.BeforeSerialization()
{
_stateMap.TryGetValue(DamageState.Alive, out normal);
_stateMap.TryGetValue(DamageState.Critical, out crit);
_stateMap.TryGetValue(DamageState.Dead, out dead);
_stateMap.TryGetValue(DamageState.Alive, out _normal);
_stateMap.TryGetValue(DamageState.Critical, out _crit);
_stateMap.TryGetValue(DamageState.Dead, out _dead);
}
void ISerializationHooks.AfterDeserialization()
{
if (normal != null)
if (_normal != null)
{
_stateMap.Add(DamageState.Alive, normal);
_stateMap.Add(DamageState.Alive, _normal);
}
if (crit != null)
if (_crit != null)
{
_stateMap.Add(DamageState.Critical, crit);
_stateMap.Add(DamageState.Critical, _crit);
}
if (dead != null)
if (_dead != null)
{
_stateMap.Add(DamageState.Dead, dead);
_stateMap.Add(DamageState.Dead, _dead);
}
}
@@ -65,6 +73,16 @@ namespace Content.Client.MobState
_data = data;
if (_rotate)
{
sprite.NoRotation = data switch
{
DamageState.Critical => false,
DamageState.Dead => false,
_ => true
};
}
if (_stateMap.TryGetValue(_data, out var state))
{
sprite.LayerSetState(DamageStateVisualLayers.Base, state);