diff options
Diffstat (limited to 'src')
32 files changed, 2122 insertions, 91 deletions
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 953c349bad7..66fd60bfcdb 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -26,6 +26,7 @@ class AreaBoundary; class AreaTrigger; +class AuraApplication; class Creature; class DynamicObject; class GameObject; @@ -144,6 +145,12 @@ class TC_GAME_API CreatureAI : public UnitAI // Called when a channeled spell finishes virtual void OnChannelFinished(SpellInfo const* /*spell*/) { } + // Called when aura is applied + virtual void OnAuraApplied(AuraApplication const* /*aurApp*/) { } + + // Called when aura is removed + virtual void OnAuraRemoved(AuraApplication const* /*aurApp*/) { } + // Should return true if the NPC is currently being escorted virtual bool IsEscorted() const { return false; } diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index cdc2530617c..c210b7ea582 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -29,6 +29,7 @@ #include "PetDefines.h" #include "Player.h" #include "ScriptMgr.h" +#include "SpellAuras.h" #include "Vehicle.h" #include "WaypointManager.h" @@ -611,6 +612,16 @@ void SmartAI::OnSpellStart(SpellInfo const* spellInfo) GetScript()->ProcessEventsFor(SMART_EVENT_ON_SPELL_START, nullptr, 0, 0, false, spellInfo); } +void SmartAI::OnAuraApplied(AuraApplication const* aurApp) +{ + GetScript()->ProcessEventsFor(SMART_EVENT_ON_AURA_APPLIED, nullptr, 0, 0, false, aurApp->GetBase()->GetSpellInfo()); +} + +void SmartAI::OnAuraRemoved(AuraApplication const* aurApp) +{ + GetScript()->ProcessEventsFor(SMART_EVENT_ON_AURA_REMOVED, nullptr, 0, 0, false, aurApp->GetBase()->GetSpellInfo()); +} + void SmartAI::DamageTaken(Unit* doneBy, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) { GetScript()->ProcessEventsFor(SMART_EVENT_DAMAGED, doneBy, damage); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 0d1054796d2..79ab404e971 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -132,6 +132,12 @@ class TC_GAME_API SmartAI : public CreatureAI // Called when a spell starts void OnSpellStart(SpellInfo const* spellInfo) override; + // Called when aura is applied + void OnAuraApplied(AuraApplication const* aurApp) override; + + // Called when aura is removed + void OnAuraRemoved(AuraApplication const* aurApp) override; + // Called at any Damage from any attacker (before damage apply) void DamageTaken(Unit* doneBy, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override; diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e1715f787b6..7eccef96070 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3366,6 +3366,8 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui case SMART_EVENT_ON_SPELL_CAST: case SMART_EVENT_ON_SPELL_FAILED: case SMART_EVENT_ON_SPELL_START: + case SMART_EVENT_ON_AURA_APPLIED: + case SMART_EVENT_ON_AURA_REMOVED: { if (!spell) return; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 82ec392bfdb..7fceb43a614 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -844,6 +844,8 @@ bool SmartAIMgr::CheckUnusedEventParams(SmartScriptHolder const& e) case SMART_EVENT_ON_SPELL_CAST: return sizeof(SmartEvent::spellCast); case SMART_EVENT_ON_SPELL_FAILED: return sizeof(SmartEvent::spellCast); case SMART_EVENT_ON_SPELL_START: return sizeof(SmartEvent::spellCast); + case SMART_EVENT_ON_AURA_APPLIED: return sizeof(SmartEvent::spellCast); + case SMART_EVENT_ON_AURA_REMOVED: return sizeof(SmartEvent::spellCast); case SMART_EVENT_ON_DESPAWN: return NO_PARAMS; case SMART_EVENT_SEND_EVENT_TRIGGER: return NO_PARAMS; case SMART_EVENT_AREATRIGGER_EXIT: return NO_PARAMS; @@ -1255,6 +1257,8 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_EVENT_ON_SPELL_CAST: case SMART_EVENT_ON_SPELL_FAILED: case SMART_EVENT_ON_SPELL_START: + case SMART_EVENT_ON_AURA_APPLIED: + case SMART_EVENT_ON_AURA_REMOVED: { if (!IsSpellValid(e, e.event.spellCast.spell)) return false; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 0c57aaf5415..ea7459ac26f 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -189,8 +189,10 @@ enum SMART_EVENT SMART_EVENT_ON_DESPAWN = 86, // NONE SMART_EVENT_SEND_EVENT_TRIGGER = 87, // NONE SMART_EVENT_AREATRIGGER_EXIT = 88, // NONE + SMART_EVENT_ON_AURA_APPLIED = 89, // SpellID, CooldownMin, CooldownMax + SMART_EVENT_ON_AURA_REMOVED = 90, // SpellID, CooldownMin, CooldownMax - SMART_EVENT_END = 89 + SMART_EVENT_END = 91 }; struct SmartEvent @@ -1608,7 +1610,9 @@ const uint32 SmartAIEventMask[SMART_EVENT_END][2] = {SMART_EVENT_ON_SPELL_START, SMART_SCRIPT_TYPE_MASK_CREATURE }, {SMART_EVENT_ON_DESPAWN, SMART_SCRIPT_TYPE_MASK_CREATURE }, {SMART_EVENT_SEND_EVENT_TRIGGER, SMART_SCRIPT_TYPE_MASK_EVENT }, - {SMART_EVENT_AREATRIGGER_EXIT, SMART_SCRIPT_TYPE_MASK_AREATRIGGER + SMART_SCRIPT_TYPE_MASK_AREATRIGGER_ENTITY } + {SMART_EVENT_AREATRIGGER_EXIT, SMART_SCRIPT_TYPE_MASK_AREATRIGGER + SMART_SCRIPT_TYPE_MASK_AREATRIGGER_ENTITY }, + {SMART_EVENT_ON_AURA_APPLIED, SMART_SCRIPT_TYPE_MASK_CREATURE }, + {SMART_EVENT_ON_AURA_REMOVED, SMART_SCRIPT_TYPE_MASK_CREATURE }, }; enum SmartEventFlags diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 6cf24b10671..b9ff4085f20 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -444,9 +444,6 @@ ObjectGuid::LowType ChatHandler::extractLowGuidFromLink(char* text, HighGuid& gu return player->GetGUID().GetCounter(); ObjectGuid guid = sCharacterCache->GetCharacterGuidByName(name); - if (guid.IsEmpty()) - return 0; - return guid.GetCounter(); } case GUID_LINK_CREATURE: diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index fcf78441463..89012688d26 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -103,7 +103,7 @@ char const* const ConditionMgr::StaticSourceTypeData[CONDITION_SOURCE_TYPE_MAX_D ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[CONDITION_MAX] = { { .Name = "None", .HasConditionValue1 = false, .HasConditionValue2 = false, .HasConditionValue3 = false, .HasConditionStringValue1 = false }, - { .Name = "Aura", .HasConditionValue1 = true, .HasConditionValue2 = true, .HasConditionValue3 = true, .HasConditionStringValue1 = false }, + { .Name = "Aura", .HasConditionValue1 = true, .HasConditionValue2 = true, .HasConditionValue3 = false, .HasConditionStringValue1 = false }, { .Name = "Item Stored", .HasConditionValue1 = true, .HasConditionValue2 = true, .HasConditionValue3 = true, .HasConditionStringValue1 = false }, { .Name = "Item Equipped", .HasConditionValue1 = true, .HasConditionValue2 = false, .HasConditionValue3 = false, .HasConditionStringValue1 = false }, { .Name = "Zone", .HasConditionValue1 = true, .HasConditionValue2 = false, .HasConditionValue3 = false, .HasConditionStringValue1 = false }, diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index dc68d9fc594..542470a7bbf 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -1216,8 +1216,11 @@ enum ItemBonusType ITEM_BONUS_OVERRIDE_NAME = 31, // ItemNameDescription id ITEM_BONUS_ITEM_BONUS_LIST_GROUP = 34, ITEM_BONUS_ITEM_LIMIT_CATEGORY = 35, + ITEM_BONUS_PVP_ITEM_LEVEL_INCREMENT = 36, ITEM_BONUS_ITEM_CONVERSION = 37, ITEM_BONUS_ITEM_HISTORY_SLOT = 38, + ITEM_BONUS_PVP_ITEM_LEVEL_BASE = 43, + ITEM_BONUS_BONDING_WITH_PRIORITY = 47, }; enum class ItemCollectionType : uint8 diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index 74aa8596a58..1ed4b4d06ca 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -894,6 +894,14 @@ void AreaTrigger::HandleUnitEnter(Unit* unit) DoActions(unit); _ai->OnUnitEnter(unit); + + // OnUnitEnter script can despawn this areatrigger + if (!IsInWorld()) + return; + + // Register areatrigger in Unit after actions/scripts to allow them to determine + // if the unit is in one or more areatriggers with the same id + // without forcing every script to have additional logic excluding this areatrigger unit->EnterAreaTrigger(this); } diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 5401c0c9c45..6df3558d66b 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -1677,7 +1677,13 @@ uint8 Item::GetGemCountWithLimitCategory(uint32 limitCategory) const if (!gemProto) return false; - return gemProto->GetItemLimitCategory() == limitCategory; + BonusData gemBonus; + gemBonus.Initialize(gemProto); + + for (uint16 bonusListID : gemData.BonusListIDs) + gemBonus.AddBonusList(bonusListID); + + return gemBonus.LimitCategory == limitCategory; })); } @@ -2339,7 +2345,13 @@ uint32 Item::GetItemLevel(ItemTemplate const* itemTemplate, BonusData const& bon uint32 itemLevelBeforeUpgrades = itemLevel; if (pvpBonus) + { + if (bonusData.PvpItemLevel) + itemLevel = bonusData.PvpItemLevel; + + itemLevel += bonusData.PvpItemLevelBonus; itemLevel += sDB2Manager.GetPvpItemLevelBonus(itemTemplate->GetId()); + } if (itemTemplate->GetInventoryType() != INVTYPE_NON_EQUIP) { @@ -2919,6 +2931,9 @@ void BonusData::Initialize(ItemTemplate const* proto) Suffix = 0; RequiredLevelCurve = 0; + PvpItemLevel = 0; + PvpItemLevelBonus = 0; + EffectCount = 0; for (ItemEffectEntry const* itemEffect : proto->Effects) Effects[EffectCount++] = itemEffect; @@ -2926,6 +2941,8 @@ void BonusData::Initialize(ItemTemplate const* proto) for (std::size_t i = EffectCount; i < Effects.size(); ++i) Effects[i] = nullptr; + LimitCategory = proto->GetItemLimitCategory(); + CanDisenchant = !proto->HasFlag(ITEM_FLAG_NO_DISENCHANT); CanScrap = proto->HasFlag(ITEM_FLAG4_SCRAPABLE); @@ -2935,7 +2952,10 @@ void BonusData::Initialize(ItemTemplate const* proto) _state.ScalingStatDistributionPriority = std::numeric_limits<int32>::max(); _state.AzeriteTierUnlockSetPriority = std::numeric_limits<int32>::max(); _state.RequiredLevelCurvePriority = std::numeric_limits<int32>::max(); + _state.PvpItemLevelPriority = std::numeric_limits<int32>::max(); + _state.BondingPriority = std::numeric_limits<int32>::max(); _state.HasQualityBonus = false; + _state.HasItemLimitCategory = false; } void BonusData::Initialize(WorldPackets::Item::ItemInstance const& itemInstance) @@ -3072,5 +3092,29 @@ void BonusData::AddBonus(uint32 type, std::array<int32, 4> const& values) ContentTuningId = static_cast<uint32>(values[1]); } break; + case ITEM_BONUS_ITEM_LIMIT_CATEGORY: + if (!_state.HasItemLimitCategory) + { + LimitCategory = values[0]; + _state.HasItemLimitCategory = true; + } + break; + case ITEM_BONUS_PVP_ITEM_LEVEL_INCREMENT: + PvpItemLevelBonus += values[0]; + break; + case ITEM_BONUS_PVP_ITEM_LEVEL_BASE: + if (values[1] < _state.PvpItemLevelPriority) + { + PvpItemLevel = values[0]; + _state.PvpItemLevelPriority = values[1]; + } + break; + case ITEM_BONUS_BONDING_WITH_PRIORITY: + if (values[1] < _state.BondingPriority) + { + Bonding = static_cast<ItemBondingType>(values[0]); + _state.BondingPriority = values[1]; + } + break; } } diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index d8d03f1e709..d7bb941284d 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -80,8 +80,11 @@ struct BonusData int32 AzeriteTierUnlockSetId; uint32 Suffix; int32 RequiredLevelCurve; + uint16 PvpItemLevel; + int16 PvpItemLevelBonus; std::array<ItemEffectEntry const*, 13> Effects; std::size_t EffectCount; + uint32 LimitCategory; bool CanDisenchant; bool CanScrap; bool HasFixedLevel; @@ -100,7 +103,10 @@ private: int32 ScalingStatDistributionPriority; int32 AzeriteTierUnlockSetPriority; int32 RequiredLevelCurvePriority; + int32 PvpItemLevelPriority; + int32 BondingPriority; bool HasQualityBonus; + bool HasItemLimitCategory; } _state; }; @@ -347,6 +353,7 @@ class TC_GAME_API Item : public Object static ItemDisenchantLootEntry const* GetBaseDisenchantLoot(ItemTemplate const* itemTemplate, uint32 quality, uint32 itemLevel); void SetFixedLevel(uint8 level); std::span<ItemEffectEntry const* const> GetEffects() const { return { _bonusData.Effects.data(), _bonusData.EffectCount }; } + uint32 GetItemLimitCategory() const { return _bonusData.LimitCategory; } // Item Refund system void SetNotRefundable(Player* owner, bool changestate = true, CharacterDatabaseTransaction* trans = nullptr, bool addToCollection = true); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c8c75eb8279..f8ab0096a05 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5626,8 +5626,8 @@ bool Player::UpdateSkillPro(uint16 skillId, int32 chance, uint32 step) if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED) return false; - uint16 value = m_activePlayerData->Skill->SkillRank[itr->second.pos]; - uint16 max = m_activePlayerData->Skill->SkillMaxRank[itr->second.pos]; + uint16 value = GetSkillRankByPos(itr->second.pos); + uint16 max = GetSkillMaxRankByPos(itr->second.pos); if (!max || !value || value >= max) return false; @@ -5666,13 +5666,13 @@ bool Player::UpdateSkillPro(uint16 skillId, int32 chance, uint32 step) void Player::ModifySkillBonus(uint32 skillid, int32 val, bool talent) { SkillStatusMap::const_iterator itr = mSkillStatus.find(skillid); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return; if (talent) - SetSkillPermBonus(itr->second.pos, m_activePlayerData->Skill->SkillPermBonus[itr->second.pos] + val); + SetSkillPermBonus(itr->second.pos, GetSkillPermBonusByPos(itr->second.pos) + val); else - SetSkillTempBonus(itr->second.pos, m_activePlayerData->Skill->SkillTempBonus[itr->second.pos] + val); + SetSkillTempBonus(itr->second.pos, GetSkillTempBonusByPos(itr->second.pos) + val); // Apply/Remove bonus to child skill lines if (std::vector<SkillLineEntry const*> const* childSkillLines = sDB2Manager.GetSkillLinesForParentSkill(skillid)) @@ -5687,7 +5687,7 @@ void Player::UpdateSkillsForLevel() for (SkillStatusMap::iterator itr = mSkillStatus.begin(); itr != mSkillStatus.end(); ++itr) { - if (itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) continue; uint32 pskill = itr->first; @@ -5706,7 +5706,7 @@ void Player::UpdateSkillsForLevel() } // Update level dependent skillline spells - LearnSkillRewardedSpells(rcEntry->SkillID, m_activePlayerData->Skill->SkillRank[itr->second.pos], race); + LearnSkillRewardedSpells(rcEntry->SkillID, GetSkillRankByPos(itr->second.pos), race); } } @@ -5761,7 +5761,7 @@ void Player::SetSkill(uint32 id, uint16 step, uint16 newVal, uint16 maxVal) // Handle already stored skills if (itr != mSkillStatus.end()) { - currVal = m_activePlayerData->Skill->SkillRank[itr->second.pos]; + currVal = GetSkillRankByPos(itr->second.pos); // Activate and update skill line if (newVal) @@ -5879,7 +5879,7 @@ void Player::SetSkill(uint32 id, uint16 step, uint16 newVal, uint16 maxVal) // Find a free skill slot for (uint32 i = 0; i < PLAYER_MAX_SKILLS; ++i) { - if (!m_activePlayerData->Skill->SkillLineID[i]) + if (!GetSkillLineIdByPos(i)) { skillSlot = i; break; @@ -5979,7 +5979,7 @@ bool Player::HasSkill(uint32 skill) const return false; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - return (itr != mSkillStatus.end() && itr->second.uState != SKILL_DELETED && m_activePlayerData->Skill->SkillRank[itr->second.pos]); + return itr != mSkillStatus.end() && itr->second.uState != SKILL_DELETED && GetSkillRankByPos(itr->second.pos); } uint16 Player::GetSkillStep(uint32 skill) const @@ -5988,10 +5988,10 @@ uint16 Player::GetSkillStep(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - return m_activePlayerData->Skill->SkillStep[itr->second.pos]; + return GetSkillStepByPos(itr->second.pos); } uint16 Player::GetSkillValue(uint32 skill) const @@ -6000,12 +6000,12 @@ uint16 Player::GetSkillValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - int32 result = int32(m_activePlayerData->Skill->SkillRank[itr->second.pos]); - result += int32(m_activePlayerData->Skill->SkillTempBonus[itr->second.pos]); - result += int32(m_activePlayerData->Skill->SkillPermBonus[itr->second.pos]); + int32 result = int32(GetSkillRankByPos(itr->second.pos)); + result += int32(GetSkillTempBonusByPos(itr->second.pos)); + result += int32(GetSkillPermBonusByPos(itr->second.pos)); return result < 0 ? 0 : result; } @@ -6015,12 +6015,12 @@ uint16 Player::GetMaxSkillValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - int32 result = int32(m_activePlayerData->Skill->SkillMaxRank[itr->second.pos]); - result += int32(m_activePlayerData->Skill->SkillTempBonus[itr->second.pos]); - result += int32(m_activePlayerData->Skill->SkillPermBonus[itr->second.pos]); + int32 result = int32(GetSkillMaxRankByPos(itr->second.pos)); + result += int32(GetSkillTempBonusByPos(itr->second.pos)); + result += int32(GetSkillPermBonusByPos(itr->second.pos)); return result < 0 ? 0 : result; } @@ -6030,10 +6030,10 @@ uint16 Player::GetPureMaxSkillValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - return m_activePlayerData->Skill->SkillMaxRank[itr->second.pos]; + return GetSkillMaxRankByPos(itr->second.pos); } uint16 Player::GetBaseSkillValue(uint32 skill) const @@ -6042,11 +6042,11 @@ uint16 Player::GetBaseSkillValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - int32 result = int32(m_activePlayerData->Skill->SkillRank[itr->second.pos]); - result += int32(m_activePlayerData->Skill->SkillPermBonus[itr->second.pos]); + int32 result = int32(GetSkillRankByPos(itr->second.pos)); + result += int32(GetSkillPermBonusByPos(itr->second.pos)); return result < 0 ? 0 : result; } @@ -6056,10 +6056,10 @@ uint16 Player::GetPureSkillValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - return m_activePlayerData->Skill->SkillRank[itr->second.pos]; + return GetSkillRankByPos(itr->second.pos); } int16 Player::GetSkillPermBonusValue(uint32 skill) const @@ -6068,10 +6068,10 @@ int16 Player::GetSkillPermBonusValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - return m_activePlayerData->Skill->SkillPermBonus[itr->second.pos]; + return GetSkillPermBonusByPos(itr->second.pos); } int16 Player::GetSkillTempBonusValue(uint32 skill) const @@ -6080,10 +6080,10 @@ int16 Player::GetSkillTempBonusValue(uint32 skill) const return 0; SkillStatusMap::const_iterator itr = mSkillStatus.find(skill); - if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !m_activePlayerData->Skill->SkillRank[itr->second.pos]) + if (itr == mSkillStatus.end() || itr->second.uState == SKILL_DELETED || !GetSkillRankByPos(itr->second.pos)) return 0; - return m_activePlayerData->Skill->SkillTempBonus[itr->second.pos]; + return GetSkillTempBonusByPos(itr->second.pos); } void Player::SendActionButtons(uint32 state) const @@ -9564,9 +9564,8 @@ uint32 Player::GetItemCountWithLimitCategory(uint32 limitCategory, Item* skipIte ForEachItem(ItemSearchLocation::Everywhere, [&count, limitCategory, skipItem](Item* item) { if (item != skipItem) - if (ItemTemplate const* pProto = item->GetTemplate()) - if (pProto->GetItemLimitCategory() == limitCategory) - count += item->GetCount(); + if (item->GetItemLimitCategory() == limitCategory) + count += item->GetCount(); return ItemSearchCallbackResult::Continue; }); @@ -9928,7 +9927,7 @@ bool Player::HasItemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count if (pItem->GetSlot() == except_slot) return ItemSearchCallbackResult::Continue; - if (pItem->GetTemplate()->GetItemLimitCategory() != limitCategory) + if (pItem->GetItemLimitCategory() != limitCategory) return ItemSearchCallbackResult::Continue; tempcount += pItem->GetCount(); @@ -9972,8 +9971,10 @@ InventoryResult Player::CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item if (pItem && pItem->m_lootGenerated) return EQUIP_ERR_LOOT_GONE; + uint32 limitCategory = pItem ? pItem->GetItemLimitCategory() : pProto->GetItemLimitCategory(); + // no maximum - if ((pProto->GetMaxCount() <= 0 && pProto->GetItemLimitCategory() == 0) || pProto->GetMaxCount() == 2147483647) + if ((pProto->GetMaxCount() <= 0 && limitCategory == 0) || pProto->GetMaxCount() == 2147483647) return EQUIP_ERR_OK; if (pProto->GetMaxCount() > 0) @@ -9988,9 +9989,9 @@ InventoryResult Player::CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item } // check unique-equipped limit - if (pProto->GetItemLimitCategory()) + if (limitCategory) { - ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(pProto->GetItemLimitCategory()); + ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(limitCategory); if (!limitEntry) { if (no_space_count) @@ -10001,7 +10002,7 @@ InventoryResult Player::CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item if (limitEntry->Flags == ITEM_LIMIT_CATEGORY_MODE_HAVE) { uint8 limitQuantity = GetItemLimitCategoryQuantity(limitEntry); - uint32 curcount = GetItemCountWithLimitCategory(pProto->GetItemLimitCategory(), pItem); + uint32 curcount = GetItemCountWithLimitCategory(limitCategory, pItem); if (curcount + count > uint32(limitQuantity)) { if (no_space_count) @@ -13027,8 +13028,10 @@ void Player::SendEquipError(InventoryResult msg, Item const* item1 /*= nullptr*/ case EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_SOCKETED_EXCEEDED_IS: case EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_EQUIPPED_EXCEEDED_IS: { - ItemTemplate const* proto = item1 ? item1->GetTemplate() : sObjectMgr->GetItemTemplate(itemId); - failure.LimitCategory = proto ? proto->GetItemLimitCategory() : 0; + if (item1) + failure.LimitCategory = item1->GetItemLimitCategory(); + else if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemId)) + failure.LimitCategory = proto->GetItemLimitCategory(); break; } default: @@ -21205,8 +21208,8 @@ void Player::_SaveSkills(CharacterDatabaseTransaction trans) continue; } - uint16 value = m_activePlayerData->Skill->SkillRank[itr->second.pos]; - uint16 max = m_activePlayerData->Skill->SkillMaxRank[itr->second.pos]; + uint16 value = GetSkillRankByPos(itr->second.pos); + uint16 max = GetSkillMaxRankByPos(itr->second.pos); int8 professionSlot = int8(GetProfessionSlotFor(itr->first)); switch (itr->second.uState) @@ -27014,7 +27017,7 @@ InventoryResult Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limi ItemTemplate const* pProto = pItem->GetTemplate(); // proto based limitations - if (InventoryResult res = CanEquipUniqueItem(pProto, eslot, limit_count)) + if (InventoryResult res = CanEquipUniqueItem(pProto, *pItem->GetBonus(), eslot, limit_count)) return res; // check unique-equipped on gems @@ -27024,18 +27027,24 @@ InventoryResult Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limi if (!pGem) continue; + BonusData gemBonus; + gemBonus.Initialize(pGem); + + for (uint16 bonusListID : gemData.BonusListIDs) + gemBonus.AddBonusList(bonusListID); + // include for check equip another gems with same limit category for not equipped item (and then not counted) - uint32 gem_limit_count = !pItem->IsEquipped() && pGem->GetItemLimitCategory() - ? pItem->GetGemCountWithLimitCategory(pGem->GetItemLimitCategory()) : 1; + uint32 gem_limit_count = !pItem->IsEquipped() && gemBonus.LimitCategory + ? pItem->GetGemCountWithLimitCategory(gemBonus.LimitCategory) : 1; - if (InventoryResult res = CanEquipUniqueItem(pGem, eslot, gem_limit_count)) + if (InventoryResult res = CanEquipUniqueItem(pGem, gemBonus, eslot, gem_limit_count)) return res; } return EQUIP_ERR_OK; } -InventoryResult Player::CanEquipUniqueItem(ItemTemplate const* itemProto, uint8 except_slot, uint32 limit_count) const +InventoryResult Player::CanEquipUniqueItem(ItemTemplate const* itemProto, BonusData const& itemBonus, uint8 except_slot, uint32 limit_count) const { // check unique-equipped on item if (itemProto->HasFlag(ITEM_FLAG_UNIQUE_EQUIPPABLE)) @@ -27046,9 +27055,9 @@ InventoryResult Player::CanEquipUniqueItem(ItemTemplate const* itemProto, uint8 } // check unique-equipped limit - if (itemProto->GetItemLimitCategory()) + if (itemBonus.LimitCategory) { - ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(itemProto->GetItemLimitCategory()); + ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(itemBonus.LimitCategory); if (!limitEntry) return EQUIP_ERR_NOT_EQUIPPABLE; @@ -27059,9 +27068,9 @@ InventoryResult Player::CanEquipUniqueItem(ItemTemplate const* itemProto, uint8 return EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_EQUIPPED_EXCEEDED_IS; // there is an equip limit on this item - if (HasItemWithLimitCategoryEquipped(itemProto->GetItemLimitCategory(), limitQuantity - limit_count + 1, except_slot)) + if (HasItemWithLimitCategoryEquipped(itemBonus.LimitCategory, limitQuantity - limit_count + 1, except_slot)) return EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_EQUIPPED_EXCEEDED_IS; - else if (HasGemWithLimitCategoryEquipped(itemProto->GetItemLimitCategory(), limitQuantity - limit_count + 1, except_slot)) + else if (HasGemWithLimitCategoryEquipped(itemBonus.LimitCategory, limitQuantity - limit_count + 1, except_slot)) return EQUIP_ERR_ITEM_MAX_COUNT_EQUIPPED_SOCKETED; } diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 51c91183d20..d6abd1c4104 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -45,6 +45,7 @@ struct AzeriteItemMilestonePowerEntry; struct AzeritePowerEntry; struct BarberShopStyleEntry; struct BattlegroundTemplate; +struct BonusData; struct CharTitlesEntry; struct ChatChannelsEntry; struct ChrSpecializationEntry; @@ -1490,7 +1491,7 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player> InventoryResult CanEquipChildItem(Item* parentItem) const; InventoryResult CanEquipUniqueItem(Item* pItem, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1) const; - InventoryResult CanEquipUniqueItem(ItemTemplate const* itemProto, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1) const; + InventoryResult CanEquipUniqueItem(ItemTemplate const* itemProto, BonusData const& itemBonus, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1) const; InventoryResult CanUnequipItems(uint32 item, uint32 count) const; InventoryResult CanUnequipItem(uint16 src, bool swap) const; InventoryResult CanBankItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item* pItem, bool swap, bool not_loading = true, bool reagentBankOnly = false) const; @@ -2310,12 +2311,19 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player> void LearnSkillRewardedSpells(uint32 skillId, uint32 skillValue, Races race); int32 GetProfessionSlotFor(uint32 skillId) const; int32 FindEmptyProfessionSlotFor(uint32 skillId) const; + uint16 GetSkillLineIdByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillLineID[pos]; } void SetSkillLineId(uint32 pos, uint16 skillLineId) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillLineID, pos), skillLineId); } - void SetSkillStep(uint32 pos, uint16 step) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillStep, pos), step); }; + uint16 GetSkillStepByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillStep[pos]; } + void SetSkillStep(uint32 pos, uint16 step) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillStep, pos), step); } + uint16 GetSkillRankByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillRank[pos]; } void SetSkillRank(uint32 pos, uint16 rank) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillRank, pos), rank); } + uint16 GetSkillStartingRankByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillStartingRank[pos]; } void SetSkillStartingRank(uint32 pos, uint16 starting) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillStartingRank, pos), starting); } + uint16 GetSkillMaxRankByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillMaxRank[pos]; } void SetSkillMaxRank(uint32 pos, uint16 max) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillMaxRank, pos), max); } + int16 GetSkillTempBonusByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillTempBonus[pos]; } void SetSkillTempBonus(uint32 pos, uint16 bonus) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillTempBonus, pos), bonus); } + uint16 GetSkillPermBonusByPos(uint32 pos) const { return m_activePlayerData->Skill->SkillPermBonus[pos]; } void SetSkillPermBonus(uint32 pos, uint16 bonus) { SetUpdateFieldValue(m_values.ModifyValue(&Player::m_activePlayerData).ModifyValue(&UF::ActivePlayerData::Skill).ModifyValue(&UF::SkillInfo::SkillPermBonus, pos), bonus); } TeleportLocation& GetTeleportDest() { return m_teleport_dest; } diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index aa504001619..36246c0c1a8 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -237,7 +237,7 @@ void Group::LoadGroupFromDB(Field* fields) m_raidDifficulty = Player::CheckLoadedRaidDifficultyID(Difficulty(fields[14].GetUInt8())); m_legacyRaidDifficulty = Player::CheckLoadedLegacyRaidDifficultyID(Difficulty(fields[15].GetUInt8())); - m_masterLooterGuid = ObjectGuid::Create<HighGuid::Player>(fields[16].GetUInt64()); + m_masterLooterGuid = fields[16].GetUInt64() ? ObjectGuid::Create<HighGuid::Player>(fields[16].GetUInt64()) : ObjectGuid::Empty; m_pingRestriction = RestrictPingsTo(fields[18].GetInt8()); diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index a8602605c7d..329849c5e34 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -1048,9 +1048,9 @@ void WorldSession::HandleSocketGems(WorldPackets::Item::SocketGems& socketGems) // unique limit type item int32 limit_newcount = 0; - if (iGemProto->GetItemLimitCategory()) + if (gems[i]->GetItemLimitCategory()) { - if (ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(iGemProto->GetItemLimitCategory())) + if (ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(gems[i]->GetItemLimitCategory())) { // NOTE: limitEntry->Flags is not checked because if item has limit then it is applied in equip case for (int j = 0; j < MAX_GEM_SOCKETS; ++j) @@ -1058,15 +1058,23 @@ void WorldSession::HandleSocketGems(WorldPackets::Item::SocketGems& socketGems) if (gems[j]) { // new gem - if (iGemProto->GetItemLimitCategory() == gems[j]->GetTemplate()->GetItemLimitCategory()) + if (gems[i]->GetItemLimitCategory() == gems[j]->GetItemLimitCategory()) ++limit_newcount; } else if (oldGemData[j]) { // existing gem if (ItemTemplate const* jProto = sObjectMgr->GetItemTemplate(oldGemData[j]->ItemID)) - if (iGemProto->GetItemLimitCategory() == jProto->GetItemLimitCategory()) + { + BonusData oldGemBonus; + oldGemBonus.Initialize(jProto); + + for (uint16 bonusListID : oldGemData[j]->BonusListIDs) + oldGemBonus.AddBonusList(bonusListID); + + if (gems[i]->GetItemLimitCategory() == oldGemBonus.LimitCategory) ++limit_newcount; + } } } diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index 299fef61b80..745783a536a 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -325,7 +325,7 @@ void Map::ScriptsProcess() { switch (step.sourceGUID.GetHigh()) { - case HighGuid::Item: // as well as HIGHGUID_CONTAINER + case HighGuid::Item: if (Player* player = GetPlayer(step.ownerGUID)) source = player->GetItemByGuid(step.sourceGUID); break; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 3d9100457c0..248fd007871 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -19,6 +19,7 @@ #include "CellImpl.h" #include "Common.h" #include "Containers.h" +#include "CreatureAI.h" #include "DynamicObject.h" #include "GridNotifiersImpl.h" #include "Item.h" @@ -1593,6 +1594,19 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; } + + if (apply) + { + if (Creature* creature = target->ToCreature()) + if (CreatureAI* ai = creature->AI()) + ai->OnAuraApplied(aurApp); + } + else + { + if (Creature* creature = target->ToCreature()) + if (CreatureAI* ai = creature->AI()) + ai->OnAuraRemoved(aurApp); + } } bool Aura::CanBeAppliedOn(Unit* target) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index edd02483b46..0dc27c80927 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -4968,7 +4968,7 @@ void SpellMgr::LoadSpellInfoCorrections() }); // Conversation - ApplySpellFix({ 274668, 274669 }, [](SpellInfo* spellInfo) + ApplySpellFix({ 274668, 274669, 274622, 274640, 274641, 274674, 274675 }, [](SpellInfo* spellInfo) { ApplySpellEffectFix(spellInfo, EFFECT_0, [](SpellEffectInfo* spellEffectInfo) { diff --git a/src/server/scripts/Battlegrounds/CageOfCarnage/arena_cage_of_carnage.cpp b/src/server/scripts/Battlegrounds/CageOfCarnage/arena_cage_of_carnage.cpp new file mode 100644 index 00000000000..8ef5d8903a0 --- /dev/null +++ b/src/server/scripts/Battlegrounds/CageOfCarnage/arena_cage_of_carnage.cpp @@ -0,0 +1,332 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "Battleground.h" +#include "BattlegroundScript.h" +#include "Creature.h" +#include "CreatureAI.h" +#include "GameObject.h" +#include "Map.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "TaskScheduler.h" + +namespace CageOfCarnage +{ + namespace Actions + { + static constexpr uint32 ReactionTrigger = 1; + static constexpr uint32 ReactionDead = 2; + } + + namespace Creatures + { + static constexpr uint32 NaminzeBoltfingers = 232750; + } + + namespace GameObjects + { + static constexpr uint32 GoblinArenaTrapDoor01 = 505683; + } + + namespace MapIds + { + static constexpr uint32 CageOfCarnage = 2759; + } + + namespace Positions + { + static constexpr Position PurpleWarningTeleport = { 442.311f, 343.167f, -34.1166f, 1.7453293f }; + static constexpr Position GoldWarningTeleport = { 443.167f, 439.243f, -42.6562f, 4.5902157f }; + } + + namespace Spells + { + static constexpr uint32 UndermineArenaVOCooldownAura = 472905; + static constexpr uint32 UndermineArenaVOCooldownAuraPlayerDeath = 472913; + static constexpr uint32 UndermineArenaReactionTrigger = 472885; + static constexpr uint32 ArenaLowHealthCooldownAura = 234031; + static constexpr uint32 Warning = 1214676; + static constexpr uint32 WarningTeleport = 371319; + static constexpr uint32 ArenaStartingAreaMarker = 228212; + } + + namespace Texts + { + namespace Naminze + { + static constexpr uint8 Prepare = 0; + static constexpr uint8 Start = 1; + static constexpr uint8 ReactionAlmostDead = 2; + static constexpr uint8 ReactionKill = 3; + } + } +} + +struct arena_cage_of_carnage : ArenaScript +{ + explicit arena_cage_of_carnage(BattlegroundMap* map) : ArenaScript(map) { } + + void OnUpdate(uint32 diff) override + { + _scheduler.Update(diff); + } + + void OnStart() override + { + for (ObjectGuid const& guid : _doorGUIDs) + { + if (GameObject* door = battlegroundMap->GetGameObject(guid)) + { + door->UseDoorOrButton(); + door->DespawnOrUnsummon(5s); + } + } + + if (Creature const* creature = battlegroundMap->GetCreature(_naminzeGUID)) + creature->AI()->Talk(CageOfCarnage::Texts::Naminze::Start); + + _scheduler.Schedule(5s, [&](TaskContext context) + { + battlegroundMap->DoOnPlayers([&](Player* player) + { + if (!player->HasAura(CageOfCarnage::Spells::ArenaStartingAreaMarker)) + return; + + if (player->HasAura(CageOfCarnage::Spells::Warning)) + return; + + player->CastSpell(nullptr, CageOfCarnage::Spells::Warning, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + }); + + context.Repeat(); + }); + } + + void DoAction(uint32 actionId, WorldObject* source, WorldObject* target) override + { + switch (actionId) + { + case CageOfCarnage::Actions::ReactionTrigger: + HandleReactionLowHealth(Object::ToPlayer(source)); + break; + case CageOfCarnage::Actions::ReactionDead: + HandleKill(Object::ToPlayer(target)); + break; + default: + break; + } + } + + void OnPrepareStage2() override + { + if (Creature const* creature = battlegroundMap->GetCreature(_naminzeGUID)) + creature->AI()->Talk(CageOfCarnage::Texts::Naminze::Prepare); + } + + void OnCreatureCreate(Creature* creature) override + { + switch (creature->GetEntry()) + { + case CageOfCarnage::Creatures::NaminzeBoltfingers: + _naminzeGUID = creature->GetGUID(); + break; + default: + break; + } + } + + void OnGameObjectCreate(GameObject* gameobject) override + { + switch (gameobject->GetEntry()) + { + case CageOfCarnage::GameObjects::GoblinArenaTrapDoor01: + _doorGUIDs.emplace_back(gameobject->GetGUID()); + break; + default: + break; + } + } + + void OnPlayerJoined(Player* player, bool /*inBattleground*/) override + { + player->CastSpell(nullptr, CageOfCarnage::Spells::UndermineArenaReactionTrigger, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + + void HandleKill(Player const* victim) const + { + if (!victim) + return; + + if (Creature* creature = battlegroundMap->GetCreature(_naminzeGUID)) + { + if (creature->HasAura(CageOfCarnage::Spells::UndermineArenaVOCooldownAuraPlayerDeath)) + return; + + creature->AI()->Talk(CageOfCarnage::Texts::Naminze::ReactionKill, victim); + + creature->CastSpell(nullptr, CageOfCarnage::Spells::UndermineArenaVOCooldownAuraPlayerDeath, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + } + + void HandleReactionLowHealth(Player const* victim) const + { + if (!victim) + return; + + if (Creature* creature = battlegroundMap->GetCreature(_naminzeGUID)) + { + if (creature->HasAura(CageOfCarnage::Spells::UndermineArenaVOCooldownAura)) + return; + + creature->AI()->Talk(CageOfCarnage::Texts::Naminze::ReactionAlmostDead, victim); + + creature->CastSpell(nullptr, CageOfCarnage::Spells::UndermineArenaVOCooldownAura, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + } + +private: + GuidVector _doorGUIDs; + ObjectGuid _naminzeGUID; + + TaskScheduler _scheduler; +}; + +// 472883 - Undermine Arena Reaction Trigger - Low Health +class spell_undermine_arena_reaction_trigger_low_health : public SpellScript +{ + bool Load() override + { + return GetCaster()->GetMapId() == CageOfCarnage::MapIds::CageOfCarnage; + } + + void HandleHit(SpellEffIndex /*effIndex*/) const + { + Unit* target = GetHitUnit(); + if (target->HasAura(CageOfCarnage::Spells::ArenaLowHealthCooldownAura)) + return; + + target->CastSpell(nullptr, CageOfCarnage::Spells::ArenaLowHealthCooldownAura, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + + if (ZoneScript* zoneScript = target->FindZoneScript()) + zoneScript->DoAction(CageOfCarnage::Actions::ReactionTrigger, GetCaster(), target); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_undermine_arena_reaction_trigger_low_health::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + +// 472885 - Undermine Arena Reaction Trigger +class spell_undermine_arena_reaction_trigger : public AuraScript +{ + bool Load() override + { + return GetOwner()->GetMapId() == CageOfCarnage::MapIds::CageOfCarnage; + } + + void HandleProc(ProcEventInfo const& eventInfo) const + { + if (ZoneScript* zonescript = GetTarget()->FindZoneScript()) + zonescript->DoAction(CageOfCarnage::Actions::ReactionDead, eventInfo.GetActor(), eventInfo.GetProcTarget()); + } + + void Register() override + { + OnProc += AuraProcFn(spell_undermine_arena_reaction_trigger::HandleProc); + } +}; + +// 1214676 - Warning (countdown) +class spell_undermine_arena_warning_countdown : public AuraScript +{ + bool Load() override + { + return GetOwner()->GetMapId() == CageOfCarnage::MapIds::CageOfCarnage; + } + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ CageOfCarnage::Spells::WarningTeleport }); + } + + void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + Player* target= GetTarget()->ToPlayer(); + if (!target) + return; + + if (!target->HasAura(CageOfCarnage::Spells::ArenaStartingAreaMarker)) + return; + + target->CastSpell(nullptr, CageOfCarnage::Spells::WarningTeleport, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + + void Register() override + { + OnEffectRemove += AuraEffectRemoveFn(spell_undermine_arena_warning_countdown::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 371319 - Warning Teleport +class spell_undermine_arena_warning_teleport : public SpellScript +{ + bool Load() override + { + return GetCaster()->GetMapId() == CageOfCarnage::MapIds::CageOfCarnage; + } + + void HandleTeleport(SpellEffIndex /*effIndex*/) const + { + Player* target = GetHitPlayer(); + if (!target) + return; + + if (target->GetBGTeam() == ALLIANCE) + target->NearTeleportTo(CageOfCarnage::Positions::PurpleWarningTeleport); + else + target->NearTeleportTo(CageOfCarnage::Positions::GoldWarningTeleport); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_undermine_arena_warning_teleport::HandleTeleport, EFFECT_0, SPELL_EFFECT_DUMMY); + } +}; + +void AddSC_arena_cage_of_carnage() +{ + RegisterBattlegroundMapScript(arena_cage_of_carnage, CageOfCarnage::MapIds::CageOfCarnage); + RegisterSpellScript(spell_undermine_arena_reaction_trigger_low_health); + RegisterSpellScript(spell_undermine_arena_reaction_trigger); + RegisterSpellScript(spell_undermine_arena_warning_countdown); + RegisterSpellScript(spell_undermine_arena_warning_teleport); +} diff --git a/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp b/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp index 5bf00c0a80a..c2c3d8b3439 100644 --- a/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp +++ b/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp @@ -70,6 +70,8 @@ void AddSC_arena_the_robodrome(); void AddSC_arena_maldraxxus_coliseum(); +void AddSC_arena_cage_of_carnage(); + // The name of this function should match: // void Add${NameOfDirectory}Scripts() void AddBattlegroundsScripts() @@ -124,4 +126,6 @@ void AddBattlegroundsScripts() AddSC_arena_the_robodrome(); AddSC_arena_maldraxxus_coliseum(); + + AddSC_arena_cage_of_carnage(); } diff --git a/src/server/scripts/EasternKingdoms/ReturnToKarazhan/boss_shade_of_medivh.cpp b/src/server/scripts/EasternKingdoms/ReturnToKarazhan/boss_shade_of_medivh.cpp new file mode 100644 index 00000000000..c2d31a6b5f7 --- /dev/null +++ b/src/server/scripts/EasternKingdoms/ReturnToKarazhan/boss_shade_of_medivh.cpp @@ -0,0 +1,868 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "AreaTrigger.h" +#include "AreaTriggerAI.h" +#include "Containers.h" +#include "Creature.h" +#include "InstanceScript.h" +#include "ObjectAccessor.h" +#include "Player.h" +#include "Position.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuras.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "return_to_karazhan.h" + +enum ShadeOfMedivhSpells +{ + SPELL_ARCANE_CHANNEL = 189573, + SPELL_MANA_REGEN = 228582, + SPELL_VO_CONTROLLER = 232314, + SPELL_BASIC_PRIMER = 227599, + SPELL_INFERNO_BOLT = 227615, + SPELL_INFERNO_BOLT_MARKER = 228249, + SPELL_PIERCING_MISSILES = 227628, + SPELL_PIERCING_MISSILES_DEBUFF = 227644, + SPELL_FROSTBITE = 227592, + SPELL_SIGNATURE_PRIMER = 228237, + SPELL_FLAME_WREATH_SELECTOR = 228269, + SPELL_FLAME_WREATH_AREATRIGGER = 228257, + SPELL_FLAME_WREATH_AREA_DAMAGE = 228262, + SPELL_FLAME_WREATH_PERIODIC_DAMAGE = 228261, + SPELL_CEASELESS_WINTER = 227779, + SPELL_CEASELESS_WINTER_DAMAGE = 227806, + SPELL_CEASELESS_WINTER_PERIODIC = 228222, + SPELL_GUARDIANS_IMAGE = 228334, + SPELL_GUARDIANS_IMAGE_MISSILE = 228338, + SPELL_DISSOLVE = 228572, + SPELL_REFORM_VISUAL = 228558, + SPELL_REFORM_VISUAL_STATE_1 = 228568, + SPELL_REFORM_VISUAL_STATE_2 = 228569, + SPELL_ARCANE_DISSOLVE_IN = 228343, + SPELL_ARCANE_BOLT_SELECTOR = 228992, + SPELL_SHIMMER = 228521 +}; + +enum ShadeOfMedivhEvents +{ + EVENT_BASIC_PRIMER = 1, + EVENT_CHECK_MANA, + EVENT_TELEPORT, + EVENT_BACK_TO_COMBAT, + + // Guardian's Image + EVENT_ARCANE_BOLT +}; + +enum ShadeOfMedivhTexts +{ + SAY_INTRO = 0, // Implement later + SAY_AGGRO = 1, + SAY_INFERNO_BOLT_WARNING = 2, + SAY_INFERNO_BOLT = 3, + SAY_FLAME_WREATH_WARNING = 4, + SAY_FLAME_WREATH = 5, + SAY_CEASELESS_WINTER = 6, + SAY_GUARDIANS_IMAGE = 7, + SAY_FROSTBITE = 8, + SAY_PIERCING_MISSILES = 9, + SAY_SLAY = 10, + SAY_STRONGER = 11, + SAY_WIPE = 12, + SAY_DEAD = 13, + SAY_SPECIAL = 14 // Used if players have the item Atiesh, Greatstaff of the Guardian +}; + +enum ShadeOfMedivhActions +{ + ACTION_DISSOLVE = 1, + ACTION_FINISH_SPLIT, + ACTION_START_VISUALS +}; + +enum ShadeOfMedivhDatas +{ + DATA_INFERNO_BOLT_NEXT = 0, +}; + +enum ShadeOfMedivhVisuals +{ + SPELLVISUAL_ARCANE_MISSILE = 51100 +}; + +static constexpr Position GuardiansImageMedivhPosition = { -4599.3f, -2517.86f, 2876.59f }; +static constexpr Position GuardiansImagePosition[3] = +{ + { -4599.8057f, -2494.7551f, 2876.6255f, 4.694935f }, + { -4618.8994f, -2526.8315f, 2876.6252f, 0.663225f }, + { -4581.1006f, -2526.6892f, 2876.6257f, 2.460914f } +}; + +static constexpr Position MedivhVisualSpellsPositions[14] = +{ + { -4573.2363f, -2517.875f, 2903.3594f }, + { -4617.39f, -2499.2f, 2886.25f }, + { -4620.2275f, -2535.092f, 2903.4875f }, + { -4573.2363f, -2517.875f, 2885.7869f }, + { -4617.3906f, -2499.1997f, 2902.f }, + { -4598.722f, -2555.3784f, 2906.814f }, + { -4580.137f, -2499.736f, 2887.0764f }, + { -4624.4116f, -2517.2588f, 2886.9016f }, + { -4624.4116f, -2517.2588f, 2904.4302f }, + { -4580.137f, -2499.736f, 2902.3f }, + { -4620.2275f, -2535.092f, 2887.8333f }, + { -4577.932f, -2535.927f, 2902.615f }, + { -4573.2363f, -2517.875f, 2903.3594f }, + { -4577.932f, -2535.927f, 2885.7869f } +}; + +// 114350 - Shade of Medivh +struct boss_shade_of_medivh : public BossAI +{ + boss_shade_of_medivh(Creature* creature) : BossAI(creature, DATA_SHADE_OF_MEDIVH), _triggeredSplit(false), _castInfernoBoltNext(0), _guardiansImageDefeatedCount(0) { } + + void JustAppeared() override + { + scheduler.ClearValidator(); + DoCastSelf(SPELL_ARCANE_CHANNEL); + me->SetPowerType(POWER_MANA); + me->SetPower(POWER_MANA, 0); + + scheduler.Schedule(2s, [this](TaskContext task) + { + static constexpr uint8 VisualCount = 5; + static constexpr float TravelSpeed = 8.0f; + + std::vector<Position> positions(std::begin(MedivhVisualSpellsPositions), std::end(MedivhVisualSpellsPositions)); + Trinity::Containers::RandomShuffle(positions); + + for (uint8 i = 0; i < VisualCount; i++) + { + me->SendPlaySpellVisual(positions[i], SPELLVISUAL_ARCANE_MISSILE, 0, 0, TravelSpeed); + } + task.Repeat(1200ms); + }); + } + + void JustDied(Unit* /*killer*/) override + { + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + _JustDied(); + me->RemoveAllAreaTriggers(); + Talk(SAY_DEAD); + } + + void EnterEvadeMode(EvadeReason /*why*/) override + { + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + + Talk(SAY_WIPE); + summons.DespawnAll(); + me->RemoveAllAreaTriggers(); + _EnterEvadeMode(); + _DespawnAtEvade(); + } + + void KilledUnit(Unit* victim) override + { + if (!victim->IsPlayer()) + return; + + Talk(SAY_SLAY); + } + + void Reset() override + { + events.Reset(); + _triggeredSplit = false; + _castInfernoBoltNext = 0; + _guardiansImageDefeatedCount = 0; + } + + void DoAction(int32 action) override + { + switch (action) + { + case ACTION_DISSOLVE: + { + DoCastSelf(SPELL_DISSOLVE); + me->RemoveAurasDueToSpell(SPELL_MANA_REGEN); + me->AttackStop(); + me->SetUninteractible(true); + me->SetReactState(REACT_PASSIVE); + events.ScheduleEvent(EVENT_TELEPORT, 2s); + events.CancelEvent(EVENT_BASIC_PRIMER); + break; + } + case ACTION_FINISH_SPLIT: + { + _triggeredSplit = false; + _guardiansImageDefeatedCount = 0; + me->RemoveAurasDueToSpell(SPELL_REFORM_VISUAL_STATE_1); + me->RemoveAurasDueToSpell(SPELL_REFORM_VISUAL_STATE_2); + instance->SendEncounterUnit(ENCOUNTER_FRAME_UPDATE_PRIORITY, me, 1); + events.ScheduleEvent(EVENT_BACK_TO_COMBAT, 2s); + break; + } + default: + break; + } + } + + void SpellHit(WorldObject* /*caster*/, SpellInfo const* spellInfo) override + { + switch (spellInfo->Id) + { + case SPELL_REFORM_VISUAL: + { + _guardiansImageDefeatedCount++; + + if (_guardiansImageDefeatedCount == 1) + DoCastSelf(SPELL_REFORM_VISUAL_STATE_1); + else if (_guardiansImageDefeatedCount == 2) + DoCastSelf(SPELL_REFORM_VISUAL_STATE_2); + else if (_guardiansImageDefeatedCount == 3) + DoAction(ACTION_FINISH_SPLIT); + + break; + } + case SPELL_GUARDIANS_IMAGE: + { + if (!_triggeredSplit) + { + _triggeredSplit = true; + DoAction(ACTION_DISSOLVE); + } + break; + } + default: + break; + } + } + + void SpellHitTarget(WorldObject* target, SpellInfo const* spellInfo) override + { + if (!target->IsPlayer()) + return; + + switch (spellInfo->Id) + { + case SPELL_PIERCING_MISSILES_DEBUFF: + { + Talk(SAY_PIERCING_MISSILES); + break; + } + case SPELL_INFERNO_BOLT_MARKER: + { + Talk(SAY_INFERNO_BOLT_WARNING, target); + break; + } + default: + break; + } + } + + void OnSpellStart(SpellInfo const* spellInfo) override + { + switch (spellInfo->Id) + { + case SPELL_GUARDIANS_IMAGE: + { + Talk(SAY_GUARDIANS_IMAGE); + break; + } + case SPELL_FLAME_WREATH_SELECTOR: + { + Talk(SAY_FLAME_WREATH_WARNING); + Talk(SAY_FLAME_WREATH); + break; + } + case SPELL_CEASELESS_WINTER: + { + Talk(SAY_CEASELESS_WINTER); + break; + } + default: + break; + } + } + + void OnSpellFailed(SpellInfo const* spellInfo) override + { + switch (spellInfo->Id) + { + case SPELL_INFERNO_BOLT: + case SPELL_PIERCING_MISSILES: + case SPELL_FROSTBITE: + { + Talk(SAY_STRONGER); + break; + } + default: + break; + } + } + + void JustEngagedWith(Unit* who) override + { + BossAI::JustEngagedWith(who); + + DoCastSelf(SPELL_VO_CONTROLLER); + DoCastSelf(SPELL_MANA_REGEN, TRIGGERED_FULL_MASK); + + scheduler.CancelAll(); + + instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); + + events.ScheduleEvent(EVENT_BASIC_PRIMER, 3s); + events.ScheduleEvent(EVENT_CHECK_MANA, 1s); + } + + void UpdateAI(uint32 diff) override + { + scheduler.Update(diff); + + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_BASIC_PRIMER: + { + DoCastSelf(SPELL_BASIC_PRIMER); + events.Repeat(6s); + break; + } + case EVENT_CHECK_MANA: + { + if (me->GetPowerPct(POWER_MANA) >= 100) + DoCastSelf(SPELL_SIGNATURE_PRIMER); + events.Repeat(500ms); + break; + } + case EVENT_TELEPORT: + { + me->NearTeleportTo(GuardiansImageMedivhPosition); + break; + } + case EVENT_BACK_TO_COMBAT: + { + me->RemoveAurasDueToSpell(SPELL_DISSOLVE); + me->SetUninteractible(false); + me->SetReactState(REACT_AGGRESSIVE); + DoCastSelf(SPELL_MANA_REGEN); + events.ScheduleEvent(EVENT_BASIC_PRIMER, 1s); + break; + } + default: + break; + } + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + } + } + + uint32 GetData(uint32 id) const override + { + if (id == DATA_INFERNO_BOLT_NEXT) + return _castInfernoBoltNext; + return 0; + } + + void SetData(uint32 id, uint32 value) override + { + if (id == DATA_INFERNO_BOLT_NEXT) + _castInfernoBoltNext = value; + } + +private: + bool _triggeredSplit; + uint8 _castInfernoBoltNext; + uint8 _guardiansImageDefeatedCount; +}; + +// 114675 - Guardian's Image +struct boss_shade_of_medivh_guardians_image : public ScriptedAI +{ + boss_shade_of_medivh_guardians_image(Creature* creature) : ScriptedAI(creature) { } + + void JustAppeared() override + { + DoCastSelf(SPELL_ARCANE_DISSOLVE_IN); + DoZoneInCombat(); + } + + void JustDied(Unit* /*killer*/) override + { + me->GetInstanceScript()->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + DoCast(SPELL_REFORM_VISUAL); + + me->DespawnOrUnsummon(3s); + } + + void EnterEvadeMode(EvadeReason why) override + { + if (Creature* shadeOfMedivh = me->GetInstanceScript()->GetCreature(DATA_SHADE_OF_MEDIVH)) + shadeOfMedivh->AI()->EnterEvadeMode(why); + } + + void JustEngagedWith(Unit* /*who*/) override + { + me->GetInstanceScript()->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 2); + DoCastSelf(SPELL_SHIMMER); + events.ScheduleEvent(EVENT_ARCANE_BOLT, 1s); + } + + void UpdateAI(uint32 diff) override + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_ARCANE_BOLT: + { + DoCastSelf(SPELL_ARCANE_BOLT_SELECTOR); + events.Repeat(3s); + break; + } + default: + break; + } + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + } + } + +private: + EventMap events; +}; + +// 228582 - Mana Regen +class spell_shade_of_medivh_mana_regen : public AuraScript +{ + static constexpr std::array<uint8, 3> ShadeOfMedivhEnergizeCycle = { 3, 4, 3 }; + + void PeriodicTick(AuraEffect const* aurEff) const + { + uint8 cycleIdx = (aurEff->GetTickNumber() - 1) % ShadeOfMedivhEnergizeCycle.size(); + int32 amount = ShadeOfMedivhEnergizeCycle[cycleIdx] * GetTarget()->GetMaxPower(POWER_MANA) / 100; + GetTarget()->ModifyPower(POWER_MANA, amount); + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_shade_of_medivh_mana_regen::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } +}; + +// 227599 - Basic Primer +class spell_shade_of_medivh_basic_primer : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_INFERNO_BOLT_MARKER, SPELL_PIERCING_MISSILES, SPELL_FROSTBITE }); + } + + void HandleHit() + { + Creature* creatureCaster = GetCaster()->ToCreature(); + if (!creatureCaster) + return; + + Unit* target = creatureCaster->AI()->SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true); + uint32 spellId = RAND(SPELL_INFERNO_BOLT_MARKER, SPELL_PIERCING_MISSILES, SPELL_FROSTBITE); + + if (creatureCaster->AI()->GetData(DATA_INFERNO_BOLT_NEXT) == 1) + { + spellId = SPELL_INFERNO_BOLT_MARKER; + creatureCaster->AI()->SetData(DATA_INFERNO_BOLT_NEXT, 0); + } + else if (spellId == SPELL_FROSTBITE) + creatureCaster->AI()->SetData(DATA_INFERNO_BOLT_NEXT, 1); + + creatureCaster->CastSpell(target, spellId, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void Register() override + { + OnHit += SpellHitFn(spell_shade_of_medivh_basic_primer::HandleHit); + } +}; + +// 228237 - Signature Primer +class spell_shade_of_medivh_signature_primer : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_FLAME_WREATH_SELECTOR, SPELL_GUARDIANS_IMAGE, SPELL_CEASELESS_WINTER }); + } + + void HandleHit() const + { + Creature* creatureCaster = GetCaster()->ToCreature(); + if (!creatureCaster) + return; + + uint32 spellId = RAND(SPELL_FLAME_WREATH_SELECTOR, SPELL_GUARDIANS_IMAGE, SPELL_CEASELESS_WINTER); + creatureCaster->CastSpell(creatureCaster, spellId, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void HandleAfterCast() const + { + GetCaster()->SetPower(POWER_MANA, 0); + } + + void Register() override + { + OnHit += SpellHitFn(spell_shade_of_medivh_signature_primer::HandleHit); + AfterCast += SpellCastFn(spell_shade_of_medivh_signature_primer::HandleAfterCast); + } +}; + +// 228249 - Inferno Bolt +class spell_shade_of_medivh_inferno_bolt_marker : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_INFERNO_BOLT }); + } + + void HandleInfernoBolt(SpellEffIndex /*effIndex*/) const + { + GetCaster()->CastSpell(GetHitUnit(), SPELL_INFERNO_BOLT, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_shade_of_medivh_inferno_bolt_marker::HandleInfernoBolt, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + } +}; + +// 227628 - Piercing Missiles +class spell_shade_of_medivh_piercing_missiles : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_PIERCING_MISSILES_DEBUFF }); + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) + return; + + GetCaster()->CastSpell(GetTarget(), SPELL_PIERCING_MISSILES_DEBUFF, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void Register() override + { + AfterEffectRemove += AuraEffectRemoveFn(spell_shade_of_medivh_piercing_missiles::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 228269 - Flame Wreath +class spell_shade_of_medivh_flame_wreath_selector : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_FLAME_WREATH_AREATRIGGER }); + } + + void HandleHitTarget(SpellEffIndex /*effIndex*/) const + { + GetCaster()->CastSpell(GetHitUnit()->GetPosition(), SPELL_FLAME_WREATH_AREATRIGGER, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_shade_of_medivh_flame_wreath_selector::HandleHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); + } +}; + +// 228222 - Ceaseless Winter +class spell_shade_of_medivh_ceaseless_winter_periodic : public AuraScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_CEASELESS_WINTER_DAMAGE }); + } + + void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) const + { + Unit* target = GetTarget(); + if (target->isMoving()) + GetTarget()->RemoveAuraFromStack(SPELL_CEASELESS_WINTER_DAMAGE); + else + target->CastSpell(target, SPELL_CEASELESS_WINTER_DAMAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_shade_of_medivh_ceaseless_winter_periodic::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } +}; + +// 228334 - Guardian's Image +class spell_shade_of_medivh_guardians_image : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_GUARDIANS_IMAGE_MISSILE }); + } + + void HandleHit() const + { + for (uint8 i = 0; i < 3; i++) + { + GetCaster()->CastSpell(GuardiansImagePosition[i], SPELL_GUARDIANS_IMAGE_MISSILE, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); + } + } + + void Register() override + { + OnHit += SpellHitFn(spell_shade_of_medivh_guardians_image::HandleHit); + } +}; + +// 228992 - Arcane Bolt +class spell_shade_of_medivh_arcane_bolt_selector : public SpellScript +{ + void HandleScript(SpellEffIndex /*effIndex*/) const + { + GetCaster()->CastSpell(GetHitUnit(), GetEffectValue(), CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell(), + }); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_shade_of_medivh_arcane_bolt_selector::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + } +}; + +// 232314 - V.O Controller +class spell_shade_of_medivh_vo_controller : public SpellScript +{ + void HandleScript(SpellEffIndex /*effIndex*/) const + { + uint8 text = 0; + ObjectGuid originalCast = GetSpell()->m_originalCastId; + + if (!originalCast.IsEmpty()) + { + switch (originalCast.GetEntry()) + { + case SPELL_FROSTBITE: + { + text = SAY_FROSTBITE; + break; + } + case SPELL_INFERNO_BOLT: + { + text = SAY_INFERNO_BOLT; + break; + } + default: + break; + } + } + else + text = SAY_AGGRO; + + if (Creature* shadeOfMedivh = GetHitUnit()->ToCreature()) + shadeOfMedivh->AI()->Talk(text); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_shade_of_medivh_vo_controller::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + } +}; + +// 232314 - V.O Controller (attached to 227592 - Frostbite and 227615 - Inferno Bolt) +class spell_shade_of_medivh_vo_controller_cast : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_VO_CONTROLLER }); + } + + void HandleAfterCast() const + { + Unit* caster = GetCaster(); + if (caster->HasAura(SPELL_VO_CONTROLLER)) + return; + + caster->CastSpell(caster, SPELL_VO_CONTROLLER, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell(), + }); + } + + void Register() override + { + AfterCast += SpellCastFn(spell_shade_of_medivh_vo_controller_cast::HandleAfterCast); + } +}; + +// 227779 - Ceaseless Winter +// Id - 8848 +struct at_shade_of_medivh_ceaseless_winter : AreaTriggerAI +{ + using AreaTriggerAI::AreaTriggerAI; + + void OnUnitEnter(Unit* unit) override + { + if (!unit->IsPlayer()) + return; + + unit->CastSpell(unit, SPELL_CEASELESS_WINTER_PERIODIC, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override + { + unit->RemoveAurasDueToSpell(SPELL_CEASELESS_WINTER_DAMAGE); + unit->RemoveAurasDueToSpell(SPELL_CEASELESS_WINTER_PERIODIC); + } + +private: + TaskScheduler _scheduler; +}; + +// 227779 - Ceaseless Winter +// Id - 8809 +struct at_shade_of_medivh_ceaseless_winter_jump_check : AreaTriggerAI +{ + using AreaTriggerAI::AreaTriggerAI; + + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override + { + unit->RemoveAuraFromStack(SPELL_CEASELESS_WINTER_DAMAGE); + } +}; + +// 228257 - Flame Wreath +struct at_shade_of_medivh_flame_wreath : AreaTriggerAI +{ + using AreaTriggerAI::AreaTriggerAI; + + uint32 GetInsidePlayersCount() + { + return std::ranges::count_if(at->GetInsideUnits(), [this](ObjectGuid const& guid) + { + Player* player = ObjectAccessor::GetPlayer(*at, guid); + if (!player || !player->IsAlive() || player->IsGameMaster()) + return false; + return true; + }); + } + + void OnUnitEnter(Unit* unit) override + { + Unit* caster = at->GetCaster(); + if (!caster) + return; + + if (!unit->IsPlayer()) + return; + + if (GetInsidePlayersCount() >= 2) + { + caster->CastSpell(unit, SPELL_FLAME_WREATH_AREA_DAMAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + at->Remove(); + } + else + caster->CastSpell(unit, SPELL_FLAME_WREATH_PERIODIC_DAMAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + + } + + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override + { + Unit* caster = at->GetCaster(); + if (!caster) + return; + + if (!unit->IsPlayer()) + return; + + if (unit->HasAura(SPELL_FLAME_WREATH_PERIODIC_DAMAGE)) + { + unit->RemoveAurasDueToSpell(SPELL_FLAME_WREATH_PERIODIC_DAMAGE); + caster->CastSpell(unit, SPELL_FLAME_WREATH_AREA_DAMAGE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + at->Remove(); + } + } +}; + +void AddSC_boss_shade_of_medivh() +{ + RegisterReturnToKarazhanCreatureAI(boss_shade_of_medivh); + RegisterReturnToKarazhanCreatureAI(boss_shade_of_medivh_guardians_image); + + RegisterSpellScript(spell_shade_of_medivh_mana_regen); + RegisterSpellScript(spell_shade_of_medivh_piercing_missiles); + RegisterSpellScript(spell_shade_of_medivh_basic_primer); + RegisterSpellScript(spell_shade_of_medivh_signature_primer); + RegisterSpellScript(spell_shade_of_medivh_inferno_bolt_marker); + RegisterSpellScript(spell_shade_of_medivh_flame_wreath_selector); + RegisterSpellScript(spell_shade_of_medivh_ceaseless_winter_periodic); + RegisterSpellScript(spell_shade_of_medivh_guardians_image); + RegisterSpellScript(spell_shade_of_medivh_arcane_bolt_selector); + RegisterSpellScript(spell_shade_of_medivh_vo_controller); + RegisterSpellScript(spell_shade_of_medivh_vo_controller_cast); + + RegisterAreaTriggerAI(at_shade_of_medivh_ceaseless_winter_jump_check); + RegisterAreaTriggerAI(at_shade_of_medivh_ceaseless_winter); + RegisterAreaTriggerAI(at_shade_of_medivh_flame_wreath); +} diff --git a/src/server/scripts/EasternKingdoms/ReturnToKarazhan/instance_return_to_karazhan.cpp b/src/server/scripts/EasternKingdoms/ReturnToKarazhan/instance_return_to_karazhan.cpp index b3fefe7c4d3..23a17ec2f9d 100644 --- a/src/server/scripts/EasternKingdoms/ReturnToKarazhan/instance_return_to_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/ReturnToKarazhan/instance_return_to_karazhan.cpp @@ -22,7 +22,8 @@ BossBoundaryData const boundaries = { - { DATA_MAIDEN_OF_VIRTUE_RTK, new CircleBoundary(Position(-10945.900391f, -2103.530029f, 92.794197f), 55.0f) } + { DATA_MAIDEN_OF_VIRTUE_RTK, new CircleBoundary(Position(-10945.900391f, -2103.530029f, 92.794197f), 55.0f) }, + { DATA_SHADE_OF_MEDIVH, new CircleBoundary(Position(-4599.149902f, -2517.947266f, 2876.506836f), 35.0f) }, }; ObjectData const creatureData[] = @@ -35,8 +36,10 @@ ObjectData const creatureData[] = DoorData const doorData[] = { - { GO_STRANGE_WALL, DATA_THE_CURATOR_RTK, EncounterDoorBehavior::OpenWhenDone }, - { 0, 0, EncounterDoorBehavior::OpenWhenNotInProgress } + { GO_STRANGE_WALL, DATA_THE_CURATOR_RTK, EncounterDoorBehavior::OpenWhenDone }, + { GO_SUSPICIOUS_BOOKCASE, DATA_SHADE_OF_MEDIVH, EncounterDoorBehavior::OpenWhenDone }, + { GO_MEDIVH_DOOR, DATA_SHADE_OF_MEDIVH, EncounterDoorBehavior::OpenWhenNotInProgress }, + { 0, 0, EncounterDoorBehavior::OpenWhenNotInProgress } }; DungeonEncounterData const encounters[] = diff --git a/src/server/scripts/EasternKingdoms/ReturnToKarazhan/return_to_karazhan.h b/src/server/scripts/EasternKingdoms/ReturnToKarazhan/return_to_karazhan.h index 5dbf20c04dc..4614073f32d 100644 --- a/src/server/scripts/EasternKingdoms/ReturnToKarazhan/return_to_karazhan.h +++ b/src/server/scripts/EasternKingdoms/ReturnToKarazhan/return_to_karazhan.h @@ -49,7 +49,9 @@ enum RTKCreatureIds enum RTKGameObjectsIds { - GO_STRANGE_WALL = 266508 + GO_STRANGE_WALL = 266508, + GO_SUSPICIOUS_BOOKCASE = 266510, + GO_MEDIVH_DOOR = 266846 }; template <class AI, class T> diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index 13f41362243..8db2083868e 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -211,6 +211,7 @@ void AddSC_instance_return_to_karazhan(); void AddSC_boss_maiden_of_virtue_rtk(); void AddSC_boss_the_curator_rtk(); void AddSC_boss_mana_devourer(); +void AddSC_boss_shade_of_medivh(); // The name of this function should match: // void Add${NameOfDirectory}Scripts() @@ -412,4 +413,5 @@ void AddEasternKingdomsScripts() AddSC_boss_maiden_of_virtue_rtk(); AddSC_boss_the_curator_rtk(); AddSC_boss_mana_devourer(); + AddSC_boss_shade_of_medivh(); } diff --git a/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp b/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp index 4494838a2f3..fb7129faf17 100644 --- a/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp +++ b/src/server/scripts/KhazAlgar/CityOfThreads/boss_orator_krix_vizk.cpp @@ -20,7 +20,7 @@ #include "CellImpl.h" #include "Conversation.h" #include "Creature.h" -#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "PathGenerator.h" diff --git a/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_lord_stormsong.cpp b/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_lord_stormsong.cpp new file mode 100644 index 00000000000..6b69fda5482 --- /dev/null +++ b/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_lord_stormsong.cpp @@ -0,0 +1,645 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "AreaTrigger.h" +#include "AreaTriggerAI.h" +#include "Conversation.h" +#include "ConversationAI.h" +#include "Creature.h" +#include "GridNotifiersImpl.h" +#include "InstanceScript.h" +#include "Map.h" +#include "MotionMaster.h" +#include "ObjectAccessor.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "TemporarySummon.h" +#include "Vehicle.h" +#include "shrine_of_the_storm.h" + +enum LordStormsongSpells +{ + SPELL_ANCIENT_MINDBENDER = 269131, + SPELL_CONVERSATION = 274622, + SPELL_CONVERSATION_ALLIANCE_INTRO = 274640, + SPELL_CONVERSATION_ALLIANCE_OUTRO = 274674, + SPELL_CONVERSATION_HORDE_INTRO = 274641, + SPELL_CONVERSATION_HORDE_OUTRO = 274675, + SPELL_DARK_BINDING = 274646, + SPELL_DISCIPLE_OF_THE_VOL_ZITH = 269289, + SPELL_ENERGIZE = 269396, // Serverside + SPELL_EXPLOSIVE_VOID = 269104, + SPELL_FIXATE = 269103, + SPELL_MIND_REND = 268896, + SPELL_RELEASE_VOID = 274711, + SPELL_RIDE_VEHICLE = 46598, + SPELL_SURRENDER_TO_THE_VOID = 269242, + SPELL_VOID_BOLT = 268347, + SPELL_WAKEN_THE_VOID_AREATRIGGER = 269094, + SPELL_WAKEN_THE_VOID_SUMMON = 269095, + SPELL_WAKEN_THE_VOID_AREA = 269097 +}; + +enum LordStormsongEvents +{ + EVENT_VOID_BOLT = 1, + EVENT_MIND_REND, + EVENT_WAKEN_THE_VOID, + EVENT_CHECK_POWER, + + EVENT_OUTRO +}; + +enum LordStormsongTexts +{ + SAY_MINDBENDER_WARNING = 0 +}; + +enum LordStormsongActions +{ + ACTION_START_INTRO = 1, + ACTION_START_OUTRO +}; + +enum LordStormsongMisc +{ + DISPLAY_POWERID = 425, + + NPC_QUEEN_AZSHARA = 139963, + NPC_ANCIENT_MINDBENDER = 137051, + NPC_WATER_STALKER = 82347, + + CONVO_ACTOR_BROTHER_PIKE = 65078, + CONVO_ACTOR_REXXAR = 65085, + + PATH_INTRO = 13997000, + PATH_OUTRO = 13997001, + + WAYPOINT_BOSS_INTRO = 11, + WAYPOINT_BOSS_OUTRO = 2 +}; + +constexpr Position IntroPosition = { 3608.3933f, -1379.824f, 160.573f, 4.370550f }; + +// 134060 - Lord Stormsong +struct boss_lord_stormsong : public BossAI +{ + boss_lord_stormsong(Creature* creature) : BossAI(creature, DATA_LORD_STORMSONG) { } + + void JustAppeared() override + { + me->SetPowerType(POWER_ENERGY); + me->SetPower(POWER_ENERGY, 55); // Energy bar is bugged on retail, but its working fine + me->SetOverrideDisplayPowerId(DISPLAY_POWERID); // No aura handle + + if (instance->GetData(DATA_LORD_STORMSONG_INTRO) == DONE) + me->SetImmuneToPC(false); + } + + void DespawnMindbenders() + { + std::list<Creature*> mindbenders; + me->GetCreatureListWithOptionsInGrid(mindbenders, 200.0f, { .CreatureId = NPC_ANCIENT_MINDBENDER }); + for (Creature* mindbender : mindbenders) + mindbender->DespawnOrUnsummon(); + } + + void EnterEvadeMode(EvadeReason /*why*/) override + { + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + instance->SetBossState(DATA_LORD_STORMSONG, FAIL); + + _EnterEvadeMode(); + _DespawnAtEvade(); + + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ANCIENT_MINDBENDER); + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DISCIPLE_OF_THE_VOL_ZITH); + DespawnMindbenders(); + } + + void JustEngagedWith(Unit* who) override + { + BossAI::JustEngagedWith(who); + instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); + instance->SetBossState(DATA_LORD_STORMSONG, IN_PROGRESS); + + DoCastSelf(SPELL_ENERGIZE); + + events.ScheduleEvent(EVENT_VOID_BOLT, 8500ms); + events.ScheduleEvent(EVENT_WAKEN_THE_VOID, 13500ms); + events.ScheduleEvent(EVENT_CHECK_POWER, 500ms); + + if (IsHeroicOrHigher()) + events.ScheduleEvent(EVENT_MIND_REND, 16s); + } + + void DoAction(int32 actionId) override + { + switch (actionId) + { + case ACTION_START_INTRO: + { + DoCastSelf(SPELL_CONVERSATION); + me->SetEmoteState(EMOTE_ONESHOT_NONE); + me->GetMap()->SummonCreature(instance->instance->GetTeamInInstance() == HORDE ? NPC_LORD_STORMSONG_REXXAR : NPC_LORD_STORMSONG_BROTHER_PIKE, IntroPosition); + + scheduler.Schedule(11s, [this](TaskContext task) + { + me->SetFacingTo(1.047197f); + me->SetOrientation(me->GetOrientation()); + Creature* azshara = me->FindNearestCreature(NPC_QUEEN_AZSHARA, 50.0f); + if (!azshara) + return; + + azshara->DespawnOrUnsummon(); + + task.Schedule(16s, [this](TaskContext task) + { + DoCastSelf(SPELL_DARK_BINDING); + + task.Schedule(6s, [this](TaskContext) + { + me->SetImmuneToPC(false); + me->SetEmoteState(EMOTE_STATE_READY1H); + instance->SetData(DATA_LORD_STORMSONG_INTRO, DONE); + }); + }); + }); + break; + } + default: + break; + } + } + + void SpellHitTarget(WorldObject* target, SpellInfo const* spellInfo) override + { + if (!target->IsPlayer()) + return; + + if (spellInfo->Id == SPELL_ANCIENT_MINDBENDER) + Talk(SAY_MINDBENDER_WARNING, target); + } + + void JustDied(Unit* /*killer*/) override + { + _JustDied(); + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); + instance->SetBossState(DATA_LORD_STORMSONG, DONE); + + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ANCIENT_MINDBENDER); + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DISCIPLE_OF_THE_VOL_ZITH); + + DespawnMindbenders(); + + Creature* pikeOrRexxar = me->GetInstanceScript()->GetCreature(instance->instance->GetTeamInInstance() == HORDE ? DATA_LORD_STORMSONG_REXXAR : DATA_LORD_STORMSONG_BROTHER_PIKE); + if (!pikeOrRexxar) + return; + + pikeOrRexxar->AI()->DoAction(ACTION_START_OUTRO); + } + + void UpdateAI(uint32 diff) override + { + scheduler.Update(diff); + + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_VOID_BOLT: + { + DoCastVictim(SPELL_VOID_BOLT); + events.Repeat(8500ms); + break; + } + case EVENT_MIND_REND: + { + DoCastSelf(SPELL_MIND_REND); + events.Repeat(10500ms); + break; + } + case EVENT_WAKEN_THE_VOID: + { + DoCastSelf(SPELL_WAKEN_THE_VOID_AREA); + events.Repeat(43500ms); + break; + } + case EVENT_CHECK_POWER: + { + if (me->GetPower(POWER_ENERGY) >= 100) + { + DoCast(SPELL_ANCIENT_MINDBENDER); + events.RescheduleEvent(EVENT_CHECK_POWER, 2s); + } + events.Repeat(500ms); + break; + } + default: + break; + } + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + } + } +}; + +// 137051 - Ancient Mindbender +struct boss_lord_stormsong_ancient_mindbender : public ScriptedAI +{ + boss_lord_stormsong_ancient_mindbender(Creature* creature) : ScriptedAI(creature) { } + + void JustAppeared() override + { + TempSummon* tempSummon = me->ToTempSummon(); + if (!tempSummon) + return; + + tempSummon->CastSpell(tempSummon->GetSummoner(), SPELL_RIDE_VEHICLE, TRIGGERED_FULL_MASK); + } +}; + +// 139971 - Rexxar +// 139970 - Brother Pike +template<uint32 ConvoIntroSpellId, uint32 ConvoOutroSpellId> +struct boss_lord_stormsong_intro_npc : public ScriptedAI +{ + boss_lord_stormsong_intro_npc(Creature* creature) : ScriptedAI(creature) { } + + void JustAppeared() override + { + me->GetMotionMaster()->MovePath(PATH_INTRO, false); + } + + void WaypointReached(uint32 waypointId, uint32 pathId) override + { + if (pathId == PATH_INTRO) + { + if (waypointId == WAYPOINT_BOSS_INTRO) + DoCastSelf(ConvoIntroSpellId); + } + else if (pathId == PATH_OUTRO) + { + if (waypointId == WAYPOINT_BOSS_OUTRO) + DoCastSelf(ConvoOutroSpellId); + } + } + + void DoAction(int32 action) override + { + if (action != ACTION_START_OUTRO) + return; + + Creature* stalker = me->FindNearestCreature(NPC_WATER_STALKER, 100.0f); + if (!stalker) + return; + + stalker->CastSpell(stalker, SPELL_RELEASE_VOID, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + + _events.ScheduleEvent(EVENT_OUTRO, 2s); + } + + void UpdateAI(uint32 diff) override + { + _events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + switch (_events.ExecuteEvent()) + { + case EVENT_OUTRO: + { + me->RemoveAurasDueToSpell(SPELL_DARK_BINDING); + me->GetMotionMaster()->MovePath(PATH_OUTRO, false); + break; + } + default: + break; + } + } + +private: + EventMap _events; +}; + +// 269396 - Lord Stormsong Gain Energy (SERVERSIDE) +class spell_lord_stormsong_energize : public AuraScript +{ + static constexpr std::array<uint8, 2> LordStormsongEnergizeCycle = { 2, 3 }; + + void PeriodicTick(AuraEffect const* aurEff) const + { + uint8 cycleIdx = aurEff->GetTickNumber() % LordStormsongEnergizeCycle.size(); + GetTarget()->ModifyPower(POWER_ENERGY, LordStormsongEnergizeCycle[cycleIdx]); + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_lord_stormsong_energize::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } +}; + +// 269021 - Waken the Void +class spell_lord_stormsong_waken_the_void_missile : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_WAKEN_THE_VOID_AREATRIGGER, SPELL_FIXATE }); + } + + void HandleHitTarget(SpellEffIndex /*effIndex*/) const + { + Unit* caster = GetCaster(); + caster->CastSpell(GetHitUnit(), SPELL_WAKEN_THE_VOID_AREATRIGGER, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + caster->CastSpell(caster, SPELL_FIXATE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_lord_stormsong_waken_the_void_missile::HandleHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); + } +}; + +// 269103 - Fixate +class spell_lord_stormsong_fixate : public SpellScript +{ + void HandleFixate(SpellEffIndex /*effIndex*/) const + { + Creature* caster = GetCaster()->ToCreature(); + if (!caster) + return; + + caster->GetMotionMaster()->MoveFollow(GetHitUnit(), 0.0f); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_lord_stormsong_fixate::HandleFixate, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + } +}; + +class spell_lord_stormsong_fixate_aura : public AuraScript +{ + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + Creature* caster = GetCaster()->ToCreature(); + if (!caster) + return; + + caster->DespawnOrUnsummon(); + } + + void Register() override + { + AfterEffectRemove += AuraEffectRemoveFn(spell_lord_stormsong_fixate_aura::AfterRemove, EFFECT_0, SPELL_AURA_MOD_FIXATE, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 269131 - Ancient Mindbender +class spell_lord_stormsong_ancient_mindbender : public SpellScript +{ + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_SURRENDER_TO_THE_VOID }); + } + + void HandleHit(SpellEffIndex /*effIndex*/) const + { + Unit* target = GetHitUnit(); + target->SummonCreature(NPC_ANCIENT_MINDBENDER, target->GetPosition(), TEMPSUMMON_MANUAL_DESPAWN); + target->CastSpell(target, SPELL_SURRENDER_TO_THE_VOID, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_lord_stormsong_ancient_mindbender::HandleHit, EFFECT_11, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + +class spell_lord_stormsong_ancient_mindbender_aura : public AuraScript +{ + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + Vehicle* playerVehicle = GetTarget()->GetVehicleKit(); + if (!playerVehicle) + return; + + Unit* ancientMindbender = playerVehicle->GetPassenger(0); + if (!ancientMindbender) + return; + + Creature* mindbender = ancientMindbender->ToCreature(); + if (!mindbender) + return; + + mindbender->DespawnOrUnsummon(); + } + + void Register() override + { + OnEffectRemove += AuraEffectRemoveFn(spell_lord_stormsong_ancient_mindbender_aura::OnRemove, EFFECT_2, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 269242 - Surrender to the Void +class spell_lord_stormsong_surrender_to_the_void : public SpellScript +{ + bool Validate(SpellInfo const* spellInfo) override + { + return ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); + } + + void HandleDummy(SpellEffIndex /* effIndex */) const + { + GetHitUnit()->m_Events.AddEvent([hitUnit = GetHitUnit(), casterGUID = GetCaster()->GetGUID(), spellId = GetEffectValue()]() + { + if (Unit* caster = ObjectAccessor::GetUnit(*hitUnit, casterGUID)) + hitUnit->CastSpell(caster, uint32(spellId), TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + }, 0ms); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_lord_stormsong_surrender_to_the_void::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + +// 269289 - Disciple of the Vol'zith +class spell_lord_stormsong_disciple_of_the_vol_zith : public AuraScript +{ + bool Validate(SpellInfo const* spellInfo) override + { + return ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); + } + + void HandlePeriodic(AuraEffect const* /*aurEff*/) const + { + Unit* target = GetTarget(); + target->CastSpell(target, GetEffectInfo(EFFECT_0).CalcValue(), TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + } + + void Register() override + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_lord_stormsong_disciple_of_the_vol_zith::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } +}; + +// 274711 - Release Void +class spell_lord_stormsong_release_void : public AuraScript +{ + void OnRemove(AuraEffect const* /*auraEffect*/, AuraEffectHandleModes /*mode*/) const + { + if (Creature* creatureCaster = GetCaster()->ToCreature()) + creatureCaster->DespawnOrUnsummon(); + } + + void Register() override + { + AfterEffectRemove += AuraEffectRemoveFn(spell_lord_stormsong_release_void::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + } +}; + +// 274710 - Release Void +class spell_lord_stormsong_release_void_missile : public SpellScript +{ + void ModDestHeight(SpellDestination& dest) const + { + Position const offset = { 0.0f, 0.0f, 20.0f, 0.0f }; + dest.RelocateOffset(offset); + } + + void Register() override + { + OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_lord_stormsong_release_void_missile::ModDestHeight, EFFECT_1, TARGET_DEST_DEST_RANDOM); + } +}; + +// 269094 - Waken the Void +struct at_lord_stormsong_waken_the_void : AreaTriggerAI +{ + using AreaTriggerAI::AreaTriggerAI; + + void OnUnitEnter(Unit* unit) override + { + if (!unit->IsPlayer()) + return; + + Unit* caster = at->GetCaster(); + if (!caster) + return; + + caster->CastSpell(unit, SPELL_EXPLOSIVE_VOID, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); + unit->RemoveAurasDueToSpell(SPELL_FIXATE); + at->Remove(); + } +}; + +// Id - XXX +struct at_lord_stormsong_intro : AreaTriggerAI +{ + at_lord_stormsong_intro(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) { } + + void OnUnitEnter(Unit* unit) override + { + Player* player = unit->ToPlayer(); + if (!player || player->IsGameMaster()) + return; + + InstanceScript* instance = at->GetInstanceScript(); + if (!instance) + return; + + if (Creature* lordStormsong = instance->GetCreature(DATA_LORD_STORMSONG)) + lordStormsong->AI()->DoAction(ACTION_START_INTRO); + + at->Remove(); + } +}; + +// 274640 - Conversation +// 274674 - Conversation +class conversation_lord_stormsong_brother_pike_intro_outro : public ConversationAI +{ +public: + conversation_lord_stormsong_brother_pike_intro_outro(Conversation* conversation) : ConversationAI(conversation) { } + + void OnCreate(Unit* creator) override + { + conversation->AddActor(CONVO_ACTOR_BROTHER_PIKE, 0, creator->GetGUID()); + } +}; + +// 274641 - Conversation +class conversation_lord_stormsong_rexxar_intro : public ConversationAI +{ +public: + conversation_lord_stormsong_rexxar_intro(Conversation* conversation) : ConversationAI(conversation) { } + + void OnCreate(Unit* creator) override + { + conversation->AddActor(CONVO_ACTOR_REXXAR, 1, creator->GetGUID()); + } +}; + +// 274675 - Conversation +class conversation_lord_stormsong_rexxar_outro : public ConversationAI +{ +public: + conversation_lord_stormsong_rexxar_outro(Conversation* conversation) : ConversationAI(conversation) { } + + void OnCreate(Unit* creator) override + { + conversation->AddActor(CONVO_ACTOR_REXXAR, 0, creator->GetGUID()); + } +}; + +void AddSC_boss_lord_stormsong() +{ + RegisterShrineOfTheStormCreatureAI(boss_lord_stormsong); + RegisterShrineOfTheStormCreatureAI(boss_lord_stormsong_ancient_mindbender); + new GenericCreatureScript<boss_lord_stormsong_intro_npc<SPELL_CONVERSATION_HORDE_INTRO, SPELL_CONVERSATION_HORDE_OUTRO>>("boss_lord_stormsong_rexxar"); + new GenericCreatureScript<boss_lord_stormsong_intro_npc<SPELL_CONVERSATION_ALLIANCE_INTRO, SPELL_CONVERSATION_ALLIANCE_OUTRO>>("boss_lord_stormsong_brother_pike"); + + RegisterSpellScript(spell_lord_stormsong_energize); + RegisterSpellScript(spell_lord_stormsong_waken_the_void_missile); + RegisterSpellAndAuraScriptPair(spell_lord_stormsong_fixate, spell_lord_stormsong_fixate_aura); + RegisterSpellAndAuraScriptPair(spell_lord_stormsong_ancient_mindbender, spell_lord_stormsong_ancient_mindbender_aura); + RegisterSpellScript(spell_lord_stormsong_surrender_to_the_void); + RegisterSpellScript(spell_lord_stormsong_disciple_of_the_vol_zith); + RegisterSpellScript(spell_lord_stormsong_release_void); + RegisterSpellScript(spell_lord_stormsong_release_void_missile); + + RegisterAreaTriggerAI(at_lord_stormsong_waken_the_void); + + RegisterAreaTriggerAI(at_lord_stormsong_intro); + + RegisterConversationAI(conversation_lord_stormsong_brother_pike_intro_outro); + RegisterConversationAI(conversation_lord_stormsong_rexxar_intro); + RegisterConversationAI(conversation_lord_stormsong_rexxar_outro); +} diff --git a/src/server/scripts/KulTiras/ShrineOfTheStorm/instance_shrine_of_the_storm.cpp b/src/server/scripts/KulTiras/ShrineOfTheStorm/instance_shrine_of_the_storm.cpp index d384ae6a85e..57c6ceba654 100644 --- a/src/server/scripts/KulTiras/ShrineOfTheStorm/instance_shrine_of_the_storm.cpp +++ b/src/server/scripts/KulTiras/ShrineOfTheStorm/instance_shrine_of_the_storm.cpp @@ -23,17 +23,20 @@ static BossBoundaryData const boundaries = { { DATA_AQUSIRR, new ZRangeBoundary(119.89f, 132.9f) }, - { DATA_TIDESAGE_COUNCIL, new CircleBoundary({ 3939.6357f, -1007.4829f, 109.2227f }, 60.0f)} + { DATA_TIDESAGE_COUNCIL, new CircleBoundary({ 3939.6357f, -1007.4829f, 109.2227f }, 60.0f) }, + { DATA_LORD_STORMSONG, new ZRangeBoundary(146.85f, 157.03f) } }; ObjectData const creatureData[] = { - { BOSS_AQUSIRR, DATA_AQUSIRR }, - { BOSS_BROTHER_IRONHULL, DATA_BROTHER_IRONHULL }, - { BOSS_GALECALLER_FAYE, DATA_GALECALLER_FAYE }, - { BOSS_LORD_STORMSONG, DATA_LORD_STORMSONG }, - { BOSS_VOLZITH_THE_WHISPERER, DATA_VOLZITH_THE_WHISPERER }, - { 0, 0 } // END + { BOSS_AQUSIRR, DATA_AQUSIRR }, + { BOSS_BROTHER_IRONHULL, DATA_BROTHER_IRONHULL }, + { BOSS_GALECALLER_FAYE, DATA_GALECALLER_FAYE }, + { BOSS_LORD_STORMSONG, DATA_LORD_STORMSONG }, + { BOSS_VOLZITH_THE_WHISPERER, DATA_VOLZITH_THE_WHISPERER }, + { NPC_LORD_STORMSONG_BROTHER_PIKE, DATA_LORD_STORMSONG_BROTHER_PIKE }, + { NPC_LORD_STORMSONG_REXXAR, DATA_LORD_STORMSONG_REXXAR }, + { 0, 0 } // END }; DungeonEncounterData const encounters[] = @@ -58,7 +61,36 @@ public: LoadBossBoundaries(boundaries); LoadObjectData(creatureData, nullptr); LoadDungeonEncounterData(encounters); + + _lordStormsongIntroState = NOT_STARTED; + } + + uint32 GetData(uint32 dataId) const override + { + switch (dataId) + { + case DATA_LORD_STORMSONG_INTRO: + return _lordStormsongIntroState; + default: + break; + } + return 0; } + + void SetData(uint32 dataId, uint32 value) override + { + switch (dataId) + { + case DATA_LORD_STORMSONG_INTRO: + _lordStormsongIntroState = value; + break; + default: + break; + } + } + + private: + uint8 _lordStormsongIntroState; }; InstanceScript* GetInstanceScript(InstanceMap* map) const override diff --git a/src/server/scripts/KulTiras/ShrineOfTheStorm/shrine_of_the_storm.h b/src/server/scripts/KulTiras/ShrineOfTheStorm/shrine_of_the_storm.h index e8d9b7f4e73..a3309dd0932 100644 --- a/src/server/scripts/KulTiras/ShrineOfTheStorm/shrine_of_the_storm.h +++ b/src/server/scripts/KulTiras/ShrineOfTheStorm/shrine_of_the_storm.h @@ -34,7 +34,11 @@ enum ShrineOfTheStormDataTypes DATA_VOLZITH_THE_WHISPERER = 3, DATA_BROTHER_IRONHULL, - DATA_GALECALLER_FAYE + DATA_GALECALLER_FAYE, + + DATA_LORD_STORMSONG_INTRO, + DATA_LORD_STORMSONG_BROTHER_PIKE, + DATA_LORD_STORMSONG_REXXAR }; enum ShrineOfTheStormCreatureIds @@ -50,6 +54,9 @@ enum ShrineOfTheStormCreatureIds NPC_SHRINE_OF_THE_STORM_DUMMY = 139986, NPC_GRASPING_TENTACLE = 134612, NPC_AQUALING = 134828, + + NPC_LORD_STORMSONG_BROTHER_PIKE = 139970, + NPC_LORD_STORMSONG_REXXAR = 139971 }; template <class AI, class T> diff --git a/src/server/scripts/KulTiras/kultiras_script_loader.cpp b/src/server/scripts/KulTiras/kultiras_script_loader.cpp index 3934b6cebe0..68057631500 100644 --- a/src/server/scripts/KulTiras/kultiras_script_loader.cpp +++ b/src/server/scripts/KulTiras/kultiras_script_loader.cpp @@ -28,6 +28,7 @@ void AddSC_drustvar_chapter_3_an_airtight_alibi(); // Shrine of the Storm void AddSC_boss_aqusirr(); void AddSC_boss_tidesage_council(); +void AddSC_boss_lord_stormsong(); void AddSC_instance_shrine_of_the_storm(); // Waycrest Manor @@ -52,6 +53,7 @@ void AddKulTirasScripts() // Shrine of the Storm AddSC_boss_aqusirr(); AddSC_boss_tidesage_council(); + AddSC_boss_lord_stormsong(); AddSC_instance_shrine_of_the_storm(); // Waycrest Manor diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 807109e1493..659f216fc1e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -648,7 +648,7 @@ struct npc_spinestalker : public ScriptedAI // Increase add count if (!me->isDead()) { - _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade + _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade Reset(); } } @@ -670,7 +670,7 @@ struct npc_spinestalker : public ScriptedAI void JustAppeared() override { ScriptedAI::JustAppeared(); - _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade + _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade } void JustDied(Unit* /*killer*/) override @@ -773,7 +773,7 @@ struct npc_rimefang_icc : public ScriptedAI // Increase add count if (!me->isDead()) { - _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade + _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade Reset(); } } @@ -795,7 +795,7 @@ struct npc_rimefang_icc : public ScriptedAI void JustAppeared() override { ScriptedAI::JustAppeared(); - _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade + _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade } void JustDied(Unit* /*killer*/) override @@ -929,7 +929,7 @@ struct npc_sindragosa_trash : public ScriptedAI if (!me->isDead()) { if (me->GetEntry() == NPC_FROSTWING_WHELP) - _instance->SetGuidData(_frostwyrmId, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade + _instance->SetData64(_frostwyrmId, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade Reset(); } } @@ -952,7 +952,7 @@ struct npc_sindragosa_trash : public ScriptedAI // Increase add count if (me->GetEntry() == NPC_FROSTWING_WHELP) - _instance->SetGuidData(_frostwyrmId, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade + _instance->SetData64(_frostwyrmId, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade } void SetData(uint32 type, uint32 data) override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index e4de05aa1f5..5ea4c256ab5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1015,18 +1015,20 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void SetGuidData(uint32 type, ObjectGuid guid) override + void SetData64(uint32 type, uint64 data) override { switch (type) { case DATA_SINDRAGOSA_FROSTWYRMS: - FrostwyrmGUIDs.insert(guid.GetCounter()); + FrostwyrmGUIDs.insert(data); break; case DATA_SPINESTALKER: - SpinestalkerTrash.insert(guid.GetCounter()); + SpinestalkerTrash.insert(data); break; case DATA_RIMEFANG: - RimefangTrash.insert(guid.GetCounter()); + RimefangTrash.insert(data); + break; + default: break; } } |