Skip to content

Commit

Permalink
[Fix] surgery emergency fix
Browse files Browse the repository at this point in the history 
* Fixed mechanics of attaching body parts to Body. (now taken from prototypes, not generated at random)

---------

Co-authored-by: gluesniffler <[email protected]>
KayzelW: Rxup/space-station-14#912
  • Loading branch information
@TokenStyle @gluesniffler
TokenStyle and gluesniffler committed Nov 17, 2024
1 parent b58d2a0 commit d87ea8a
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 31 deletions.
46 changes: 30 additions & 16 deletions Content.Shared/Backmen/Surgery/Body/SharedBodySystem.PartAppearance.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
using Content.Shared.Body.Part;
using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Markings;
using Content.Shared.Humanoid.Prototypes;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;

namespace Content.Shared.Body.Systems;

public partial class SharedBodySystem
{
[Dependency] private readonly SharedHumanoidAppearanceSystem _humanoid = default!;

private void InitializePartAppearances()
{
base.Initialize();
Expand All @@ -20,7 +25,6 @@ private void InitializePartAppearances()

private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent component, ComponentStartup args)
{

// God this function reeks, it needs some cleanup BADLY. Help is appreciated as always.

if (!TryComp(uid, out BodyPartComponent? part)
Expand Down Expand Up @@ -55,19 +59,8 @@ private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent
else
{
component.Color = bodyAppearance.SkinColor;
var symmetryPrefix = part.Symmetry switch
{
BodyPartSymmetry.Left => "L",
BodyPartSymmetry.Right => "R",
_ => ""
};

var genderSuffix = "";

if (part.PartType == BodyPartType.Torso || part.PartType == BodyPartType.Head)
genderSuffix = part.Sex.ToString();

component.ID = $"Mob{part.Species}{symmetryPrefix}{part.PartType}{genderSuffix}";
component.ID = GetBodyPartPrototype(part);
}

// I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS
Expand All @@ -80,22 +73,39 @@ private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent
{
var category = MarkingCategoriesConversion.FromHumanoidVisualLayers(layer);
if (bodyAppearance.MarkingSet.Markings.TryGetValue(category, out var markingList))
markingsByLayer[layer] = markingList.Select(m => new Marking(m.MarkingId, m.MarkingColors.ToList())).ToList();
markingsByLayer[layer] =
markingList.Select(m => new Marking(m.MarkingId, m.MarkingColors.ToList())).ToList();
}

component.Markings = markingsByLayer;
}

public string GetBodyPartPrototype(BodyPartComponent part)
{
var speciesPrototype = _proto.Index<SpeciesPrototype>(part.Species);
var spriteSet = _proto.Index<HumanoidSpeciesBaseSpritesPrototype>(speciesPrototype.SpriteSet);

var layers = part.ToHumanoidLayers();

DebugTools.AssertNotNull(layers);

DebugTools.Assert(spriteSet.Sprites.ContainsKey(layers!.Value));

return HumanoidVisualLayersExtension.GetSexMorph(layers.Value, part.Sex, spriteSet.Sprites[layers.Value]);
}

private void HandleState(EntityUid uid, BodyPartAppearanceComponent component, ref AfterAutoHandleStateEvent args)
{
ApplyPartMarkings(uid, component);
}

private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref BodyPartAttachedEvent args)
{
if (!TryComp(args.Part, out BodyPartAppearanceComponent? partAppearance)
|| !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
return;

// _humanoid.SetBaseLayerId(uid, partAppearance.Type, partAppearance.ID, sync: true, bodyAppearance); // Corvax-next changes : for some reason this thing breaks everything because of "removed + Name of the part" (for ex. removedRightHand, removedLeftLeg etc), it would be fixed in future
_humanoid.SetBaseLayerId(uid, partAppearance.Type, partAppearance.ID, sync: true, bodyAppearance);
UpdateAppearance(uid, partAppearance);
}

Expand Down Expand Up @@ -129,6 +139,7 @@ protected void UpdateAppearance(EntityUid target,
_humanoid.AddMarking(target, marking.MarkingId, marking.MarkingColors, false, true, bodyAppearance);
}
}

Dirty(target, bodyAppearance);
}

Expand All @@ -141,10 +152,13 @@ protected void RemoveAppearance(EntityUid entity, BodyPartAppearanceComponent co
{
_humanoid.SetLayerVisibility(entity, visualLayer, false, true, bodyAppearance);
}

RemovePartMarkings(entity, component, bodyAppearance);
}

protected abstract void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component);

protected abstract void RemovePartMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance);
protected abstract void RemovePartMarkings(EntityUid target,
BodyPartAppearanceComponent partAppearance,
HumanoidAppearanceComponent bodyAppearance);
}
30 changes: 15 additions & 15 deletions Content.Shared/Body/Systems/SharedBodySystem.Body.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,21 +237,21 @@ private void MapInitParts(EntityUid rootPartId, BodyPartComponent rootPart, Body
continue;
}

// start-backmen: surgery
if (TryComp(parentPartComponent.Body, out HumanoidAppearanceComponent? bodyAppearance))
{
var appearance = AddComp<BodyPartAppearanceComponent>(childPart);
appearance.OriginalBody = childPartComponent.OriginalBody;
appearance.Color = bodyAppearance.SkinColor;

var symmetry = ((BodyPartSymmetry) childPartComponent.Symmetry).ToString();
if (symmetry == "None")
symmetry = "";
appearance.ID = "removed" + symmetry + ((BodyPartType) childPartComponent.PartType).ToString();

Dirty(childPart, appearance);
}
// end-backmen: surgery
// // start-backmen: surgery
// if (TryComp(parentPartComponent.Body, out HumanoidAppearanceComponent? bodyAppearance))
// {
// var appearance = AddComp<BodyPartAppearanceComponent>(childPart);
// appearance.OriginalBody = childPartComponent.OriginalBody;
// appearance.Color = bodyAppearance.SkinColor;
//
// var symmetry = ((BodyPartSymmetry) childPartComponent.Symmetry).ToString();
// if (symmetry == "None")
// symmetry = "";
// appearance.ID = "removed" + symmetry + ((BodyPartType) childPartComponent.PartType).ToString();
//
// Dirty(childPart, appearance);
// }
// // end-backmen: surgery

// Add organs
SetupOrgans((childPart, childPartComponent), connectionSlot.Organs);
Expand Down

0 comments on commit d87ea8a

Please sign in to comment.