SpawnGroup: Implement spawn_group_squad and respawn override

cmangos · Mar 8, 2025 · 7a87aeb · 7a87aeb
1 parent 8d12d24
commit 7a87aeb
Show file tree

Hide file tree

Showing 11 changed files with 273 additions and 115 deletions.
diff --git a/sql/base/mangos.sql b/sql/base/mangos.sql
@@ -10533,6 +10533,8 @@ CREATE TABLE `spawn_group`  (
   `WorldStateExpression` int(11) NOT NULL DEFAULT 0 COMMENT 'Worldstate expression Id',
   `Flags` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Flags for various behaviour',
   `StringId` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+  `RespawnOverrideMin` INT UNSIGNED COMMENT 'Respawn time override' DEFAULT NULL,
+  `RespawnOverrideMax` INT UNSIGNED COMMENT 'Respawn time override' DEFAULT NULL,
   PRIMARY KEY (`Id`)
 );
 
@@ -10586,6 +10588,19 @@ CREATE TABLE `spawn_group_linked_group`  (
   PRIMARY KEY (`Id`, `LinkedId`)
 );
 
+-- ----------------------------
+-- Table structure for spawn_group_squad
+-- ----------------------------
+
+DROP TABLE IF EXISTS spawn_group_squad;
+CREATE TABLE spawn_group_squad(
+Id INT NOT NULL COMMENT 'Spawn Group ID',
+SquadId INT NOT NULL COMMENT 'Squad Id within Spawn Group',
+Guid INT NOT NULL COMMENT 'Guid of creature or GO',
+Entry INT NOT NULL COMMENT 'Entry of creature or GO',
+PRIMARY KEY(Id, SquadId, Guid)
+);
+
 --
 -- Table structure for table `spam_records`
 --

diff --git a/sql/updates/mangos/z0000_01_mangos_spawn_group_squad.sql b/sql/updates/mangos/z0000_01_mangos_spawn_group_squad.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS spawn_group_squad;
+CREATE TABLE spawn_group_squad(
+Id INT NOT NULL COMMENT 'Spawn Group ID',
+SquadId INT NOT NULL COMMENT 'Squad Id within Spawn Group',
+Guid INT NOT NULL COMMENT 'Guid of creature or GO',
+Entry INT NOT NULL COMMENT 'Entry of creature or GO',
+PRIMARY KEY(Id, SquadId, Guid)
+);
+
+ALTER TABLE spawn_group ADD COLUMN `RespawnOverrideMin` INT UNSIGNED COMMENT 'Respawn time override' DEFAULT NULL AFTER `StringId`;
+ALTER TABLE spawn_group ADD COLUMN `RespawnOverrideMax` INT UNSIGNED COMMENT 'Respawn time override' DEFAULT NULL AFTER `RespawnOverrideMin`;
+
+
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -1825,7 +1825,9 @@ void Creature::SetDeathState(DeathState s)
     {
         if (!m_respawnOverriden)
         {
-            if (CreatureData const* data = sObjectMgr.GetCreatureData(GetDbGuid()))
+            if (GetCreatureGroup() && GetCreatureGroup()->IsRespawnOverriden())
+                m_respawnDelay = GetCreatureGroup()->GetRandomRespawnTime();
+            else if (CreatureData const* data = sObjectMgr.GetCreatureData(GetDbGuid()))
                 m_respawnDelay = data->GetRandomRespawnTime();
         }
         else if (m_respawnOverrideOnce)

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -758,7 +758,7 @@ class Creature : public Unit
         void Respawn();
         void SaveRespawnTime() override;
 
-        uint32 GetRespawnDelay() const { return m_respawnDelay; }
+        uint32 GetRespawnDelay() const override { return m_respawnDelay; }
         void SetRespawnDelay(uint32 delay, bool once = false) { m_respawnDelay = delay; m_respawnOverriden = true; m_respawnOverrideOnce = once; } // in seconds
         void SetRespawnDelay(std::chrono::seconds delay, bool once = false) { SetRespawnDelay(delay.count(), once); }
 

diff --git a/src/game/Entities/GameObject.cpp b/src/game/Entities/GameObject.cpp
@@ -686,8 +686,12 @@ void GameObject::Update(const uint32 diff)
             {
                 // since pool system can fail to roll unspawned object, this one can remain spawned, so must set respawn nevertheless
                 if (IsSpawnedByDefault())
-                    if (GameObjectData const* data = sObjectMgr.GetGOData(GetDbGuid()))
+                {
+                    if (GetGameObjectGroup() && GetGameObjectGroup()->IsRespawnOverriden())
+                        m_respawnDelay = GetGameObjectGroup()->GetRandomRespawnTime();
+                    else if (GameObjectData const* data = sObjectMgr.GetGOData(GetDbGuid()))
                         m_respawnDelay = data->GetRandomRespawnTime();
+                }
             }
             else if (m_respawnOverrideOnce)
                 m_respawnOverriden = false;

diff --git a/src/game/Entities/GameObject.h b/src/game/Entities/GameObject.h
@@ -757,7 +757,7 @@ class GameObject : public WorldObject
                    (m_respawnTime == 0 && m_spawnedByDefault);
         }
         bool IsSpawnedByDefault() const { return m_spawnedByDefault; }
