From 86e93a6bfc2c13da01d7a90f41d4fcb8fe6db24d Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 18 Sep 2025 22:49:52 +0200 Subject: Scripts/Arenas: Rework Ruins of Lordaeron (#31280) --- .../RuinsOfLordaeron/arena_ruins_of_lordaeron.cpp | 47 +++++++++------------- 1 file changed, 18 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Battlegrounds/RuinsOfLordaeron/arena_ruins_of_lordaeron.cpp b/src/server/scripts/Battlegrounds/RuinsOfLordaeron/arena_ruins_of_lordaeron.cpp index 75f9c6caef1..da2ab67d3df 100644 --- a/src/server/scripts/Battlegrounds/RuinsOfLordaeron/arena_ruins_of_lordaeron.cpp +++ b/src/server/scripts/Battlegrounds/RuinsOfLordaeron/arena_ruins_of_lordaeron.cpp @@ -20,30 +20,19 @@ #include "GameObject.h" #include "Map.h" #include "ScriptMgr.h" -#include "TaskScheduler.h" -struct arena_ruins_of_lordaeron : ArenaScript +namespace RuinsOfLordaeron { - enum BattlegroundRLGameObjects - { - BG_RL_OBJECT_TYPE_DOOR_1 = 185918, - BG_RL_OBJECT_TYPE_DOOR_2 = 185917, - BG_RL_OBJECT_TYPE_BUFF_1 = 184663, - BG_RL_OBJECT_TYPE_BUFF_2 = 184664 - }; - - explicit arena_ruins_of_lordaeron(BattlegroundMap* map) : ArenaScript(map) { } - - void OnUpdate(uint32 diff) override + namespace GameObjects { - _scheduler.Update(diff); + static constexpr uint32 Door01 = 185918; + static constexpr uint32 Door02 = 185917; } +} - void OnInit() override - { - AddDoor(BG_RL_OBJECT_TYPE_DOOR_1, 1293.561f, 1601.938f, 31.60557f, -1.457349f, 0, 0, -0.6658813f, 0.7460576f); - AddDoor(BG_RL_OBJECT_TYPE_DOOR_2, 1278.648f, 1730.557f, 31.60557f, 1.684245f, 0, 0, 0.7460582f, 0.6658807f); - } +struct arena_ruins_of_lordaeron : ArenaScript +{ + explicit arena_ruins_of_lordaeron(BattlegroundMap* map) : ArenaScript(map) { } void OnStart() override { @@ -55,23 +44,23 @@ struct arena_ruins_of_lordaeron : ArenaScript door->DespawnOrUnsummon(5s); } } - - _scheduler.Schedule(1min, [&](TaskContext) - { - CreateObject(BG_RL_OBJECT_TYPE_BUFF_1, 1328.719971f, 1632.719971f, 36.730400f, -1.448624f, 0, 0, 0.6626201f, -0.7489557f); - CreateObject(BG_RL_OBJECT_TYPE_BUFF_2, 1243.300049f, 1699.170044f, 34.872601f, -0.06981307f, 0, 0, 0.03489945f, -0.9993908f); - }); } - void AddDoor(uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, GOState goState = GO_STATE_READY) + void OnGameObjectCreate(GameObject* gameobject) override { - if (GameObject const* go = CreateObject(entry, x, y, z, o, rotation0, rotation1, rotation2, rotation3, goState)) - _doorGUIDs.emplace_back(go->GetGUID()); + switch (gameobject->GetEntry()) + { + case RuinsOfLordaeron::GameObjects::Door01: + case RuinsOfLordaeron::GameObjects::Door02: + _doorGUIDs.emplace_back(gameobject->GetGUID()); + break; + default: + break; + } } private: GuidVector _doorGUIDs; - TaskScheduler _scheduler; }; void AddSC_arena_ruins_of_lordaeron() -- cgit v1.2.3