diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-08-09 17:00:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-12 14:45:04 +0100 |
| commit | 71c2f0af46b3ccec8c3422534e4403f3650b757d (patch) | |
| tree | 824556b76e51acd3698bb3b80fa3475e99f1a449 /src/server/scripts/World | |
| parent | 5f38fd2f2d4fc2f7caba8c6b9e0b3286d8d79339 (diff) | |
Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken (#26787)
* Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken
* Update scripts
(cherry picked from commit 0800ab20a8039620fd271a43c173c008af68c22a)
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/boss_emerald_dragons.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 8535ebca83f..d3d915bd10d 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -278,7 +278,7 @@ class boss_ysondre : public CreatureScript } // Summon druid spirits on 75%, 50% and 25% health - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { if (!HealthAbovePct(100 - 25 * _stage)) { @@ -371,7 +371,7 @@ class boss_lethon : public CreatureScript WorldBossAI::JustEngagedWith(who); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { if (!HealthAbovePct(100 - 25 * _stage)) { @@ -510,7 +510,7 @@ class boss_emeriss : public CreatureScript WorldBossAI::JustEngagedWith(who); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { if (!HealthAbovePct(100 - 25 * _stage)) { @@ -613,7 +613,7 @@ class boss_taerar : public CreatureScript --_shades; } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { // At 75, 50 or 25 percent health, we need to activate the shades and go "banished" // Note: _stage holds the amount of times they have been summoned diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index bd568901191..464705fea2e 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1461,7 +1461,7 @@ struct npc_training_dummy : NullCreatureAI { npc_training_dummy(Creature* creature) : NullCreatureAI(creature) { } - void DamageTaken(Unit* attacker, uint32& damage) override + void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { damage = 0; |