fix(src, map): починена команда sendert, теперь происходит загрузка ч…

…ерез метод TryLoadGrid. все шаттлы ERT переделаны из мап в гриды.
AdventureTimeSS14 · Feb 20, 2025 · 1a95fb7 · 1a95fb7
1 parent 355cd60
commit 1a95fb7
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 103 deletions.
diff --git a/Content.Server/ADT/Administration/Commands/SendERTCommand.cs b/Content.Server/ADT/Administration/Commands/SendERTCommand.cs
@@ -155,9 +155,8 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
 
             var mapId = _mapManager.CreateMap();
             _system.GetEntitySystem<MetaDataSystem>().SetEntityName(_mapManager.GetMapEntityId(mapId), Loc.GetString("sent-ert-map-name"));
-            var offset = new Vector2(0, 0);
             var opts = new DeserializationOptions {StoreYamlUids = true, InitializeMaps = true};
-            _system.GetEntitySystem<MapLoaderSystem>().TryLoadMapWithId(mapId, new ResPath(gridPath), out _, out _, opts, offset);
+            _system.GetEntitySystem<MapLoaderSystem>().TryLoadGrid(mapId, new ResPath(gridPath), out _, opts);
             shell.WriteLine($"Карта {gridPath} успешно загружена! :з");
             _chat.SendAdminAlert($"Админ {player.Name} вызвал {args[0].ToLower()}. Карте 'Сектор патрулирования' было присовино ID: {mapId}. Точка телепортации для призраков появилась на шаттле.");
         }

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/cbun.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/cbun.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:10:50
+  entityCount: 1147
+maps: []
+grids:
+- 2
+orphans:
+- 2
+nullspace: []
 tilemap:
   0: Space
   26: FloorDark
@@ -21,24 +32,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 2
     components:
     - type: MetaData
       name: NT-CBUN-NZ
     - type: Transform
       pos: 0.7253765,-7.084765
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -1046,7 +1046,7 @@ entities:
       pos: 1.5,-1.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -1647.2473
+      secondsUntilStateChange: -1716.8092
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -3331,7 +3331,7 @@ entities:
       pos: 2.5,-7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -941.5998
+      secondsUntilStateChange: -1011.1617
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 349.0996529

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/default-rev.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/default-rev.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:12:59
+  entityCount: 993
+maps: []
+grids:
+- 2
+orphans:
+- 2
+nullspace: []
 tilemap:
   0: Space
   4: ADTLatticeLeftLower
@@ -25,24 +36,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 2
     components:
     - type: MetaData
       name: NT-MidnightCrew 1482
     - type: Transform
       pos: 0.7253765,-7.084765
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -3017,7 +3017,7 @@ entities:
       pos: 2.5,-7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -3783.4744
+      secondsUntilStateChange: -3823.2615
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 11369.7211955

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/default.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/default.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:13:48
+  entityCount: 980
+maps: []
+grids:
+- 732
+orphans:
+- 732
+nullspace: []
 tilemap:
   0: Space
   26: FloorDark
@@ -18,24 +29,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 732
     components:
     - type: MetaData
       name: NT-ERT-RatVore-13
     - type: Transform
       pos: 2.2710133,-2.4148211
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         -1,0:

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/engineer.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/engineer.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:14:54
+  entityCount: 980
+maps: []
+grids:
+- 732
+orphans:
+- 732
+nullspace: []
 tilemap:
   0: Space
   26: FloorDark
@@ -18,24 +29,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 732
     components:
     - type: MetaData
       name: NT-ERT-RatVore-13
     - type: Transform
       pos: 2.2710133,-2.4148211
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         -1,0:

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/janitor.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/janitor.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:15:30
+  entityCount: 980
+maps: []
+grids:
+- 732
+orphans:
+- 732
+nullspace: []
 tilemap:
   0: Space
   26: FloorDark
@@ -18,24 +29,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 732
     components:
     - type: MetaData
       name: NT-ERT-RatVore-13
     - type: Transform
       pos: 2.2710133,-2.4148211
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         -1,0:

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/medical.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/medical.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:16:20
+  entityCount: 987
+maps: []
+grids:
+- 732
+orphans:
+- 732
+nullspace: []
 tilemap:
   0: Space
   26: FloorDark
@@ -18,24 +29,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 732
     components:
     - type: MetaData
       name: NT-ERT-RatVore-13
     - type: Transform
       pos: 2.2710133,-2.4148211
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         -1,0:

diff --git a/Resources/Maps/ADTMaps/Shuttles/ERT/security.yml b/Resources/Maps/ADTMaps/Shuttles/ERT/security.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 247.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 02/20/2025 21:17:05
+  entityCount: 987
+maps: []
+grids:
+- 732
+orphans:
+- 732
+nullspace: []
 tilemap:
   0: Space
   26: FloorDark
@@ -18,24 +29,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 732
     components:
     - type: MetaData
       name: NT-ERT-RatVore-13
     - type: Transform
       pos: 2.2710133,-2.4148211
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         -1,0: