diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-08-09 17:00:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 17:00:34 +0200 |
| commit | 0800ab20a8039620fd271a43c173c008af68c22a (patch) | |
| tree | af2152fcbb0c34d069a5fbc1ca640a4c88b42b4c /src/server/scripts/World | |
| parent | 1b9ee9525316861dd1d2099ed355a221ffc47e3b (diff) | |
Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken (#26787)
* Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken
* Update scripts
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 244a026cf32..ee65217daf4 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -280,7 +280,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)) { @@ -373,7 +373,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)) { @@ -512,7 +512,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)) { @@ -615,7 +615,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 933f949fd60..72f48524e02 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1464,7 +1464,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; |