tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issues #17034: Changed Dead Mob DrawDepth (#17052)

Browse Source 
* Issues #17034: Changed Mob Dead DrawDepth from FloorObjects to Items

* Issues #17034: Added new DeadMobs Layer
This commit is contained in:
ArthurMousatov
2023-07-18 07:13:59 -04:00
committed by GitHub
parent f594403fe8
commit 7d1c576556
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/DamageState/DamageStateVisualizerSystem.cs
View File

@@ -40,10 +40,10 @@ public sealed class DamageStateVisualizerSystem : VisualizerSystem<DamageStateVi
// So they don't draw over mobs anymore // So they don't draw over mobs anymore
if (data == MobState.Dead) if (data == MobState.Dead)
{ {
if (sprite.DrawDepth > (int) DrawDepth.FloorObjects) if (sprite.DrawDepth > (int) DrawDepth.DeadMobs)
{ {
component.OriginalDrawDepth = sprite.DrawDepth; component.OriginalDrawDepth = sprite.DrawDepth;
sprite.DrawDepth = (int) DrawDepth.FloorObjects; sprite.DrawDepth = (int) DrawDepth.DeadMobs;
} }
} }
else if (component.OriginalDrawDepth != null) else if (component.OriginalDrawDepth != null)

18
Content.Shared/DrawDepth/DrawDepth.cs
View File

@@ -9,32 +9,34 @@ namespace Content.Shared.DrawDepth
/// <summary> /// <summary>
/// This is for sub-floors, the floors you see after prying off a tile. /// This is for sub-floors, the floors you see after prying off a tile.
/// </summary> /// </summary>
LowFloors = DrawDepthTag.Default - 10, LowFloors = DrawDepthTag.Default - 11,
// various entity types that require different // various entity types that require different
// draw depths, as to avoid hiding // draw depths, as to avoid hiding
#region SubfloorEntities #region SubfloorEntities
ThickPipe = DrawDepthTag.Default - 9, ThickPipe = DrawDepthTag.Default - 10,
ThickWire = DrawDepthTag.Default - 8, ThickWire = DrawDepthTag.Default - 9,
ThinPipe = DrawDepthTag.Default - 7, ThinPipe = DrawDepthTag.Default - 8,
ThinWire = DrawDepthTag.Default - 6, ThinWire = DrawDepthTag.Default - 7,
#endregion #endregion
/// <summary> /// <summary>
/// Things that are beneath regular floors. /// Things that are beneath regular floors.
/// </summary> /// </summary>
BelowFloor = DrawDepthTag.Default - 6, BelowFloor = DrawDepthTag.Default - 7,
/// <summary> /// <summary>
/// Used for entities like carpets. /// Used for entities like carpets.
/// </summary> /// </summary>
FloorTiles = DrawDepthTag.Default - 5, FloorTiles = DrawDepthTag.Default - 6,
/// <summary> /// <summary>
/// Things that are actually right on the floor, like puddles. This does not mean objects like /// Things that are actually right on the floor, like puddles. This does not mean objects like
/// tables, even though they are technically "on the floor". /// tables, even though they are technically "on the floor".
/// </summary> /// </summary>
FloorObjects = DrawDepthTag.Default - 4, FloorObjects = DrawDepthTag.Default - 5,
DeadMobs = DrawDepthTag.Default - 4,
/// <summary> /// <summary>
/// Allows small mobs like mice and drones to render under tables and chairs but above puddles and vents /// Allows small mobs like mice and drones to render under tables and chairs but above puddles and vents