space-wizards/space-station-14
1
0
Fork 0
mirror of https://github.com/space-wizards/space-station-14.git synced 2026-06-09 10:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error texture for harmpack hand solution visuals (#39442)

Browse Source 
* fix: check for inhand sprite's existence

* refactor: simplify solution container visuals code

this made my brain hurt but I think I didn't break anything
This commit is contained in:
Perry Fraser
2026-05-22 16:47:14 -04:00
committed by GitHub
parent cb5fb4582b
commit b6479b8b21
1 changed files with 117 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+117 -112
View File
@@ -27,29 +27,30 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
{
var meta = MetaData(uid);
component.InitialDescription = meta.EntityDescription;
component.InitialDescription = MetaData(uid).EntityDescription;
}
protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisualsComponent component, ref AppearanceChangeEvent args)
{
// Check if the solution that was updated is the one set as represented
if (!string.IsNullOrEmpty(component.SolutionName))
{
if (AppearanceSystem.TryGetData<string>(uid, SolutionContainerVisuals.SolutionName, out var name,
args.Component) && name != component.SolutionName)
{
return;
}
}
if (!AppearanceSystem.TryGetData<float>(uid, SolutionContainerVisuals.FillFraction, out var fraction, args.Component))
return;
if (args.Sprite == null)
return;
if (!SpriteSystem.LayerMapTryGet((uid, args.Sprite), component.Layer, out var fillLayer, false))
// Check if the solution that was updated is the one set as represented
if (!string.IsNullOrEmpty(component.SolutionName)
&& AppearanceSystem.TryGetData(uid, SolutionContainerVisuals.SolutionName, out string name, args.Component)
&& name != component.SolutionName)
return;
if (!AppearanceSystem.TryGetData(uid,
SolutionContainerVisuals.FillFraction,
out float fraction,
args.Component))
return;
// C# moment; setting it as nullable (even though it's not) avoids a
// gazillion .AsNullable calls.
Entity<SpriteComponent?> ent = (uid, args.Sprite);
if (!SpriteSystem.LayerMapTryGet(ent, component.Layer, out var fillLayer, false))
return;
var maxFillLevels = component.MaxFillLevels;
@@ -62,52 +63,27 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
// a giant error sign and error for debug.
if (fraction > 1f)
{
Log.Error("Attempted to set solution container visuals volume ratio on " + ToPrettyString(uid) + " to a value greater than 1. Volume should never be greater than max volume!");
Log.Error($"Attempted to set solution container visuals volume ratio on {ToPrettyString(uid)} to a "
+ $"value greater than 1. Volume should never be greater than max volume!");
fraction = 1f;
}
if (component.Metamorphic)
{
if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), component.BaseLayer, out var baseLayer, false))
{
var hasOverlay = SpriteSystem.LayerMapTryGet((uid, args.Sprite), component.OverlayLayer, out var overlayLayer, false);
if (AppearanceSystem.TryGetData<string>(uid, SolutionContainerVisuals.BaseOverride,
out var baseOverride,
args.Component))
{
_prototype.TryIndex<ReagentPrototype>(baseOverride, out var reagentProto);
if (reagentProto?.MetamorphicSprite is { } sprite)
{
SpriteSystem.LayerSetSprite((uid, args.Sprite), baseLayer, sprite);
if (reagentProto.MetamorphicMaxFillLevels > 0)
{
SpriteSystem.LayerSetVisible((uid, args.Sprite), fillLayer, true);
maxFillLevels = reagentProto.MetamorphicMaxFillLevels;
fillBaseName = reagentProto.MetamorphicFillBaseName;
changeColor = reagentProto.MetamorphicChangeColor;
fillSprite = sprite;
}
else
SpriteSystem.LayerSetVisible((uid, args.Sprite), fillLayer, false);
if (hasOverlay)
SpriteSystem.LayerSetVisible((uid, args.Sprite), overlayLayer, false);
}
else
{
SpriteSystem.LayerSetVisible((uid, args.Sprite), fillLayer, true);
if (hasOverlay)
SpriteSystem.LayerSetVisible((uid, args.Sprite), overlayLayer, true);
if (component.MetamorphicDefaultSprite != null)
SpriteSystem.LayerSetSprite((uid, args.Sprite), baseLayer, component.MetamorphicDefaultSprite);
}
}
}
}
if (!component.Metamorphic)
SpriteSystem.LayerSetVisible(ent, fillLayer, true);
else
{
SpriteSystem.LayerSetVisible((uid, args.Sprite), fillLayer, true);
var reagentProto = MetamorphicChanged(uid, component, args, ent, fillLayer);
if (reagentProto?.MetamorphicMaxFillLevels > 0)
{
SpriteSystem.LayerSetVisible(ent, fillLayer, true);
maxFillLevels = reagentProto.MetamorphicMaxFillLevels;
fillBaseName = reagentProto.MetamorphicFillBaseName;
changeColor = reagentProto.MetamorphicChangeColor;
fillSprite = reagentProto.MetamorphicSprite ?? fillSprite;
}
else
SpriteSystem.LayerSetVisible(ent, fillLayer, false);
}
var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, maxFillLevels + 1);
@@ -117,27 +93,25 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
if (fillBaseName == null)
return;
var stateName = fillBaseName + closestFillSprite;
if (fillSprite != null)
SpriteSystem.LayerSetSprite((uid, args.Sprite), fillLayer, fillSprite);
SpriteSystem.LayerSetRsiState((uid, args.Sprite), fillLayer, stateName);
SpriteSystem.LayerSetSprite(ent, fillLayer, fillSprite);
if (changeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, args.Component))
SpriteSystem.LayerSetColor((uid, args.Sprite), fillLayer, color);
SpriteSystem.LayerSetRsiState(ent, fillLayer, fillBaseName + closestFillSprite);
if (changeColor
&& AppearanceSystem.TryGetData(uid, SolutionContainerVisuals.Color, out Color color, args.Component))
SpriteSystem.LayerSetColor(ent, fillLayer, color);
else
SpriteSystem.LayerSetColor((uid, args.Sprite), fillLayer, Color.White);
SpriteSystem.LayerSetColor(ent, fillLayer, Color.White);
}
else
{
if (component.EmptySpriteName == null)
SpriteSystem.LayerSetVisible((uid, args.Sprite), fillLayer, false);
SpriteSystem.LayerSetVisible(ent, fillLayer, false);
else
{
SpriteSystem.LayerSetRsiState((uid, args.Sprite), fillLayer, component.EmptySpriteName);
if (changeColor)
SpriteSystem.LayerSetColor((uid, args.Sprite), fillLayer, component.EmptySpriteColor);
else
SpriteSystem.LayerSetColor((uid, args.Sprite), fillLayer, Color.White);
SpriteSystem.LayerSetRsiState(ent, fillLayer, component.EmptySpriteName);
SpriteSystem.LayerSetColor(ent, fillLayer, changeColor ? component.EmptySpriteColor : Color.White);
}
}
@@ -145,36 +119,51 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
_itemSystem.VisualsChanged(uid);
}
private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent component, GetInhandVisualsEvent args)
private ReagentPrototype? MetamorphicChanged(EntityUid uid,
SolutionContainerVisualsComponent component,
AppearanceChangeEvent args,
Entity<SpriteComponent?> ent,
int fillLayer)
{
if (component.InHandsFillBaseName == null)
return;
if (!AppearanceSystem.TryGetData(uid,
SolutionContainerVisuals.BaseOverride,
out string baseOverride,
args.Component))
return null;
if (!TryComp(uid, out AppearanceComponent? appearance))
return;
var reagentProto = _prototype.Index<ReagentPrototype>(baseOverride);
if (!TryComp<ItemComponent>(uid, out var item))
return;
if (SpriteSystem.LayerMapTryGet(ent, component.OverlayLayer, out var overlayLayer, false))
SpriteSystem.LayerSetVisible(ent, overlayLayer, reagentProto.MetamorphicSprite is not null);
if (!AppearanceSystem.TryGetData<float>(uid, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
return;
if (!SpriteSystem.LayerMapTryGet(ent, component.BaseLayer, out var baseLayer, false))
return null;
var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.InHandsMaxFillLevels + 1);
if (closestFillSprite > 0)
if (reagentProto.MetamorphicSprite is { } sprite)
SpriteSystem.LayerSetSprite(ent, baseLayer, sprite);
else
{
var layer = new PrototypeLayerData();
var heldPrefix = item.HeldPrefix == null ? "inhand-" : $"{item.HeldPrefix}-inhand-";
var key = heldPrefix + args.Location.ToString().ToLowerInvariant() + component.InHandsFillBaseName + closestFillSprite;
layer.State = key;
if (component.ChangeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, appearance))
layer.Color = color;
args.Layers.Add((key, layer));
SpriteSystem.LayerSetVisible(ent, fillLayer, true);
if (component.MetamorphicDefaultSprite != null)
SpriteSystem.LayerSetSprite(ent, baseLayer, component.MetamorphicDefaultSprite);
}
return reagentProto;
}
private void OnGetHeldVisuals(Entity<SolutionContainerVisualsComponent> ent, ref GetInhandVisualsEvent args)
{
if (ent.Comp.InHandsFillBaseName == null)
return;
if (!TryComp<ItemComponent>(ent, out var item))
return;
var inhandPrefix = item.HeldPrefix == null ? "inhand-" : $"{item.HeldPrefix}-inhand-";
var layerKeyPrefix = inhandPrefix + args.Location.ToString().ToLowerInvariant() + ent.Comp.InHandsFillBaseName;
if (GetVisualsLayer(ent, layerKeyPrefix, ent.Comp.InHandsMaxFillLevels) is { } layer)
args.Layers.Add(layer);
}
private void OnGetClothingVisuals(Entity<SolutionContainerVisualsComponent> ent, ref GetEquipmentVisualsEvent args)
@@ -182,35 +171,51 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
if (ent.Comp.EquippedFillBaseName == null)
return;
if (!TryComp<AppearanceComponent>(ent, out var appearance))
return;
if (!TryComp<ClothingComponent>(ent, out var clothing))
return;
if (!AppearanceSystem.TryGetData<float>(ent, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
return;
var equippedPrefix = clothing.EquippedPrefix == null
? $"equipped-{args.Slot}"
: $" {clothing.EquippedPrefix}-equipped-{args.Slot}";
var layerKeyPrefix = equippedPrefix + ent.Comp.EquippedFillBaseName;
var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, ent.Comp.EquippedMaxFillLevels + 1);
if (GetVisualsLayer(ent, layerKeyPrefix, ent.Comp.EquippedMaxFillLevels) is { } layer)
args.Layers.Add(layer);
}
if (closestFillSprite > 0)
{
var layer = new PrototypeLayerData();
private (string Key, PrototypeLayerData Layer)? GetVisualsLayer(Entity<SolutionContainerVisualsComponent> ent,
string layerKeyPrefix,
int maxFillLevels)
{
if (!TryComp<AppearanceComponent>(ent, out var appearance))
return null;
var equippedPrefix = clothing.EquippedPrefix == null ? $"equipped-{args.Slot}" : $" {clothing.EquippedPrefix}-equipped-{args.Slot}";
var key = equippedPrefix + ent.Comp.EquippedFillBaseName + closestFillSprite;
if (!AppearanceSystem.TryGetData<float>(ent,
SolutionContainerVisuals.FillFraction,
out var fraction,
appearance))
return null;
// Make sure the sprite state is valid so we don't show a big red error message
// This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets).
if (!TryComp<SpriteComponent>(ent, out var sprite) || sprite.BaseRSI == null || !sprite.BaseRSI.TryGetState(key, out _))
return;
var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, maxFillLevels + 1);
if (closestFillSprite <= 0)
return null;
layer.State = key;
var layer = new PrototypeLayerData();
var key = layerKeyPrefix + closestFillSprite;
if (ent.Comp.ChangeColor && AppearanceSystem.TryGetData<Color>(ent, SolutionContainerVisuals.Color, out var color, appearance))
layer.Color = color;
// Make sure the sprite state is valid so we don't show a big red error message
// This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets).
if (!TryComp<SpriteComponent>(ent, out var sprite)
|| sprite.BaseRSI?.TryGetState(key, out _) != true)
return null;
layer.State = key;
if (ent.Comp.ChangeColor
&& AppearanceSystem.TryGetData<Color>(ent, SolutionContainerVisuals.Color, out var color, appearance))
layer.Color = color;
return (key, layer);
args.Layers.Add((key, layer));
}
}
}