Revert "baff (#995)"

This reverts commit a0337843ac.

Content.Client/_CP14/Displacement/CP14SimpleDisplacementMapComponent.cs

@@ -1,16 +0,0 @@
-using Content.Shared.DisplacementMap;
-
-namespace Content.Client._CP14.Displacement;
-
-/// <summary>
-/// Simply apply displacements to sprite layers
-/// </summary>
-[RegisterComponent]
-public sealed partial class CP14SimpleDisplacementMapComponent : Component
-{
-    [DataField]
-    public Dictionary<string, DisplacementData> Displacements = new();
-
-    public readonly HashSet<string> RevealedLayers = new();
-}
-

Content.Client/_CP14/Displacement/CP14SimpleDisplacementMapSystem.cs

@@ -1,36 +0,0 @@
-using Content.Client.DisplacementMap;
-using Content.Shared.Item;
-using Robust.Client.GameObjects;
-
-namespace Content.Client._CP14.Displacement;
-
-public sealed class CP14SimpleDisplacementMapSystem : EntitySystem
-{
-    [Dependency] private readonly DisplacementMapSystem _displacement = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CP14SimpleDisplacementMapComponent, VisualsChangedEvent>(OnVisualChanged);
-    }
-
-    private void OnVisualChanged(Entity<CP14SimpleDisplacementMapComponent> ent, ref VisualsChangedEvent args)
-    {
-        if (!TryComp<SpriteComponent>(ent, out var sprite))
-            return;
-
-        foreach (var key in ent.Comp.RevealedLayers)
-        {
-            sprite.RemoveLayer(key);
-        }
-        ent.Comp.RevealedLayers.Clear();
-
-        foreach (var (key, dData) in ent.Comp.Displacements)
-        {
-            if (!sprite.LayerMapTryGet(key, out var index))
-                continue;
-
-            _displacement.TryAddDisplacement(dData, sprite, index, key, ent.Comp.RevealedLayers);
-        }
-    }
-}

Content.Server/Entry/IgnoredComponents.cs

@@ -4,8 +4,8 @@ namespace Content.Server.Entry
     public static class IgnoredComponents
     {
         public static string[] List => new[] {
-            "CP14WaveShader", // CP14
-            "CP14SimpleDisplacementMap", // CP14
+            "CP14WaveShader", // CP14 Wave shader
+            "CP14WorldSprite", // CP14 World Sprite
             "ConstructionGhost",
             "IconSmooth",
             "InteractionOutline",

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_heal_ballade.yml

@@ -52,15 +52,15 @@
       - !type:HealthChange
         damage:
           types:
-            Slash: -0.70
-            Blunt: -0.70
-            Piercing: -0.70
-            Cold: -0.40
-            Heat: -0.40
-            Shock: -0.40
+            Slash: -0.25
+            Blunt: -0.25
+            Piercing: -0.25
+            Cold: -0.25
+            Heat: -0.25
+            Shock: -0.25
             Poison: -0.25
-            Bloodloss: -0.40
-            Caustic: -0.30
+            Bloodloss: -0.25
+            Caustic: -0.25
 
 - type: entity
   id: CP14ImpactEffectHealthBallade

Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml

@@ -43,7 +43,7 @@
     - map: [ "neck" ]
     - map: [ "back" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-    - map: [ "enum.HumanoidVisualLayers.Hair", "HairDisplacement" ]
+    - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
     - map: [ "enum.HumanoidVisualLayers.Tail" ]
@@ -125,16 +125,6 @@
         32:
           sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
           state: hands
-  - type: CP14SimpleDisplacementMap
-    displacements:
-      HairDisplacement:
-        sizeMaps:
-          32:
-            sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
-            state: head
-          48:
-            sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi
-            state: head
   - type: Inventory
     templateId: CP14Human
     speciesId: goblin