From acd46085d1f496657e27e0d5f823f53d466702dc Mon Sep 17 00:00:00 2001 From: joschiwald Date: Thu, 30 Jan 2014 02:40:12 +0100 Subject: Core/Spells: drop last leftovers of hardcoded spell target selection and move it into spellscripts Closes #1719 Closes #3186 --- src/server/game/Spells/Spell.cpp | 74 +-------- src/server/game/Spells/Spell.h | 2 +- src/server/game/Spells/SpellEffects.cpp | 61 +------ src/server/game/Spells/SpellScript.cpp | 14 +- src/server/game/Spells/SpellScript.h | 3 +- src/server/scripts/Spells/spell_dk.cpp | 273 ++++++++++++++++++++++++++++++-- 6 files changed, 277 insertions(+), 150 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e72a1da563e..8e0861cdb88 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1171,77 +1171,6 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge float radius = m_spellInfo->Effects[effIndex].CalcRadius(m_caster) * m_spellValue->RadiusMod; SearchAreaTargets(targets, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), m_spellInfo->Effects[effIndex].ImplicitTargetConditions); - // Custom entries - /// @todo remove those - switch (m_spellInfo->Id) - { - case 46584: // Raise Dead - { - if (Player* playerCaster = m_caster->ToPlayer()) - { - for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) - { - switch ((*itr)->GetTypeId()) - { - case TYPEID_UNIT: - case TYPEID_PLAYER: - { - Unit* unitTarget = (*itr)->ToUnit(); - if (unitTarget->IsAlive() || !playerCaster->isHonorOrXPTarget(unitTarget) - || ((unitTarget->GetCreatureTypeMask() & (1 << (CREATURE_TYPE_HUMANOID-1))) == 0) - || (unitTarget->GetDisplayId() != unitTarget->GetNativeDisplayId())) - break; - AddUnitTarget(unitTarget, effMask, false); - // no break; - } - case TYPEID_CORPSE: // wont work until corpses are allowed in target lists, but at least will send dest in packet - m_targets.SetDst(*(*itr)); - return; // nothing more to do here - default: - break; - } - } - } - return; // don't add targets to target map - } - // Corpse Explosion - case 49158: - case 51325: - case 51326: - case 51327: - case 51328: - // check if our target is not valid (spell can target ghoul or dead unit) - if (!(m_targets.GetUnitTarget() && m_targets.GetUnitTarget()->GetDisplayId() == m_targets.GetUnitTarget()->GetNativeDisplayId() && - ((m_targets.GetUnitTarget()->GetEntry() == 26125 && m_targets.GetUnitTarget()->GetOwnerGUID() == m_caster->GetGUID()) - || m_targets.GetUnitTarget()->isDead()))) - { - // remove existing targets - CleanupTargetList(); - - for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) - { - switch ((*itr)->GetTypeId()) - { - case TYPEID_UNIT: - case TYPEID_PLAYER: - if (!(*itr)->ToUnit()->isDead()) - break; - AddUnitTarget((*itr)->ToUnit(), 1 << effIndex, false); - return; - default: - break; - } - } - if (m_caster->GetTypeId() == TYPEID_PLAYER) - m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); - SendCastResult(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW); - finish(false); - } - return; - default: - break; - } - CallScriptObjectAreaTargetSelectHandlers(targets, effIndex); if (!targets.empty()) @@ -4866,8 +4795,7 @@ SpellCastResult Spell::CheckCast(bool strict) uint32 zone, area; m_caster->GetZoneAndAreaId(zone, area); - SpellCastResult locRes= m_spellInfo->CheckLocation(m_caster->GetMapId(), zone, area, - m_caster->GetTypeId() == TYPEID_PLAYER ? m_caster->ToPlayer() : NULL); + SpellCastResult locRes = m_spellInfo->CheckLocation(m_caster->GetMapId(), zone, area, m_caster->ToPlayer()); if (locRes != SPELL_CAST_OK) return locRes; } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 76be075e94d..031311f2749 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -557,7 +557,7 @@ class Spell GameObject* focusObject; // Damage and healing in effects need just calculate - int32 m_damage; // Damge in effects count here + int32 m_damage; // Damage in effects count here int32 m_healing; // Healing in effects count here // ****************************************** diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index b2b4690f893..19cc2fe95c5 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -682,11 +682,6 @@ void Spell::EffectDummy(SpellEffIndex effIndex) if (!unitTarget && !gameObjTarget && !itemTarget) return; - uint32 spell_id = 0; - int32 bp = 0; - bool triggered = true; - SpellCastTargets targets; - // selection by spell family switch (m_spellInfo->SpellFamilyName) { @@ -723,60 +718,10 @@ void Spell::EffectDummy(SpellEffIndex effIndex) } } break; - case SPELLFAMILY_DEATHKNIGHT: - switch (m_spellInfo->Id) - { - case 46584: // Raise Dead - if (m_caster->GetTypeId() != TYPEID_PLAYER) - return; - - // Do we have talent Master of Ghouls? - if (m_caster->HasAura(52143)) - // summon as pet - bp = 52150; - else - // or guardian - bp = 46585; - - if (m_targets.HasDst()) - targets.SetDst(*m_targets.GetDstPos()); - else - { - targets.SetDst(*m_caster); - // Corpse not found - take reagents (only not triggered cast can take them) - triggered = false; - } - // Remove cooldown - summon spellls have category - m_caster->ToPlayer()->RemoveSpellCooldown(m_spellInfo->Id, true); - spell_id = 48289; - break; - // Raise dead - take reagents and trigger summon spells - case 48289: - if (m_targets.HasDst()) - targets.SetDst(*m_targets.GetDstPos()); - spell_id = CalculateDamage(0, NULL); - break; - } + default: break; } - //spells triggered by dummy effect should not miss - if (spell_id) - { - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell_id); - - if (!spellInfo) - { - TC_LOG_ERROR("spells", "EffectDummy of spell %u: triggering unknown spell id %i\n", m_spellInfo->Id, spell_id); - return; - } - - targets.SetUnitTarget(unitTarget); - Spell* spell = new Spell(m_caster, spellInfo, triggered ? TRIGGERED_FULL_MASK : TRIGGERED_NONE, m_originalCasterGUID, true); - if (bp) spell->SetSpellValue(SPELLVALUE_BASE_POINT0, bp); - spell->prepare(&targets); - } - // pet auras if (PetAura const* petSpell = sSpellMgr->GetPetAura(m_spellInfo->Id, effIndex)) { @@ -910,7 +855,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id); if (!spellInfo) { - TC_LOG_DEBUG("spells", "Spell::EffectTriggerSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id); + TC_LOG_ERROR("spells", "Spell::EffectTriggerSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id); return; } @@ -962,7 +907,7 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex) SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id); if (!spellInfo) { - TC_LOG_DEBUG("spells", "Spell::EffectTriggerMissileSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id); + TC_LOG_ERROR("spells", "Spell::EffectTriggerMissileSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id); return; } diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index c7eebb495c0..d984dbc8901 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -576,16 +576,26 @@ void SpellScript::PreventHitDefaultEffect(SpellEffIndex effIndex) m_hitPreventDefaultEffectMask |= 1 << effIndex; } -int32 SpellScript::GetEffectValue() +int32 SpellScript::GetEffectValue() const { if (!IsInEffectHook()) { - TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::PreventHitDefaultEffect was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); + TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::GetEffectValue was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); return 0; } return m_spell->damage; } +void SpellScript::SetEffectValue(int32 value) +{ + if (!IsInEffectHook()) + { + TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetEffectValue was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); + return; + } + m_spell->damage = value; +} + Item* SpellScript::GetCastItem() { return m_spell->m_CastItem; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index dfa494e38e6..6378a8bed9b 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -411,7 +411,8 @@ class SpellScript : public _SpellScript void PreventHitDefaultEffect(SpellEffIndex effIndex); // method avalible only in EffectHandler method - int32 GetEffectValue(); + int32 GetEffectValue() const; + void SetEffectValue(int32 value); // returns: cast item if present. Item* GetCastItem(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index e2e4d30541c..e8108f03e7d 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -25,6 +25,7 @@ #include "ScriptMgr.h" #include "SpellScript.h" #include "SpellAuraEffects.h" +#include "Containers.h" enum DeathKnightSpells { @@ -49,6 +50,8 @@ enum DeathKnightSpells SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED = 63622, SPELL_DK_ITEM_SIGIL_VENGEFUL_HEART = 64962, SPELL_DK_ITEM_T8_MELEE_4P_BONUS = 64736, + SPELL_DK_MASTER_OF_GHOULS = 52143, + SPELL_DK_RAISE_DEAD_USE_REAGENT = 48289, SPELL_DK_RUNIC_POWER_ENERGIZE = 49088, SPELL_DK_SCENT_OF_BLOOD = 50422, SPELL_DK_SCOURGE_STRIKE_TRIGGERED = 70890, @@ -63,6 +66,11 @@ enum DeathKnightSpellIcons DK_ICON_ID_IMPROVED_DEATH_STRIKE = 2751 }; +enum Misc +{ + NPC_DK_GHOUL = 26125 +}; + // 50462 - Anti-Magic Shell (on raid member) class spell_dk_anti_magic_shell_raid : public SpellScriptLoader { @@ -311,6 +319,28 @@ class spell_dk_blood_gorged : public SpellScriptLoader } }; +class CorpseExplosionCheck +{ +public: + explicit CorpseExplosionCheck(uint64 casterGUID) : _casterGUID(casterGUID) { } + + bool operator()(WorldObject* obj) const + { + if (Unit* target = obj->ToUnit()) + { + if ((target->isDead() || (target->GetEntry() == NPC_DK_GHOUL && target->GetOwnerGUID() == _casterGUID)) + && !(target->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL) + && target->GetDisplayId() == target->GetNativeDisplayId()) + return false; + } + + return true; + } + +private: + uint64 _casterGUID; +}; + // 49158 - Corpse Explosion (51325, 51326, 51327, 51328) class spell_dk_corpse_explosion : public SpellScriptLoader { @@ -321,41 +351,87 @@ class spell_dk_corpse_explosion : public SpellScriptLoader { PrepareSpellScript(spell_dk_corpse_explosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* spellInfo) OVERRIDE { - if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_DK_GHOUL_EXPLODE)) - return false; - if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_VISUAL)) + if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED) + || !sSpellMgr->GetSpellInfo(SPELL_DK_GHOUL_EXPLODE) + || !sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_VISUAL) + || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_1].CalcValue())) return false; return true; } - void HandleDummy(SpellEffIndex /*effIndex*/) + bool Load() OVERRIDE + { + _target = NULL; + return true; + } + + void CheckTarget(WorldObject*& target) + { + if (CorpseExplosionCheck(GetCaster()->GetGUID())(target)) + target = NULL; + + _target = target; + } + + void CheckTargets(std::list& targets) + { + WorldObject* target = _target; + if (!target) + { + targets.remove_if(CorpseExplosionCheck(GetCaster()->GetGUID())); + if (targets.empty()) + { + FinishCast(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW); + return; + } + target = Trinity::Containers::SelectRandomContainerElement(targets); + targets.clear(); + targets.push_back(target); + } + else + targets.clear(); + } + + void HandleDamage(SpellEffIndex effIndex, Unit* target) + { + if (effIndex == EFFECT_0) + GetCaster()->CastCustomSpell(GetSpellInfo()->Effects[EFFECT_1].CalcValue(), SPELLVALUE_BASE_POINT0, GetEffectValue(), target, true); + else if (effIndex == EFFECT_1) + GetCaster()->CastCustomSpell(GetEffectValue(), SPELLVALUE_BASE_POINT0, GetSpell()->CalculateDamage(EFFECT_0, NULL), target, true); + } + + void HandleCorpseExplosion(SpellEffIndex effIndex) { if (Unit* unitTarget = GetHitUnit()) { - int32 bp = 0; if (unitTarget->IsAlive()) // Living ghoul as a target { - bp = int32(unitTarget->CountPctFromMaxHealth(25)); - unitTarget->CastCustomSpell(unitTarget, SPELL_DK_GHOUL_EXPLODE, &bp, NULL, NULL, false); + unitTarget->CastSpell(unitTarget, SPELL_DK_GHOUL_EXPLODE, false); + // Corpse Explosion (Suicide) and Set corpse look handled in SpellScript of SPELL_DK_GHOUL_EXPLODE } else // Some corpse { - bp = GetEffectValue(); - GetCaster()->CastCustomSpell(unitTarget, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), &bp, NULL, NULL, true); + HandleDamage(effIndex, unitTarget); // Corpse Explosion (Suicide) unitTarget->CastSpell(unitTarget, SPELL_DK_CORPSE_EXPLOSION_TRIGGERED, true); + // Set corpse look + GetCaster()->CastSpell(unitTarget, SPELL_DK_CORPSE_EXPLOSION_VISUAL, true); } - // Set corpse look - GetCaster()->CastSpell(unitTarget, SPELL_DK_CORPSE_EXPLOSION_VISUAL, true); } } void Register() OVERRIDE { - OnEffectHitTarget += SpellEffectFn(spell_dk_corpse_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_dk_corpse_explosion_SpellScript::CheckTarget, EFFECT_0, TARGET_UNIT_TARGET_ANY); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_corpse_explosion_SpellScript::CheckTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget += SpellEffectFn(spell_dk_corpse_explosion_SpellScript::HandleCorpseExplosion, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_dk_corpse_explosion_SpellScript::HandleCorpseExplosion, EFFECT_1, SPELL_EFFECT_DUMMY); } + + private: + WorldObject* _target; }; SpellScript* GetSpellScript() const OVERRIDE @@ -616,24 +692,34 @@ class spell_dk_ghoul_explode : public SpellScriptLoader { PrepareSpellScript(spell_dk_ghoul_explode_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* spellInfo) OVERRIDE { - if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED)) + if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED) + || spellInfo->Effects[EFFECT_2].CalcValue() <= 0) return false; return true; } + void HandleDamage(SpellEffIndex /*effIndex*/) + { + int32 value = int32(GetCaster()->CountPctFromMaxHealth(GetSpellInfo()->Effects[EFFECT_2].CalcValue(GetCaster()))); + SetEffectValue(value); + } + void Suicide(SpellEffIndex /*effIndex*/) { if (Unit* unitTarget = GetHitUnit()) { // Corpse Explosion (Suicide) unitTarget->CastSpell(unitTarget, SPELL_DK_CORPSE_EXPLOSION_TRIGGERED, true); + // Set corpse look + GetCaster()->CastSpell(unitTarget, SPELL_DK_CORPSE_EXPLOSION_VISUAL, true); } } void Register() OVERRIDE { + OnEffectLaunchTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -940,6 +1026,162 @@ class spell_dk_presence : public SpellScriptLoader } }; +class RaiseDeadCheck +{ + public: + explicit RaiseDeadCheck(Player const* caster) : _caster(caster) { } + + bool operator()(WorldObject* obj) const + { + if (Unit* target = obj->ToUnit()) + { + if (!target->IsAlive() + && _caster->isHonorOrXPTarget(target) + && target->GetCreatureType() == CREATURE_TYPE_HUMANOID + && target->GetDisplayId() == target->GetNativeDisplayId()) + return false; + } + + return true; + } + + private: + Player const* _caster; +}; + +// 46584 - Raise Dead +class spell_dk_raise_dead : public SpellScriptLoader +{ + public: + spell_dk_raise_dead() : SpellScriptLoader("spell_dk_raise_dead") { } + + class spell_dk_raise_dead_SpellScript : public SpellScript + { + PrepareSpellScript(spell_dk_raise_dead_SpellScript); + + bool Validate(SpellInfo const* spellInfo) OVERRIDE + { + if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_1].CalcValue()) + || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_2].CalcValue()) + || !sSpellMgr->GetSpellInfo(SPELL_DK_RAISE_DEAD_USE_REAGENT) + || !sSpellMgr->GetSpellInfo(SPELL_DK_MASTER_OF_GHOULS)) + return false; + return true; + } + + bool Load() OVERRIDE + { + _result = SPELL_CAST_OK; + _corpse = false; + return GetCaster()->GetTypeId() == TYPEID_PLAYER; + } + + SpellCastResult CheckCast() + { + /// process spell target selection before cast starts + /// targets of effect_1 are used to check cast + GetSpell()->SelectSpellTargets(); + /// cleanup spell target map, and fill it again on normal way + GetSpell()->CleanupTargetList(); + /// _result is set in spell target selection + return _result; + } + + SpellCastResult CheckReagents() + { + /// @workaround: there is no access to castresult of other spells, check it manually + SpellInfo const* reagentSpell = sSpellMgr->GetSpellInfo(SPELL_DK_RAISE_DEAD_USE_REAGENT); + Player* player = GetCaster()->ToPlayer(); + if (!player->CanNoReagentCast(reagentSpell)) + { + for (uint32 i = 0; i < MAX_SPELL_REAGENTS; i++) + { + if (reagentSpell->Reagent[i] <= 0) + continue; + + if (!player->HasItemCount(reagentSpell->Reagent[i], reagentSpell->ReagentCount[i])) + { + Spell::SendCastResult(player, reagentSpell, 0, SPELL_FAILED_REAGENTS); + return SPELL_FAILED_DONT_REPORT; + } + } + } + return SPELL_CAST_OK; + } + + void CheckTargets(std::list& targets) + { + targets.remove_if(RaiseDeadCheck(GetCaster()->ToPlayer())); + + if (targets.empty()) + { + if (GetSpell()->getState() == SPELL_STATE_PREPARING) + _result = CheckReagents(); + + return; + } + + WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets); + targets.clear(); + targets.push_back(target); + _corpse = true; + } + + void CheckTarget(WorldObject*& target) + { + // Don't add caster to target map, if we found a corpse to raise dead + if (_corpse) + target = NULL; + } + + void ConsumeReagents() + { + // No corpse found, take reagents + if (!_corpse) + GetCaster()->CastSpell(GetCaster(), SPELL_DK_RAISE_DEAD_USE_REAGENT, TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST)); + } + + uint32 GetGhoulSpellId() + { + // Do we have talent Master of Ghouls? + if (GetCaster()->HasAura(SPELL_DK_MASTER_OF_GHOULS)) + // summon as pet + return GetSpellInfo()->Effects[EFFECT_2].CalcValue(); + + // or guardian + return GetSpellInfo()->Effects[EFFECT_1].CalcValue(); + } + + void HandleRaiseDead(SpellEffIndex /*effIndex*/) + { + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(GetGhoulSpellId()); + SpellCastTargets targets; + targets.SetDst(*GetHitUnit()); + + GetCaster()->CastSpell(targets, spellInfo, NULL, TRIGGERED_FULL_MASK); + } + + void Register() OVERRIDE + { + OnCheckCast += SpellCheckCastFn(spell_dk_raise_dead_SpellScript::CheckCast); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_raise_dead_SpellScript::CheckTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_dk_raise_dead_SpellScript::CheckTarget, EFFECT_2, TARGET_UNIT_CASTER); + OnCast += SpellCastFn(spell_dk_raise_dead_SpellScript::ConsumeReagents); + OnEffectHitTarget += SpellEffectFn(spell_dk_raise_dead_SpellScript::HandleRaiseDead, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_dk_raise_dead_SpellScript::HandleRaiseDead, EFFECT_2, SPELL_EFFECT_DUMMY); + } + + private: + SpellCastResult _result; + bool _corpse; + }; + + SpellScript* GetSpellScript() const OVERRIDE + { + return new spell_dk_raise_dead_SpellScript(); + } +}; + // 59754 Rune Tap - Party class spell_dk_rune_tap_party : public SpellScriptLoader { @@ -1224,6 +1466,7 @@ void AddSC_deathknight_spell_scripts() new spell_dk_improved_frost_presence(); new spell_dk_improved_unholy_presence(); new spell_dk_presence(); + new spell_dk_raise_dead(); new spell_dk_rune_tap_party(); new spell_dk_scent_of_blood(); new spell_dk_scourge_strike(); -- cgit v1.2.3 From ad8eb434c02e451effd0949aaa7d2b7999d91597 Mon Sep 17 00:00:00 2001 From: Discover- Date: Thu, 30 Jan 2014 10:28:05 +0100 Subject: Core/Misc: Missing changes and get rid of useless method in acd46085d1f496657e27e0d5f823f53d466702dc --- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Entities/Player/Player.h | 2 +- src/server/game/Handlers/MiscHandler.cpp | 1 - src/server/game/Handlers/NPCHandler.cpp | 2 -- src/server/game/Spells/SpellScript.cpp | 10 ---------- src/server/game/Spells/SpellScript.h | 1 - src/server/scripts/Spells/spell_dk.cpp | 2 +- 7 files changed, 3 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9ee7bc4b05a..79716908df8 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23592,7 +23592,7 @@ uint32 Player::GetResurrectionSpellId() } // Used in triggers for check "Only to targets that grant experience or honor" req -bool Player::isHonorOrXPTarget(Unit* victim) +bool Player::isHonorOrXPTarget(Unit* victim) const { uint8 v_level = victim->getLevel(); uint8 k_grey = Trinity::XP::GetGrayLevel(getLevel()); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 1f5f9fee7d4..27331e35949 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1894,7 +1894,7 @@ class Player : public Unit, public GridObject bool IsAtRecruitAFriendDistance(WorldObject const* pOther) const; void RewardPlayerAndGroupAtKill(Unit* victim, bool isBattleGround); void RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource); - bool isHonorOrXPTarget(Unit* victim); + bool isHonorOrXPTarget(Unit* victim) const; bool GetsRecruitAFriendBonus(bool forXP); uint8 GetGrantableLevels() { return m_grantableLevels; } diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index fcec4f38852..60f4fb09c28 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1135,7 +1135,6 @@ void WorldSession::HandleMoveRootAck(WorldPacket& recvData) void WorldSession::HandleSetActionBarToggles(WorldPacket& recvData) { uint8 actionBar; - recvData >> actionBar; if (!GetPlayer()) // ignore until not logged (check needed because STATUS_AUTHED) diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 4d78064423c..fc14797ea94 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -390,7 +390,6 @@ void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "WORLD: CMSG_SPIRIT_HEALER_ACTIVATE"); uint64 guid; - recvData >> guid; Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_SPIRITHEALER); @@ -410,7 +409,6 @@ void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket& recvData) void WorldSession::SendSpiritResurrect() { _player->ResurrectPlayer(0.5f, true); - _player->DurabilityLossAll(0.25f, true); // get corpse nearest graveyard diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index d984dbc8901..579fb0f9418 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -586,16 +586,6 @@ int32 SpellScript::GetEffectValue() const return m_spell->damage; } -void SpellScript::SetEffectValue(int32 value) -{ - if (!IsInEffectHook()) - { - TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetEffectValue was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); - return; - } - m_spell->damage = value; -} - Item* SpellScript::GetCastItem() { return m_spell->m_CastItem; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 6378a8bed9b..1a438323d4d 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -412,7 +412,6 @@ class SpellScript : public _SpellScript // method avalible only in EffectHandler method int32 GetEffectValue() const; - void SetEffectValue(int32 value); // returns: cast item if present. Item* GetCastItem(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index e8108f03e7d..d39156e3770 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -703,7 +703,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader void HandleDamage(SpellEffIndex /*effIndex*/) { int32 value = int32(GetCaster()->CountPctFromMaxHealth(GetSpellInfo()->Effects[EFFECT_2].CalcValue(GetCaster()))); - SetEffectValue(value); + SetHitDamage(value); } void Suicide(SpellEffIndex /*effIndex*/) -- cgit v1.2.3 From 378d27f9bcb04543ebc7a119279b3b88a05c588e Mon Sep 17 00:00:00 2001 From: jackpoz Date: Tue, 28 Jan 2014 22:40:13 +0100 Subject: Core/Splines: Fix "velocity > 0.1f" error Updates #6191. --- src/server/game/Movement/MotionMaster.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index d224c21efe8..55f745d993b 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -337,6 +337,9 @@ void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, floa if (_owner->GetTypeId() == TYPEID_PLAYER) return; + if (speedXY <= 0.1f) + return; + float x, y, z; float moveTimeHalf = speedZ / Movement::gravity; float dist = 2 * moveTimeHalf * speedXY; @@ -370,6 +373,8 @@ void MotionMaster::MoveJumpTo(float angle, float speedXY, float speedZ) void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id) { TC_LOG_DEBUG("misc", "Unit (GUID: %u) jump to point (X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), x, y, z); + if (speedXY <= 0.1f) + return; float moveTimeHalf = speedZ / Movement::gravity; float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -speedZ); -- cgit v1.2.3 From 856e0933b5ba2b0dfc2a7cd8049f9c35677c0114 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 30 Jan 2014 21:29:37 +0100 Subject: Scripts/HoR: Fix log error Fix "DoZoneInCombat called for creature that has empty threat list" error caused by DoZoneInCombat() called by IsSummonedBy() in a script before the Creature is allowed to enter combat. --- .../Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 027a6843c87..1f4713415ac 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1837,7 +1837,6 @@ public: void IsSummonedBy(Unit*) OVERRIDE { DoCast(me, SPELL_EMERGE_VISUAL); - DoZoneInCombat(me, 100.00f); } void JustDied(Unit* /*killer*/) OVERRIDE -- cgit v1.2.3 From 9495194bf2c13d8e2ae097cf07b86240d3d8dc96 Mon Sep 17 00:00:00 2001 From: QAston Date: Thu, 30 Jan 2014 23:43:10 +0100 Subject: Fix warnings introduced on littleendian in 2134cb610d45727a0623741f7416a360882133fa This fix prevents possible issues on bigendian machines. Don't use c style casts ppl, it's evul. --- src/server/authserver/Server/AuthSocket.cpp | 12 ++++++------ src/server/shared/Utilities/ByteConverter.h | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index 8a2a6c67496..c7bb600024a 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -321,7 +321,7 @@ bool AuthSocket::_HandleLogonChallenge() socket().recv((char *)&buf[0], 4); - EndianConvert(*((uint16*)(buf[0]))); + EndianConvertPtr(&buf[0]); uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size; TC_LOG_DEBUG("server.authserver", "[AuthChallenge] got header, body is %#04x bytes", remaining); @@ -341,11 +341,11 @@ bool AuthSocket::_HandleLogonChallenge() // BigEndian code, nop in little endian case // size already converted - EndianConvert(*((uint32*)(&ch->gamename[0]))); + EndianConvertPtr(&ch->gamename[0]); EndianConvert(ch->build); - EndianConvert(*((uint32*)(&ch->platform[0]))); - EndianConvert(*((uint32*)(&ch->os[0]))); - EndianConvert(*((uint32*)(&ch->country[0]))); + EndianConvertPtr(&ch->platform[0]); + EndianConvertPtr(&ch->os[0]); + EndianConvertPtr(&ch->country[0]); EndianConvert(ch->timezone_bias); EndianConvert(ch->ip); @@ -779,7 +779,7 @@ bool AuthSocket::_HandleReconnectChallenge() socket().recv((char *)&buf[0], 4); - EndianConvert(*((uint16*)(buf[0]))); + EndianConvertPtr(&buf[0]); uint16 remaining = ((sAuthLogonChallenge_C *)&buf[0])->size; TC_LOG_DEBUG("server.authserver", "[ReconnectChallenge] got header, body is %#04x bytes", remaining); diff --git a/src/server/shared/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h index bf1342a10e4..8eebb05bb13 100644 --- a/src/server/shared/Utilities/ByteConverter.h +++ b/src/server/shared/Utilities/ByteConverter.h @@ -47,9 +47,13 @@ namespace ByteConverter #if TRINITY_ENDIAN == TRINITY_BIGENDIAN template inline void EndianConvert(T& val) { ByteConverter::apply(&val); } template inline void EndianConvertReverse(T&) { } +template inline void EndianConvertPtr(void* val) { ByteConverter::apply(val); } +template inline void EndianConvertPtrReverse(void*) { } #else template inline void EndianConvert(T&) { } template inline void EndianConvertReverse(T& val) { ByteConverter::apply(&val); } +template inline void EndianConvertPtr(void*) { } +template inline void EndianConvertPtrReverse(void* val) { ByteConverter::apply(val); } #endif template void EndianConvert(T*); // will generate link error -- cgit v1.2.3 From d749b721930311601b09b14e4e627d0f94ce2e11 Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Fri, 31 Jan 2014 04:32:03 +0000 Subject: Core&DB/Spells: Move custom spell attributes from code to DB, `spell_custom_attr` table `spell_custom_attr` - `entry` uint PK - `attributes` uint (enum SpellCustomAttributes of SpellInfo.h) --- .../2014_01_31_00_world_spell_custom_attr.sql | 167 +++++++++++++++++ src/server/game/Spells/SpellMgr.cpp | 198 ++++----------------- 2 files changed, 199 insertions(+), 166 deletions(-) create mode 100644 sql/updates/world/2014_01_31_00_world_spell_custom_attr.sql (limited to 'src') diff --git a/sql/updates/world/2014_01_31_00_world_spell_custom_attr.sql b/sql/updates/world/2014_01_31_00_world_spell_custom_attr.sql new file mode 100644 index 00000000000..54c9d84c7a9 --- /dev/null +++ b/sql/updates/world/2014_01_31_00_world_spell_custom_attr.sql @@ -0,0 +1,167 @@ +DROP TABLE IF EXISTS `spell_custom_attr`; +CREATE TABLE IF NOT EXISTS `spell_custom_attr` ( + `entry` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'spell id', + `attributes` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'SpellCustomAttributes', + PRIMARY KEY (`entry`) +) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 COMMENT='SpellInfo custom attributes'; + +SET @SPELL_ATTR0_CU_ENCHANT_PROC = 0x00000001, + @SPELL_ATTR0_CU_CONE_BACK = 0x00000002, + @SPELL_ATTR0_CU_CONE_LINE = 0x00000004, + @SPELL_ATTR0_CU_SHARE_DAMAGE = 0x00000008, + @SPELL_ATTR0_CU_NO_INITIAL_THREAT = 0x00000010, + @SPELL_ATTR0_CU_AURA_CC = 0x00000040, + @SPELL_ATTR0_CU_DIRECT_DAMAGE = 0x00000100, + @SPELL_ATTR0_CU_CHARGE = 0x00000200, + @SPELL_ATTR0_CU_PICKPOCKET = 0x00000400, + @SPELL_ATTR0_CU_NEGATIVE_EFF0 = 0x00001000, + @SPELL_ATTR0_CU_NEGATIVE_EFF1 = 0x00002000, + @SPELL_ATTR0_CU_NEGATIVE_EFF2 = 0x00004000, + @SPELL_ATTR0_CU_IGNORE_ARMOR = 0x00008000, + @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER = 0x00010000, + @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET = 0x00020000; + +INSERT INTO `spell_custom_attr` (`entry`, `attributes`) VALUES +(1776, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(1777, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(8629, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(11285, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(11286, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(12540, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(13579, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(24698, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(28456, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(29425, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(34940, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(36862, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(38764, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(38863, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(52743, @SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER), +(53, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(2589, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(2590, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(2591, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(7159, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8627, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8721, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11279, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11280, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11281, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(15582, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(15657, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(22416, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(25300, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(26863, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(37685, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48656, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48657, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(703, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8631, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8632, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8633, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11289, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11290, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(26839, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(26884, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48675, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48676, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(5221, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(6800, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8992, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(9829, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(9830, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(27001, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(27002, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48571, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48572, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8676, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8724, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(8725, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11267, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11268, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(11269, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(27441, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48689, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48690, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48691, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(6785, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(6787, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(9866, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(9867, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(27005, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48578, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(48579, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(21987, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(23959, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(24825, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(58563, @SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET), +(26029, @SPELL_ATTR0_CU_CONE_LINE), +(37433, @SPELL_ATTR0_CU_CONE_LINE), +(43140, @SPELL_ATTR0_CU_CONE_LINE), +(43215, @SPELL_ATTR0_CU_CONE_LINE), +(70461, @SPELL_ATTR0_CU_CONE_LINE), +(72133, @SPELL_ATTR0_CU_CONE_LINE), +(73788, @SPELL_ATTR0_CU_CONE_LINE), +(73789, @SPELL_ATTR0_CU_CONE_LINE), +(73790, @SPELL_ATTR0_CU_CONE_LINE), +(24340, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(26558, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(28884, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(36837, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(38903, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(41276, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(57467, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(26789, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(31436, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(35181, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(40810, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(43267, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(43268, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(42384, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(45150, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(64688, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(72373, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(71904, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(70492, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(72505, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(72624, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(72625, @SPELL_ATTR0_CU_SHARE_DAMAGE), +(18500, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(33086, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(49749, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(52890, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(53454, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(59446, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(62383, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64777, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(65239, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(65919, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(67858, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(67859, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(67860, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(69293, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(74439, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(63278, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(62544, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64588, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(66479, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(68505, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(62709, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(62626, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64590, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64342, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64686, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(65147, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(68504, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(62874, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(68498, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64591, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(63003, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(63010, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(68321, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(72255, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(72444, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(72445, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(72446, @SPELL_ATTR0_CU_IGNORE_ARMOR), +(64422, @SPELL_ATTR0_CU_SHARE_DAMAGE | @SPELL_ATTR0_CU_IGNORE_ARMOR), +(72293, @SPELL_ATTR0_CU_NEGATIVE_EFF0); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 8b31e749c62..eccb7863460 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2714,8 +2714,39 @@ void SpellMgr::UnloadSpellInfoImplicitTargetConditionLists() void SpellMgr::LoadSpellInfoCustomAttributes() { uint32 oldMSTime = getMSTime(); - + uint32 oldMSTime2 = oldMSTime; SpellInfo* spellInfo = NULL; + + QueryResult result = WorldDatabase.Query("SELECT entry, attributes FROM spell_custom_attr"); + + if (!result) + TC_LOG_INFO("server.loading", ">> Loaded 0 spell custom attributes from DB. DB table `spell_custom_attr` is empty."); + else + { + uint32 count = 0; + do + { + Field* fields = result->Fetch(); + + uint32 spellId = fields[0].GetUInt32(); + uint32 attributes = fields[1].GetUInt32(); + + spellInfo = mSpellInfoMap[spellId]; + if (!spellInfo) + { + TC_LOG_ERROR("sql.sql", "Table `spell_custom_attr` has wrong spell (entry: %u), ignored.", spellId); + continue; + } + + // TODO: validate attributes + + spellInfo->AttributesCu |= attributes; + ++count; + } while (result->NextRow()); + + TC_LOG_INFO("server.loading", ">> Loaded %u spell custom attributes from DB in %u ms", count, GetMSTimeDiffToNow(oldMSTime2)); + } + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { spellInfo = mSpellInfoMap[i]; @@ -2826,171 +2857,6 @@ void SpellMgr::LoadSpellInfoCustomAttributes() if (spellInfo->SpellVisual[0] == 3879) spellInfo->AttributesCu |= SPELL_ATTR0_CU_CONE_BACK; - switch (spellInfo->Id) - { - case 1776: // Gouge - case 1777: - case 8629: - case 11285: - case 11286: - case 12540: - case 13579: - case 24698: - case 28456: - case 29425: - case 34940: - case 36862: - case 38764: - case 38863: - case 52743: // Head Smack - spellInfo->AttributesCu |= SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER; - break; - case 53: // Backstab - case 2589: - case 2590: - case 2591: - case 7159: - case 8627: - case 8721: - case 11279: - case 11280: - case 11281: - case 15582: - case 15657: - case 22416: - case 25300: - case 26863: - case 37685: - case 48656: - case 48657: - case 703: // Garrote - case 8631: - case 8632: - case 8633: - case 11289: - case 11290: - case 26839: - case 26884: - case 48675: - case 48676: - case 5221: // Shred - case 6800: - case 8992: - case 9829: - case 9830: - case 27001: - case 27002: - case 48571: - case 48572: - case 8676: // Ambush - case 8724: - case 8725: - case 11267: - case 11268: - case 11269: - case 27441: - case 48689: - case 48690: - case 48691: - case 6785: // Ravage - case 6787: - case 9866: - case 9867: - case 27005: - case 48578: - case 48579: - case 21987: // Lash of Pain - case 23959: // Test Stab R50 - case 24825: // Test Backstab - case 58563: // Assassinate Restless Lookout - spellInfo->AttributesCu |= SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET; - break; - case 26029: // Dark Glare - case 37433: // Spout - case 43140: // Flame Breath - case 43215: // Flame Breath - case 70461: // Coldflame Trap - case 72133: // Pain and Suffering - case 73788: // Pain and Suffering - case 73789: // Pain and Suffering - case 73790: // Pain and Suffering - spellInfo->AttributesCu |= SPELL_ATTR0_CU_CONE_LINE; - break; - case 24340: // Meteor - case 26558: // Meteor - case 28884: // Meteor - case 36837: // Meteor - case 38903: // Meteor - case 41276: // Meteor - case 57467: // Meteor - case 26789: // Shard of the Fallen Star - case 31436: // Malevolent Cleave - case 35181: // Dive Bomb - case 40810: // Saber Lash - case 43267: // Saber Lash - case 43268: // Saber Lash - case 42384: // Brutal Swipe - case 45150: // Meteor Slash - case 64688: // Sonic Screech - case 72373: // Shared Suffering - case 71904: // Chaos Bane - case 70492: // Ooze Eruption - case 72505: // Ooze Eruption - case 72624: // Ooze Eruption - case 72625: // Ooze Eruption - // ONLY SPELLS WITH SPELLFAMILY_GENERIC and EFFECT_SCHOOL_DAMAGE - spellInfo->AttributesCu |= SPELL_ATTR0_CU_SHARE_DAMAGE; - break; - case 18500: // Wing Buffet - case 33086: // Wild Bite - case 49749: // Piercing Blow - case 52890: // Penetrating Strike - case 53454: // Impale - case 59446: // Impale - case 62383: // Shatter - case 64777: // Machine Gun - case 65239: // Machine Gun - case 65919: // Impale - case 67858: // Impale - case 67859: // Impale - case 67860: // Impale - case 69293: // Wing Buffet - case 74439: // Machine Gun - case 63278: // Mark of the Faceless (General Vezax) - case 62544: // Thrust (Argent Tournament) - case 64588: // Thrust (Argent Tournament) - case 66479: // Thrust (Argent Tournament) - case 68505: // Thrust (Argent Tournament) - case 62709: // Counterattack! (Argent Tournament) - case 62626: // Break-Shield (Argent Tournament, Player) - case 64590: // Break-Shield (Argent Tournament, Player) - case 64342: // Break-Shield (Argent Tournament, NPC) - case 64686: // Break-Shield (Argent Tournament, NPC) - case 65147: // Break-Shield (Argent Tournament, NPC) - case 68504: // Break-Shield (Argent Tournament, NPC) - case 62874: // Charge (Argent Tournament, Player) - case 68498: // Charge (Argent Tournament, Player) - case 64591: // Charge (Argent Tournament, Player) - case 63003: // Charge (Argent Tournament, NPC) - case 63010: // Charge (Argent Tournament, NPC) - case 68321: // Charge (Argent Tournament, NPC) - case 72255: // Mark of the Fallen Champion (Deathbringer Saurfang) - case 72444: // Mark of the Fallen Champion (Deathbringer Saurfang) - case 72445: // Mark of the Fallen Champion (Deathbringer Saurfang) - case 72446: // Mark of the Fallen Champion (Deathbringer Saurfang) - spellInfo->AttributesCu |= SPELL_ATTR0_CU_IGNORE_ARMOR; - break; - case 64422: // Sonic Screech (Auriaya) - spellInfo->AttributesCu |= SPELL_ATTR0_CU_SHARE_DAMAGE; - spellInfo->AttributesCu |= SPELL_ATTR0_CU_IGNORE_ARMOR; - break; - case 72293: // Mark of the Fallen Champion (Deathbringer Saurfang) - spellInfo->AttributesCu |= SPELL_ATTR0_CU_NEGATIVE_EFF0; - break; - default: - break; - } - switch (spellInfo->SpellFamilyName) { case SPELLFAMILY_WARRIOR: -- cgit v1.2.3 From a242662ae6fd424928c3972de1232b43e7164457 Mon Sep 17 00:00:00 2001 From: Discover- Date: Fri, 31 Jan 2014 10:37:55 +0100 Subject: Core/Spells: Fix DK Ghoul's damage after ad8eb434c02e451effd0949aaa7d2b7999d91597. I misread 'SpellScript::m_damage' for 'SpellScript::damage'. By @joschiwald --- src/server/game/Spells/SpellScript.cpp | 12 ++++++++++++ src/server/game/Spells/SpellScript.h | 1 + src/server/scripts/Spells/spell_dk.cpp | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 579fb0f9418..c0bcd477e5b 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -583,9 +583,21 @@ int32 SpellScript::GetEffectValue() const TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::GetEffectValue was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); return 0; } + return m_spell->damage; } +void SpellScript::SetEffectValue(int32 value) +{ + if (!IsInEffectHook()) + { + TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetEffectValue was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); + return; + } + + m_spell->damage = value; +} + Item* SpellScript::GetCastItem() { return m_spell->m_CastItem; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 1a438323d4d..6378a8bed9b 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -412,6 +412,7 @@ class SpellScript : public _SpellScript // method avalible only in EffectHandler method int32 GetEffectValue() const; + void SetEffectValue(int32 value); // returns: cast item if present. Item* GetCastItem(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index d39156e3770..e8108f03e7d 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -703,7 +703,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader void HandleDamage(SpellEffIndex /*effIndex*/) { int32 value = int32(GetCaster()->CountPctFromMaxHealth(GetSpellInfo()->Effects[EFFECT_2].CalcValue(GetCaster()))); - SetHitDamage(value); + SetEffectValue(value); } void Suicide(SpellEffIndex /*effIndex*/) -- cgit v1.2.3 From 5666c7cc35ac8e5ff56a796bbbbe869028c8ea41 Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Fri, 31 Jan 2014 15:43:24 +0000 Subject: Core/Achievs: Rename a few unknown achievement criteria flags Source tomrus88, Mangos --- src/server/game/DataStores/DBCEnums.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 87397c6685b..e9e3f531706 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -91,9 +91,9 @@ enum AchievementCriteriaFlags { ACHIEVEMENT_CRITERIA_FLAG_SHOW_PROGRESS_BAR = 0x00000001, // Show progress as bar ACHIEVEMENT_CRITERIA_FLAG_HIDDEN = 0x00000002, // Not show criteria in client - ACHIEVEMENT_CRITERIA_FLAG_UNK3 = 0x00000004, // BG related?? - ACHIEVEMENT_CRITERIA_FLAG_UNK4 = 0x00000008, // - ACHIEVEMENT_CRITERIA_FLAG_UNK5 = 0x00000010, // not used + ACHIEVEMENT_CRITERIA_FLAG_FAIL_ACHIEVEMENT = 0x00000004, // BG related?? + ACHIEVEMENT_CRITERIA_FLAG_RESET_ON_START = 0x00000008, // + ACHIEVEMENT_CRITERIA_FLAG_IS_DATE = 0x00000010, // not used ACHIEVEMENT_CRITERIA_FLAG_MONEY_COUNTER = 0x00000020 // Displays counter as money }; -- cgit v1.2.3 From 68d48ecbd1654fc2f1311e966c41654d265f368b Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 31 Jan 2014 20:47:47 +0100 Subject: Core/Arena: Fix arena season not always appearing to clients Arena season sent to client with SMSG_INIT_WORLD_STATES opcode was not sent if Player was on a zone with id 0 on login. Initializing the zone id to -1 will always trigger UpdateZone() properly on login. Fixes #10623 --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 79716908df8..2ea3e48883c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -687,7 +687,7 @@ Player::Player(WorldSession* session): Unit(true) m_regenTimerCount = 0; m_weaponChangeTimer = 0; - m_zoneUpdateId = 0; + m_zoneUpdateId = uint32(-1); m_zoneUpdateTimer = 0; m_areaUpdateId = 0; -- cgit v1.2.3 From b054275fb277d34f98746a1ebcfec1d39d3ce13a Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 31 Jan 2014 22:11:49 +0100 Subject: Shared/Logs: Fix crash in Console log output Correctly handle the return value of vsnprintf() which returns -1 if the buffer is too small http://msdn.microsoft.com/en-us/library/1kt27hek.aspx . In this case just truncate the output. This caused a crash on character delete if Logger.entities.player.dump was enabled and set to 3. Fixes #11539 --- src/server/shared/Utilities/Util.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 499ad0502b7..ffef61557fc 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -510,6 +510,9 @@ void vutf8printf(FILE* out, const char *str, va_list* ap) wchar_t wtemp_buf[32*1024]; size_t temp_len = vsnprintf(temp_buf, 32*1024, str, *ap); + //vsnprintf returns -1 if the buffer is too small + if (temp_len == size_t(-1)) + temp_len = 32*1024-1; size_t wtemp_len = 32*1024-1; Utf8toWStr(temp_buf, temp_len, wtemp_buf, wtemp_len); -- cgit v1.2.3 From 19172ee4c26a12b844a7e1f435daed9bb44bf625 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 31 Jan 2014 23:30:25 +0100 Subject: Build: Use override/final keywords for VS 2012 and newer. (VS 2013 still defines __cplusplus as 199711L) --- src/server/shared/CompilerDefs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h index 71b20a4d175..8a557328af4 100644 --- a/src/server/shared/CompilerDefs.h +++ b/src/server/shared/CompilerDefs.h @@ -57,6 +57,8 @@ #if defined(__cplusplus) && __cplusplus == 201103L # define COMPILER_HAS_CPP11_SUPPORT 1 +#elif _MSC_VER >= 1700 +# define COMPILER_HAS_CPP11_SUPPORT 1 #else # define COMPILER_HAS_CPP11_SUPPORT 0 #endif -- cgit v1.2.3