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>
155 lines
5.8 KiB
C#
155 lines
5.8 KiB
C#
using System.Diagnostics.CodeAnalysis;
|
|
using System.Linq;
|
|
using Content.Shared.Administration.Managers;
|
|
using Content.Shared.Administration;
|
|
using Content.Shared.Humanoid;
|
|
using Content.Shared.Humanoid.Markings;
|
|
using Content.Shared.Preferences;
|
|
using Content.Shared.Verbs;
|
|
using Robust.Shared.Containers;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Shared.Body;
|
|
|
|
public abstract partial class SharedVisualBodySystem
|
|
{
|
|
[Dependency] private readonly ISharedAdminManager _admin = default!;
|
|
[Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!;
|
|
|
|
private void InitializeModifiers()
|
|
{
|
|
SubscribeLocalEvent<VisualBodyComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
|
|
|
|
Subs.BuiEvents<VisualBodyComponent>(HumanoidMarkingModifierKey.Key,
|
|
subs =>
|
|
{
|
|
subs.Event<BoundUIOpenedEvent>(OnModifiersOpened);
|
|
subs.Event<HumanoidMarkingModifierMarkingSetMessage>(OnSetModifiers);
|
|
});
|
|
}
|
|
|
|
private void OnGetVerbs(Entity<VisualBodyComponent> ent, ref GetVerbsEvent<Verb> args)
|
|
{
|
|
if (!_admin.HasAdminFlag(args.User, AdminFlags.Fun))
|
|
return;
|
|
|
|
var user = args.User;
|
|
args.Verbs.Add(new Verb
|
|
{
|
|
Text = "Modify markings",
|
|
Category = VerbCategory.Tricks,
|
|
Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Customization/reptilian_parts.rsi"), "tail_smooth"),
|
|
Act = () =>
|
|
{
|
|
_userInterface.OpenUi(ent.Owner, HumanoidMarkingModifierKey.Key, user);
|
|
}
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gathers all the markings-relevant data from this entity
|
|
/// </summary>
|
|
/// <param name="ent">The entity to sample</param>
|
|
/// <param name="filter">If set, only returns data concerning the given layers</param>
|
|
/// <param name="profiles">The profiles for the various organs</param>
|
|
/// <param name="markings">The marking parameters for the various organs</param>
|
|
/// <param name="applied">The markings that are applied to the entity</param>
|
|
public bool TryGatherMarkingsData(Entity<VisualBodyComponent?> ent,
|
|
HashSet<HumanoidVisualLayers>? filter,
|
|
[NotNullWhen(true)] out Dictionary<ProtoId<OrganCategoryPrototype>, OrganProfileData>? profiles,
|
|
[NotNullWhen(true)] out Dictionary<ProtoId<OrganCategoryPrototype>, OrganMarkingData>? markings,
|
|
[NotNullWhen(true)] out Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>>? applied)
|
|
{
|
|
if (!Resolve(ent, ref ent.Comp))
|
|
{
|
|
profiles = null;
|
|
markings = null;
|
|
applied = null;
|
|
return false;
|
|
}
|
|
|
|
profiles = new();
|
|
markings = new();
|
|
applied = new();
|
|
|
|
var organContainer = _container.EnsureContainer<Container>(ent, BodyComponent.ContainerID);
|
|
|
|
foreach (var organ in organContainer.ContainedEntities)
|
|
{
|
|
if (!TryComp<OrganComponent>(organ, out var organComp) || organComp.Category is not { } category)
|
|
continue;
|
|
|
|
if (TryComp<VisualOrganComponent>(organ, out var visualOrgan))
|
|
{
|
|
profiles.TryAdd(category, visualOrgan.Profile);
|
|
}
|
|
|
|
if (TryComp<VisualOrganMarkingsComponent>(organ, out var visualOrganMarkings))
|
|
{
|
|
markings.TryAdd(category, visualOrganMarkings.MarkingData);
|
|
if (filter is not null)
|
|
applied.TryAdd(category, visualOrganMarkings.Markings.Where(kvp => filter.Contains(kvp.Key)).ToDictionary());
|
|
else
|
|
applied.TryAdd(category, visualOrganMarkings.Markings);
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
private void OnModifiersOpened(Entity<VisualBodyComponent> ent, ref BoundUIOpenedEvent args)
|
|
{
|
|
TryGatherMarkingsData(ent.AsNullable(), null, out var profiles, out var markings, out var applied);
|
|
|
|
_userInterface.SetUiState(ent.Owner, HumanoidMarkingModifierKey.Key, new HumanoidMarkingModifierState(applied!, markings!, profiles!));
|
|
}
|
|
|
|
private void OnSetModifiers(Entity<VisualBodyComponent> ent, ref HumanoidMarkingModifierMarkingSetMessage args)
|
|
{
|
|
var markingsEvt = new ApplyOrganMarkingsEvent(args.Markings);
|
|
RaiseLocalEvent(ent, ref markingsEvt);
|
|
}
|
|
|
|
public void ApplyMarkings(EntityUid ent, Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> markings)
|
|
{
|
|
var markingsEvt = new ApplyOrganMarkingsEvent(markings);
|
|
RaiseLocalEvent(ent, ref markingsEvt);
|
|
}
|
|
|
|
private void ApplyAppearanceTo(Entity<VisualBodyComponent?> ent, HumanoidCharacterAppearance appearance, Sex sex, float height) // Delta V - CD Height
|
|
{
|
|
if (!Resolve(ent, ref ent.Comp))
|
|
return;
|
|
|
|
ApplyProfile(ent,
|
|
new()
|
|
{
|
|
Sex = sex,
|
|
SkinColor = appearance.SkinColor,
|
|
EyeColor = appearance.EyeColor,
|
|
Height = height,
|
|
});
|
|
|
|
var markingsEvt = new ApplyOrganMarkingsEvent(appearance.Markings);
|
|
RaiseLocalEvent(ent, ref markingsEvt);
|
|
}
|
|
|
|
public void ApplyProfileTo(Entity<VisualBodyComponent?> ent, HumanoidCharacterProfile profile)
|
|
{
|
|
ApplyAppearanceTo(ent, profile.Appearance, profile.Sex, profile.Height);
|
|
}
|
|
|
|
public void ApplyProfile(EntityUid ent, OrganProfileData profile)
|
|
{
|
|
var profileEvt = new ApplyOrganProfileDataEvent(profile, null);
|
|
RaiseLocalEvent(ent, ref profileEvt);
|
|
}
|
|
|
|
public void ApplyProfiles(EntityUid ent, Dictionary<ProtoId<OrganCategoryPrototype>, OrganProfileData> profiles)
|
|
{
|
|
var profileEvt = new ApplyOrganProfileDataEvent(null, profiles);
|
|
RaiseLocalEvent(ent, ref profileEvt);
|
|
}
|
|
}
|