From 1a95fb72dfb3c085fd0c886e733875d2ddfa0f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Fri, 21 Feb 2025 00:19:33 +0300 Subject: [PATCH] =?UTF-8?q?fix(src,=20map):=20=D0=BF=D0=BE=D1=87=D0=B8?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0=20sendert,=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=B8=D1=82=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D1=87=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20TryLoadGr?= =?UTF-8?q?id.=20=D0=B2=D1=81=D0=B5=20=D1=88=D0=B0=D1=82=D1=82=D0=BB=D1=8B?= =?UTF-8?q?=20ERT=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B8=D0=B7=20=D0=BC=D0=B0=D0=BF=20=D0=B2=20=D0=B3?= =?UTF-8?q?=D1=80=D0=B8=D0=B4=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administration/Commands/SendERTCommand.cs | 3 +- Resources/Maps/ADTMaps/Shuttles/ERT/cbun.yml | 32 +++++++++---------- .../Maps/ADTMaps/Shuttles/ERT/default-rev.yml | 30 ++++++++--------- .../Maps/ADTMaps/Shuttles/ERT/default.yml | 28 ++++++++-------- .../Maps/ADTMaps/Shuttles/ERT/engineer.yml | 28 ++++++++-------- .../Maps/ADTMaps/Shuttles/ERT/janitor.yml | 28 ++++++++-------- .../Maps/ADTMaps/Shuttles/ERT/medical.yml | 28 ++++++++-------- .../Maps/ADTMaps/Shuttles/ERT/security.yml | 28 ++++++++-------- 8 files changed, 102 insertions(+), 103 deletions(-) diff --git a/Content.Server/ADT/Administration/Commands/SendERTCommand.cs b/Content.Server/ADT/Administration/Commands/SendERTCommand.cs index 426f20a0170..b6d88ed4fe9 100644 --- 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().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().TryLoadMapWithId(mapId, new ResPath(gridPath), out _, out _, opts, offset); + _system.GetEntitySystem().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 index 391827e797b..915712111de 100644 --- 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 index 86d6f9a7a76..a80fd833b21 100644 --- 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 index 11515b62058..16d392f94ce 100644 --- 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 index ea2f756b6a7..11c9265d9c4 100644 --- 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 index 17802cb0982..544b0910c00 100644 --- 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 index c4adb7b1335..81b5aee5e53 100644 --- 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 index eb4c2a054ed..c3397babeb4 100644 --- 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: