diff --git a/README.md b/README.md index 8aae26fe58..b0b1f7043d 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,8 @@ website at [TrinityCore.org](http://www.trinitycore.org). ## Install -Detailed installation guides are available in the wiki for -[Windows](http://collab.kpsn.org/display/tc/Win), -[Linux](http://collab.kpsn.org/display/tc/Linux) and -[Mac OSX](http://collab.kpsn.org/display/tc/Mac). +Detailed installation guides are available in the [wiki](http://collab.kpsn.org/display/tc/Installation+Guide) for +Windows, Linux and Mac OSX. ## Reporting issues diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 1b60cebcfa..650fd82cf2 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -23,6 +23,7 @@ #include "Errors.h" #include #include +#include class Player; class Unit; diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 8b7fc69651..f9379dc7e6 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1425,9 +1425,29 @@ bool Creature::CanStartAttack(Unit const* who, bool force) const if (!CanCreatureAttack(who, force)) return false; + // No aggro from gray creatures + if (CheckNoGrayAggroConfig(who->getLevelForTarget(this), getLevelForTarget(who))) + return false; + return IsWithinLOSInMap(who); } + +bool Creature::CheckNoGrayAggroConfig(uint32 playerLevel, uint32 creatureLevel) const +{ + if (Trinity::XP::GetColorCode(playerLevel, creatureLevel) != XP_GRAY) + return false; + + uint32 notAbove = sWorld->getIntConfig(CONFIG_NO_GRAY_AGGRO_ABOVE); + uint32 notBelow = sWorld->getIntConfig(CONFIG_NO_GRAY_AGGRO_BELOW); + if (notAbove == 0 && notBelow == 0) + return false; + + if (playerLevel <= notBelow || (playerLevel >= notAbove && notAbove > 0)) + return true; + return false; +} + float Creature::GetAttackDistance(Unit const* player) const { float aggroRate = sWorld->getRate(RATE_CREATURE_AGGRO); diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index c39ca41eab..60fbb688cf 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -729,6 +729,7 @@ class Creature : public Unit, public GridObject, public MapObject private: void ForcedDespawn(uint32 timeMSToDespawn = 0); + bool CheckNoGrayAggroConfig(uint32 playerLevel, uint32 creatureLevel) const; // No aggro from gray creatures //WaypointMovementGenerator vars uint32 m_waypointID; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ec617a700b..f28fdd017c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3366,6 +3366,12 @@ void Unit::RemoveOwnedAura(Aura* aura, AuraRemoveMode removeMode) ASSERT(aura->GetOwner() == this); + if (removeMode == AURA_REMOVE_NONE) + { + TC_LOG_ERROR("spells", "Unit::RemoveOwnedAura() called with unallowed removeMode AURA_REMOVE_NONE, spellId %u", aura->GetId()); + return; + } + uint32 spellId = aura->GetId(); AuraMapBoundsNonConst range = m_ownedAuras.equal_range(spellId); @@ -8159,7 +8165,7 @@ int32 Unit::DealHeal(Unit* victim, uint32 addhealth) bool Unit::IsMagnet() const { - // Grounding Totem + // Grounding Totem if (GetUInt32Value(UNIT_CREATED_BY_SPELL) == 8177) /// @todo: find a more generic solution return true; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f1511b8e5e..ba4f36d4b3 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -434,7 +434,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= AuraEffect::AuraEffect(Aura* base, uint8 effIndex, int32 *baseAmount, Unit* caster): m_base(base), m_spellInfo(base->GetSpellInfo()), m_baseAmount(baseAmount ? *baseAmount : m_spellInfo->Effects[effIndex].BasePoints), -m_damage(0), m_critChance(0.0f), m_donePct(1.0f), +m_bonusAmount(0), m_critChance(0.0f), m_donePct(1.0f), m_spellmod(NULL), m_periodicTimer(0), m_tickNumber(0), m_effIndex(effIndex), m_canBeRecalculated(true), m_isPeriodic(false) { @@ -5835,16 +5835,18 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const // AOE spells are not affected by the new periodic system. bool isAreaAura = m_spellInfo->Effects[m_effIndex].IsAreaAuraEffect() || m_spellInfo->Effects[m_effIndex].IsEffect(SPELL_EFFECT_PERSISTENT_AREA_AURA); // ignore negative values (can be result apply spellmods to aura damage - uint32 damage = isAreaAura ? std::max(GetAmount(), 0) : m_damage; + uint32 damage = std::max(GetAmount() + GetBonusAmount(), 0); // if isAreaAura == true, GetBonusAmount == 0. // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - if (isAreaAura) - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); + sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); if (GetAuraType() == SPELL_AURA_PERIODIC_DAMAGE) { if (isAreaAura) damage = caster->SpellDamageBonusDone(target, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()) * caster->SpellDamagePctDone(target, m_spellInfo, DOT); + else + damage = std::max(int32(damage * GetDonePct()), 0); + damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()); // Calculate armor mitigation @@ -5902,7 +5904,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const bool crit = false; if (CanPeriodicTickCrit(caster)) - crit = roll_chance_f(isAreaAura ? caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask()) : m_critChance); + crit = roll_chance_f(isAreaAura ? caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask()) : GetCritChance()); if (crit) damage = caster->SpellCriticalDamageBonus(m_spellInfo, damage, target); @@ -5961,14 +5963,16 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c bool isAreaAura = m_spellInfo->Effects[m_effIndex].IsAreaAuraEffect() || m_spellInfo->Effects[m_effIndex].IsEffect(SPELL_EFFECT_PERSISTENT_AREA_AURA); // ignore negative values (can be result apply spellmods to aura damage - uint32 damage = isAreaAura ? std::max(GetAmount(), 0) : m_damage; + uint32 damage = std::max(GetAmount() + GetBonusAmount(), 0); // if isAreaAura == true, GetBonusAmount == 0. + + // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations + sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); if (isAreaAura) - { - // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); damage = caster->SpellDamageBonusDone(target, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()) * caster->SpellDamagePctDone(target, m_spellInfo, DOT); - } + else + damage = std::max(int32(damage * GetDonePct()), 0); + damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()); // Calculate armor mitigation @@ -5982,15 +5986,15 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c if (!(m_spellInfo->AttributesEx4 & SPELL_ATTR4_FIXED_DAMAGE)) if (m_spellInfo->Effects[m_effIndex].IsTargetingArea() || isAreaAura) { - damage = int32(float(damage) * target->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask)); + damage = uint32(float(damage) * target->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask)); if (caster->GetTypeId() != TYPEID_PLAYER) - damage = int32(float(damage) * target->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask)); + damage = uint32(float(damage) * target->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask)); } bool crit = false; if (CanPeriodicTickCrit(caster)) - crit = roll_chance_f(isAreaAura ? caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask()) : m_critChance); + crit = roll_chance_f(isAreaAura ? caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask()) : GetCritChance()); if (crit) damage = caster->SpellCriticalDamageBonus(m_spellInfo, damage, target); @@ -6081,7 +6085,10 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const bool isAreaAura = m_spellInfo->Effects[m_effIndex].IsAreaAuraEffect() || m_spellInfo->Effects[m_effIndex].IsEffect(SPELL_EFFECT_PERSISTENT_AREA_AURA); // ignore negative values (can be result apply spellmods to aura damage - int32 damage = isAreaAura ? std::max(GetAmount(), 0) : m_damage; + uint32 damage = std::max(GetAmount() + GetBonusAmount(), 0); // if isAreaAura == true, GetBonusAmount == 0. + + // Script Hook For HandlePeriodicHealAurasTick -- Allow scripts to change the Damage pre class mitigation calculations + sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); if (GetAuraType() == SPELL_AURA_OBS_MOD_HEALTH) { @@ -6120,15 +6127,19 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const damage += addition; } + if (isAreaAura) damage = caster->SpellHealingBonusDone(target, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()) * caster->SpellHealingPctDone(target, m_spellInfo); + else + damage = std::max(int32(damage * GetDonePct()), 0); + damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount()); } bool crit = false; if (CanPeriodicTickCrit(caster)) - crit = roll_chance_f(isAreaAura ? caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask()) : m_critChance); + crit = roll_chance_f(isAreaAura ? caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask()) : GetCritChance()); if (crit) damage = caster->SpellCriticalHealingBonus(m_spellInfo, damage, target); @@ -6137,7 +6148,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const GetCasterGUID().ToString().c_str(), target->GetGUID().ToString().c_str(), damage, GetId()); uint32 absorb = 0; - uint32 heal = uint32(damage); + uint32 heal = damage; caster->CalcHealAbsorb(target, GetSpellInfo(), heal, absorb); int32 gain = caster->DealHeal(target, heal); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h index cf28b28b4f..e2cb86f6b0 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.h +++ b/src/server/game/Spells/Auras/SpellAuraEffects.h @@ -70,8 +70,8 @@ class AuraEffect void HandleEffect(Unit* target, uint8 mode, bool apply); void ApplySpellMod(Unit* target, bool apply); - void SetDamage(int32 val) { m_damage = val; } - int32 GetDamage() const { return m_damage; } + void SetBonusAmount(int32 val) { m_bonusAmount = val; } + int32 GetBonusAmount() const { return m_bonusAmount; } void SetCritChance(float val) { m_critChance = val; } float GetCritChance() const { return m_critChance; } void SetDonePct(float val) { m_donePct = val; } @@ -105,7 +105,7 @@ class AuraEffect int32 const m_baseAmount; int32 m_amount; - int32 m_damage; + int32 m_bonusAmount; float m_critChance; float m_donePct; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 87afab1ae5..b036a2b1c0 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1533,14 +1533,8 @@ void Aura::HandleAuraSpecificPeriodics(AuraApplication const* aurApp, Unit* cast { AuraEffect* aurEff = GetEffect(i); - // ignore non positive values (can be result apply spellmods to aura damage - uint32 damage = std::max(aurEff->GetAmount(), 0); - - // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); - - aurEff->SetDonePct(caster->SpellDamagePctDone(target, m_spellInfo, DOT)); // Calculate done percentage first! - aurEff->SetDamage(caster->SpellDamageBonusDone(target, m_spellInfo, damage, DOT, GetStackAmount()) * aurEff->GetDonePct()); + aurEff->SetDonePct(caster->SpellDamagePctDone(target, m_spellInfo, DOT)); + aurEff->SetBonusAmount(caster->SpellDamageBonusDone(target, m_spellInfo, 0, DOT, GetStackAmount())); aurEff->SetCritChance(caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask())); break; } @@ -1549,14 +1543,8 @@ void Aura::HandleAuraSpecificPeriodics(AuraApplication const* aurApp, Unit* cast { AuraEffect* aurEff = GetEffect(i); - // ignore non positive values (can be result apply spellmods to aura damage - uint32 damage = std::max(aurEff->GetAmount(), 0); - - // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); - - aurEff->SetDonePct(caster->SpellHealingPctDone(target, m_spellInfo)); // Calculate done percentage first! - aurEff->SetDamage(caster->SpellHealingBonusDone(target, m_spellInfo, damage, DOT, GetStackAmount()) * aurEff->GetDonePct()); + aurEff->SetDonePct(caster->SpellHealingPctDone(target, m_spellInfo)); + aurEff->SetBonusAmount(caster->SpellHealingBonusDone(target, m_spellInfo, 0, DOT, GetStackAmount())); aurEff->SetCritChance(caster->GetUnitSpellCriticalChance(target, m_spellInfo, m_spellInfo->GetSchoolMask())); break; } diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index dce2422023..96977804f7 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -1001,9 +1001,9 @@ DynamicObject* AuraScript::GetDynobjOwner() const return m_aura->GetDynobjOwner(); } -void AuraScript::Remove(uint32 removeMode) +void AuraScript::Remove(AuraRemoveMode removeMode) { - m_aura->Remove((AuraRemoveMode)removeMode); + m_aura->Remove(removeMode); } Aura* AuraScript::GetAura() const diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index c7bbe0ed01..0916a43498 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -813,7 +813,7 @@ class AuraScript : public _SpellScript DynamicObject* GetDynobjOwner() const; // removes aura with remove mode (see AuraRemoveMode enum) - void Remove(uint32 removeMode = 0); + void Remove(AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT); // returns aura object of script Aura* GetAura() const; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index b7d61c55d9..1bac937ad7 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1156,6 +1156,25 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_CHARDELETE_HEROIC_MIN_LEVEL] = sConfigMgr->GetIntDefault("CharDelete.Heroic.MinLevel", 0); m_int_configs[CONFIG_CHARDELETE_KEEP_DAYS] = sConfigMgr->GetIntDefault("CharDelete.KeepDays", 30); + // No aggro from gray mobs + m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE] = sConfigMgr->GetIntDefault("NoGrayAggro.Above", 0); + m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW] = sConfigMgr->GetIntDefault("NoGrayAggro.Below", 0); + if (m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE] > m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) + { + TC_LOG_ERROR("server.loading", "NoGrayAggro.Above (%i) must be in range 0..%u. Set to %u.", m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE], m_int_configs[CONFIG_MAX_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE] = m_int_configs[CONFIG_MAX_PLAYER_LEVEL]; + } + if (m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW] > m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) + { + TC_LOG_ERROR("server.loading", "NoGrayAggro.Below (%i) must be in range 0..%u. Set to %u.", m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW], m_int_configs[CONFIG_MAX_PLAYER_LEVEL], m_int_configs[CONFIG_MAX_PLAYER_LEVEL]); + m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW] = m_int_configs[CONFIG_MAX_PLAYER_LEVEL]; + } + if (m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE] > 0 && m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE] < m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW]) + { + TC_LOG_ERROR("server.loading", "NoGrayAggro.Below (%i) cannot be greater than NoGrayAggro.Above (%i). Set to %i.", m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW], m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE], m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE]); + m_int_configs[CONFIG_NO_GRAY_AGGRO_BELOW] = m_int_configs[CONFIG_NO_GRAY_AGGRO_ABOVE]; + } + ///- Read the "Data" directory from the config file std::string dataPath = sConfigMgr->GetStringDefault("DataDir", "./"); if (dataPath.empty() || (dataPath.at(dataPath.length()-1) != '/' && dataPath.at(dataPath.length()-1) != '\\')) diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 1a93d549c0..d970cbaf0a 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -362,6 +362,8 @@ enum WorldIntConfigs CONFIG_CHARTER_COST_ARENA_2v2, CONFIG_CHARTER_COST_ARENA_3v3, CONFIG_CHARTER_COST_ARENA_5v5, + CONFIG_NO_GRAY_AGGRO_ABOVE, + CONFIG_NO_GRAY_AGGRO_BELOW, INT_CONFIG_VALUE_COUNT }; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 96651e5bff..b094eb45dc 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -33,7 +33,14 @@ enum Spells SPELL_DRAINLIFE = 20743, SPELL_DRAIN_MANA = 17243, SPELL_ICETOMB = 16869 +}; +enum MalekiEvents +{ + EVENT_FROSTBOLT = 1, + EVENT_DRAINLIFE = 2, + EVENT_DRAIN_MANA = 3, + EVENT_ICETOMB = 4 }; class boss_maleki_the_pallid : public CreatureScript @@ -41,39 +48,23 @@ class boss_maleki_the_pallid : public CreatureScript public: boss_maleki_the_pallid() : CreatureScript("boss_maleki_the_pallid") { } - CreatureAI* GetAI(Creature* creature) const override - { - return GetInstanceAI(creature); - } - struct boss_maleki_the_pallidAI : public ScriptedAI { boss_maleki_the_pallidAI(Creature* creature) : ScriptedAI(creature) { - Initialize(); instance = me->GetInstanceScript(); } - void Initialize() - { - Frostbolt_Timer = 1000; - IceTomb_Timer = 16000; - DrainLife_Timer = 31000; - } - - InstanceScript* instance; - - uint32 Frostbolt_Timer; - uint32 IceTomb_Timer; - uint32 DrainLife_Timer; - void Reset() override { - Initialize(); + _events.Reset(); } void EnterCombat(Unit* /*who*/) override { + _events.ScheduleEvent(EVENT_FROSTBOLT, 1 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_ICETOMB, 16 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS); } void JustDied(Unit* /*killer*/) override @@ -87,34 +78,47 @@ public: if (!UpdateVictim()) return; - //Frostbolt - if (Frostbolt_Timer <= diff) - { - if (rand32() % 100 < 90) - DoCastVictim(SPELL_FROSTBOLT); - Frostbolt_Timer = 3500; - } else Frostbolt_Timer -= diff; + _events.Update(diff); - //IceTomb - if (IceTomb_Timer <= diff) - { - if (rand32() % 100 < 65) - DoCastVictim(SPELL_ICETOMB); - IceTomb_Timer = 28000; - } else IceTomb_Timer -= diff; + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; - //DrainLife - if (DrainLife_Timer <= diff) + while (uint32 eventId = _events.ExecuteEvent()) { - if (rand32() % 100 < 55) - DoCastVictim(SPELL_DRAINLIFE); - DrainLife_Timer = 31000; - } else DrainLife_Timer -= diff; + switch (eventId) + { + case EVENT_FROSTBOLT: + if (rand32() % 90) + DoCastVictim(SPELL_FROSTBOLT); + _events.ScheduleEvent(EVENT_FROSTBOLT, 3.5 * IN_MILLISECONDS); + break; + case EVENT_ICETOMB: + if (rand32() % 65) + DoCastVictim(SPELL_ICETOMB); + _events.ScheduleEvent(EVENT_ICETOMB, 28 * IN_MILLISECONDS); + break; + case EVENT_DRAINLIFE: + if (rand32() % 55) + DoCastVictim(SPELL_DRAINLIFE); + _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS); + break; + default: + break; + } + } DoMeleeAttackIfReady(); } + + private: + EventMap _events; + InstanceScript* instance; }; + CreatureAI* GetAI(Creature* creature) const override + { + return GetInstanceAI(creature); + } }; void AddSC_boss_maleki_the_pallid() diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index 6d9ccc5e88..0b3fa2e7ca 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -55,7 +55,8 @@ enum Events class boss_postmaster_malown : public CreatureScript { - public: boss_postmaster_malown() : CreatureScript("boss_postmaster_malown") { } + public: + boss_postmaster_malown() : CreatureScript("boss_postmaster_malown") { } struct boss_postmaster_malownAI : public BossAI { @@ -120,13 +121,14 @@ class boss_postmaster_malown : public CreatureScript break; } } + DoMeleeAttackIfReady(); } }; CreatureAI* GetAI(Creature* creature) const override { - return new boss_postmaster_malownAI(creature); + return GetInstanceAI(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index b6e8c48058..ea56494f0f 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -247,14 +247,11 @@ public: DoCastAOE(SPELL_DARKNESS); } else - { - DarkFiend = false; me->SummonCreatureGroup(CREATURE_GROUP_DARKFIENDS); - } events.ScheduleEvent(EVENT_DARKNESS, DarkFiend ? 3000 : 42000, 0, PHASE_ONE); break; case EVENT_SUMMON_HUMANOIDS: - me->SummonCreatureGroup(CREATURE_GROUP_DARKFIENDS); + me->SummonCreatureGroup(CREATURE_GROUP_HUMANOIDS); events.ScheduleEvent(EVENT_SUMMON_HUMANOIDS, 60000, 0, PHASE_ONE); break; case EVENT_SUMMON_SENTINEL: diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index 4d65ec6e29..be2f526892 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -21,6 +21,8 @@ #define DataHeader "BFD" +uint32 const EncounterCount = 3; + enum Data64 { DATA_SHRINE1, @@ -35,10 +37,9 @@ enum Data64 enum Data { - TYPE_GELIHAST, - TYPE_KELRIS, - TYPE_SHRINE, - TYPE_AKU_MAI, + DATA_GELIHAST, + DATA_KELRIS, + DATA_AKU_MAI, DATA_FIRE, DATA_EVENT }; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index cb5c40cadc..46008244aa 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -28,7 +28,7 @@ enum Spells enum Events { EVENT_POISON_CLOUD = 1, - EVENT_FRENZIED_RAGE = 2 + EVENT_FRENZIED_RAGE }; class boss_aku_mai : public CreatureScript @@ -38,7 +38,7 @@ public: struct boss_aku_maiAI : public BossAI { - boss_aku_maiAI(Creature* creature) : BossAI(creature, TYPE_AKU_MAI) + boss_aku_maiAI(Creature* creature) : BossAI(creature, DATA_AKU_MAI) { Initialize(); } @@ -56,42 +56,30 @@ public: void EnterCombat(Unit* /*who*/) override { - events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); _EnterCombat(); + events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); } - void JustDied(Unit* /*killer*/) override + void DamageTaken(Unit* /*atacker*/, uint32 &damage) override { - _JustDied(); - } - - void UpdateAI(uint32 diff) override - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (!IsEnraged && HealthBelowPct(30)) - events.ScheduleEvent(EVENT_FRENZIED_RAGE, 100); - - while (uint32 eventId = events.ExecuteEvent()) + if (!IsEnraged && me->HealthBelowPctDamaged(30, damage)) { - switch (eventId) - { - case EVENT_POISON_CLOUD: - DoCastVictim(SPELL_POISON_CLOUD); - events.ScheduleEvent(EVENT_POISON_CLOUD, urand(25000, 50000)); - break; - case EVENT_FRENZIED_RAGE: - DoCast(me, SPELL_FRENZIED_RAGE); - IsEnraged = true; - break; - default: - break; - } + DoCast(me, SPELL_FRENZIED_RAGE); + IsEnraged = true; + } + } + + void ExecuteEvent(uint32 eventId) override + { + switch (eventId) + { + case EVENT_POISON_CLOUD: + DoCastVictim(SPELL_POISON_CLOUD); + events.ScheduleEvent(EVENT_POISON_CLOUD, urand(25000, 50000)); + break; + default: + break; } - DoMeleeAttackIfReady(); } private: @@ -100,7 +88,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new boss_aku_maiAI(creature); + return GetInstanceAI(creature); } }; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index a432a5714e..a68558b9c2 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -21,7 +21,12 @@ enum Spells { - SPELL_NET = 6533 + SPELL_NET = 6533 +}; + +enum Events +{ + EVENT_THROW_NET = 1 }; class boss_gelihast : public CreatureScript @@ -29,42 +34,14 @@ class boss_gelihast : public CreatureScript public: boss_gelihast() : CreatureScript("boss_gelihast") { } - CreatureAI* GetAI(Creature* creature) const override + struct boss_gelihastAI : public BossAI { - return GetInstanceAI(creature); - } - - struct boss_gelihastAI : public ScriptedAI - { - boss_gelihastAI(Creature* creature) : ScriptedAI(creature) - { - Initialize(); - instance = creature->GetInstanceScript(); - } - - void Initialize() - { - netTimer = urand(2000, 4000); - } - - uint32 netTimer; - - InstanceScript* instance; - - void Reset() override - { - Initialize(); - instance->SetData(TYPE_GELIHAST, NOT_STARTED); - } + boss_gelihastAI(Creature* creature) : BossAI(creature, DATA_GELIHAST) { } void EnterCombat(Unit* /*who*/) override { - instance->SetData(TYPE_GELIHAST, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) override - { - instance->SetData(TYPE_GELIHAST, DONE); + _EnterCombat(); + events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000)); } void UpdateAI(uint32 diff) override @@ -72,15 +49,25 @@ public: if (!UpdateVictim()) return; - if (netTimer < diff) + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) { - DoCastVictim(SPELL_NET); - netTimer = urand(4000, 7000); - } else netTimer -= diff; + if (eventId == EVENT_THROW_NET) + { + DoCastVictim(SPELL_NET); + events.ScheduleEvent(EVENT_THROW_NET, urand(4000, 7000)); + } + } DoMeleeAttackIfReady(); } }; + + CreatureAI* GetAI(Creature* creature) const override + { + return GetInstanceAI(creature); + } }; void AddSC_boss_gelihast() diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 202c50014f..4bff75d8ef 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -21,12 +21,21 @@ enum Spells { - SPELL_MIND_BLAST = 15587, - SPELL_SLEEP = 8399, + SPELL_MIND_BLAST = 15587, + SPELL_SLEEP = 8399, +}; - SAY_AGGRO = 0, - SAY_SLEEP = 1, - SAY_DEATH = 2 +enum Texts +{ + SAY_AGGRO = 0, + SAY_SLEEP = 1, + SAY_DEATH = 2 +}; + +enum Events +{ + EVENT_MIND_BLAST = 1, + EVENT_SLEEP }; class boss_kelris : public CreatureScript @@ -34,46 +43,22 @@ class boss_kelris : public CreatureScript public: boss_kelris() : CreatureScript("boss_kelris") { } - CreatureAI* GetAI(Creature* creature) const override + struct boss_kelrisAI : public BossAI { - return GetInstanceAI(creature); - } - - struct boss_kelrisAI : public ScriptedAI - { - boss_kelrisAI(Creature* creature) : ScriptedAI(creature) - { - Initialize(); - instance = creature->GetInstanceScript(); - } - - void Initialize() - { - mindBlastTimer = urand(2000, 5000); - sleepTimer = urand(9000, 12000); - } - - uint32 mindBlastTimer; - uint32 sleepTimer; - - InstanceScript* instance; - - void Reset() override - { - Initialize(); - instance->SetData(TYPE_KELRIS, NOT_STARTED); - } + boss_kelrisAI(Creature* creature) : BossAI(creature, DATA_KELRIS) { } void EnterCombat(Unit* /*who*/) override { + _EnterCombat(); Talk(SAY_AGGRO); - instance->SetData(TYPE_KELRIS, IN_PROGRESS); + events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000)); + events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000)); } void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - instance->SetData(TYPE_KELRIS, DONE); + _JustDied(); } void UpdateAI(uint32 diff) override @@ -81,25 +66,40 @@ public: if (!UpdateVictim()) return; - if (mindBlastTimer < diff) - { - DoCastVictim(SPELL_MIND_BLAST); - mindBlastTimer = urand(7000, 9000); - } else mindBlastTimer -= diff; + events.Update(diff); - if (sleepTimer < diff) + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + switch (eventId) { - Talk(SAY_SLEEP); - DoCast(target, SPELL_SLEEP); + case EVENT_MIND_BLAST: + DoCastVictim(SPELL_MIND_BLAST); + events.ScheduleEvent(EVENT_MIND_BLAST, urand(7000, 9000)); + break; + case EVENT_SLEEP: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + Talk(SAY_SLEEP); + DoCast(target, SPELL_SLEEP); + } + events.ScheduleEvent(EVENT_SLEEP, urand(15000, 20000)); + break; + default: + break; } - sleepTimer = urand(15000, 20000); - } else sleepTimer -= diff; + } DoMeleeAttackIfReady(); } }; + + CreatureAI* GetAI(Creature* creature) const override + { + return GetInstanceAI(creature); + } }; void AddSC_boss_kelris() diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index f6fdd260c0..458539f1da 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -27,14 +27,6 @@ EndScriptData */ #include "InstanceScript.h" #include "blackfathom_deeps.h" -#define MAX_ENCOUNTER 4 - -/* Encounter 0 = Gelihast - Encounter 1 = Twilight Lord Kelris - Encounter 2 = Shrine event - Encounter 3 = Aku'Mai - */ - const Position LorgusPosition[4] = { { -458.500610f, -38.343079f, -33.474445f, 0.0f }, @@ -67,25 +59,12 @@ public: instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) { SetHeaders(DataHeader); - memset(&encounter, 0, sizeof(encounter)); + SetBossNumber(EncounterCount); countFires = 0; deathTimes = 0; } - ObjectGuid twilightLordKelrisGUID; - ObjectGuid shrine1GUID; - ObjectGuid shrine2GUID; - ObjectGuid shrine3GUID; - ObjectGuid shrine4GUID; - ObjectGuid shrineOfGelihastGUID; - ObjectGuid altarOfTheDeepsGUID; - ObjectGuid mainDoorGUID; - - uint8 encounter[MAX_ENCOUNTER]; - uint8 countFires; - uint8 deathTimes; - void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) @@ -117,16 +96,16 @@ public: break; case GO_SHRINE_OF_GELIHAST: shrineOfGelihastGUID = go->GetGUID(); - if (encounter[0] != DONE) + if (GetBossState(DATA_GELIHAST) != DONE) go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); break; case GO_ALTAR_OF_THE_DEEPS: altarOfTheDeepsGUID = go->GetGUID(); - if (encounter[3] != DONE) + if (GetBossState(DATA_AKU_MAI) != DONE) go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); break; case GO_AKU_MAI_DOOR: - if (encounter[2] == DONE) + if (GetBossState(DATA_AKU_MAI) == DONE) HandleGameObject(ObjectGuid::Empty, true, go); mainDoorGUID = go->GetGUID(); break; @@ -137,21 +116,6 @@ public: { switch (type) { - case TYPE_GELIHAST: - encounter[0] = data; - if (data == DONE) - if (GameObject* go = instance->GetGameObject(shrineOfGelihastGUID)) - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); - break; - case TYPE_AKU_MAI: - encounter[3] = data; - if (data == DONE) - if (GameObject* go = instance->GetGameObject(altarOfTheDeepsGUID)) - { - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); - go->SummonCreature(NPC_MORRIDUNE, SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - } - break; case DATA_FIRE: countFires = data; switch (countFires) @@ -159,10 +123,8 @@ public: case 1: if (GameObject* go = instance->GetGameObject(shrine1GUID)) { - go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + for (uint8 i = 0; i < 4; ++i) + go->SummonCreature(NPC_AKU_MAI_SNAPJAW, SpawnsLocation[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); } break; case 2: @@ -187,10 +149,8 @@ public: case 4: if (GameObject* go = instance->GetGameObject(shrine1GUID)) { - go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + for (uint8 i = 0; i < 4; ++i) + go->SummonCreature(NPC_BARBED_CRUSTACEAN, SpawnsLocation[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); } break; } @@ -203,18 +163,37 @@ public: } } + bool SetBossState(uint32 type, EncounterState state) override + { + if (!InstanceScript::SetBossState(type, state)) + return false; + + switch (type) + { + case DATA_GELIHAST: + if (state == DONE) + if (GameObject* go = instance->GetGameObject(shrineOfGelihastGUID)) + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + break; + case DATA_AKU_MAI: + if (state == DONE) + if (GameObject* go = instance->GetGameObject(altarOfTheDeepsGUID)) + { + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + go->SummonCreature(NPC_MORRIDUNE, SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + } + break; + default: + break; + } + + return true; + } + uint32 GetData(uint32 type) const override { switch (type) { - case TYPE_GELIHAST: - return encounter[0]; - case TYPE_KELRIS: - return encounter[1]; - case TYPE_SHRINE: - return encounter[2]; - case TYPE_AKU_MAI: - return encounter[3]; case DATA_FIRE: return countFires; case DATA_EVENT: @@ -246,6 +225,18 @@ public: return ObjectGuid::Empty; } + + private: + ObjectGuid twilightLordKelrisGUID; + ObjectGuid shrine1GUID; + ObjectGuid shrine2GUID; + ObjectGuid shrine3GUID; + ObjectGuid shrine4GUID; + ObjectGuid shrineOfGelihastGUID; + ObjectGuid altarOfTheDeepsGUID; + ObjectGuid mainDoorGUID; + uint8 countFires; + uint8 deathTimes; }; }; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index c4994a04db..b849b095ce 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -16,6 +16,7 @@ * with this program. If not, see . */ +#include "GameEventMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "nexus.h" diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index f3e655b45b..a6c00c05dc 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -86,6 +86,7 @@ class boss_nazan : public CreatureScript void Reset() override { Initialize(); + _Reset(); } void EnterCombat(Unit* /*who*/) override { } @@ -297,7 +298,6 @@ class boss_vazruden_the_herald : public CreatureScript Initialize(); summoned = false; sentryDown = false; - lootSpawned = false; } void Initialize() @@ -434,13 +434,6 @@ class boss_vazruden_the_herald : public CreatureScript return; } } - else if (!lootSpawned) - { - me->SummonGameObject(DUNGEON_MODE(GO_FEL_IRON_CHEST_NORMAL, GO_FEL_IRON_CHECT_HEROIC), VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, 0, 0, 0, 0, 0); - me->SetLootRecipient(NULL); // don't think this is necessary.. - //me->Kill(me); - lootSpawned = true; - } check = 2000; } else @@ -457,7 +450,6 @@ class boss_vazruden_the_herald : public CreatureScript ObjectGuid NazanGUID; ObjectGuid VazrudenGUID; bool summoned; - bool lootSpawned; }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index 100a10fadc..f41b76a1a0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -43,7 +43,7 @@ enum CreatureIds enum GameobjectIds { GO_FEL_IRON_CHEST_NORMAL = 185168, - GO_FEL_IRON_CHECT_HEROIC = 185169 + GO_FEL_IRON_CHEST_HEROIC = 185169 }; #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 1e8f1b5e9a..4d45845c64 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -36,7 +36,6 @@ class instance_ramparts : public InstanceMapScript { instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) { - spawned = false; SetHeaders(DataHeader); SetBossNumber(EncounterCount); } @@ -46,7 +45,7 @@ class instance_ramparts : public InstanceMapScript switch (go->GetEntry()) { case GO_FEL_IRON_CHEST_NORMAL: - case GO_FEL_IRON_CHECT_HEROIC: + case GO_FEL_IRON_CHEST_HEROIC: felIronChestGUID = go->GetGUID(); break; } @@ -61,11 +60,11 @@ class instance_ramparts : public InstanceMapScript { case DATA_VAZRUDEN: case DATA_NAZAN: - if (GetBossState(DATA_VAZRUDEN) == DONE && GetBossState(DATA_NAZAN) == DONE && !spawned) - { - DoRespawnGameObject(felIronChestGUID, HOUR*IN_MILLISECONDS); - spawned = true; - } + if (GetBossState(DATA_VAZRUDEN) == DONE && GetBossState(DATA_NAZAN) == DONE) + if (GameObject* chest = instance->GetGameObject(felIronChestGUID)) + chest->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + break; + default: break; } return true; @@ -73,7 +72,6 @@ class instance_ramparts : public InstanceMapScript protected: ObjectGuid felIronChestGUID; - bool spawned; }; InstanceScript* GetInstanceScript(InstanceMap* map) const override diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 07195a334b..86cf61183b 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1046,7 +1046,7 @@ class spell_dk_pestilence : public SpellScriptLoader { aurEffNew->SetCritChance(critChance); // Blood Plague can crit if caster has T9. aurEffNew->SetDonePct(donePct); - aurEffNew->SetDamage(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), std::max(aurEffNew->GetAmount(), 0), DOT) * donePct); + aurEffNew->SetBonusAmount(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), 0, DOT)); } } } @@ -1065,7 +1065,7 @@ class spell_dk_pestilence : public SpellScriptLoader if (AuraEffect* aurEffNew = aurNew->GetEffect(EFFECT_0)) { aurEffNew->SetDonePct(donePct); - aurEffNew->SetDamage(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), std::max(aurEffNew->GetAmount(), 0), DOT) * donePct); + aurEffNew->SetBonusAmount(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), 0, DOT)); } } } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 8867b3cccc..95109f7404 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -750,9 +750,7 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader if (Unit* target = GetHitUnit()) if (AuraEffect* aur = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, caster->GetGUID())) { - uint32 damage = std::max(aur->GetAmount(), 0); - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); - aur->SetDamage(caster->SpellDamageBonusDone(target, aur->GetSpellInfo(), damage, DOT) * aur->GetDonePct()); + aur->SetBonusAmount(caster->SpellDamageBonusDone(target, aur->GetSpellInfo(), 0, DOT)); aur->CalculatePeriodic(caster, false, false); aur->GetBase()->RefreshDuration(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 0333604a75..777a3b437d 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -543,9 +543,7 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader // Refresh corruption on target if (AuraEffect* aurEff = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_WARLOCK, 0x2, 0, 0, caster->GetGUID())) { - uint32 damage = std::max(aurEff->GetAmount(), 0); - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); - aurEff->SetDamage(caster->SpellDamageBonusDone(target, aurEff->GetSpellInfo(), damage, DOT) * aurEff->GetDonePct()); + aur->SetBonusAmount(caster->SpellDamageBonusDone(target, aur->GetSpellInfo(), 0, DOT)); aurEff->CalculatePeriodic(caster, false, false); aurEff->GetBase()->RefreshDuration(true); } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index c52c316387..1a81ca328d 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -249,7 +249,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader // Add remaining ticks to damage done if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC, EFFECT_0, caster->GetGUID())) - damage += aurEff->GetDamage() * int32(ticks - aurEff->GetTickNumber()); + damage += (aurEff->GetAmount() + aurEff->GetBonusAmount()) * aurEff->GetDonePct() * int32(ticks - aurEff->GetTickNumber()); damage /= int32(ticks); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 9ad63d9306..e1108f5422 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2660,6 +2660,21 @@ Calculate.Creature.Zone.Area.Data = 0 Calculate.Gameoject.Zone.Area.Data = 0 +# +# NoGrayAggro +# Description: Gray mobs will not aggro players above/below some levels +# NoGrayAggro.Above: If player is at this level or above, gray mobs will not attack +# NoGrayAggro.Below: If player is at this level or below, gray mobs will not attack +# Example: You can for example make players free from gray until they reach level 30. +# Then gray will start to attack them, until they reach max level (80 for example): +# NoGrayAggro.Above = 80 +# NoGrayAggro.Below = 29 +# Default: 0 - (Blizzlike) +# + +NoGrayAggro.Above = 0 +NoGrayAggro.Below = 0 + # ################################################################################################### diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index d806858eea..350c8becb3 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -12,4 +12,3 @@ add_subdirectory(map_extractor) add_subdirectory(vmap4_assembler) add_subdirectory(vmap4_extractor) add_subdirectory(mmaps_generator) -endif()