Displacement maps now works on any layers (#27405)

* try

* pipupi

* Update ClientClothingSystem.cs

* Update vox.yml

* Update ClientClothingSystem.cs

diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 6d13bf4edab0021d9b8931e9273d3ffaee0296e3..dd69521f483819da7c1d2969622d06b96e4f8bf5 100644 (file)
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -307,13 +307,16 @@ public sealed class ClientClothingSystem : ClothingSystem
             // Sprite layer redactor when
             // Sprite "redactor" just a week away.
             if (slot == Jumpsuit)
-                layerData.Shader ??= inventory.JumpsuitShader;
+                layerData.Shader ??= "StencilDraw";
 
             sprite.LayerSetData(index, layerData);
             layer.Offset += slotDef.Offset;
 
             if (displacementData != null)
             {
+                if (displacementData.ShaderOverride != null)
+                    sprite.LayerSetShader(index, displacementData.ShaderOverride);
+
                 var displacementKey = $"{key}-displacement";
                 if (!revealedLayers.Add(displacementKey))
                 {

diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index dde48a62aaa42824c46e6d613e8eafb377d3e107..02b3a5b2583a8d87723338bbe6d99ed7c0db3f83 100644 (file)
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -13,7 +13,6 @@ public sealed partial class InventoryComponent : Component
 
     [DataField("speciesId")] public string? SpeciesId { get; set; }
 
-    [DataField] public string JumpsuitShader = "StencilDraw";
     [DataField] public Dictionary<string, SlotDisplacementData> Displacements = [];
 
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
@@ -24,5 +23,8 @@ public sealed partial class InventoryComponent : Component
     {
         [DataField(required: true)]
         public PrototypeLayerData Layer = default!;
+
+        [DataField]
+        public string? ShaderOverride = "DisplacedStencilDraw";
     }
 }

diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
index de1e3da2be77778a8c362dc1a88e237ec58adad8..e7ad39d7316178e135d96b30489f67e67a368b96 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -1,5 +1,5 @@
 - type: entity
   save: false
-  name: Vox
+  name: Urist McVox
   parent: BaseMobVox
-  id: MobVox
+  id: MobVox
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index c79947f15c4600f9e6d16e0f917a0f63ef8807b5..ec8035563b725d4636dad346b5d71f8195b30103 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -16,7 +16,6 @@
     #- type: VoxAccent # Not yet coded
   - type: Inventory
     speciesId: vox
-    jumpsuitShader: DisplacedStencilDraw
     displacements:
       jumpsuit:
         layer: