diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-08-06 20:21:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-07 00:05:36 +0200 |
| commit | 98007f859b7318570c0c923a00aa32fc485c8ec8 (patch) | |
| tree | ef8405fa2d3740b6531a510673a0124dd0c2c957 /src/server/scripts/Northrend | |
| parent | d2784d4c65ec987fe587718d96b2feb885905e13 (diff) | |
Core/Misc: Turn ChrSpecialization into enum class
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp | 13 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 5 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 6f66ed7d1fd..b2157756451 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -16,6 +16,7 @@ */ #include "ahnkahet.h" +#include "DB2Stores.h" #include "InstanceScript.h" #include "Map.h" #include "ObjectAccessor.h" @@ -241,7 +242,7 @@ struct boss_volazj : public BossAI // clone player->CastSpell(summon, SPELL_CLONE_PLAYER, true); summon->GetAI()->SetData(DATA_TWISTED_VISAGE_PLAYER_CLASS, player->GetClass()); - summon->GetAI()->SetData(DATA_TWISTED_VISAGE_PLAYER_SPEC, player->GetPrimarySpecialization()); + summon->GetAI()->SetData(DATA_TWISTED_VISAGE_PLAYER_SPEC, AsUnderlyingType(player->GetPrimarySpecialization())); summon->SetReactState(REACT_AGGRESSIVE); DoZoneInCombat(summon); // set phase @@ -441,7 +442,7 @@ struct npc_twisted_visage : public ScriptedAI switch (_playerClass) { case CLASS_WARRIOR: - switch (data) + switch (ChrSpecialization(data)) { case ChrSpecialization::WarriorArms: _scheduler.Schedule(3s, [this](TaskContext mortalStrike) @@ -485,7 +486,7 @@ struct npc_twisted_visage : public ScriptedAI } break; case CLASS_PALADIN: - switch (data) + switch (ChrSpecialization(data)) { case ChrSpecialization::PaladinProtection: _scheduler.Schedule(5s, [this](TaskContext consecration) @@ -544,7 +545,7 @@ struct npc_twisted_visage : public ScriptedAI }); break; case CLASS_PRIEST: - switch (data) + switch (ChrSpecialization(data)) { case ChrSpecialization::PriestShadow: _scheduler.Schedule(5s, [this](TaskContext shadowWordPain) @@ -597,7 +598,7 @@ struct npc_twisted_visage : public ScriptedAI }); break; case CLASS_SHAMAN: - switch (data) + switch (ChrSpecialization(data)) { default: case ChrSpecialization::ShamanElemental: @@ -664,7 +665,7 @@ struct npc_twisted_visage : public ScriptedAI }); break; case CLASS_DRUID: - switch (data) + switch (ChrSpecialization(data)) { case ChrSpecialization::DruidBalance: _scheduler.Schedule(2s, [this](TaskContext moonfire) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index e4d74a47faa..9d7a7df5dbe 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1098,7 +1098,10 @@ class spell_sindragosa_unchained_magic : public SpellScript if (!player) continue; - ChrSpecializationEntry const* specialization = sChrSpecializationStore.LookupEntry(player->GetPrimarySpecialization()); + ChrSpecializationEntry const* specialization = player->GetPrimarySpecializationEntry(); + if (!specialization) + continue; + if (specialization->GetRole() == ChrSpecializationRole::Healer) { healers.push_back(target); |