-        uint32 GetRespawnDelay() const { return m_respawnDelay; }
+        uint32 GetRespawnDelay() const override { return m_respawnDelay; }
         void SetRespawnDelay(uint32 delay, bool once = false) { m_respawnDelay = delay; m_respawnOverriden = true; m_respawnOverrideOnce = once; }
         void SetForcedDespawn() { m_forcedDespawn = true; };
         void SetChestDespawn();

diff --git a/src/game/Entities/Object.h b/src/game/Entities/Object.h
@@ -1177,6 +1177,8 @@ class WorldObject : public Object
         bool HasStringId(uint32 stringId) const; // not to be used in sd2
         void SetStringId(uint32 stringId, bool apply); // not to be used outside of scriptmgr
 
+        virtual uint32 GetRespawnDelay() const { return 0; }
+
     protected:
         explicit WorldObject();
 

diff --git a/src/game/Globals/ObjectMgr.cpp b/src/game/Globals/ObjectMgr.cpp
@@ -1031,7 +1031,7 @@ void ObjectMgr::LoadSpawnGroups()
     std::shared_ptr<SpawnGroupEntryContainer> newContainer = std::make_shared<SpawnGroupEntryContainer>();
     uint32 count = 0;
 
-    std::unique_ptr<QueryResult> result(WorldDatabase.Query("SELECT Id, Name, Type, MaxCount, WorldState, WorldStateExpression, Flags, StringId FROM spawn_group"));
+    std::unique_ptr<QueryResult> result(WorldDatabase.Query("SELECT Id, Name, Type, MaxCount, WorldState, WorldStateExpression, Flags, StringId, RespawnOverrideMin, RespawnOverrideMax FROM spawn_group"));
     if (result)
     {
         do
@@ -1090,7 +1090,11 @@ void ObjectMgr::LoadSpawnGroups()
             entry.EnabledByDefault = true;
             entry.formationEntry = nullptr;
             entry.HasChancedSpawns = false;
-            newContainer->spawnGroupMap.emplace(entry.Id, entry);
+            if (!fields[8].IsNULL())
+                entry.RespawnOverrideMin = fields[8].GetUInt32();
+            if (!fields[9].IsNULL())
+                entry.RespawnOverrideMax = fields[9].GetUInt32();
+            newContainer->spawnGroupMap.emplace(entry.Id, std::move(entry));
         } while (result->NextRow());
     }
 
@@ -1328,6 +1332,46 @@ void ObjectMgr::LoadSpawnGroups()
         } while (result->NextRow());
     }
 
+    result = WorldDatabase.Query("SELECT Id, SquadId, Guid, Entry FROM spawn_group_squad");
+    if (result)
+    {
+        do
+        {
+            Field* fields = result->Fetch();
+            uint32 Id = fields[0].GetUInt32();
+
+            uint32 squadId = fields[1].GetUInt32();
+            uint32 dbGuid = fields[2].GetUInt32();
+            uint32 entry = fields[3].GetUInt32();
+
+            auto itr = newContainer->spawnGroupMap.find(Id);
+            if (itr == newContainer->spawnGroupMap.end())
+            {
+                sLog.outErrorDb("LoadSpawnGroups: Invalid spawn_group_squad Id %u. Skipping.", Id);
+                continue;
+            }
+
+            auto& spawnGroup = itr->second;
+            if (!spawnGroup.RandomEntries.empty())
+                sLog.outErrorDb("LoadSpawnGroups: spawn_group_squad Id %u has spawn_group_entry. Will be overriden by squad", Id);
+
+            auto squadItr = std::find_if(spawnGroup.Squads.begin(), spawnGroup.Squads.end(), [squadId](const SpawnGroupSquad& obj) -> bool { return obj.SquadId == squadId; });
+
+            if (squadItr == spawnGroup.Squads.end())
+            {
+                SpawnGroupSquad squad;
+                squad.SquadId = squadId;
+                squad.GuidToEntry.emplace(dbGuid, entry);
+                spawnGroup.Squads.push_back(std::move(squad));
+            }
+            else
+            {
+                squadItr->GuidToEntry.emplace(dbGuid, entry);
+            }
+        }
+        while (result->NextRow());
+    }
+
     for (auto& data : newContainer->spawnGroupMap)
     {
         SpawnGroupEntry& entry = data.second;