Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add puddle drawdepth #32369

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −9
Open

Add puddle drawdepth #32369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4c251
Add puddle drawdepth
metalgearsloth Sep 22, 2024
6fb1220
crash
metalgearsloth Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Content.Shared/DrawDepth/DrawDepth.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,29 @@ public enum DrawDepth
/// <summary>
/// This is for sub-floors, the floors you see after prying off a tile.
/// </summary>
LowFloors = DrawDepthTag.Default - 11,
LowFloors = DrawDepthTag.Default - 12,

// various entity types that require different
// draw depths, as to avoid hiding
#region SubfloorEntities
ThickPipe = DrawDepthTag.Default - 10,
ThickWire = DrawDepthTag.Default - 9,
ThinPipe = DrawDepthTag.Default - 8,
ThinWire = DrawDepthTag.Default - 7,
ThickPipe = DrawDepthTag.Default - 11,
ThickWire = DrawDepthTag.Default - 10,
ThinPipe = DrawDepthTag.Default - 9,
ThinWire = DrawDepthTag.Default - 8,
#endregion

/// <summary>
/// Things that are beneath regular floors.
/// </summary>
BelowFloor = DrawDepthTag.Default - 7,
BelowFloor = DrawDepthTag.Default - 8,

/// <summary>
/// Used for entities like carpets.
/// </summary>
FloorTiles = DrawDepthTag.Default - 6,
FloorTiles = DrawDepthTag.Default - 7,

// Discrete drawdepth to avoid y-fighting with other FloorObjects but also above floor entities.
Puddles = DrawDepthTag.Default - 6,

/// <summary>
/// Things that are actually right on the floor, like puddles. This does not mean objects like
Copy link
Member

@slarticodefast slarticodefast Oct 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// 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 conveyor belts, ice crust or atmos devices. This does not mean objects like

Expand Down Expand Up @@ -75,7 +78,7 @@ public enum DrawDepth
Items = DrawDepthTag.Default + 3,

Mobs = DrawDepthTag.Default + 4,

OverMobs = DrawDepthTag.Default + 5,

Doors = DrawDepthTag.Default + 6,
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Effects/puddle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
layers:
- sprite: Fluids/puddle.rsi
state: splat0
drawdepth: FloorObjects
drawdepth: Puddles
color: "#FFFFFF80"
- type: Physics
bodyType: Static
Expand Down
Loading