Scripts/Gundrak: Drakkari Colossus cleanup (TrinityCore#31275)

Drakkari Colossus implementation cleanup

Author: ccrs

sql/updates/world/3.3.5/2025_10_10_01_world.sql

@@ -0,0 +1,26 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_drakkari_colossus_surge';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(54801, 'spell_drakkari_colossus_surge');
+
+DELETE FROM `spawn_group` WHERE (`groupId` = '33') and (`spawnType` = '0') and (`spawnId` = '127071');
+DELETE FROM `spawn_group` WHERE (`groupId` = '33') and (`spawnType` = '0') and (`spawnId` = '127072');
+DELETE FROM `spawn_group` WHERE (`groupId` = '33') and (`spawnType` = '0') and (`spawnId` = '127073');
+DELETE FROM `spawn_group` WHERE (`groupId` = '33') and (`spawnType` = '0') and (`spawnId` = '127074');
+DELETE FROM `spawn_group` WHERE (`groupId` = '33') and (`spawnType` = '0') and (`spawnId` = '127075');
+
+DELETE FROM `spawn_group_template` WHERE `groupId`=328;
+INSERT INTO `spawn_group_template` (`groupId`,`groupName`,`groupFlags`) VALUES
+(328,'Gundrak - Drakkari Colossus',4);
+
+DELETE FROM `spawn_group` WHERE `groupId`=328;
+INSERT INTO `spawn_group` (`groupId`,`spawnType`,`spawnId`) VALUES
+(328,0,127071),
+(328,0,127072),
+(328,0,127073),
+(328,0,127074),
+(328,0,127075);
+
+DELETE FROM `instance_spawn_groups` WHERE `spawnGroupId` =328;
+INSERT INTO `instance_spawn_groups` (`instanceMapId`,`bossStateId`,`bossStates`,`spawnGroupId`,`flags`) VALUES
+(604,1,23,328,2);

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

@@ -20,6 +20,7 @@
 #include "Cell.h"
 #include "CellImpl.h"
 #include "Containers.h"
+#include "CommonHelpers.h"
 #include "DBCStores.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
@@ -489,6 +490,13 @@ void ScriptedAI::SetCombatMovement(bool allowMovement)
     _isCombatMovementAllowed = allowMovement;
 }
 
+void ScriptedAI::SetAggressiveStateAfter(Milliseconds timer, Creature* who/* = nullptr*/, bool startCombat/* = true*/, Creature* summoner/* = nullptr*/)
+{
+    if (!who)
+        who = me;
+    who->m_Events.AddEvent(new Trinity::Helpers::Events::SetAggresiveStateEvent(who, startCombat, summoner->GetGUID()), who->m_Events.CalculateTime(timer));
+}
+
 // BossAI - for instanced bosses
 BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature), instance(creature->GetInstanceScript()), summons(creature), _bossId(bossId)
 {

src/server/game/AI/ScriptedAI/ScriptedCreature.h

@@ -246,6 +246,8 @@ struct TC_GAME_API ScriptedAI : public CreatureAI
         // return true for 25 man or 25 man heroic mode
         bool Is25ManRaid() const { return _difficulty & RAID_DIFFICULTY_MASK_25MAN; }
 
+        void SetAggressiveStateAfter(Milliseconds timer, Creature* who = nullptr, bool startCombat = true, Creature* summoner = nullptr);
+
         template <class T>
         inline T const& DUNGEON_MODE(T const& normal5, T const& heroic10) const
         {

src/server/game/Miscellaneous/CommonHelpers.cpp

@@ -17,10 +17,14 @@
 
 #include "CommonHelpers.h"
 #include "Common.h"
+#include "Creature.h"
+#include "CreatureAI.h"
 #include "Item.h"
 #include "ItemTemplate.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
 #include "SharedDefines.h"
+#include "UnitAI.h"
 
 enum PlayerSpecializationIconicSpellIds
 {
@@ -322,3 +326,26 @@ bool Trinity::Helpers::Entity::IsPlayerRangedAttacker(Player const* who)
             return (Trinity::Helpers::Entity::GetPlayerSpecialization(who) == SPEC_DRUID_BALANCE);
     }
 }
+
+Trinity::Helpers::Events::SetAggresiveStateEvent::SetAggresiveStateEvent(Creature* owner, bool startCombat/* = true*/, ObjectGuid summonerGUID/* = ObjectGuid::Empty*/) : _owner(owner), _startCombat(startCombat), _summonerGUID(summonerGUID)
+{
+}
+
+bool Trinity::Helpers::Events::SetAggresiveStateEvent::Execute(uint64 /*time*/, uint32 /*diff*/)
+{
+    _owner->SetReactState(REACT_AGGRESSIVE);
+    if (_startCombat)
+    {
+        if (Unit* currentVictim = _owner->SelectVictim())
+        {
+            if (_owner->IsAIEnabled())
+                _owner->AI()->AttackStart(currentVictim);
+        }
+        else if (!_summonerGUID.IsEmpty())
+            if (Creature* summoner = ObjectAccessor::GetCreature(*_owner, _summonerGUID))
+                if (summoner->IsEngaged() && summoner->IsAIEnabled() && _owner->IsAIEnabled())
+                    if (Unit* target = summoner->AI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
+                        _owner->AI()->AttackStart(target);
+    }
+    return true;
+}

src/server/game/Miscellaneous/CommonHelpers.h

@@ -18,8 +18,11 @@
 #ifndef TRINITY_COMMONHELPERS_H
 #define TRINITY_COMMONHELPERS_H
 
+#include "EventProcessor.h"
 #include "Define.h"
+#include "ObjectGuid.h"
 
+class Creature;
 class Player;
 
 namespace Trinity
@@ -33,6 +36,21 @@ namespace Trinity
             TC_GAME_API bool IsPlayerHealer(Player const* who);
             bool IsPlayerRangedAttacker(Player const* who);
         }
+        namespace Events
+        {
+            class SetAggresiveStateEvent : public BasicEvent
+            {
+                public:
+                    SetAggresiveStateEvent(Creature* owner, bool startCombat = true, ObjectGuid summonerGUID = ObjectGuid::Empty);
+
+                    bool Execute(uint64 /*time*/, uint32 /*diff*/) override;
+
+                private:
+                    Creature* _owner;
+                    bool const _startCombat;
+                    ObjectGuid const _summonerGUID;
+            };
+        }
     }
 }