diff options
Diffstat (limited to 'src')
24 files changed, 1410 insertions, 199 deletions
diff --git a/src/common/Collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp deleted file mode 100644 index c50bc69cb91..00000000000 --- a/src/common/Collision/Management/MMapFactory.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "MMapFactory.h" - -namespace MMAP -{ - // ######################## MMapFactory ######################## - // our global singleton copy - MMapManager* g_MMapManager = nullptr; - - MMapManager* MMapFactory::createOrGetMMapManager() - { - if (g_MMapManager == nullptr) - g_MMapManager = new MMapManager(); - - return g_MMapManager; - } - - void MMapFactory::clear() - { - if (g_MMapManager) - { - delete g_MMapManager; - g_MMapManager = nullptr; - } - } -} diff --git a/src/common/Collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h deleted file mode 100644 index d586eadbbcb..00000000000 --- a/src/common/Collision/Management/MMapFactory.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef _MMAP_FACTORY_H -#define _MMAP_FACTORY_H - -#include "Define.h" -#include "MMapManager.h" - -namespace MMAP -{ - enum MMAP_LOAD_RESULT - { - MMAP_LOAD_RESULT_ERROR, - MMAP_LOAD_RESULT_OK, - MMAP_LOAD_RESULT_IGNORED - }; - - // static class - // holds all mmap global data - // access point to MMapManager singleton - class TC_COMMON_API MMapFactory - { - public: - static MMapManager* createOrGetMMapManager(); - static void clear(); - }; -} - -#endif diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 3b5431e1cc7..8c926d79a6e 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -17,6 +17,7 @@ #include "MMapManager.h" #include "Errors.h" +#include "Hash.h" #include "Log.h" #include "MMapDefines.h" #include "Memory.h" @@ -26,24 +27,42 @@ namespace MMAP constexpr char MAP_FILE_NAME_FORMAT[] = "{}mmaps/{:04}.mmap"; constexpr char TILE_FILE_NAME_FORMAT[] = "{}mmaps/{:04}{:02}{:02}.mmtile"; - // ######################## MMapManager ######################## - MMapManager::~MMapManager() + using NavMeshPtr = std::unique_ptr<dtNavMesh, decltype(Trinity::unique_ptr_deleter<dtNavMesh*, &::dtFreeNavMesh>())>; + using NavMeshQueryPtr = std::unique_ptr<dtNavMeshQuery, decltype(Trinity::unique_ptr_deleter<dtNavMeshQuery*, &::dtFreeNavMeshQuery>())>; + + typedef std::unordered_map<std::pair<uint32, uint32>, NavMeshQueryPtr> NavMeshQuerySet; + typedef std::unordered_map<uint32, dtTileRef> MMapTileSet; + + // dummy struct to hold map's mmap data + struct MMapData { - for (std::pair<uint32 const, MMapData*>& loadedMMap : loadedMMaps) - delete loadedMMap.second; + explicit MMapData(NavMeshPtr&& mesh) : navMesh(std::move(mesh)) { } + + // we have to use single dtNavMeshQuery for every instance, since those are not thread safe + NavMeshQuerySet navMeshQueries; // instanceId to query + + NavMeshPtr navMesh; + MMapTileSet loadedTileRefs; // maps [map grid coords] to [dtTile] + }; - // by now we should not have maps loaded - // if we had, tiles in MMapData->mmapLoadedTiles, their actual data is lost! + // ######################## MMapManager ######################## + MMapManager::MMapManager() = default; + MMapManager::~MMapManager() = default; + + MMapManager* MMapManager::instance() + { + static MMapManager instance; + return &instance; } void MMapManager::InitializeThreadUnsafe(std::unordered_map<uint32, std::vector<uint32>> const& mapData) { - // the caller must pass the list of all mapIds that will be used in the VMapManager2 lifetime - for (std::pair<uint32 const, std::vector<uint32>> const& mapId : mapData) + // the caller must pass the list of all mapIds that will be used in the MMapManager lifetime + for (auto const& [mapId, childMapIds] : mapData) { - loadedMMaps.insert(MMapDataSet::value_type(mapId.first, nullptr)); - for (uint32 childMapId : mapId.second) - parentMapData[childMapId] = mapId.first; + loadedMMaps.insert(MMapDataSet::value_type(mapId, nullptr)); + for (uint32 childMapId : childMapIds) + parentMapData[childMapId] = mapId; } thread_safe_environment = false; @@ -59,7 +78,7 @@ namespace MMAP return itr; } - LoadResult MMapManager::loadMapData(std::string const& basePath, uint32 mapId) + LoadResult MMapManager::loadMapData(std::string_view basePath, uint32 mapId) { // we already have this map loaded? MMapDataSet::iterator itr = loadedMMaps.find(mapId); @@ -93,11 +112,10 @@ namespace MMAP return LoadResult::ReadFromFileFailed; } - dtNavMesh* mesh = dtAllocNavMesh(); + NavMeshPtr mesh(dtAllocNavMesh()); ASSERT(mesh); if (dtStatusFailed(mesh->init(¶ms))) { - dtFreeNavMesh(mesh); TC_LOG_ERROR("maps", "MMAP:loadMapData: Failed to initialize dtNavMesh for mmap {:04} from file {}", mapId, fileName); return LoadResult::LibraryError; } @@ -105,9 +123,7 @@ namespace MMAP TC_LOG_DEBUG("maps", "MMAP:loadMapData: Loaded {:04}.mmap", mapId); // store inside our map list - MMapData* mmap_data = new MMapData(mesh); - - itr->second = mmap_data; + itr->second.reset(new MMapData(std::move(mesh))); return LoadResult::Success; } @@ -116,7 +132,7 @@ namespace MMAP return uint32(x << 16 | y); } - LoadResult MMapManager::loadMap(std::string const& basePath, uint32 mapId, int32 x, int32 y) + LoadResult MMapManager::loadMap(std::string_view basePath, uint32 mapId, int32 x, int32 y) { // make sure the mmap is loaded and ready to load tiles switch (LoadResult mapResult = loadMapData(basePath, mapId)) @@ -129,12 +145,12 @@ namespace MMAP } // get this mmap data - MMapData* mmap = loadedMMaps[mapId]; + MMapData* mmap = loadedMMaps[mapId].get(); ASSERT(mmap->navMesh); // check if we already have this tile loaded uint32 packedGridPos = packTileID(x, y); - if (mmap->loadedTileRefs.find(packedGridPos) != mmap->loadedTileRefs.end()) + if (mmap->loadedTileRefs.contains(packedGridPos)) return LoadResult::AlreadyLoaded; // load this tile :: mmaps/MMMMXXYY.mmtile @@ -187,21 +203,21 @@ namespace MMAP fseek(file.get(), pos, SEEK_SET); - unsigned char* data = (unsigned char*)dtAlloc(fileHeader.size, DT_ALLOC_PERM); + auto data = Trinity::make_unique_ptr_with_deleter<&::dtFree>(dtAlloc(fileHeader.size, DT_ALLOC_PERM)); ASSERT(data); - size_t result = fread(data, fileHeader.size, 1, file.get()); + size_t result = fread(data.get(), fileHeader.size, 1, file.get()); if (!result) { TC_LOG_ERROR("maps", "MMAP:loadMap: Bad header or data in mmap {:04}{:02}{:02}.mmtile", mapId, x, y); return LoadResult::ReadFromFileFailed; } - dtMeshHeader* header = (dtMeshHeader*)data; + dtMeshHeader* header = static_cast<dtMeshHeader*>(data.get()); dtTileRef tileRef = 0; // memory allocated for data is now managed by detour, and will be deallocated when the tile is removed - if (dtStatusSucceed(mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef))) + if (dtStatusSucceed(mmap->navMesh->addTile(static_cast<unsigned char*>(data.release()), fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef))) { mmap->loadedTileRefs.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef)); ++loadedTiles; @@ -211,12 +227,11 @@ namespace MMAP else { TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load {:04}{:02}{:02}.mmtile into navmesh", mapId, x, y); - dtFree(data); return LoadResult::LibraryError; } } - bool MMapManager::loadMapInstance(std::string const& basePath, uint32 meshMapId, uint32 instanceMapId, uint32 instanceId) + bool MMapManager::loadMapInstance(std::string_view basePath, uint32 meshMapId, uint32 instanceMapId, uint32 instanceId) { switch (loadMapData(basePath, meshMapId)) { @@ -227,24 +242,23 @@ namespace MMAP return false; } - MMapData* mmap = loadedMMaps[meshMapId]; + MMapData* mmap = loadedMMaps[meshMapId].get(); auto [queryItr, inserted] = mmap->navMeshQueries.try_emplace({ instanceMapId, instanceId }, nullptr); if (!inserted) return true; // allocate mesh query - dtNavMeshQuery* query = dtAllocNavMeshQuery(); + NavMeshQueryPtr query(dtAllocNavMeshQuery()); ASSERT(query); - if (dtStatusFailed(query->init(mmap->navMesh, 1024))) + if (dtStatusFailed(query->init(mmap->navMesh.get(), 1024))) { - dtFreeNavMeshQuery(query); mmap->navMeshQueries.erase(queryItr); TC_LOG_ERROR("maps", "MMAP:GetNavMeshQuery: Failed to initialize dtNavMeshQuery for mapId {:04} instanceId {}", instanceMapId, instanceId); return false; } TC_LOG_DEBUG("maps", "MMAP:GetNavMeshQuery: created dtNavMeshQuery for mapId {:04} instanceId {}", instanceMapId, instanceId); - queryItr->second = query; + queryItr->second = std::move(query); return true; } @@ -259,12 +273,12 @@ namespace MMAP return false; } - MMapData* mmap = itr->second; + MMapData* mmap = itr->second.get(); // check if we have this tile loaded uint32 packedGridPos = packTileID(x, y); - auto tileRefItr = mmap->loadedTileRefs.find(packedGridPos); - if (tileRefItr == mmap->loadedTileRefs.end()) + auto tileRef = mmap->loadedTileRefs.extract(packedGridPos); + if (!tileRef) { // file may not exist, therefore not loaded TC_LOG_DEBUG("maps", "MMAP:unloadMap: Asked to unload not loaded navmesh tile. {:04}{:02}{:02}.mmtile", mapId, x, y); @@ -272,7 +286,7 @@ namespace MMAP } // unload, and mark as non loaded - if (dtStatusFailed(mmap->navMesh->removeTile(tileRefItr->second, nullptr, nullptr))) + if (dtStatusFailed(mmap->navMesh->removeTile(tileRef.mapped(), nullptr, nullptr))) { // this is technically a memory leak // if the grid is later reloaded, dtNavMesh::addTile will return error but no extra memory is used @@ -282,7 +296,6 @@ namespace MMAP } else { - mmap->loadedTileRefs.erase(tileRefItr); --loadedTiles; TC_LOG_DEBUG("maps", "MMAP:unloadMap: Unloaded mmtile {:04}[{:02}, {:02}] from {:03}", mapId, x, y, mapId); return true; @@ -302,12 +315,12 @@ namespace MMAP } // unload all tiles from given map - MMapData* mmap = itr->second; - for (MMapTileSet::iterator i = mmap->loadedTileRefs.begin(); i != mmap->loadedTileRefs.end(); ++i) + MMapData* mmap = itr->second.get(); + for (auto const& [tileId, tileRef] : mmap->loadedTileRefs) { - uint32 x = (i->first >> 16); - uint32 y = (i->first & 0x0000FFFF); - if (dtStatusFailed(mmap->navMesh->removeTile(i->second, nullptr, nullptr))) + uint32 x = (tileId >> 16); + uint32 y = (tileId & 0x0000FFFF); + if (dtStatusFailed(mmap->navMesh->removeTile(tileRef, nullptr, nullptr))) TC_LOG_ERROR("maps", "MMAP:unloadMap: Could not unload {:04}{:02}{:02}.mmtile from navmesh", mapId, x, y); else { @@ -316,7 +329,6 @@ namespace MMAP } } - delete mmap; itr->second = nullptr; TC_LOG_DEBUG("maps", "MMAP:unloadMap: Unloaded {:04}.mmap", mapId); @@ -334,16 +346,14 @@ namespace MMAP return false; } - MMapData* mmap = itr->second; - auto queryItr = mmap->navMeshQueries.find({ instanceMapId, instanceId }); - if (queryItr == mmap->navMeshQueries.end()) + MMapData* mmap = itr->second.get(); + std::size_t erased = mmap->navMeshQueries.erase({ instanceMapId, instanceId }); + if (!erased) { TC_LOG_DEBUG("maps", "MMAP:unloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId {:04} instanceId {}", instanceMapId, instanceId); return false; } - dtFreeNavMeshQuery(queryItr->second); - mmap->navMeshQueries.erase(queryItr); TC_LOG_DEBUG("maps", "MMAP:unloadMapInstance: Unloaded mapId {:04} instanceId {}", instanceMapId, instanceId); return true; @@ -355,7 +365,7 @@ namespace MMAP if (itr == loadedMMaps.end()) return nullptr; - return itr->second->navMesh; + return itr->second->navMesh.get(); } dtNavMeshQuery const* MMapManager::GetNavMeshQuery(uint32 meshMapId, uint32 instanceMapId, uint32 instanceId) @@ -368,6 +378,6 @@ namespace MMAP if (queryItr == itr->second->navMeshQueries.end()) return nullptr; - return queryItr->second; + return queryItr->second.get(); } } diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index 45c0466e687..9973f37d51c 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -19,40 +19,19 @@ #define _MMAP_MANAGER_H #include "Define.h" -#include "DetourNavMesh.h" -#include "DetourNavMeshQuery.h" -#include "Hash.h" -#include <string> +#include <DetourNavMesh.h> +#include <DetourNavMeshQuery.h> +#include <memory> +#include <string_view> #include <unordered_map> #include <vector> // move map related classes namespace MMAP { - typedef std::unordered_map<uint32, dtTileRef> MMapTileSet; - typedef std::unordered_map<std::pair<uint32, uint32>, dtNavMeshQuery*> NavMeshQuerySet; + struct MMapData; - // dummy struct to hold map's mmap data - struct TC_COMMON_API MMapData - { - MMapData(dtNavMesh* mesh) : navMesh(mesh) { } - ~MMapData() - { - for (NavMeshQuerySet::iterator i = navMeshQueries.begin(); i != navMeshQueries.end(); ++i) - dtFreeNavMeshQuery(i->second); - - if (navMesh) - dtFreeNavMesh(navMesh); - } - - // we have to use single dtNavMeshQuery for every instance, since those are not thread safe - NavMeshQuerySet navMeshQueries; // instanceId to query - - dtNavMesh* navMesh; - MMapTileSet loadedTileRefs; // maps [map grid coords] to [dtTile] - }; - - typedef std::unordered_map<uint32, MMapData*> MMapDataSet; + typedef std::unordered_map<uint32, std::unique_ptr<MMapData>> MMapDataSet; enum class LoadResult : uint8 { @@ -69,12 +48,18 @@ namespace MMAP class TC_COMMON_API MMapManager { public: - MMapManager() : loadedTiles(0), thread_safe_environment(true) {} + MMapManager(); + MMapManager(MMapManager const& other) = delete; + MMapManager(MMapManager&& other) noexcept = delete; + MMapManager& operator=(MMapManager const& other) = delete; + MMapManager& operator=(MMapManager&& other) noexcept = delete; ~MMapManager(); + static MMapManager* instance(); + void InitializeThreadUnsafe(std::unordered_map<uint32, std::vector<uint32>> const& mapData); - LoadResult loadMap(std::string const& basePath, uint32 mapId, int32 x, int32 y); - bool loadMapInstance(std::string const& basePath, uint32 meshMapId, uint32 instanceMapId, uint32 instanceId); + LoadResult loadMap(std::string_view basePath, uint32 mapId, int32 x, int32 y); + bool loadMapInstance(std::string_view basePath, uint32 meshMapId, uint32 instanceMapId, uint32 instanceId); bool unloadMap(uint32 mapId, int32 x, int32 y); bool unloadMap(uint32 mapId); bool unloadMapInstance(uint32 meshMapId, uint32 instanceMapId, uint32 instanceId); @@ -86,13 +71,13 @@ namespace MMAP uint32 getLoadedTilesCount() const { return loadedTiles; } uint32 getLoadedMapsCount() const { return uint32(loadedMMaps.size()); } private: - LoadResult loadMapData(std::string const& basePath, uint32 mapId); + LoadResult loadMapData(std::string_view basePath, uint32 mapId); uint32 packTileID(int32 x, int32 y); MMapDataSet::const_iterator GetMMapData(uint32 mapId) const; MMapDataSet loadedMMaps; - uint32 loadedTiles; - bool thread_safe_environment; + uint32 loadedTiles = 0; + bool thread_safe_environment = true; std::unordered_map<uint32, uint32> parentMapData; }; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 2739854926b..b6716c248ae 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -32,6 +32,7 @@ #include "Player.h" #include "SharedDefines.h" #include "World.h" +#include "WorldSession.h" bool BattlegroundTemplate::IsArena() const { @@ -64,7 +65,7 @@ uint8 BattlegroundTemplate::GetMaxLevel() const BattlegroundMgr::BattlegroundMgr() : m_NextRatedArenaUpdate(sWorld->getIntConfig(CONFIG_ARENA_RATED_UPDATE_TIMER)), - m_UpdateTimer(0), m_ArenaTesting(false), m_Testing(false) + m_UpdateTimer(0), m_ArenaTesting(0), m_Testing(false) { } BattlegroundMgr::~BattlegroundMgr() @@ -300,6 +301,15 @@ BattlegroundScriptTemplate const* BattlegroundMgr::FindBattlegroundScriptTemplat return Trinity::Containers::MapGetValuePtr(_battlegroundScriptTemplates, { mapId, BATTLEGROUND_TYPE_NONE }); } +void BattlegroundMgr::QueuePlayerForArena(Player const* player, uint8 teamSize, uint8 roles) +{ + WorldPackets::Battleground::BattlemasterJoinArena packet((WorldPacket(CMSG_BATTLEMASTER_JOIN_ARENA))); + packet.TeamSizeIndex = teamSize; + packet.Roles = roles; + + player->GetSession()->HandleBattlemasterJoinArena(packet); +} + uint32 BattlegroundMgr::CreateClientVisibleInstanceId(BattlegroundTypeId bgTypeId, BattlegroundBracketId bracket_id) { if (IsArenaType(bgTypeId)) @@ -507,10 +517,23 @@ void BattlegroundMgr::ToggleTesting() sWorld->SendWorldText(m_Testing ? LANG_DEBUG_BG_ON : LANG_DEBUG_BG_OFF); } -void BattlegroundMgr::ToggleArenaTesting() +bool BattlegroundMgr::ToggleArenaTesting(uint32 battlemasterListId) { - m_ArenaTesting = !m_ArenaTesting; - sWorld->SendWorldText(m_ArenaTesting ? LANG_DEBUG_ARENA_ON : LANG_DEBUG_ARENA_OFF); + if (battlemasterListId != 0) + { + BattlegroundTemplate const* bgTemplate = GetBattlegroundTemplateByTypeId(static_cast<BattlegroundTypeId>(battlemasterListId)); + if (!bgTemplate) + return false; + + if (!bgTemplate->IsArena()) + return false; + } + + if (m_ArenaTesting != battlemasterListId) + sWorld->SendWorldText((battlemasterListId != 0) ? LANG_DEBUG_ARENA_ON : LANG_DEBUG_ARENA_OFF); + + m_ArenaTesting = battlemasterListId; + return true; } bool BattlegroundMgr::IsValidQueueId(BattlegroundQueueTypeId bgQueueTypeId) @@ -686,6 +709,9 @@ BattlegroundTypeId BattlegroundMgr::GetRandomBG(BattlegroundTypeId bgTypeId) { if (BattlegroundTemplate const* bgTemplate = GetBattlegroundTemplateByTypeId(bgTypeId)) { + if (bgTemplate->IsArena() && isArenaTesting()) + return static_cast<BattlegroundTypeId>(m_ArenaTesting); + std::vector<BattlegroundTemplate const*> ids; ids.reserve(bgTemplate->MapIDs.size()); for (int32 mapId : bgTemplate->MapIDs) diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index b31b0193af0..8aa341cbca8 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -126,10 +126,11 @@ class TC_GAME_API BattlegroundMgr void ScheduleQueueUpdate(uint32 arenaMatchmakerRating, BattlegroundQueueTypeId bgQueueTypeId, BattlegroundBracketId bracket_id); uint32 GetPrematureFinishTime() const; - void ToggleArenaTesting(); + // Return whether toggling was successful. In case of a non-existing battlemasterListId, or this battlemasterListId is not an arena, this would return false. + bool ToggleArenaTesting(uint32 battlemasterListId); void ToggleTesting(); - bool isArenaTesting() const { return m_ArenaTesting; } + bool isArenaTesting() const { return m_ArenaTesting != 0; } bool isTesting() const { return m_Testing; } static bool IsRandomBattleground(uint32 battlemasterListId); @@ -162,6 +163,8 @@ class TC_GAME_API BattlegroundMgr void LoadBattlegroundScriptTemplate(); BattlegroundScriptTemplate const* FindBattlegroundScriptTemplate(uint32 mapId, BattlegroundTypeId bgTypeId) const; + static void QueuePlayerForArena(Player const* player, uint8 teamSize, uint8 roles); + private: uint32 CreateClientVisibleInstanceId(BattlegroundTypeId bgTypeId, BattlegroundBracketId bracket_id); static bool IsArenaType(BattlegroundTypeId bgTypeId); @@ -185,7 +188,7 @@ class TC_GAME_API BattlegroundMgr std::vector<ScheduledQueueUpdate> m_QueueUpdateScheduler; uint32 m_NextRatedArenaUpdate; uint32 m_UpdateTimer; - bool m_ArenaTesting; + uint32 m_ArenaTesting; bool m_Testing; BattleMastersMap mBattleMastersMap; diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index 829aa4d4816..74aa8596a58 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -178,7 +178,7 @@ bool AreaTrigger::Create(AreaTriggerCreatePropertiesId areaTriggerCreateProperti SetScaleCurve(areaTriggerData.ModifyValue(&UF::AreaTriggerData::ExtraScaleCurve), 1.0f); - if (caster) + if (caster && spellInfo) { if (Player const* modOwner = caster->GetSpellModOwner()) { diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 8fb5a150793..e78a52042b9 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -540,9 +540,16 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPackets::Battleground::Battl return; Group* grp = _player->GetGroup(); + if (!grp) + { + grp = new Group(); + grp->Create(_player); + } + // no group found, error if (!grp) return; + if (grp->GetLeaderGUID() != _player->GetGUID()) return; @@ -559,7 +566,10 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPackets::Battleground::Battl GroupQueueInfo* ginfo = nullptr; ObjectGuid errorGuid; - GroupJoinBattlegroundResult err = grp->CanJoinBattlegroundQueue(bgTemplate, bgQueueTypeId, arenatype, arenatype, true, packet.TeamSizeIndex, errorGuid); + GroupJoinBattlegroundResult err = ERR_BATTLEGROUND_NONE; + if (!sBattlegroundMgr->isArenaTesting()) + err = grp->CanJoinBattlegroundQueue(bgTemplate, bgQueueTypeId, arenatype, arenatype, true, packet.TeamSizeIndex, errorGuid); + if (!err) { TC_LOG_DEBUG("bg.battleground", "Battleground: arena team id {}, leader {} queued with matchmaker rating {} for type {}", _player->GetArenaTeamId(packet.TeamSizeIndex), _player->GetName(), matchmakerRating, arenatype); diff --git a/src/server/game/Maps/TerrainMgr.cpp b/src/server/game/Maps/TerrainMgr.cpp index 2e6d8e184b9..65655e6e84b 100644 --- a/src/server/game/Maps/TerrainMgr.cpp +++ b/src/server/game/Maps/TerrainMgr.cpp @@ -22,7 +22,7 @@ #include "GridMap.h" #include "Log.h" #include "Memory.h" -#include "MMapFactory.h" +#include "MMapManager.h" #include "PhasingHandler.h" #include "Random.h" #include "ScriptMgr.h" @@ -39,7 +39,7 @@ TerrainInfo::TerrainInfo(uint32 mapId) : _mapId(mapId), _parentTerrain(nullptr), TerrainInfo::~TerrainInfo() { VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId()); - MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(GetId()); + MMAP::MMapManager::instance()->unloadMap(GetId()); } char const* TerrainInfo::GetMapName() const @@ -185,7 +185,7 @@ void TerrainInfo::LoadMapAndVMapImpl(int32 gx, int32 gy) void TerrainInfo::LoadMMapInstanceImpl(uint32 mapId, uint32 instanceId) { - MMAP::MMapFactory::createOrGetMMapManager()->loadMapInstance(sWorld->GetDataPath(), _mapId, mapId, instanceId); + MMAP::MMapManager::instance()->loadMapInstance(sWorld->GetDataPath(), _mapId, mapId, instanceId); } void TerrainInfo::LoadMap(int32 gx, int32 gy) @@ -239,7 +239,7 @@ void TerrainInfo::LoadMMap(int32 gx, int32 gy) if (!DisableMgr::IsPathfindingEnabled(GetId())) return; - switch (MMAP::LoadResult mmapLoadResult = MMAP::MMapFactory::createOrGetMMapManager()->loadMap(sWorld->GetDataPath(), GetId(), gx, gy)) + switch (MMAP::LoadResult mmapLoadResult = MMAP::MMapManager::instance()->loadMap(sWorld->GetDataPath(), GetId(), gx, gy)) { case MMAP::LoadResult::Success: TC_LOG_DEBUG("mmaps.tiles", "MMAP loaded name:{}, id:{}, x:{}, y:{} (mmap rep.: x:{}, y:{})", GetMapName(), GetId(), gx, gy, gx, gy); @@ -274,7 +274,7 @@ void TerrainInfo::UnloadMapImpl(int32 gx, int32 gy) { _gridMap[gx][gy] = nullptr; VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gx, gy); - MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(GetId(), gx, gy); + MMAP::MMapManager::instance()->unloadMap(GetId(), gx, gy); for (std::shared_ptr<TerrainInfo> const& childTerrain : _childTerrain) childTerrain->UnloadMapImpl(gx, gy); @@ -284,7 +284,7 @@ void TerrainInfo::UnloadMapImpl(int32 gx, int32 gy) void TerrainInfo::UnloadMMapInstanceImpl(uint32 mapId, uint32 instanceId) { - MMAP::MMapFactory::createOrGetMMapManager()->unloadMapInstance(_mapId, mapId, instanceId); + MMAP::MMapManager::instance()->unloadMapInstance(_mapId, mapId, instanceId); } GridMap* TerrainInfo::GetGrid(uint32 mapId, float x, float y, bool loadIfMissing /*= true*/) diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index 1d8285822ec..49f2f0150fa 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -22,7 +22,6 @@ #include "DisableMgr.h" #include "G3DPosition.hpp" #include "Log.h" -#include "MMapFactory.h" #include "MMapManager.h" #include "Map.h" #include "Metric.h" @@ -42,7 +41,7 @@ PathGenerator::PathGenerator(WorldObject const* owner) : uint32 mapId = PhasingHandler::GetTerrainMapId(_source->GetPhaseShift(), _source->GetMapId(), _source->GetMap()->GetTerrain(), _startPosition.x, _startPosition.y); if (DisableMgr::IsPathfindingEnabled(_source->GetMapId())) { - MMAP::MMapManager* mmap = MMAP::MMapFactory::createOrGetMMapManager(); + MMAP::MMapManager* mmap = MMAP::MMapManager::instance(); _navMeshQuery = mmap->GetNavMeshQuery(mapId, _source->GetMapId(), _source->GetInstanceId()); _navMesh = _navMeshQuery ? _navMeshQuery->getAttachedNavMesh() : mmap->GetNavMesh(mapId); } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 2776b10628e..d4436a76e96 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -69,7 +69,7 @@ #include "LootItemStorage.h" #include "LootMgr.h" #include "M2Stores.h" -#include "MMapFactory.h" +#include "MMapManager.h" #include "Map.h" #include "MapManager.h" #include "MapUtils.h" @@ -188,7 +188,6 @@ World::~World() delete command; VMAP::VMapFactory::clear(); - MMAP::MMapFactory::clear(); /// @todo free addSessQueue } @@ -1356,7 +1355,7 @@ bool World::SetInitialWorldSettings() vmmgr2->InitializeThreadUnsafe(mapData); - MMAP::MMapManager* mmmgr = MMAP::MMapFactory::createOrGetMMapManager(); + MMAP::MMapManager* mmmgr = MMAP::MMapManager::instance(); mmmgr->InitializeThreadUnsafe(mapData); ///- Initialize static helper structures diff --git a/src/server/scripts/Battlegrounds/MaldraxxusColiseum/arena_maldraxxus_coliseum.cpp b/src/server/scripts/Battlegrounds/MaldraxxusColiseum/arena_maldraxxus_coliseum.cpp new file mode 100644 index 00000000000..643f582e3fa --- /dev/null +++ b/src/server/scripts/Battlegrounds/MaldraxxusColiseum/arena_maldraxxus_coliseum.cpp @@ -0,0 +1,125 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "Battleground.h" +#include "BattlegroundScript.h" +#include "Creature.h" +#include "GameObject.h" +#include "Map.h" +#include "MotionMaster.h" +#include "ScriptMgr.h" + +namespace MaldraxxusColiseum +{ + namespace MapIds + { + static constexpr uint32 MaldraxxusColiseum = 2509; + } + + namespace Creatures + { + static constexpr uint32 MaldraxxianGladiator = 185764; + } + + namespace GameObjects + { + static constexpr uint32 Door = 375890; + } + + namespace Destinations + { + static constexpr Position Guard1 = { 2875.89f, 2285.57f, 3260.1755f }; + static constexpr Position Guard2 = { 2816.69f, 2300.51f, 3260.1885f }; + static constexpr Position Guard3 = { 2873.62f, 2219.39f, 3260.7085f }; + static constexpr Position Guard4 = { 2823.31f, 2204.30f, 3260.0960f }; + } + + namespace StringIds + { + static constexpr std::string_view Guard1 = "arena_maldraxxus_coliseum_1"; + static constexpr std::string_view Guard2 = "arena_maldraxxus_coliseum_2"; + static constexpr std::string_view Guard3 = "arena_maldraxxus_coliseum_3"; + static constexpr std::string_view Guard4 = "arena_maldraxxus_coliseum_4"; + } +} + +struct arena_maldraxxus_coliseum : ArenaScript +{ + explicit arena_maldraxxus_coliseum(BattlegroundMap* map) : ArenaScript(map) { } + + void OnStart() override + { + for (ObjectGuid const& guid : _doorGUIDs) + { + if (GameObject* door = battlegroundMap->GetGameObject(guid)) + { + door->UseDoorOrButton(); + door->DespawnOrUnsummon(5s); + } + } + + for (ObjectGuid const& guid : _gladiatorGUIDs) + { + if (Creature* creature = battlegroundMap->GetCreature(guid)) + { + if (creature->HasStringId(MaldraxxusColiseum::StringIds::Guard1)) + creature->GetMotionMaster()->MovePoint(1, MaldraxxusColiseum::Destinations::Guard1); + else if (creature->HasStringId(MaldraxxusColiseum::StringIds::Guard2)) + creature->GetMotionMaster()->MovePoint(1, MaldraxxusColiseum::Destinations::Guard2); + else if (creature->HasStringId(MaldraxxusColiseum::StringIds::Guard3)) + creature->GetMotionMaster()->MovePoint(1, MaldraxxusColiseum::Destinations::Guard3); + else if (creature->HasStringId(MaldraxxusColiseum::StringIds::Guard4)) + creature->GetMotionMaster()->MovePoint(1, MaldraxxusColiseum::Destinations::Guard4); + + creature->DespawnOrUnsummon(2s); + } + } + } + + void OnCreatureCreate(Creature* creature) override + { + switch (creature->GetEntry()) + { + case MaldraxxusColiseum::Creatures::MaldraxxianGladiator: + _gladiatorGUIDs.emplace_back(creature->GetGUID()); + break; + default: + break; + } + } + + void OnGameObjectCreate(GameObject* gameobject) override + { + switch (gameobject->GetEntry()) + { + case MaldraxxusColiseum::GameObjects::Door: + _doorGUIDs.emplace_back(gameobject->GetGUID()); + break; + default: + break; + } + } + +private: + GuidVector _doorGUIDs; + GuidVector _gladiatorGUIDs; +}; + +void AddSC_arena_maldraxxus_coliseum() +{ + RegisterBattlegroundMapScript(arena_maldraxxus_coliseum, MaldraxxusColiseum::MapIds::MaldraxxusColiseum); +} diff --git a/src/server/scripts/Battlegrounds/TheRobodrome/arena_the_robodrome.cpp b/src/server/scripts/Battlegrounds/TheRobodrome/arena_the_robodrome.cpp new file mode 100644 index 00000000000..b7e00b73969 --- /dev/null +++ b/src/server/scripts/Battlegrounds/TheRobodrome/arena_the_robodrome.cpp @@ -0,0 +1,136 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "Battleground.h" +#include "BattlegroundScript.h" +#include "Creature.h" +#include "CreatureAI.h" +#include "GameObject.h" +#include "Map.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "TaskScheduler.h" + +namespace TheRobodrome +{ + namespace MapIds + { + static constexpr uint32 TheRobodrome = 2167; + } + + namespace Creatures + { + static constexpr uint32 PowerCoil = 154593; + } + + namespace GameObjects + { + static constexpr uint32 Door01 = 329742; + static constexpr uint32 Door02 = 329743; + } + + namespace Spells + { + static constexpr uint32 Zap = 300642; + } +} + +struct arena_the_robodrome : ArenaScript +{ + explicit arena_the_robodrome(BattlegroundMap* map) : ArenaScript(map) { } + + void OnUpdate(uint32 diff) override + { + _scheduler.Update(diff); + } + + void OnStart() override + { + for (ObjectGuid const& guid : _doorGUIDs) + { + if (GameObject* door = battlegroundMap->GetGameObject(guid)) + { + door->UseDoorOrButton(); + door->DespawnOrUnsummon(5s); + } + } + + _scheduler.Schedule(5s, [&](TaskContext context) + { + for (ObjectGuid const& guid : _powerCoilGUIDs) + if (Creature* coil = battlegroundMap->GetCreature(guid)) + coil->CastSpell(nullptr, TheRobodrome::Spells::Zap); + + context.Repeat(); + }); + } + + void OnGameObjectCreate(GameObject* gameobject) override + { + switch (gameobject->GetEntry()) + { + case TheRobodrome::GameObjects::Door01: + case TheRobodrome::GameObjects::Door02: + _doorGUIDs.emplace_back(gameobject->GetGUID()); + break; + default: + break; + } + } + + void OnCreatureCreate(Creature* creature) override + { + switch (creature->GetEntry()) + { + case TheRobodrome::Creatures::PowerCoil: + _powerCoilGUIDs.emplace_back(creature->GetGUID()); + break; + default: + break; + } + } + +private: + GuidVector _doorGUIDs; + GuidVector _powerCoilGUIDs; + + TaskScheduler _scheduler; +}; + +// 300642 - Zap (Damage mod) +class spell_the_robodrome_zap_damage : public SpellScript +{ + void HandleHitTarget(SpellEffIndex /*effIndex*/) + { + uint32 basePct = 16; + uint32 stackCount = GetHitUnit()->GetAuraCount(TheRobodrome::Spells::Zap); + + SetEffectValue(basePct + basePct * stackCount); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_the_robodrome_zap_damage::HandleHitTarget, EFFECT_2, SPELL_EFFECT_DAMAGE_FROM_MAX_HEALTH_PCT); + } +}; + +void AddSC_arena_the_robodrome() +{ + RegisterBattlegroundMapScript(arena_the_robodrome, TheRobodrome::MapIds::TheRobodrome); + RegisterSpellScript(spell_the_robodrome_zap_damage); +} diff --git a/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp b/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp index 65f831fae9e..5bf00c0a80a 100644 --- a/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp +++ b/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp @@ -66,6 +66,9 @@ void AddSC_battleground_deephaul_ravine(); void AddSC_arena_blades_edge_legion(); void AddSC_arena_mugambala(); +void AddSC_arena_the_robodrome(); + +void AddSC_arena_maldraxxus_coliseum(); // The name of this function should match: // void Add${NameOfDirectory}Scripts() @@ -118,4 +121,7 @@ void AddBattlegroundsScripts() AddSC_arena_blades_edge_legion(); AddSC_arena_mugambala(); + AddSC_arena_the_robodrome(); + + AddSC_arena_maldraxxus_coliseum(); } diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 68020eb435d..3785f81f70a 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -39,6 +39,7 @@ EndScriptData */ #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "Language.h" +#include "LFG.h" #include "Log.h" #include "M2Stores.h" #include "MapManager.h" @@ -856,9 +857,20 @@ public: return true; } - static bool HandleDebugArenaCommand(ChatHandler* /*handler*/) + static bool HandleDebugArenaCommand(ChatHandler* handler, uint32 battlemasterListId) { - sBattlegroundMgr->ToggleArenaTesting(); + bool successful = sBattlegroundMgr->ToggleArenaTesting(battlemasterListId); + if (!successful) + { + handler->PSendSysMessage("BattlemasterListId %u does not exist or is not an arena.", battlemasterListId); + handler->SetSentErrorMessage(true); + return true; + } + + if (!battlemasterListId || !handler || !handler->GetSession()) + return true; + + BattlegroundMgr::QueuePlayerForArena(handler->GetSession()->GetPlayer(), 0, lfg::PLAYER_ROLE_DAMAGE); return true; } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 3e5fe709ee0..5e87cf376fb 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -32,7 +32,7 @@ #include "ItemBonusMgr.h" #include "Language.h" #include "MiscPackets.h" -#include "MMapFactory.h" +#include "MMapManager.h" #include "MotionMaster.h" #include "MovementDefines.h" #include "ObjectAccessor.h" @@ -258,7 +258,7 @@ public: uint32 haveMap = TerrainInfo::ExistMap(mapId, gridX, gridY) ? 1 : 0; uint32 haveVMap = TerrainInfo::ExistVMap(mapId, gridX, gridY) ? 1 : 0; - uint32 haveMMap = (DisableMgr::IsPathfindingEnabled(mapId) && MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId())) ? 1 : 0; + uint32 haveMMap = (DisableMgr::IsPathfindingEnabled(mapId) && MMAP::MMapManager::instance()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId())) ? 1 : 0; if (haveVMap) { diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 2b4fc01675e..d30bfcdc746 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -29,7 +29,7 @@ #include "ChatCommand.h" #include "DisableMgr.h" #include "GridNotifiersImpl.h" -#include "MMapFactory.h" +#include "MMapManager.h" #include "PathGenerator.h" #include "PhasingHandler.h" #include "Player.h" @@ -66,7 +66,7 @@ public: static bool HandleMmapPathCommand(ChatHandler* handler, char const* args) { - if (!MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId())) + if (!MMAP::MMapManager::instance()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId())) { handler->PSendSysMessage("NavMesh not loaded for current map."); return true; @@ -144,8 +144,8 @@ public: handler->PSendSysMessage("%04u%02i%02i.mmtile", terrainMapId, gx, gy); handler->PSendSysMessage("tileloc [%i, %i]", gy, gx); - dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(terrainMapId); - dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMeshQuery(terrainMapId, player->GetMapId(), player->GetInstanceId()); + dtNavMesh const* navmesh = MMAP::MMapManager::instance()->GetNavMesh(terrainMapId); + dtNavMeshQuery const* navmeshquery = MMAP::MMapManager::instance()->GetNavMeshQuery(terrainMapId, player->GetMapId(), player->GetInstanceId()); if (!navmesh || !navmeshquery) { handler->PSendSysMessage("NavMesh not loaded for current map."); @@ -195,8 +195,8 @@ public: { Player* player = handler->GetSession()->GetPlayer(); uint32 terrainMapId = PhasingHandler::GetTerrainMapId(player->GetPhaseShift(), player->GetMapId(), player->GetMap()->GetTerrain(), player->GetPositionX(), player->GetPositionY()); - dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(terrainMapId); - dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMeshQuery(terrainMapId, player->GetMapId(), player->GetInstanceId()); + dtNavMesh const* navmesh = MMAP::MMapManager::instance()->GetNavMesh(terrainMapId); + dtNavMeshQuery const* navmeshquery = MMAP::MMapManager::instance()->GetNavMeshQuery(terrainMapId, player->GetMapId(), player->GetInstanceId()); if (!navmesh || !navmeshquery) { handler->PSendSysMessage("NavMesh not loaded for current map."); @@ -224,7 +224,7 @@ public: handler->PSendSysMessage("mmap stats:"); handler->PSendSysMessage(" global mmap pathfinding is %sabled", DisableMgr::IsPathfindingEnabled(player->GetMapId()) ? "en" : "dis"); - MMAP::MMapManager* manager = MMAP::MMapFactory::createOrGetMMapManager(); + MMAP::MMapManager* manager = MMAP::MMapManager::instance(); handler->PSendSysMessage(" %u maps loaded with %u tiles overall", manager->getLoadedMapsCount(), manager->getLoadedTilesCount()); dtNavMesh const* navmesh = manager->GetNavMesh(terrainMapId); diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_1.cpp b/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_1.cpp new file mode 100644 index 00000000000..a249d16a0f5 --- /dev/null +++ b/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_1.cpp @@ -0,0 +1,176 @@ +/* +* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "ScriptMgr.h" +#include "CreatureAIImpl.h" +#include "MotionMaster.h" +#include "ObjectAccessor.h" +#include "Player.h" +#include "PhasingHandler.h" +#include "ScriptedCreature.h" +#include "SpellInfo.h" +#include "SpellScript.h" +#include "TemporarySummon.h" + +namespace Scripts::EasternKingdoms::Gilneas::Chapter1 +{ + namespace Creatures + { + static constexpr uint32 EvacuationStalkerFirst = 35830; + static constexpr uint32 EvacuationStalkerNear = 35010; + static constexpr uint32 EvacuationStalkerFar = 35011; + } + + namespace Events + { + namespace EvacuateTheMerchantSquare + { + static constexpr uint32 TalkFrightened = 1; + static constexpr uint32 MoveToNearStalker = 2; + static constexpr uint32 MoveToFarStalker = 3; + static constexpr uint32 FrightenedDespawn = 4; + } + } + + namespace Texts + { + namespace FrightenedCitizen + { + static constexpr uint32 SayFrightenedCitizenRescue = 0; + } + } + + namespace Points + { + static constexpr uint32 PointStalkerFirst = 1; + static constexpr uint32 PointStalkerNear = 2; + static constexpr uint32 PointStalkerFar = 3; + } + +// 34981 - Frightened Citizen +// 35836 - Frightened Citizen +struct npc_frightened_citizen : public ScriptedAI +{ + npc_frightened_citizen(Creature* creature) : ScriptedAI(creature) {} + + void IsSummonedBy(WorldObject* /*summoner*/) override + { + me->SetReactState(REACT_PASSIVE); + + if (Creature* stalkerNear = me->FindNearestCreature(Creatures::EvacuationStalkerFirst, 20.0f)) + me->GetMotionMaster()->MovePoint(Points::PointStalkerFirst, stalkerNear->GetPosition(), true); + } + + void MovementInform(uint32 type, uint32 id) override + { + if (type != POINT_MOTION_TYPE) + return; + + switch (id) + { + case Points::PointStalkerFirst: + _events.ScheduleEvent(Events::EvacuateTheMerchantSquare::TalkFrightened, 1s); + break; + case Points::PointStalkerNear: + _events.ScheduleEvent(Events::EvacuateTheMerchantSquare::MoveToFarStalker, 1ms); + break; + case Points::PointStalkerFar: + _events.ScheduleEvent(Events::EvacuateTheMerchantSquare::FrightenedDespawn, 1ms); + break; + default: + break; + } + } + + void UpdateAI(uint32 diff) override + { + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case Events::EvacuateTheMerchantSquare::TalkFrightened: + if (TempSummon* summon = me->ToTempSummon()) + { + if (Unit* summoner = summon->GetSummonerUnit()) + { + if (Player* player = summoner->ToPlayer()) + { + player->KilledMonsterCredit(Creatures::EvacuationStalkerFirst); + Talk(Texts::FrightenedCitizen::SayFrightenedCitizenRescue, summoner); + } + } + } + _events.ScheduleEvent(Events::EvacuateTheMerchantSquare::MoveToNearStalker, 2s); + break; + case Events::EvacuateTheMerchantSquare::MoveToNearStalker: + if (Creature* stalker = me->FindNearestCreature(Creatures::EvacuationStalkerFar, 50.0f)) + me->GetMotionMaster()->MovePoint(Points::PointStalkerFar, stalker->GetPosition(), true); + else if (Creature* stalker = me->FindNearestCreature(Creatures::EvacuationStalkerNear, 100.0f)) + me->GetMotionMaster()->MovePoint(Points::PointStalkerNear, stalker->GetPosition(), true); + break; + case Events::EvacuateTheMerchantSquare::MoveToFarStalker: + if (Creature* stalker = me->FindNearestCreature(Creatures::EvacuationStalkerFar, 500.0f)) + me->GetMotionMaster()->MovePoint(Points::PointStalkerFar, stalker->GetPosition(), true); + break; + case Events::EvacuateTheMerchantSquare::FrightenedDespawn: + me->DespawnOrUnsummon(); + break; + default: + break; + } + } + } +private: + EventMap _events; +}; + +// 67869 - Knocking +class spell_gilneas_knocking : public SpellScript +{ + bool Validate(SpellInfo const* spellInfo) override + { + return ValidateSpellInfo( + { + uint32(spellInfo->GetEffect(EFFECT_1).CalcValue()), + uint32(spellInfo->GetEffect(EFFECT_2).CalcValue()) + }); + } + + void HandleEffect() + { + GetCaster()->CastSpell(GetCaster(), GetEffectInfo(RAND(EFFECT_1, EFFECT_2)).CalcValue(), true); + } + + void Register() override + { + OnCast += SpellCastFn(spell_gilneas_knocking::HandleEffect); + } +}; +} + +void AddSC_gilneas_chapter_1() +{ + using namespace Scripts::EasternKingdoms::Gilneas::Chapter1; + + // Creatures + RegisterCreatureAI(npc_frightened_citizen); + + // Spells + RegisterSpellScript(spell_gilneas_knocking); +} diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index 283eed704a0..13f41362243 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -65,6 +65,7 @@ void AddSC_boss_chromaggus(); void AddSC_boss_nefarian(); void AddSC_instance_blackwing_lair(); void AddSC_instance_deadmines(); //Deadmines +void AddSC_gilneas_chapter_1(); //Gilneas void AddSC_gnomeregan(); //Gnomeregan void AddSC_instance_gnomeregan(); void AddSC_instance_grim_batol(); //Grim Batol @@ -264,6 +265,7 @@ void AddEasternKingdomsScripts() AddSC_boss_nefarian(); AddSC_instance_blackwing_lair(); AddSC_instance_deadmines(); //Deadmines + AddSC_gilneas_chapter_1(); //Gilneas AddSC_gnomeregan(); //Gnomeregan AddSC_instance_gnomeregan(); AddSC_instance_grim_batol(); //Grim Batol diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 17b5a2de406..60162630e80 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -15,11 +15,45 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "CombatAI.h" #include "Containers.h" +#include "CreatureAIImpl.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" +namespace Scripts::EasternKingdoms::Westfall +{ +namespace Creatures +{ + static constexpr uint32 EnergizedHarvestReaper = 42342; + static constexpr uint32 OverloadedHarvestGolem = 42601; +} + +namespace Events +{ + namespace ItsAlive + { + static constexpr uint32 CheckArea = 1; + static constexpr uint32 DespawnHarvester = 2; + } +} + +namespace Text +{ + namespace HarvestGolem + { + static constexpr uint32 AnnounceOutOfArea = 0; + } +} + +namespace Area +{ + static constexpr uint32 TheMoestFarm = 918; +} + // 79084 - Unbound Energy class spell_westfall_unbound_energy : public SpellScript { @@ -44,7 +78,121 @@ class spell_westfall_unbound_energy : public SpellScript } }; +// 42601 - Overloaded Harvest Golem +struct npc_westfall_overloaded_harvest_golem : public ScriptedAI +{ + npc_westfall_overloaded_harvest_golem(Creature* creature) : ScriptedAI(creature) {} + + void JustAppeared() override + { + _events.ScheduleEvent(Events::ItsAlive::CheckArea, 1s); + } + + void PassengerBoarded(Unit* /*passenger*/, int8 /*seatId*/, bool apply) override + { + if (!apply) + me->DespawnOrUnsummon(); + } + + void UpdateAI(uint32 diff) override + { + _events.Update(diff); + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case Events::ItsAlive::CheckArea: + if (me->GetAreaId() != Area::TheMoestFarm) + { + if (Unit* owner = me->GetCharmerOrOwner()) + Talk(Text::HarvestGolem::AnnounceOutOfArea, owner); + _events.ScheduleEvent(Events::ItsAlive::DespawnHarvester, 8s); + } + else + _events.Repeat(1s); + break; + case Events::ItsAlive::DespawnHarvester: + if (me->GetAreaId() != Area::TheMoestFarm) + me->DespawnOrUnsummon(); + else + _events.ScheduleEvent(Events::ItsAlive::CheckArea, 1s); + break; + default: + break; + } + } + } + +private: + EventMap _events; +}; + +// 79425 - Reaping Blows +class spell_westfall_reaping_blows : public AuraScript +{ + bool Validate(SpellInfo const* spellInfo) override + { + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_1).TriggerSpell) }); + } + + void HandlePeriodic(AuraEffect const* /*aurEff*/) + { + // HACK + // periodic ticks are forcing to cast the spell onto himself instead of target + // ref AuraEffect::HandlePeriodicTriggerSpellAuraTick + PreventDefaultAction(); + if (Creature* reaper = GetTarget()->FindNearestCreature(Creatures::EnergizedHarvestReaper, 5.f, true)) + GetTarget()->CastSpell(reaper, GetSpellInfo()->GetEffect(EFFECT_1).TriggerSpell, true); + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_westfall_reaping_blows::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + } +}; + +// 79436 - Wake Harvest Golem +class spell_westfall_wake_harvest_golem : public SpellScript +{ + SpellCastResult CheckTarget() + { + Unit* target = GetExplTargetUnit(); + if (!target || !target->IsCreature()) + return SPELL_FAILED_BAD_TARGETS; + + return SPELL_CAST_OK; + } + + void HandleScriptEffect(SpellEffIndex /*effIndex*/) + { + Unit* caster = GetCaster(); + if (!caster || !caster->IsPlayer()) + return; + + if (Creature* target = GetHitCreature()) + { + caster->ToPlayer()->KilledMonsterCredit(Creatures::OverloadedHarvestGolem); + target->DespawnOrUnsummon(100ms); + } + } + + void Register() override + { + OnCheckCast += SpellCheckCastFn(spell_westfall_wake_harvest_golem::CheckTarget); + OnEffectHitTarget += SpellEffectFn(spell_westfall_wake_harvest_golem::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; +} + void AddSC_westfall() { + using namespace Scripts::EasternKingdoms::Westfall; + + // Creature + RegisterCreatureAI(npc_westfall_overloaded_harvest_golem); + + // Spells RegisterSpellScript(spell_westfall_unbound_energy); + RegisterSpellScript(spell_westfall_reaping_blows); + RegisterSpellScript(spell_westfall_wake_harvest_golem); } diff --git a/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp b/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp new file mode 100644 index 00000000000..4494838a2f3 --- /dev/null +++ b/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp @@ -0,0 +1,525 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "AreaTrigger.h" +#include "AreaTriggerAI.h" +#include "CellImpl.h" +#include "Conversation.h" +#include "Creature.h" +#include "GridNotifiers.h" +#include "InstanceScript.h" +#include "MotionMaster.h" +#include "PathGenerator.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "city_of_threads.h" + +enum OratorKrixVizkSpells +{ + SPELL_ORATION = 454689, + SPELL_CHAINS_OF_OPPRESSION = 434691, + SPELL_CHAINS_OF_OPPRESSION_PERIODIC = 440310, + SPELL_CHAINS_OF_OPPRESSION_CHARGE = 434712, + SPELL_CHAINS_OF_OPPRESSION_DAMAGE = 434710, + SPELL_SUBJUGATE = 434722, + SPELL_TERRORIZE_SELECTOR = 434808, + SPELL_TERRORIZE = 434779, + SPELL_SHADOWS_OF_DOUBT_SELECTOR = 448560, + SPELL_SHADOWS_OF_DOUBT = 448561, + SPELL_DOUBT = 448562, + SPELL_VOCIFEROUS_INDOCTRINATION = 434829, + SPELL_VOCIFEROUS_INDOCTRINATION_DAMAGE = 434832, + SPELL_LINGERING_INFLUENCE_AREATRIGGER = 434923, + SPELL_LINGERING_INFLUENCE_DAMAGE = 434926 +}; + +enum OratorKrixVizkConversations +{ + CONVERSATION_ORATOR_INTRO_1 = 24642, + CONVERSATION_ORATOR_INTRO_2 = 24643, + CONVERSATION_ORATOR_INTRO_3 = 24644 +}; + +enum OratorKrixVizkTexts +{ + SAY_AGGRO = 0, + SAY_SUBJUGATE = 1, + SAY_TERRORIZE = 2, + SAY_VOCIFEROUS_INDOCTRINATION = 3, + SAY_KILL = 4, + SAY_DEATH = 5 +}; + +enum OratorKrixVizkEvents +{ + EVENT_SUBJUGATE = 1, + EVENT_TERRORIZE, + EVENT_SHADOWS_OF_DOUBT, + EVENT_ENERGIZE +}; + +enum OratorKrixVizkMisc +{ + AREATRIGGER_BARRIER = 35803, + DISPLAY_POWERID = 527 +}; + +// 163 +// 164 +template<uint32 conversationEntry, uint32 data> +struct at_orator_conversation_intro : AreaTriggerAI +{ + at_orator_conversation_intro(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) { } + + void OnUnitEnter(Unit* unit) override + { + InstanceScript* instance = at->GetInstanceScript(); + if (!instance) + return; + + Player* player = unit->ToPlayer(); + if (!player || player->IsGameMaster()) + return; + + if (Creature* oratorKrixVizk = instance->GetCreature(data)) + Conversation::CreateConversation(conversationEntry, oratorKrixVizk, player->GetPosition(), player->GetGUID()); + + at->Remove(); + } +}; + +// 216619 - Orator Krix'vizk <The Fifth Strand> +struct boss_orator_krix_vizk : public BossAI +{ + boss_orator_krix_vizk(Creature* creature) : BossAI(creature, DATA_ORATOR_KRIX_VIZK), _subjugateCount(1), _terrorizeCount(1), _energizeCount(0) { } + + void JustAppeared() override + { + DoCastSelf(SPELL_ORATION); + me->SetPower(POWER_ENERGY, 0); + } + + void JustDied(Unit* /*killer*/) override + { + _JustDied(); + Talk(SAY_DEATH); + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + + WorldObject* obj = nullptr; + Trinity::ObjectEntryAndPrivateOwnerIfExistsCheck check(ObjectGuid::Empty, AREATRIGGER_BARRIER); + Trinity::WorldObjectSearcher<Trinity::ObjectEntryAndPrivateOwnerIfExistsCheck> checker(me, obj, check, GRID_MAP_TYPE_MASK_AREATRIGGER); + Cell::VisitGridObjects(me, checker, 100.0f); + + if (!obj) + return; + + if (AreaTrigger* at = obj->ToAreaTrigger()) + at->Remove(); + } + + void EnterEvadeMode(EvadeReason /*why*/) override + { + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + + _EnterEvadeMode(); + _DespawnAtEvade(); + } + + void KilledUnit(Unit* victim) override + { + if (!victim->IsPlayer()) + return; + + Talk(SAY_KILL); + } + + void Reset() override + { + _Reset(); + + _subjugateCount = 1; + _terrorizeCount = 1; + _energizeCount = 0; + } + + void JustEngagedWith(Unit* who) override + { + BossAI::JustEngagedWith(who); + Talk(SAY_AGGRO); + + DoCastSelf(SPELL_CHAINS_OF_OPPRESSION); + + instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); + + me->SetOverrideDisplayPowerId(DISPLAY_POWERID); // No aura handle + + events.ScheduleEvent(EVENT_ENERGIZE, 1s); + events.ScheduleEvent(EVENT_SUBJUGATE, 4500ms); + events.ScheduleEvent(EVENT_TERRORIZE, 9400ms); + + if (IsMythic() || IsMythicPlus()) + events.ScheduleEvent(EVENT_SHADOWS_OF_DOUBT, 15200ms); + } + + void UpdateAI(uint32 diff) override + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SUBJUGATE: + { + Talk(SAY_SUBJUGATE); + DoCastVictim(SPELL_SUBJUGATE); + _subjugateCount++; + if (_subjugateCount % 2 == 0) + events.ScheduleEvent(EVENT_SUBJUGATE, 17100ms); + else + events.ScheduleEvent(EVENT_SUBJUGATE, 12s); + break; + } + case EVENT_TERRORIZE: + { + Talk(SAY_TERRORIZE); + DoCast(SPELL_TERRORIZE_SELECTOR); + _terrorizeCount++; + if (_terrorizeCount % 2 == 0) + events.ScheduleEvent(EVENT_TERRORIZE, 8100ms); + else + events.ScheduleEvent(EVENT_TERRORIZE, 21100ms); + break; + } + case EVENT_SHADOWS_OF_DOUBT: + { + DoCast(SPELL_SHADOWS_OF_DOUBT_SELECTOR); + events.ScheduleEvent(EVENT_SHADOWS_OF_DOUBT, 30300ms); + break; + } + case EVENT_ENERGIZE: + { + if (me->GetPower(POWER_ENERGY) == 100) + { + Talk(SAY_VOCIFEROUS_INDOCTRINATION); + DoCastSelf(SPELL_VOCIFEROUS_INDOCTRINATION); + events.RescheduleEvent(EVENT_ENERGIZE, 6s); + } + else + { + me->SetPower(POWER_ENERGY, me->GetPower(POWER_ENERGY) + 4); + _energizeCount++; + events.ScheduleEvent(EVENT_ENERGIZE, (_energizeCount % 2) ? 1200ms : 800ms); + } + break; + } + default: + break; + } + } + } + +private: + uint8 _subjugateCount; + uint8 _terrorizeCount; + uint8 _energizeCount; +}; + +// 434808 - Terrorize +class spell_orator_krix_vizk_terrorize_selector : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_TERRORIZE }); + } + + void HandleHitTarget(SpellEffIndex /*effIndex*/) const + { + GetCaster()->CastSpell(GetHitUnit(), SPELL_TERRORIZE, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_orator_krix_vizk_terrorize_selector::HandleHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); + } +}; + +// 448560 - Shadows of Doubt +class spell_orator_krix_vizk_shadows_of_doubt_selector : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_SHADOWS_OF_DOUBT }); + } + + void HandleHitTarget(SpellEffIndex /*effIndex*/) const + { + GetCaster()->CastSpell(GetHitUnit(), SPELL_SHADOWS_OF_DOUBT, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_orator_krix_vizk_shadows_of_doubt_selector::HandleHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); + } +}; + +// 440310 - Chains of Oppression +class spell_orator_krix_vizk_chains_of_oppression_periodic : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_CHAINS_OF_OPPRESSION_DAMAGE, SPELL_CHAINS_OF_OPPRESSION_CHARGE }); + } + + void Tick(AuraEffect const* /*aurEff*/) const + { + if (Unit* caster = GetCaster()) + { + Unit* target = GetTarget(); + CastSpellExtraArgs args; + args.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR; + + caster->CastSpell(target, SPELL_CHAINS_OF_OPPRESSION_DAMAGE, args); + target->CastSpell(caster, SPELL_CHAINS_OF_OPPRESSION_CHARGE, args); + } + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_orator_krix_vizk_chains_of_oppression_periodic::Tick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } +}; + +// 448561 - Shadows of Doubt +class spell_orator_krix_vizk_shadows_of_doubt_periodic : public AuraScript +{ + static constexpr uint8 MAX_SHADOW_OF_DOUBTS = 5; + static constexpr uint32 DOUBT_AT_CREATE_PROPERTIES = 165; + + bool Validate(SpellInfo const* /*spell*/) override + { + return ValidateSpellInfo({ SPELL_DOUBT }); + } + + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE && GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL) + return; + + Unit* caster = GetCaster(); + if (!caster) + return; + + for (uint8 i = 0; i < MAX_SHADOW_OF_DOUBTS; ++i) + { + Unit* target = GetTarget(); + float angle = 2.f * float(M_PI) / MAX_SHADOW_OF_DOUBTS * i; + Position dest(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), angle); + AreaTrigger::CreateAreaTrigger({ DOUBT_AT_CREATE_PROPERTIES, true }, dest, -1, caster, target); + } + } + + void Register() override + { + AfterEffectRemove += AuraEffectRemoveFn(spell_orator_krix_vizk_shadows_of_doubt_periodic::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 434829 - Vociferous Indoctrination +class spell_orator_krix_vizk_vociferous_indoctrination_periodic : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_VOCIFEROUS_INDOCTRINATION_DAMAGE, SPELL_LINGERING_INFLUENCE_AREATRIGGER }); + } + + void Tick(AuraEffect const* aurEff) const + { + if (Unit* caster = GetCaster()) + caster->CastSpell(GetTarget(), SPELL_VOCIFEROUS_INDOCTRINATION_DAMAGE, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringAura = aurEff + }); + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + if (Unit* caster = GetCaster()) + GetTarget()->CastSpell(caster, SPELL_LINGERING_INFLUENCE_AREATRIGGER, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + + if (Creature* creatureTarget = GetTarget()->ToCreature()) + creatureTarget->SetPower(POWER_ENERGY, 0); + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_orator_krix_vizk_vociferous_indoctrination_periodic::Tick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove += AuraEffectRemoveFn(spell_orator_krix_vizk_vociferous_indoctrination_periodic::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 434691 - Chains of Oppression +// Id - 31997 +struct at_orator_krix_vizk_chains_of_oppression : AreaTriggerAI +{ + at_orator_krix_vizk_chains_of_oppression(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) { } + + void OnUnitEnter(Unit* unit) override + { + if (!unit->IsPlayer()) + return; + + Unit* caster = at->GetCaster(); + if (!caster) + return; + + caster->CastSpell(unit, SPELL_CHAINS_OF_OPPRESSION_PERIODIC, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override + { + if (!unit->IsPlayer()) + return; + + unit->RemoveAurasDueToSpell(SPELL_CHAINS_OF_OPPRESSION_PERIODIC); + } +}; + +// 434923 - Lingering Influence +// ID - 32026 +struct at_orator_krix_vizk_lingering_influence : AreaTriggerAI +{ + at_orator_krix_vizk_lingering_influence(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) { } + + void OnUnitEnter(Unit* unit) override + { + if (!unit->IsPlayer()) + return; + + Unit* caster = at->GetCaster(); + if (!caster) + return; + + caster->CastSpell(unit, SPELL_LINGERING_INFLUENCE_DAMAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override + { + if (!unit->IsPlayer()) + return; + + unit->RemoveAurasDueToSpell(SPELL_LINGERING_INFLUENCE_DAMAGE); + } + + void OnInitialize() override + { + std::array<DBCPosition2D, 2> points = + { { + { 0.0f, 1.0f }, + { 1.0f, 18.0f } + } }; + + at->SetTimeToTargetScale(6000); + at->SetOverrideScaleCurve(points, 2); + } +}; + +// 165 +struct at_orator_krix_vizk_doubt : AreaTriggerAI +{ + explicit at_orator_krix_vizk_doubt(AreaTrigger* areaTrigger) : AreaTriggerAI(areaTrigger), _canHitOrigin(false) {} + + void OnInitialize() override + { + Position destPos = at->GetPosition(); + at->MovePositionToFirstCollision(destPos, 200.0f, 0.0f); + + PathGenerator path(at); + path.CalculatePath(destPos.GetPositionX(), destPos.GetPositionY(), destPos.GetPositionZ(), true); + + at->InitSplines(path.GetPath()); + + _canHitOrigin = false; + _scheduler.Schedule(1s, [this](TaskContext /*task*/) + { + _canHitOrigin = true; + }); + } + + void OnUpdate(uint32 diff) override + { + _scheduler.Update(diff); + } + + void OnDestinationReached() override + { + at->Remove(); + } + + void OnUnitEnter(Unit* unit) override + { + if (!unit->IsPlayer()) + return; + + if (!_canHitOrigin && unit == at->GetTarget()) + return; + + Unit* caster = at->GetCaster(); + if (!caster) + return; + + caster->CastSpell(unit, SPELL_DOUBT, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + +private: + TaskScheduler _scheduler; + bool _canHitOrigin; +}; + +void AddSC_boss_orator_krix_vizk() +{ + new GenericAreaTriggerEntityScript<at_orator_conversation_intro<CONVERSATION_ORATOR_INTRO_1, DATA_ORATOR_CONVO>>("at_orator_conversation_intro_1"); + new GenericAreaTriggerEntityScript<at_orator_conversation_intro<CONVERSATION_ORATOR_INTRO_2, DATA_ORATOR_KRIX_VIZK>>("at_orator_conversation_intro_2"); + new GenericAreaTriggerEntityScript<at_orator_conversation_intro<CONVERSATION_ORATOR_INTRO_3, DATA_ORATOR_KRIX_VIZK>>("at_orator_conversation_intro_3"); + + RegisterCityOfThreadsCreatureAI(boss_orator_krix_vizk); + + RegisterSpellScript(spell_orator_krix_vizk_terrorize_selector); + RegisterSpellScript(spell_orator_krix_vizk_shadows_of_doubt_selector); + RegisterSpellScript(spell_orator_krix_vizk_chains_of_oppression_periodic); + RegisterSpellScript(spell_orator_krix_vizk_shadows_of_doubt_periodic); + RegisterSpellScript(spell_orator_krix_vizk_vociferous_indoctrination_periodic); + + RegisterAreaTriggerAI(at_orator_krix_vizk_chains_of_oppression); + RegisterAreaTriggerAI(at_orator_krix_vizk_lingering_influence); + RegisterAreaTriggerAI(at_orator_krix_vizk_doubt); +} diff --git a/src/server/scripts/KhazAlgar/CityOfThreads/city_of_threads.h b/src/server/scripts/KhazAlgar/CityOfThreads/city_of_threads.h new file mode 100644 index 00000000000..7efc98d0269 --- /dev/null +++ b/src/server/scripts/KhazAlgar/CityOfThreads/city_of_threads.h @@ -0,0 +1,61 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef DEF_CITY_OF_THREADS_H_ +#define DEF_CITY_OF_THREADS_H_ + +#include "CreatureAIImpl.h" + +#define COTScriptName "instance_city_of_threads" +#define DataHeader "CityOfThreads" + +uint32 const EncounterCount = 4; + +enum CityOfThreadsDataTypes +{ + // Encounters + DATA_ORATOR_KRIX_VIZK = 0, + DATA_FANGS_OF_THE_QUEEN = 1, + DATA_THE_COAGLAMATION = 2, + DATA_IZO_THE_GRAND_SPLICER = 3, + + // Additional Data + DATA_ORATOR_CONVO +}; + +enum CityOfThreadsCreatureIds +{ + // Bosses + BOSS_ORATOR_KRIX_VIZK = 216619, + BOSS_NX = 216648, + BOSS_VX = 216649, + BOSS_THE_COAGLAMATION = 216320, + BOSS_IZO_THE_GRAND_SPLICER = 216658, + + // Npcs + NPC_ORATOR_KRIX_VIZK_CONVO = 220769 +}; + +template <class AI, class T> +inline AI* GetCityOfThreadsAI(T* obj) +{ + return GetInstanceAI<AI>(obj, COTScriptName); +} + +#define RegisterCityOfThreadsCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetCityOfThreadsAI) + +#endif diff --git a/src/server/scripts/KhazAlgar/CityOfThreads/instance_city_of_threads.cpp b/src/server/scripts/KhazAlgar/CityOfThreads/instance_city_of_threads.cpp new file mode 100644 index 00000000000..38e8d2905d5 --- /dev/null +++ b/src/server/scripts/KhazAlgar/CityOfThreads/instance_city_of_threads.cpp @@ -0,0 +1,66 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "InstanceScript.h" +#include "ScriptMgr.h" +#include "city_of_threads.h" + +static constexpr ObjectData creatureData[] = +{ + { BOSS_ORATOR_KRIX_VIZK, DATA_ORATOR_KRIX_VIZK }, + { BOSS_NX, DATA_FANGS_OF_THE_QUEEN }, + { BOSS_VX, DATA_FANGS_OF_THE_QUEEN }, + { BOSS_THE_COAGLAMATION, DATA_THE_COAGLAMATION }, + { BOSS_IZO_THE_GRAND_SPLICER, DATA_IZO_THE_GRAND_SPLICER }, + { NPC_ORATOR_KRIX_VIZK_CONVO, DATA_ORATOR_CONVO }, + { 0, 0 } // END +}; + +static constexpr DungeonEncounterData const encounters[] = +{ + { DATA_ORATOR_KRIX_VIZK, {{ 2907 }} }, + { DATA_FANGS_OF_THE_QUEEN, {{ 2908 }} }, + { DATA_THE_COAGLAMATION, {{ 2905 }} }, + { DATA_IZO_THE_GRAND_SPLICER, {{ 2909 }} } +}; + +class instance_city_of_threads : public InstanceMapScript +{ +public: + instance_city_of_threads() : InstanceMapScript(COTScriptName, 2669) { } + + struct instance_city_of_threads_InstanceMapScript: public InstanceScript + { + instance_city_of_threads_InstanceMapScript(InstanceMap* map) : InstanceScript(map) + { + SetHeaders(DataHeader); + SetBossNumber(EncounterCount); + LoadObjectData(creatureData, nullptr); + LoadDungeonEncounterData(encounters); + } + }; + + InstanceScript* GetInstanceScript(InstanceMap* map) const override + { + return new instance_city_of_threads_InstanceMapScript(map); + } +}; + +void AddSC_instance_city_of_threads() +{ + new instance_city_of_threads(); +} diff --git a/src/server/scripts/KhazAlgar/khaz_algar_script_loader.cpp b/src/server/scripts/KhazAlgar/khaz_algar_script_loader.cpp index e8f1c7de329..86ae7069db0 100644 --- a/src/server/scripts/KhazAlgar/khaz_algar_script_loader.cpp +++ b/src/server/scripts/KhazAlgar/khaz_algar_script_loader.cpp @@ -32,6 +32,10 @@ void AddSC_boss_skarmorak(); void AddSC_instance_nerubar_palace(); void AddSC_boss_ulgrax_the_devourer(); +// City of Threads +void AddSC_instance_city_of_threads(); +void AddSC_boss_orator_krix_vizk(); + // The name of this function should match: // void Add${NameOfDirectory}Scripts() void AddKhazAlgarScripts() @@ -50,4 +54,8 @@ void AddKhazAlgarScripts() // Nerub'ar Palace AddSC_instance_nerubar_palace(); AddSC_boss_ulgrax_the_devourer(); + + // City of Threads + AddSC_instance_city_of_threads(); + AddSC_boss_orator_krix_vizk(); } |