Content changes required for physicsmap purge (#37878)

* PhysMap changes

* Fix call

* Avoid tilefriction resolve

yummy

* a

diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index ca04c93e74d4949e0022ef3c7264ee939f3f40dd..2fe5c18fe09997cac116b729ef1deddba2cf573a 100644 (file)
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Alert;
 using Content.Shared.CCVar;
+using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;

diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 26684b88822c5b77ff99ac6eb15e21590cd6cfa2..f0a723f3c0896de1fd5fbecac3fa82e023bcff88 100644 (file)
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -2,6 +2,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
+using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;

diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index 159637a9e0c610137afcb522de3a988b572940c2..36e971862a54d5c6cecc55be43cd1309a4b04c68 100644 (file)
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -51,13 +51,14 @@ namespace Content.Shared.Friction
             _gridQuery = GetEntityQuery<MapGridComponent>();
         }
 
-        public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
+        public override void UpdateBeforeSolve(bool prediction, float frameTime)
         {
-            base.UpdateBeforeMapSolve(prediction, mapComponent, frameTime);
+            base.UpdateBeforeSolve(prediction, frameTime);
 
-            foreach (var body in mapComponent.AwakeBodies)
+            foreach (var ent in PhysicsSystem.AwakeBodies)
             {
-                var uid = body.Owner;
+                var uid = ent.Owner;
+                var body = ent.Comp1;
 
                 // Only apply friction when it's not a mob (or the mob doesn't have control)
                 // We may want to instead only apply friction to dynamic entities and not mobs ever.
@@ -67,12 +68,7 @@ namespace Content.Shared.Friction
                 if (body.LinearVelocity.Equals(Vector2.Zero) && body.AngularVelocity.Equals(0f))
                     continue;
 
-                if (!_xformQuery.TryGetComponent(uid, out var xform))
-                {
-                    Log.Error($"Unable to get transform for {ToPrettyString(uid)} in tilefrictioncontroller");
-                    continue;
-                }
-
+                var xform = ent.Comp2;
                 float friction;
 
                 // If we're not touching the ground, don't use tileFriction.

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 759d6c57ca82a22fbfd71b6e7dcf214da40b9399..e43800dc9f399269b49718406647ffc07655a028 100644 (file)
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -74,6 +74,7 @@ public abstract partial class SharedMoverController : VirtualController
 
     public override void Initialize()
     {
+        UpdatesBefore.Add(typeof(TileFrictionController));
         base.Initialize();
 
         MoverQuery = GetEntityQuery<InputMoverComponent>();
@@ -98,7 +99,6 @@ public abstract partial class SharedMoverController : VirtualController
         Subs.CVar(_configManager, CCVars.MinFriction, value => _minDamping = value, true);
         Subs.CVar(_configManager, CCVars.AirFriction, value => _airDamping = value, true);
         Subs.CVar(_configManager, CCVars.OffgridFriction, value => _offGridDamping = value, true);
-        UpdatesBefore.Add(typeof(TileFrictionController));
     }
 
     public override void Shutdown()

diff --git a/Resources/Maps/Dungeon/experiment.yml b/Resources/Maps/Dungeon/experiment.yml
index a2668db44bcf311f44cc32328e0f467120c5d014..2e303f835c1ce52aa5a4bae4bd0717bf807cf6c0 100644 (file)
--- a/Resources/Maps/Dungeon/experiment.yml
+++ b/Resources/Maps/Dungeon/experiment.yml
@@ -42,7 +42,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -2223,7 +2222,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: Airlock
   entities:

diff --git a/Resources/Maps/Dungeon/haunted.yml b/Resources/Maps/Dungeon/haunted.yml
index e0353a1e3f685605dd4ca1b1a3a9a07cc36918be..2b01fe5659d2a70582e2e46572a159cc818c0da5 100644 (file)
--- a/Resources/Maps/Dungeon/haunted.yml
+++ b/Resources/Maps/Dungeon/haunted.yml
@@ -22,7 +22,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - chunks:
@@ -352,7 +351,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: AirCanister
   entities:

diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
index ebf267a9c2e879fe6be5d6a462185481d8de5367..2c29d5beb95b6e39a4a83a022db9d1161f5a5a23 100644 (file)
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -28,7 +28,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -2685,7 +2684,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: AirlockBrigGlassLocked
   entities:

diff --git a/Resources/Maps/Dungeon/maints.yml b/Resources/Maps/Dungeon/maints.yml
index ae7ec858588d2bbc2fad91166aa4d42a778468f0..d7d99ad3f14068687e9a868c051501d53bff06f1 100644 (file)
--- a/Resources/Maps/Dungeon/maints.yml
+++ b/Resources/Maps/Dungeon/maints.yml
@@ -25,9 +25,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid

diff --git a/Resources/Maps/Dungeon/mineshaft.yml b/Resources/Maps/Dungeon/mineshaft.yml
index 898b7e8ff208948987e24eabb985a33a90522aef..df006c1e63ff81c77f260dbb435e2421f090f0d8 100644 (file)
--- a/Resources/Maps/Dungeon/mineshaft.yml
+++ b/Resources/Maps/Dungeon/mineshaft.yml
@@ -17,7 +17,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -109,7 +108,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
     - type: DecalGrid
       chunkCollection:

diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml
index 27e4fe1c0790852ec963deaadb46f69b663d190a..b93333488cd1aa7114b6da627808a7b7fa337e56 100644 (file)
--- a/Resources/Maps/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/Dungeon/snowy_labs.yml
@@ -47,7 +47,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -2869,7 +2868,6 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 - proto: Airlock
   entities:

diff --git a/Resources/Maps/Dungeon/template.yml b/Resources/Maps/Dungeon/template.yml
index d499b454a8ece96d943db4c4e95267db43b905e5..6968500e576e0cadcb8bb2fe2302ef9634f38b8a 100644 (file)
--- a/Resources/Maps/Dungeon/template.yml
+++ b/Resources/Maps/Dungeon/template.yml
@@ -13,7 +13,6 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -76,6 +75,5 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridTree
-    - type: MovedGrids
     - type: GridPathfinding
 ...

diff --git a/Resources/Maps/Dungeon/vgroidinterior.yml b/Resources/Maps/Dungeon/vgroidinterior.yml
index c0964711264f9c2d1634a55801f8dfabd3b185c9..e7625f0c02d84e58328b5feafd755703e8eb1e6a 100644 (file)
--- a/Resources/Maps/Dungeon/vgroidinterior.yml
+++ b/Resources/Maps/Dungeon/vgroidinterior.yml
@@ -22,9 +22,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid

diff --git a/Resources/Maps/Lavaland/basalt_ruin.yml b/Resources/Maps/Lavaland/basalt_ruin.yml
index 6cd492375c6527a624377ce06126304d5be7af07..af9933f06569541c342288b5ae8ac123f698f691 100644 (file)
--- a/Resources/Maps/Lavaland/basalt_ruin.yml
+++ b/Resources/Maps/Lavaland/basalt_ruin.yml
@@ -148,9 +148,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: BasaltRandom

diff --git a/Resources/Maps/Lavaland/crashedsyndiepod.yml b/Resources/Maps/Lavaland/crashedsyndiepod.yml
index 2e516623b1a05baba2851849314f6ebae701c077..b2b0ca90137a9a5ba2fecba50fa4cb582795bd07 100644 (file)
--- a/Resources/Maps/Lavaland/crashedsyndiepod.yml
+++ b/Resources/Maps/Lavaland/crashedsyndiepod.yml
@@ -245,9 +245,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AirCanister

diff --git a/Resources/Maps/Lavaland/wrecked_outpost.yml b/Resources/Maps/Lavaland/wrecked_outpost.yml
index 9772a75e0307e74f8f452090f0bd905a801e6a72..1d2c05b32321f6d977ec07d03ffc8c15b7bc3f34 100644 (file)
--- a/Resources/Maps/Lavaland/wrecked_outpost.yml
+++ b/Resources/Maps/Lavaland/wrecked_outpost.yml
@@ -153,9 +153,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AirlockEngineeringLocked

diff --git a/Resources/Maps/Nonstations/dm01-entryway.yml b/Resources/Maps/Nonstations/dm01-entryway.yml
index 874fbb0178ee0ccb5e1d056cb68df3d0d6ea52ed..bb252e35abe919b121a208594db5982c28d69f32 100644 (file)
--- a/Resources/Maps/Nonstations/dm01-entryway.yml
+++ b/Resources/Maps/Nonstations/dm01-entryway.yml
@@ -29,9 +29,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapLight

diff --git a/Resources/Maps/Nonstations/meteor-arena.yml b/Resources/Maps/Nonstations/meteor-arena.yml
index 92320b491fc608434bd776ee87db6925e2babcaf..64f52fdc777589f34e893641c623a21d9efdaccd 100644 (file)
--- a/Resources/Maps/Nonstations/meteor-arena.yml
+++ b/Resources/Maps/Nonstations/meteor-arena.yml
@@ -22,9 +22,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapLight

diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 69a498b7aaf289419138ab0d7f13be35c59dcdbf..554e242410cf8feccc2c7e52f3756cb49e96132e 100644 (file)
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1630,9 +1630,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: FTLDestination
       whitelist:
         tags:

diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml
index 87b6336f73c0be0d4cbad8afa7fe68246afee3d4..a50bf22fe164abe14075c02cc8eeca554ac4ffcb 100644 (file)
--- a/Resources/Maps/Test/dev_map.yml
+++ b/Resources/Maps/Test/dev_map.yml
@@ -1709,9 +1709,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap

diff --git a/Resources/Maps/Test/empty.yml b/Resources/Maps/Test/empty.yml
index 830926268e1a448f516cb0305dbfa83d4c36c66c..000b91ea43887f20bb2a970b0cae33802bf6b87d 100644 (file)
--- a/Resources/Maps/Test/empty.yml
+++ b/Resources/Maps/Test/empty.yml
@@ -46,9 +46,7 @@ entities:
       name: map 89
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: SpawnPointLatejoin

diff --git a/Resources/Maps/Test/npc_test_map.yml b/Resources/Maps/Test/npc_test_map.yml
index 8f7493a98074f0521834fd0afcbcbcdd5f458f64..66dd4e7b55707c5b7cfb1868c78e07c7a5804de2 100644 (file)
--- a/Resources/Maps/Test/npc_test_map.yml
+++ b/Resources/Maps/Test/npc_test_map.yml
@@ -13,12 +13,10 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
     - type: GridTree
-    - type: MovedGrids
   - uid: 10
     components:
     - type: MetaData

diff --git a/Resources/Maps/Test/test_teg.yml b/Resources/Maps/Test/test_teg.yml
index 4a101265bb185878692d2d73ffea088f0b9efc42..830e5012a9af01514a75ddc3dfaef5d2ba2e5468 100644 (file)
--- a/Resources/Maps/Test/test_teg.yml
+++ b/Resources/Maps/Test/test_teg.yml
@@ -15,9 +15,7 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap

diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml
index a475726cd92fd9caeaf80faafde36ad4ed26af99..294672642998b48f58a314caa30e1886c7bae658 100644 (file)
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
@@ -80,9 +80,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 3dc84c0761c2037fa0b0e0f57a2a92cbcfcca6c9..cbee5a1327252ecfb5f326a38b7453f3409e28db 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -9561,9 +9561,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax

diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index b82df7eb123cc7d9f5709189ba46352aaa0e9931..eaeb2db3c476cd75ce8d78c6a79f894916e851f3 100644 (file)
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -75,9 +75,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 5691

diff --git a/Resources/Maps/convex.yml b/Resources/Maps/convex.yml
index 6f38a05f8caea4fc7c02cdc2c173ad8504593551..1381e2d156be3bb548eebdd526f693713450a8c5 100644 (file)
--- a/Resources/Maps/convex.yml
+++ b/Resources/Maps/convex.yml
@@ -16360,9 +16360,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AcousticGuitarInstrument

diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index cea879b607ce95333fc4f8820aa54fedc52cf409..b57bcd2229279ff42e0a04c44217c954d026c9f3 100644 (file)
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -11777,9 +11777,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax
@@ -106504,11 +106502,11 @@ entities:
         After several simulations where Superconducting Magnetic Energy Storage units were drained from the main system from [italic]a variety[/italic] of user errors and other shenanigans, it has been determined that the Singularity should be put on its own power loop, disconnected from the main station. The upsides of this include but are not limited to:
 
 
-        [bold]1.[/bold] Limited external forces from the containments power. 
+        [bold]1.[/bold] Limited external forces from the containments power.
 
-        [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue. 
+        [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue.
 
-        [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system. 
+        [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system.
 
 
         [italic]While we have listed the upsides we also acknowledge the downside,[/italic] for it being on its own loop you will need an external force if the system "runs out of juice". Our recommendation for this is simply attaching a generator to said SMES and letting it get to full charge before continuing operations but as said from another of our technicians... "just attach it to the main grid for like, a hot moment, and kickstart the thing!"

diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml
index 81adf37508917b51205891bed55438724018f595..2701afe7084109cde64c16e3eb2729a5531134f9 100644 (file)
--- a/Resources/Maps/elkridge.yml
+++ b/Resources/Maps/elkridge.yml
@@ -52,9 +52,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 850beef1f41c4bac093456d70583887b02c087d9..ff2a3de6dedcd247ad0307b7f2369760a51f7cd6 100644 (file)
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -69,9 +69,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 13329

diff --git a/Resources/Maps/gate.yml b/Resources/Maps/gate.yml
index 76dde2f15bca956191610d7da8c14bdb66341798..cab587675f047382bcfed06d44bb41a5f8322b20 100644 (file)
--- a/Resources/Maps/gate.yml
+++ b/Resources/Maps/gate.yml
@@ -97,9 +97,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap

diff --git a/Resources/Maps/loop.yml b/Resources/Maps/loop.yml
index f1072a72eaa2500de8887a6578fd6554a0138e46..5a918fa10c0964e19334c39e17ca3a186a7b51c4 100644 (file)
--- a/Resources/Maps/loop.yml
+++ b/Resources/Maps/loop.yml
@@ -59,9 +59,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index feaf12eb5e309a05c592c603fe920fc954df6799..f0f886e1e372801351980d7097bccc42309c4352 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -7621,9 +7621,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AcousticGuitarInstrument

diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index f85ca5a21d6d05d1bfe22ffb712a795b20473eee..fb4b4a0d833c24e28d0585ec83772f48f21f8ac5 100644 (file)
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -75,9 +75,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 5350

diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml
index 9d8b2a7832cef96017d92591c8827cbf76cd3886..8a7aa578f555dc6c77d59b99aaf35b453be94ab3 100644 (file)
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
@@ -80,9 +80,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2
@@ -38526,23 +38524,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38573,17 +38571,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
@@ -38632,23 +38630,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38679,17 +38677,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
@@ -38738,23 +38736,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38785,17 +38783,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 
@@ -38846,23 +38844,23 @@ entities:
         [head=2][color=darkgrey][bold]Troubleshooting[/bold][/color][/head]
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock doesn’t respond when you approach.[/bolditalic]  
+        The dock doesn’t respond when you approach.[/bolditalic]
 
         Solution: It’s just being shy. Give it some encouragement by knocking lightly on the hull, or jostling the [color=darkorange][bolditalic]Aether Coil Modulator[/bolditalic][/color]. If no response, consult the  [color=blue][bold]Technical Support AI[/bold][/color] (usually known as "Door Stuck").
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The shuttle is stuck halfway through the docking process.[/bolditalic]  
+        The shuttle is stuck halfway through the docking process.[/bolditalic]
 
         Solution: This is an unfortunate but expected outcome. Reboot the dock, reattempt the process, and pray. Alternatively, try "tugging" the shuttle out, but be prepared for the consequences.
 
 
-        [bolditalic]Problem: 
+        [bolditalic]Problem:
 
-        The dock has *disengaged itself* mid-operation.[/bolditalic]  
+        The dock has *disengaged itself* mid-operation.[/bolditalic]
 
         Solution: This is a feature of the  [color=darkblue][bold]NanoTrasen Smart Dock Mk VII™[/bold][/color], called the  [color=darkorange][bolditalic]Premature Release Safety Protocol™[/bolditalic][/color]. It's designed to keep you on your toes. Simply re-dock and hope it doesn’t happen again (spoiler: it will).
 
@@ -38893,17 +38891,17 @@ entities:
         [head=2][color=darkgrey][bold]FAQ: Frequently Avoided Questions[/bold][/color][/head]
 
 
-        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]  
+        [bolditalic]Q: What do I do if the dock’s lights go out suddenly?[/bolditalic]
 
         A: Nothing. Just accept the darkness. The dock has either entered [color=darkorange][bolditalic]Sleep Mode™[/bolditalic][/color], or something unspeakable is about to happen.
 
 
-        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]  
+        [bolditalic]Q: Why does the dock occasionally whisper my name?[/bolditalic]
 
         A: The dock is semi-sentient and enjoys toying with your mental state. We suggest playing along until it decides you’re no longer amusing.
 
 
-        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]  
+        [bolditalic]Q: How do I know if the docking process is complete?[/bolditalic]
 
         A: You'll know it's done when your shuttle stops shaking violently and the alarms stop blaring. Or when you black out—whichever comes first.
 

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index fec3c994c13a309a15acd8ef7fff9c80081eee1b..732ab0eee836e81a690c8f5d2728a8e035a5c678 100644 (file)
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -55,9 +55,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 4812

diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 4b21699902d001683bf7d9c4e2645613b45bb69b..723af65e155b9756a7fbc73ebdf394bfe3d8b167 100644 (file)
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -6620,9 +6620,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
 - proto: AccordionInstrument

diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 7d6183dd5e7ffb6bdbc92125a30e413826c8dccc..a354c816e533fa1f037e33d13203caa18cd5408e 100644 (file)
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -68,9 +68,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax

diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml
index 9d4b1aa8fc5b6a8d66fc637843b91c0e2dae955c..47632d992299452cf1a481e6ffc66c67a7367241 100644 (file)
--- a/Resources/Maps/reach.yml
+++ b/Resources/Maps/reach.yml
@@ -44,9 +44,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2

diff --git a/Resources/Maps/relic.yml b/Resources/Maps/relic.yml
index a7862dde76b162c9c03d7940f95ac04df5eb67cc..65033273a2ff9334ef1eda792581edc5f148c4cc 100644 (file)
--- a/Resources/Maps/relic.yml
+++ b/Resources/Maps/relic.yml
@@ -47,9 +47,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
   - uid: 2

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 4a8f4a85f3f5bcd8255106d7e34bb3273ed574bf..826045296e3cb4d4b856606451dddd58f9395c07 100644 (file)
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -3378,9 +3378,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap

diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml
index fe3615e3f1e4b527205cf391596bb939f5ee301b..a8f68d846c2086d919a4b5059bfa82a4bfcb0243 100644 (file)
--- a/Resources/Maps/train.yml
+++ b/Resources/Maps/train.yml
@@ -71,9 +71,7 @@ entities:
     - type: Transform
     - type: Map
       mapPaused: True
-    - type: PhysicsMap
     - type: GridTree
-    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: Parallax