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

Fix borg mobstates (#21307)

Browse Source 
* Add dead states to borgs

* this?

* ack
This commit is contained in:
Nemanja
2023-11-09 18:14:06 -05:00
committed by GitHub
parent 4de0cf66d7
commit ac5e9cd70b
17 changed files with 107 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Client/Silicons/Borgs/BorgSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Silicons.Borgs;
using Content.Shared.Mobs;
using Content.Shared.Silicons.Borgs;
using Content.Shared.Silicons.Borgs.Components;
using Robust.Client.GameObjects;
using Robust.Shared.Containers;
@@ -22,7 +23,7 @@ public sealed class BorgSystem : SharedBorgSystem
{
if (args.Sprite == null)
return;
UpdateBorgAppearnce(uid, component, args.Component, args.Sprite);
UpdateBorgAppearance(uid, component, args.Component, args.Sprite);
}
protected override void OnInserted(EntityUid uid, BorgChassisComponent component, EntInsertedIntoContainerMessage args)
@@ -31,7 +32,7 @@ public sealed class BorgSystem : SharedBorgSystem
return;
base.OnInserted(uid, component, args);
UpdateBorgAppearnce(uid, component);
UpdateBorgAppearance(uid, component);
}
protected override void OnRemoved(EntityUid uid, BorgChassisComponent component, EntRemovedFromContainerMessage args)
@@ -40,10 +41,10 @@ public sealed class BorgSystem : SharedBorgSystem
return;
base.OnRemoved(uid, component, args);
UpdateBorgAppearnce(uid, component);
UpdateBorgAppearance(uid, component);
}
private void UpdateBorgAppearnce(EntityUid uid,
private void UpdateBorgAppearance(EntityUid uid,
BorgChassisComponent? component = null,
AppearanceComponent? appearance = null,
SpriteComponent? sprite = null)
@@ -51,6 +52,15 @@ public sealed class BorgSystem : SharedBorgSystem
if (!Resolve(uid, ref component, ref appearance, ref sprite))
return;
if (_appearance.TryGetData<MobState>(uid, MobStateVisuals.State, out var state, appearance))
{
if (state != MobState.Alive)
{
sprite.LayerSetVisible(BorgVisualLayers.Light, false);
return;
}
}
if (!_appearance.TryGetData<bool>(uid, BorgVisuals.HasPlayer, out var hasPlayer, appearance))
hasPlayer = false;