]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Shrink clearance for dungeon doors (#14656)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sun, 26 Mar 2023 17:07:49 +0000 (04:07 +1100)
committerGitHub <noreply@github.com>
Sun, 26 Mar 2023 17:07:49 +0000 (12:07 -0500)
* Shrink clearance for dungeon doors

I tried adjusting it on engine but it was leading to test assertions on content which scared me.

* a

* comment

Content.Server/Procedural/DungeonJob.PostGen.cs

index 9ee326ffb9b439f2137102d52c32c94115ce6a92..9f1e410a6054223b7def0b633545c453e01e4488 100644 (file)
@@ -501,9 +501,11 @@ public sealed partial class DungeonJob
                 if (!dungeon.RoomTiles.Contains(neighbor))
                     continue;
 
-                foreach (var ent in _lookup.GetEntitiesIntersecting(_gridUid, neighbor, flags))
+                // Shrink by 0.01 to avoid polygon overlap from neighboring tiles.
+                foreach (var ent in _lookup.GetEntitiesIntersecting(_gridUid, new Box2(neighbor * grid.TileSize, (neighbor + 1) * grid.TileSize).Enlarged(-0.1f), flags))
                 {
                     if (!physicsQuery.TryGetComponent(ent, out var physics) ||
+                        !physics.Hard ||
                         (CollisionMask & physics.CollisionLayer) == 0x0 &&
                         (CollisionLayer & physics.CollisionMask) == 0x0)
                     {