From 867ccc68e3145978ae4828b4ce01fe62e4ac337e Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 23 Jul 2019 22:45:06 +0200 Subject: [PATCH] Scripts/BWD: added enum for Chimaeron's Lord Victor Nefarius heroic entry --- .../BlackrockMountain/BlackwingDescent/blackwing_descent.h | 6 ++++-- .../BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp | 2 -- .../BlackwingDescent/instance_blackwing_descent.cpp | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h index 548fa9ffb33..f4cf91c72ee 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h @@ -59,7 +59,8 @@ enum BWDDataTypes /*Chimaeron*/ DATA_BILE_O_TRON_800, - DATA_FINKLE_EINHORN + DATA_FINKLE_EINHORN, + DATA_LORD_VICTOR_NEFARIUS_CHIMAERON }; enum BWDCreatureIds @@ -110,6 +111,7 @@ enum BWDCreatureIds /*Chimaeron*/ NPC_FINKLE_EINHORN = 44202, NPC_BILE_O_TRON_800 = 44418, + NPC_LORD_VICTOR_NEFARIUS_CHIMAERON = 48964, /*Events*/ NPC_SPIRIT_OF_MOLTENFIST = 43125, @@ -120,7 +122,7 @@ enum BWDCreatureIds NPC_SPIRIT_OF_IRONSTAR = 43127, NPC_SPIRIT_OF_THAURISSAN = 43126, NPC_SPIRIT_OF_BURNINGEYE = 43130, - NPC_COLUMN_OF_LIGHT = 51506, + NPC_COLUMN_OF_LIGHT = 51506 }; enum BWDGameObjectIds diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp index 6abd472456e..fd67203c90d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp @@ -557,9 +557,7 @@ class spell_chimaeron_finkles_mixture : public AuraScript Unit* target = GetTarget(); if (dmgInfo.GetDamage() >= target->GetHealth() && target->GetHealth() > healthThreshold) - { absorbAmount = dmgInfo.GetDamage() - target->GetHealth() + 1; - } } void Register() override diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp index 123fe9c8070..9aa155cd2f5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp @@ -38,6 +38,7 @@ ObjectData const creatureData[] = { NPC_LORD_VICTOR_NEFARIUS_ATRAMEDES, DATA_LORD_VICTOR_NEFARIUS_ATRAMEDES }, { NPC_BILE_O_TRON_800, DATA_BILE_O_TRON_800 }, { NPC_FINKLE_EINHORN, DATA_FINKLE_EINHORN }, + { NPC_LORD_VICTOR_NEFARIUS_CHIMAERON, NPC_LORD_VICTOR_NEFARIUS_CHIMAERON }, { 0, 0 } // END };