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

Change all of body system to use entities and components (#2074)

Browse Source 
* Early commit

* Early commit 2

* merging master broke my git

* does anyone even read these

* life is fleeting

* it just works

* this time passing integration tests

* Remove hashset yaml serialization for now

* You got a license for those nullables?

* No examine, no context menu, part and mechanism parenting and visibility

* Fix wrong brain sprite state

* Removing layers was a mistake

* just tear body system a new one and see if it still breathes

* Remove redundant code

* Add that comment back

* Separate damage and body, component states, stomach rework

* Add containers for body parts

* Bring layers back pls

* Fix parts magically changing color

* Reimplement sprite layer visibility

* Fix tests

* Add leg test

* Active legs is gone

Crab rave

* Merge fixes, rename DamageState to CurrentState

* Remove IShowContextMenu and ICanExamine
This commit is contained in:
DrSmugleaf
2020-10-10 15:25:13 +02:00
committed by GitHub
parent 73c730d06c
commit dd385a0511
165 changed files with 4232 additions and 4650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
View File

@@ -1,4 +1,6 @@
using Content.Client.GameObjects.Components.ActionBlocking;
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.GameObjects.Components.Body.Part;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Preferences;
using Content.Shared.Preferences.Appearance;
@@ -8,7 +10,7 @@ using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects.Components.Mobs
{
[RegisterComponent]
public sealed class HumanoidAppearanceComponent : SharedHumanoidAppearanceComponent
public sealed class HumanoidAppearanceComponent : SharedHumanoidAppearanceComponent, IBodyPartAdded, IBodyPartRemoved
{
public override HumanoidCharacterAppearance Appearance
{
@@ -39,8 +41,24 @@ namespace Content.Client.GameObjects.Components.Mobs
private void UpdateLooks()
{
if (Appearance is null) return;
var sprite = Owner.GetComponent<SpriteComponent>();
if (Appearance is null ||
!Owner.TryGetComponent(out SpriteComponent sprite))
{
return;
}
if (Owner.TryGetBody(out var body))
{
foreach (var part in body.Parts.Values)
{
if (!part.Owner.TryGetComponent(out SpriteComponent partSprite))
{
continue;
}
partSprite.Color = Appearance.SkinColor;
}
}
sprite.LayerSetColor(HumanoidVisualLayers.Hair, Appearance.HairColor);
sprite.LayerSetColor(HumanoidVisualLayers.FacialHair, Appearance.FacialHairColor);
@@ -71,5 +89,51 @@ namespace Content.Client.GameObjects.Components.Mobs
sprite.LayerSetState(HumanoidVisualLayers.FacialHair,
HairStyles.FacialHairStylesMap[facialHairStyle]);
}
public void BodyPartAdded(BodyPartAddedEventArgs args)
{
if (!Owner.TryGetComponent(out SpriteComponent sprite))
{
return;
}
if (!args.Part.Owner.TryGetComponent(out SpriteComponent partSprite))
{
return;
}
var layer = args.Part.ToHumanoidLayer();
if (layer == null)
{
return;
}
// TODO BODY Layer color, sprite and state
sprite.LayerSetVisible(layer, true);
}
public void BodyPartRemoved(BodyPartRemovedEventArgs args)
{
if (!Owner.TryGetComponent(out SpriteComponent sprite))
{
return;
}
if (!args.Part.Owner.TryGetComponent(out SpriteComponent partSprite))
{
return;
}
var layer = args.Part.ToHumanoidLayer();
if (layer == null)
{
return;
}
// TODO BODY Layer color, sprite and state
sprite.LayerSetVisible(layer, false);
}
}
}