From a9a28c889e93eb3e17825afa221bb7b64099e279 Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sat, 31 Aug 2024 18:37:44 -0400 Subject: [PATCH] Tools/vmap_assembler: Organize vmap files into directory-per-map Port From (https://github.com/TrinityCore/TrinityCore/commit/518fe1fd1ecf107e11336c4a41ed90405b115dc0) --- Source/Framework/Constants/MapConst.cs | 2 +- Source/Game/Collision/Management/VMapManager.cs | 2 +- Source/Game/Collision/Maps/MapTree.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Framework/Constants/MapConst.cs b/Source/Framework/Constants/MapConst.cs index b6cc3f79e..7acb3ff55 100644 --- a/Source/Framework/Constants/MapConst.cs +++ b/Source/Framework/Constants/MapConst.cs @@ -56,7 +56,7 @@ namespace Framework.Constants public const uint mmapMagic = 0x4D4D4150; // 'MMAP' public const int mmapVersion = 15; - public const string VMapMagic = "VMAP_4.C"; + public const string VMapMagic = "VMAP_4.D"; public const float VMAPInvalidHeightValue = -200000.0f; public const uint MaxDungeonEncountersPerBoss = 4; diff --git a/Source/Game/Collision/Management/VMapManager.cs b/Source/Game/Collision/Management/VMapManager.cs index dc65fd7d1..226add0fd 100644 --- a/Source/Game/Collision/Management/VMapManager.cs +++ b/Source/Game/Collision/Management/VMapManager.cs @@ -249,7 +249,7 @@ namespace Game.Collision public static string GetMapFileName(uint mapId) { - return $"{mapId:D4}.vmtree"; + return $"{mapId:D4}/{mapId:D4}.vmtree"; } public void SetEnableLineOfSightCalc(bool pVal) { _enableLineOfSightCalc = pVal; } diff --git a/Source/Game/Collision/Maps/MapTree.cs b/Source/Game/Collision/Maps/MapTree.cs index a41f5c157..06fe4ba2c 100644 --- a/Source/Game/Collision/Maps/MapTree.cs +++ b/Source/Game/Collision/Maps/MapTree.cs @@ -259,7 +259,7 @@ namespace Game.Collision public static string GetTileFileName(uint mapID, int tileX, int tileY, string extension) { - return $"{mapID:D4}_{tileY:D2}_{tileX:D2}.{extension}"; + return $"{mapID:D4}/{mapID:D4}_{tileY:D2}_{tileX:D2}.{extension}"; } public bool GetLocationInfo(Vector3 pos, LocationInfo info)