[Upstream] Goob UP #168
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ | |
| using System.Numerics; | ||
| using Content.Client.DisplacementMap; | ||
| using Content.Shared.CCVar; | ||
| using Content.Shared.Humanoid; | ||
| using Content.Shared.Humanoid.Markings; | ||
| using Content.Shared.Humanoid.Prototypes; | ||
|
|
@@ -177,7 +176,7 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profil | |
|
|
||
| var customBaseLayers = new Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo>(); | ||
|
|
||
| var speciesPrototype = _prototypeManager.Index(profile.Species); // Floof | ||
| var markings = new MarkingSet(speciesPrototype.MarkingPoints, _markingManager, _prototypeManager); | ||
|
|
||
| // Add markings that doesn't need coloring. We store them until we add all other markings that doesn't need it. | ||
|
|
@@ -378,50 +377,109 @@ private void ApplyMarking(MarkingPrototype markingPrototype, | |
| var humanoid = entity.Comp1; | ||
| var sprite = entity.Comp2; | ||
|
|
||
| // FLOOF ADD START | ||
| // make a handy dict of filename -> colors | ||
| // cus we might need to access it by filename to link | ||
| // one sprite's colors to another | ||
| var colorDict = new Dictionary<string, Color>(); | ||
| for (var i = 0; i < markingPrototype.Sprites.Count; i++) | ||
| { | ||
| var spriteName = markingPrototype.Sprites[i] switch | ||
| { | ||
| SpriteSpecifier.Rsi rsi => rsi.RsiState, | ||
| SpriteSpecifier.Texture texture => texture.TexturePath.Filename, | ||
| _ => null | ||
| }; | ||
|
|
||
| if (spriteName != null) | ||
| { | ||
| if (colors != null && i < colors.Count) | ||
| colorDict.Add(spriteName, colors[i]); | ||
| else | ||
| colorDict.Add(spriteName, Color.White); | ||
| } | ||
| } | ||
| // now, rearrange them, copying any parented colors to children set to | ||
| // inherit them | ||
| if (markingPrototype.ColorLinks != null) | ||
| { | ||
| foreach (var (child, parent) in markingPrototype.ColorLinks) | ||
| { | ||
| if (colorDict.TryGetValue(parent, out var color)) | ||
| { | ||
| colorDict[child] = color; | ||
| } | ||
| } | ||
| } | ||
| // and, since we can't rely on the iterator knowing where the heck to put | ||
| // each sprite when we have one marking setting multiple layers, | ||
| // lets just kinda sorta do that ourselves | ||
| var layerDict = new Dictionary<string, int>(); | ||
| // FLOOF ADD END | ||
| for (var j = 0; j < markingPrototype.Sprites.Count; j++) | ||
| { | ||
| // FLOOF CHANGE START | ||
| var markingSprite = markingPrototype.Sprites[j]; | ||
| if (markingSprite is not SpriteSpecifier.Rsi rsi) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var layerSlot = markingPrototype.BodyPart; | ||
| // first, try to see if there are any custom layers for this marking | ||
| if (markingPrototype.Layering != null && markingPrototype.Layering.TryGetValue(rsi.RsiState, out var layerName)) // Arcane-Edit: Bugfix | ||
| { | ||
| // Arcane-Edit-Start | ||
| if (!Enum.TryParse<HumanoidVisualLayers>(layerName, out var parsedLayer)) | ||
| { | ||
| Log.Error($"Marking {markingPrototype.ID} references unknown visual layer {layerName}"); | ||
| continue; | ||
| } | ||
| // Arcane-Edit-End | ||
| layerSlot = parsedLayer; // Arcane | ||
| } | ||
|
UmbiMax marked this conversation as resolved.
|
||
| // update the layerDict | ||
| // if it doesnt have this, add it at 0, otherwise increment it | ||
| if (layerDict.TryGetValue(layerSlot.ToString(), out var layerIndex)) | ||
| { | ||
| layerDict[layerSlot.ToString()] = layerIndex + 1; | ||
| } | ||
| else | ||
| { | ||
| layerDict.Add(layerSlot.ToString(), 0); | ||
| } | ||
|
|
||
| if (!sprite.LayerMapTryGet(layerSlot, out var targetLayer)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| visible &= !IsHidden(humanoid, markingPrototype.BodyPart); | ||
| visible &= humanoid.BaseLayers.TryGetValue(markingPrototype.BodyPart, out var setting) | ||
| && setting.AllowsMarkings; | ||
|
|
||
| var layerId = $"{markingPrototype.ID}-{rsi.RsiState}"; | ||
| // FLOOF CHANGE END | ||
|
|
||
| if (!sprite.LayerMapTryGet(layerId, out _)) | ||
| { | ||
| // for layers that are supposed to be behind everything, | ||
| // adding 1 to the layer index makes it not be behind | ||
| // everything. fun! FLOOF ADD =3 | ||
| // var targLayerAdj = targetLayer == 0 ? 0 + j : targetLayer + j + 1; | ||
| var targLayerAdj = targetLayer + layerDict[layerSlot.ToString()] + 1; | ||
| var layer = sprite.AddLayer(markingSprite, targLayerAdj); | ||
| sprite.LayerMapSet(layerId, layer); | ||
| sprite.LayerSetSprite(layerId, rsi); | ||
| } | ||
| // imp special via beck. check if there's a shader defined in the markingPrototype's shader datafield, and if there is... | ||
| if (markingPrototype.Shader != null) | ||
| { | ||
| // use spriteComponent's layersetshader function to set the layer's shader to that which is specified. | ||
| sprite.LayerSetShader(layerId, markingPrototype.Shader); | ||
| } | ||
| // end imp special | ||
| sprite.LayerSetVisible(layerId, visible); | ||
|
Comment on lines
+452
to
+482
Contributor
There was a problem hiding this comment. 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win 🧩 Analysis chain🌐 Web query:
💡 Result: In RobustToolbox, recent architectural changes have deprecated several methods on the SpriteComponent in favor of using the SpriteSystem. This migration is part of a broader effort to move logic out of components and into their corresponding systems [1][2]. Key Migration Points: Obsolete SpriteComponent Methods: Methods such as LayerMapSet, LayerMapRemove, and LayerMapTryGet (among others) on SpriteComponent have been marked as [Obsolete] and now advise using the equivalent methods provided by SpriteSystem [1]. Using SpriteSystem: Instead of calling methods directly on the SpriteComponent instance, you should now pass the Entity (containing the SpriteComponent) to the SpriteSystem [1][3]. For example, when working with layer maps, you would use: - SpriteSystem.LayerMapSet(entity, key, layerIndex) [1] - SpriteSystem.LayerMapRemove(entity, key) [1] - SpriteSystem.LayerMapTryGet(entity, key, out layerIndex) [1] Layer Reservation: If you were using LayerMapReserveBlank, the modern equivalent is SpriteSystem.LayerMapReserve(entity, key). Note that this method has been updated to be more resilient; it no longer throws an exception if the specified layer already exists, effectively behaving like the former LayerMapReserveBlank [3][2]. Other Methods: The migration also affects layer management and shader operations. Where you previously might have called LayerSetShader directly on a component or layer object, you should look for the corresponding methods in SpriteSystem [1]. Best Practice: When migrating, verify if your code interacts with the SpriteComponent directly and shift those interactions to the SpriteSystem, injecting the SpriteSystem dependency into your own system if necessary [2]. Always refer to the specific [Obsolete] attribute message in your IDE, as it typically points to the exact SpriteSystem method you should use as a replacement [1]. Citations:
🏁 Script executed: #!/bin/bash
set -euo pipefail
echo "== Locate game files =="
git ls-files | rg '(^|/)Content\.Client/Humanoid/HumanoidAppearanceSystem\.cs$|package\.lock|packages\.lock\.json|\.csproj$|Directory\.Build\.props$' || true
echo
echo "== Relevant snippet =="
if [ -f Content.Client/Humanoid/HumanoidAppearanceSystem.cs ]; then
nl -ba Content.Client/Humanoid/HumanoidAppearanceSystem.cs | sed -n '1,90p;430,515p'
fi
echo
echo "== SpriteComponent/SpriteSystem usages in file =="
rg -n "(_sprite|SpriteSystem|LayerMapTryGet|AddLayer|LayerMapSet|LayerSetSprite|LayerSetShader|LayerSetVisible|LayerSetColor|RemoveLayer|ResolveLayers)" Content.Client/H g -2 --iglob '*.cs' --iglob '*.xml' 2>/dev/null | head -n 200 || trueRepository: ArcaneSS14/arcane Length of output: 1377 🏁 Script executed: #!/bin/bash
set -euo pipefail
echo "== Relevant HumanoidAppearanceSystem areas =="
awk '{printf "%4d\t%s\n", NR, $0}' Content.Client/Humanoid/HumanoidAppearanceSystem.cs | sed -n '1,100p;420,515p'
echo
echo "== SpriteComponent direct layer calls in HumanoidAppearanceSystem =="
rg -n "LayerMapTryGet|AddLayer|LayerMapSet|LayerSetSprite|LayerSetShader|LayerSetVisible|LayerSetColor|RemoveLayer|ResolveLayer|_sprite" Content.Client/Humanoid/HumanoidAppearanceSystem.cs Content.Client/Humanoid 2>/dev/null || true
echo
echo "== Package refs likely affecting robust refs =="
rg -n "RobustToolbox|SpaceWizards|RobustClient|Robust.Shared" Content.Client/Content.Client.csproj Directory.Build.props . 2>/dev/null | head -n 80 || true
echo
echo "== Find project/package files =="
find . -maxdepth 3 \( -name 'packages.lock.json' -o -name 'package.lock' -o -name '*.resx' \) -print 2>/dev/null | sort | head -n 50 || trueRepository: ArcaneSS14/arcane Length of output: 24430 Переведите этот блок на Здесь смешаны вызовы 🤖 Prompt for AI Agents |
||
|
|
||
| if (!visible || setting == null) // this is kinda implied | ||
| { | ||
|
|
@@ -431,29 +489,18 @@ private void ApplyMarking(MarkingPrototype markingPrototype, | |
| // Okay so if the marking prototype is modified but we load old marking data this may no longer be valid | ||
| // and we need to check the index is correct. | ||
| // So if that happens just default to white? | ||
| // FLOOF ADD =3 | ||
| sprite.LayerSetColor(layerId, colorDict.TryGetValue(rsi.RsiState, out var color) ? color : Color.White); | ||
|
|
||
| // FLOOF CHANGE | ||
| // if (colors != null && j < colors.Count) | ||
| // { | ||
| // sprite.LayerSetColor(layerId, colors[j]); | ||
| // } | ||
| // else | ||
| // { | ||
| // sprite.LayerSetColor(layerId, Color.White); | ||
| // } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| using Content.Shared._Lavaland.Atmos; | ||
|
|
||
| namespace Content.Client._Lavaland.Atmos; | ||
|
|
||
| public sealed class LavalandAtmosphereSystem : SharedLavalandAtmosphereSystem; |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
Repository: ArcaneSS14/arcane
Length of output: 155
🏁 Script executed:
Repository: ArcaneSS14/arcane
Length of output: 7165
🌐 Web query:
RobustContent HumanoidAppearanceSystem ApplyMarking MarkingPrototype MarkingManager Marking rsi.RsiState colorDict Add Dictionary💡 Result:
The terms mentioned are related to the codebase of Space Station 14 (SS14), a multiplayer game built on the RobustToolbox engine, with the exception of RobustContent, which appears to be a confusion with the "Robust" accessibility principle from the Web Content Accessibility Guidelines (WCAG) [1][2][3]. In the context of SS14's humanoid appearance system: 1. HumanoidAppearanceSystem: This was a core system in SS14 responsible for managing the appearance of humanoid entities (such as species, markings, and colors) [4][5]. Note that in recent versions of the game, this has undergone significant refactoring (e.g., the "nubody" refactor), moving logic toward SharedVisualBodySystem and components like HumanoidProfileComponent [6]. 2. ApplyMarking / MarkingManager / MarkingPrototype: These are part of the game's marking system. MarkingManager handles the logic for markings across both in-simulation entities and out-of-simulation profile editing [7]. MarkingPrototype defines specific marking data (like textures or sponsor-only status) [7][8]. Marking manipulation is often performed via methods that manage layers and groups [6][7]. 3. RSI / RsiState: RSI (Robust Station Image) is the proprietary file format used by the RobustToolbox engine to store sprites, animations, and associated metadata [9]. RsiState represents an individual "state" (an icon or animation sequence) within an RSI file, containing data such as frame delays, directions, and metadata flags [9][10][11]. 4. colorDict: This usually refers to a Dictionary object (often
Dictionary<string, Color>or similar structures) used in the code to map specific color identifiers to color values, commonly used when applying colors to markings or character features [4][6]. "RobustContent" is not a specific class or system in this codebase; it is a fundamental principle of web accessibility (WCAG), which dictates that web content must be robust enough to be interpreted reliably by a wide variety of user agents and assistive technologies [1][12][3].Citations:
🏁 Script executed:
Repository: ArcaneSS14/arcane
Length of output: 50374
Не меняйте порядок добавления цветов в
colorDict.Два спрайта в одном marking с одинаковым
RsiState/именем текстуры до сих пор вызываютDictionary.Addи крашат клиент. Учтите путь RSI или используйтеcolorDict[spriteName] = ..., чтобы семантика была явной: последний спрайт задает цвет.🤖 Prompt for AI Agents
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Это с апстрима. Как можно кратко пофиксить?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@UmbiMax, замените оба вызоваcolorDict.Add(...)на одно присваивание. Последний спрайт с одинаковым именем сохранит свой цвет, а клиент не упадёт.То есть замените текущий блок:
Порядок обхода
Spritesне меняется.🧠 Learnings used
You are interacting with an AI system.