mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-29 23:57:29 +00:00
* Nubody (#42419) * Nubody * fix test fails * gibbing * lung test returns * doc comment * hand organ test * giblet test * yaml formatting * returning * relocate * trimming * re-smite * oops thusd tweak * arachnids have slower metabolism i guess * never mind the old behaviour is bad actually * rider whyyy * style changes and allat * fix collision --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * C# files done * Visual nubody (humanoid appearance refactor) (#42476) * initial visual nubody * oops overlay * im so pheeming rn * conversion... * tests * comeback of the underwear * oops eyes * blabbl * zeds * yaml linted * search and visible count constraints * reordering * preserve previously selected markings colors * fix test * some ui niceties * ordering * make DB changes backwards-compatible/downgrade-friendly * fix things again * fix migration * vulpkanin markings limit increase * wrapping * code cleanup and more code cleanup and more code cleanup and more code cleanup and * fix slop ports * better sampling API * make filter work + use the method i made for its intended purpose * fix test fails real quick * magic mirror cleanup, remove TODO * don't 0-init the organ profile data * remove deltastates --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Let vox eat trash again (#42503) * C# complete port * Getting closer * Harpy Nubody Port * Port Feroxi, Kitsune. Fix some yml typos and remove ipcs stuff * Port Oni * Port Rest, except Motorkind * Port Motorkind * Remove more surgery, restore too much deleted stuff * Fix Typos and change some organ names. Need to split eyes next * Harpy HAve Wings again * Some fixes, More Surgeyr Removal, Copying of eye organs * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Use correct Body imports * Markings Refactoring, Harpy Layering * Motorkind doesn't crash anymore. Some layer remappings. * Allow Organs to have Markings Displacements again. (#43604) * first shtep * readd markings support --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Fix STalk eyes and several layerings * Fix sexed organs (#42554) * Fix markings for several species, fit them for sexed organs and rename some files to fit them for it * Additional IPC-related removals * Vulpkanin eyes are now correct again * Fix Subtle Cultist Marks on species * Fix Asakim Sprites (sexed) and make CD imports work * Migration, error fixes, and Height * Fix humanoid profile voice being broken (#42550) Fix humanoid appearance voice being broken * Change Kitsune SexChanged Event to with ref * Fix asakim issue, Respirator fix * Simplify hands UI code (#42534) * Simplify hands UI code * i remembered about SortedHands in the component * minor cleanup --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Set size of Analyzer back to 350, Kitsune can't gib themselves no more. Migration * yml linter errors and an rudimentary onAdd Organ Functionality * Fixing it trying to remove nothing * midpoint migration * Why do you put so many organs everywhere * More missing prototypes * Migration of more organs * Forgot lungs * Move character preview handling into a specialized control (#41252) * Move character preview handling into a specialized control Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> * Restore job name that I accidentally removed from character picker buttons * Just resolve dependencies the standard way --------- Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Janet Blackquill <uhhadd@gmail.com> * Drop ICharacterProfile/ICharacterAppearance interfaces (#42661) * Ensure profile loading only returns valid species (#42842) (Stable merge) (#42865) Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * Changes to make it work for us. * No more bald Harpy * OperatingTables instead of null * Adding Delta V Comments, commenting out instead of deleting * Fix broken Height Scale. * Remove HumanoidSilicon Mention * Did an error. Readded, uncommented. * Clean up Marking data structure, add tests for Zombie transformation (#42756) * Clean up Marking data structure, add tests for Zombie transformation * empty * AAAAAAAAAAAAAAAA --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Fix markings colour setting (#42771) * Fix: Markings Color For Downstream * Comment out A Leg. Remove Todo * Revert to original hidden species code --------- Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Absotively <jen@jenpollock.ca> Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: Myra <vasilis@pikachu.systems>
282 lines
9.9 KiB
C#
282 lines
9.9 KiB
C#
using System.Linq;
|
|
using Content.Client.DisplacementMap;
|
|
using Content.Shared.Body;
|
|
using Content.Shared.CCVar;
|
|
using Content.Shared.Humanoid.Markings;
|
|
using Content.Shared.Humanoid;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Shared.Configuration;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Client.Body;
|
|
|
|
public sealed class VisualBodySystem : SharedVisualBodySystem
|
|
{
|
|
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
|
[Dependency] private readonly IPrototypeManager _prototype = default!;
|
|
[Dependency] private readonly DisplacementMapSystem _displacement = default!;
|
|
[Dependency] private readonly MarkingManager _marking = default!;
|
|
[Dependency] private readonly SpriteSystem _sprite = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<VisualOrganComponent, OrganGotInsertedEvent>(OnOrganGotInserted);
|
|
SubscribeLocalEvent<VisualOrganComponent, OrganGotRemovedEvent>(OnOrganGotRemoved);
|
|
SubscribeLocalEvent<VisualOrganComponent, AfterAutoHandleStateEvent>(OnOrganState);
|
|
|
|
SubscribeLocalEvent<VisualOrganMarkingsComponent, OrganGotInsertedEvent>(OnMarkingsGotInserted);
|
|
SubscribeLocalEvent<VisualOrganMarkingsComponent, OrganGotRemovedEvent>(OnMarkingsGotRemoved);
|
|
SubscribeLocalEvent<VisualOrganMarkingsComponent, AfterAutoHandleStateEvent>(OnMarkingsState);
|
|
|
|
SubscribeLocalEvent<VisualOrganMarkingsComponent, BodyRelayedEvent<HumanoidLayerVisibilityChangedEvent>>(OnMarkingsChangedVisibility);
|
|
|
|
Subs.CVar(_cfg, CCVars.AccessibilityClientCensorNudity, OnCensorshipChanged, true);
|
|
Subs.CVar(_cfg, CCVars.AccessibilityServerCensorNudity, OnCensorshipChanged, true);
|
|
}
|
|
|
|
private void OnCensorshipChanged(bool value)
|
|
{
|
|
var query = AllEntityQuery<OrganComponent, VisualOrganMarkingsComponent>();
|
|
while (query.MoveNext(out var ent, out var organComp, out var markingsComp))
|
|
{
|
|
if (organComp.Body is not { } body)
|
|
continue;
|
|
|
|
RemoveMarkings((ent, markingsComp), body);
|
|
ApplyMarkings((ent, markingsComp), body);
|
|
}
|
|
}
|
|
|
|
private void OnOrganGotInserted(Entity<VisualOrganComponent> ent, ref OrganGotInsertedEvent args)
|
|
{
|
|
ApplyVisual(ent, args.Target);
|
|
}
|
|
|
|
private void OnOrganGotRemoved(Entity<VisualOrganComponent> ent, ref OrganGotRemovedEvent args)
|
|
{
|
|
RemoveVisual(ent, args.Target);
|
|
}
|
|
|
|
private void OnOrganState(Entity<VisualOrganComponent> ent, ref AfterAutoHandleStateEvent args)
|
|
{
|
|
if (Comp<OrganComponent>(ent).Body is not { } body)
|
|
return;
|
|
|
|
ApplyVisual(ent, body);
|
|
}
|
|
|
|
private void ApplyVisual(Entity<VisualOrganComponent> ent, EntityUid target)
|
|
{
|
|
if (!_sprite.LayerMapTryGet(target, ent.Comp.Layer, out var index, true))
|
|
return;
|
|
|
|
_sprite.LayerSetData(target, index, ent.Comp.Data);
|
|
}
|
|
|
|
private void RemoveVisual(Entity<VisualOrganComponent> ent, EntityUid target)
|
|
{
|
|
if (!_sprite.LayerMapTryGet(target, ent.Comp.Layer, out var index, true))
|
|
return;
|
|
|
|
_sprite.LayerSetRsiState(target, index, RSI.StateId.Invalid);
|
|
}
|
|
|
|
private void OnMarkingsGotInserted(Entity<VisualOrganMarkingsComponent> ent, ref OrganGotInsertedEvent args)
|
|
{
|
|
ApplyMarkings(ent, args.Target);
|
|
}
|
|
|
|
private void OnMarkingsGotRemoved(Entity<VisualOrganMarkingsComponent> ent, ref OrganGotRemovedEvent args)
|
|
{
|
|
RemoveMarkings(ent, args.Target);
|
|
}
|
|
|
|
private void OnMarkingsState(Entity<VisualOrganMarkingsComponent> ent, ref AfterAutoHandleStateEvent args)
|
|
{
|
|
if (Comp<OrganComponent>(ent).Body is not { } body)
|
|
return;
|
|
|
|
RemoveMarkings(ent, body);
|
|
ApplyMarkings(ent, body);
|
|
}
|
|
|
|
protected override void SetOrganColor(Entity<VisualOrganComponent> ent, Color color)
|
|
{
|
|
base.SetOrganColor(ent, color);
|
|
|
|
if (Comp<OrganComponent>(ent).Body is not { } body)
|
|
return;
|
|
|
|
ApplyVisual(ent, body);
|
|
}
|
|
|
|
protected override void SetOrganMarkings(Entity<VisualOrganMarkingsComponent> ent, Dictionary<HumanoidVisualLayers, List<Marking>> markings)
|
|
{
|
|
base.SetOrganMarkings(ent, markings);
|
|
|
|
if (Comp<OrganComponent>(ent).Body is not { } body)
|
|
return;
|
|
|
|
RemoveMarkings(ent, body);
|
|
ApplyMarkings(ent, body);
|
|
}
|
|
|
|
protected override void SetOrganAppearance(Entity<VisualOrganComponent> ent, PrototypeLayerData data)
|
|
{
|
|
base.SetOrganAppearance(ent, data);
|
|
|
|
if (Comp<OrganComponent>(ent).Body is not { } body)
|
|
return;
|
|
|
|
ApplyVisual(ent, body);
|
|
}
|
|
|
|
private IEnumerable<Marking> AllMarkings(Entity<VisualOrganMarkingsComponent> ent)
|
|
{
|
|
foreach (var markings in ent.Comp.Markings.Values)
|
|
{
|
|
foreach (var marking in markings)
|
|
{
|
|
yield return marking;
|
|
}
|
|
}
|
|
|
|
var censorNudity = _cfg.GetCVar(CCVars.AccessibilityClientCensorNudity) || _cfg.GetCVar(CCVars.AccessibilityServerCensorNudity);
|
|
if (!censorNudity)
|
|
yield break;
|
|
|
|
var group = _prototype.Index(ent.Comp.MarkingData.Group);
|
|
foreach (var layer in ent.Comp.MarkingData.Layers)
|
|
{
|
|
if (!group.Limits.TryGetValue(layer, out var layerLimits))
|
|
continue;
|
|
|
|
if (layerLimits.NudityDefault.Count < 1)
|
|
continue;
|
|
|
|
var markings = ent.Comp.Markings.GetValueOrDefault(layer) ?? [];
|
|
if (markings.Any(marking => _marking.TryGetMarking(marking, out var proto) && proto.BodyPart == layer))
|
|
continue;
|
|
|
|
foreach (var marking in layerLimits.NudityDefault)
|
|
{
|
|
yield return new(marking, 1);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void ApplyMarkings(Entity<VisualOrganMarkingsComponent> ent, Entity<SpriteComponent?> target)
|
|
{
|
|
if (!Resolve(target, ref target.Comp))
|
|
return;
|
|
|
|
var applied = new List<Marking>();
|
|
foreach (var marking in AllMarkings(ent))
|
|
{
|
|
if (!_marking.TryGetMarking(marking, out var proto))
|
|
continue;
|
|
|
|
if (!_sprite.LayerMapTryGet(target, proto.BodyPart, out var index, true))
|
|
continue;
|
|
|
|
ent.Comp.MarkingsDisplacement.TryGetValue(proto.BodyPart, out var displacement);
|
|
|
|
for (var i = 0; i < proto.Sprites.Count; i++)
|
|
{
|
|
var sprite = proto.Sprites[i];
|
|
|
|
DebugTools.Assert(sprite is SpriteSpecifier.Rsi);
|
|
if (sprite is not SpriteSpecifier.Rsi rsi)
|
|
continue;
|
|
|
|
var layerId = $"{proto.ID}-{rsi.RsiState}";
|
|
|
|
if (!_sprite.LayerMapTryGet(target, layerId, out _, false))
|
|
{
|
|
var spriteLayer = _sprite.AddLayer(target, sprite, index + i + 1);
|
|
_sprite.LayerMapSet(target, layerId, spriteLayer);
|
|
_sprite.LayerSetSprite(target, layerId, rsi);
|
|
}
|
|
|
|
if (marking.MarkingColors is not null && i < marking.MarkingColors.Count)
|
|
_sprite.LayerSetColor(target, layerId, marking.MarkingColors[i]);
|
|
else
|
|
_sprite.LayerSetColor(target, layerId, Color.White);
|
|
|
|
if (displacement != null && proto.CanBeDisplaced)
|
|
_displacement.TryAddDisplacement(displacement, (target, target.Comp), index + i + 1, layerId, out _);
|
|
}
|
|
|
|
applied.Add(marking);
|
|
}
|
|
ent.Comp.AppliedMarkings = applied;
|
|
}
|
|
|
|
private void RemoveMarkings(Entity<VisualOrganMarkingsComponent> ent, Entity<SpriteComponent?> target)
|
|
{
|
|
if (!Resolve(target, ref target.Comp))
|
|
return;
|
|
|
|
foreach (var marking in ent.Comp.AppliedMarkings)
|
|
{
|
|
if (!_marking.TryGetMarking(marking, out var proto))
|
|
continue;
|
|
|
|
foreach (var sprite in proto.Sprites)
|
|
{
|
|
DebugTools.Assert(sprite is SpriteSpecifier.Rsi);
|
|
if (sprite is not SpriteSpecifier.Rsi rsi)
|
|
continue;
|
|
|
|
var layerId = $"{proto.ID}-{rsi.RsiState}";
|
|
|
|
// If this marking is one that can be displaced, we need to remove the displacement as well; otherwise
|
|
// altering a marking at runtime can lead to the renderer falling over.
|
|
// The Vulps must be shaved.
|
|
// (https://github.com/space-wizards/space-station-14/issues/40135).
|
|
if (proto.CanBeDisplaced)
|
|
_displacement.EnsureDisplacementIsNotOnSprite((target, target.Comp), layerId);
|
|
|
|
if (!_sprite.LayerMapTryGet(target, layerId, out var index, false))
|
|
continue;
|
|
|
|
_sprite.LayerMapRemove(target, layerId);
|
|
_sprite.RemoveLayer(target, index);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void OnMarkingsChangedVisibility(Entity<VisualOrganMarkingsComponent> ent, ref BodyRelayedEvent<HumanoidLayerVisibilityChangedEvent> args)
|
|
{
|
|
foreach (var markings in ent.Comp.Markings.Values)
|
|
{
|
|
foreach (var marking in markings)
|
|
{
|
|
if (!_marking.TryGetMarking(marking, out var proto))
|
|
continue;
|
|
|
|
if (proto.BodyPart != args.Args.Layer)
|
|
continue;
|
|
|
|
foreach (var sprite in proto.Sprites)
|
|
{
|
|
DebugTools.Assert(sprite is SpriteSpecifier.Rsi);
|
|
if (sprite is not SpriteSpecifier.Rsi rsi)
|
|
continue;
|
|
|
|
var layerId = $"{proto.ID}-{rsi.RsiState}";
|
|
|
|
if (!_sprite.LayerMapTryGet(args.Body.Owner, layerId, out var index, true))
|
|
continue;
|
|
|
|
_sprite.LayerSetVisible(args.Body.Owner, index, args.Args.Visible);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|