diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2025-10-16 21:23:42 +0200 |
|---|---|---|
| committer | ccrs <ccrs@users.noreply.github.com> | 2025-10-16 21:47:06 +0200 |
| commit | c1d36d37c9a2a0e09c245b50711f5654447922f5 (patch) | |
| tree | 756e070cac354499913d1982d2690a323c5fab3e | |
| parent | b49f998d1e879d6e9de691c8039b05e3cedce6b7 (diff) | |
Scripts/Gundrak: followup bc68d013da92f70c20a1dbed16e5c6b8bcba48ae
| -rw-r--r-- | src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp | 12 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Gundrak/gundrak.h | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 8c3cd33e0de..3bab22283f5 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -145,6 +145,8 @@ struct boss_drakkari_colossus : public BossAI { if (me->HealthBelowPctDamaged(events.IsInPhase(COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON) ? 5 : 50, damage)) { + if ((int64(me->GetHealth()) - int64(damage)) <= 0) + damage = me->GetHealth() - 1; events.SetPhase((events.IsInPhase(COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON) ? COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON : COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON)); // Freeze Colossus @@ -197,10 +199,14 @@ struct boss_drakkari_colossus : public BossAI void JustSummoned(Creature* summon) override { - BossAI::JustSummoned(summon); - - if (events.IsInPhase(COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON)) + if (summon->GetEntry() == NPC_DRAKKARI_ELEMENTAL && events.IsInPhase(COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON)) + { summon->SetHealth(summon->GetMaxHealth() / 2); + summon->LowerPlayerDamageReq(1); + DoZoneInCombat(summon); + } + else + BossAI::JustSummoned(summon); } }; diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index 8218775c035..668f98b8743 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -61,7 +61,8 @@ enum GDCreatureIds NPC_ECK_THE_FEROCIOUS = 29932, NPC_ALTAR_TRIGGER = 30298, NPC_RHINO_SPIRIT = 29791, - NPC_LIVING_MOJO = 29830 + NPC_LIVING_MOJO = 29830, + NPC_DRAKKARI_ELEMENTAL = 29573 }; enum GDGameObjectIds |