[MIRROR] Changes required for component tree engine PR (space-wizards#38

) * Changes required for component tree engine PR (space-wizards#13109) * Changes required for component tree engine PR Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: lunar-crater-ex <[email protected]>
moonheart08 · Dec 27, 2022 · 81065cf · 81065cf
1 parent 4767f64
commit 81065cf
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 15 deletions.
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -29,6 +29,7 @@ public abstract class SharedDoorSystem : EntitySystem
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly OccluderSystem _occluder = default!;
 
     /// <summary>
     ///     A body must have an intersection percentage larger than this in order to be considered as colliding with a
@@ -390,8 +391,8 @@ protected virtual void SetCollidable(EntityUid uid, bool collidable,
         if (!collidable)
             door.CurrentlyCrushing.Clear();
 
-        if (door.Occludes && Resolve(uid, ref occluder, false))
-            occluder.Enabled = collidable;
+        if (door.Occludes)
+            _occluder.SetEnabled(uid, collidable);
     }
 
     /// <summary>

diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -186,7 +186,8 @@ public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinat
                     continue;
                 }
 
-                var bBox = o.BoundingBox.Translated(entMan.GetComponent<TransformComponent>(o.Owner).WorldPosition);
+                var bBox = o.BoundingBox;
+                bBox = bBox.Translated(entMan.GetComponent<TransformComponent>(o.Owner).WorldPosition);
 
                 if (bBox.Contains(origin.Position) || bBox.Contains(other.Position))
                 {

diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -127,8 +127,6 @@
       mask:
       - WallLayer
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
   - type: Transform
     anchored: true
   - type: Airtight

diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -57,8 +57,6 @@
     key: walls
     mode: NoSprite
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
 
 - type: entity
   id: MetalDoor

diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -24,8 +24,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
   - type: Airtight
   - type: Fixtures
     fixtures:

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -42,8 +42,6 @@
       - WallLayer
       density: 1000
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
   - type: Airtight
   - type: StaticPrice
     price: 75

diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -67,8 +67,6 @@
     graph: Window
     node: tintedWindow
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
   - type: StaticPrice
     price: 0.75
 

diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -62,8 +62,6 @@
       - Opaque
       - MidImpassable
   - type: Occluder
-    sizeX: 32
-    sizeY: 32
 
 - type: entity
   id: PlasticFlapsAirtightClear