Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4
Conflicts: sql/updates/world/2014_12_30_00_world.sql sql/updates/world/2014_12_30_01_world.sql src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
This commit is contained in:
commit
b9c871fdb7
6 files changed
+284
-172
No files matched your search
@@ -43,6 +43,7 @@ enum DeathKnightSpells
|
||||
SPELL_DK_DEATH_AND_DECAY_DAMAGE = 52212,
|
||||
SPELL_DK_DEATH_COIL_DAMAGE = 47632,
|
||||
SPELL_DK_DEATH_COIL_HEAL = 47633,
|
||||
SPELL_DK_DEATH_GRIP = 49560,
|
||||
SPELL_DK_DEATH_STRIKE_HEAL = 45470,
|
||||
SPELL_DK_DEATH_STRIKE_ENABLER = 89832,
|
||||
SPELL_DK_FROST_FEVER = 55095,
|
||||
@@ -1556,6 +1557,50 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
// 49576 - Death Grip Initial
|
||||
class spell_dk_death_grip_initial : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_dk_death_grip_initial() : SpellScriptLoader("spell_dk_death_grip_initial") { }
|
||||
|
||||
class spell_dk_death_grip_initial_SpellScript : public SpellScript
|
||||
{
|
||||
PrepareSpellScript(spell_dk_death_grip_initial_SpellScript);
|
||||
|
||||
SpellCastResult CheckCast()
|
||||
{
|
||||
Unit* caster = GetCaster();
|
||||
// Death Grip should not be castable while jumping/falling
|
||||
if (caster->HasUnitState(UNIT_STATE_JUMPING) || caster->HasUnitMovementFlag(MOVEMENTFLAG_FALLING))
|
||||
return SPELL_FAILED_MOVING;
|
||||
|
||||
// Patch 3.3.3 (2010-03-23): Minimum range has been changed to 8 yards in PvP.
|
||||
Unit* target = GetExplTargetUnit();
|
||||
if (target && target->GetTypeId() == TYPEID_PLAYER)
|
||||
if (caster->GetDistance(target) < 8.f)
|
||||
return SPELL_FAILED_TOO_CLOSE;
|
||||
|
||||
return SPELL_CAST_OK;
|
||||
}
|
||||
|
||||
void HandleDummy(SpellEffIndex /*effIndex*/)
|
||||
{
|
||||
GetCaster()->CastSpell(GetHitUnit(), SPELL_DK_DEATH_GRIP, true);
|
||||
}
|
||||
|
||||
void Register() override
|
||||
{
|
||||
OnCheckCast += SpellCheckCastFn(spell_dk_death_grip_initial_SpellScript::CheckCast);
|
||||
OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_initial_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
|
||||
}
|
||||
};
|
||||
|
||||
SpellScript* GetSpellScript() const override
|
||||
{
|
||||
return new spell_dk_death_grip_initial_SpellScript();
|
||||
}
|
||||
};
|
||||
|
||||
void AddSC_deathknight_spell_scripts()
|
||||
{
|
||||
new spell_dk_anti_magic_shell_raid();
|
||||
@@ -1585,4 +1630,5 @@ void AddSC_deathknight_spell_scripts()
|
||||
new spell_dk_scourge_strike();
|
||||
new spell_dk_vampiric_blood();
|
||||
new spell_dk_will_of_the_necropolis();
|
||||
new spell_dk_death_grip_initial();
|
||||
}
|
||||
@@ -1076,9 +1076,12 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader
|
||||
// http://old01.wowhead.com/quest=9452 - Red Snapper - Very Tasty!
|
||||
enum RedSnapperVeryTasty
|
||||
{
|
||||
SPELL_CAST_NET = 29866,
|
||||
ITEM_RED_SNAPPER = 23614,
|
||||
SPELL_NEW_SUMMON_TEST = 49214,
|
||||
ITEM_RED_SNAPPER = 23614,
|
||||
|
||||
SPELL_CAST_NET = 29866,
|
||||
SPELL_NEW_SUMMON_TEST = 49214,
|
||||
|
||||
GO_SCHOOL_OF_RED_SNAPPER = 181616
|
||||
};
|
||||
|
||||
class spell_q9452_cast_net: public SpellScriptLoader
|
||||
@@ -1095,6 +1098,15 @@ class spell_q9452_cast_net: public SpellScriptLoader
|
||||
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
|
||||
}
|
||||
|
||||
SpellCastResult CheckCast()
|
||||
{
|
||||
GameObject* go = GetCaster()->FindNearestGameObject(GO_SCHOOL_OF_RED_SNAPPER, 3.0f);
|
||||
if (!go || go->GetRespawnTime())
|
||||
return SPELL_FAILED_REQUIRES_SPELL_FOCUS;
|
||||
|
||||
return SPELL_CAST_OK;
|
||||
}
|
||||
|
||||
void HandleDummy(SpellEffIndex /*effIndex*/)
|
||||
{
|
||||
Player* caster = GetCaster()->ToPlayer();
|
||||
@@ -1104,9 +1116,19 @@ class spell_q9452_cast_net: public SpellScriptLoader
|
||||
caster->CastSpell(caster, SPELL_NEW_SUMMON_TEST, true);
|
||||
}
|
||||
|
||||
void HandleActiveObject(SpellEffIndex effIndex)
|
||||
{
|
||||
PreventHitDefaultEffect(effIndex);
|
||||
GetHitGObj()->SetRespawnTime(roll_chance_i(50) ? 2 * MINUTE : 3 * MINUTE);
|
||||
GetHitGObj()->Use(GetCaster());
|
||||
GetHitGObj()->SetLootState(GO_JUST_DEACTIVATED);
|
||||
}
|
||||
|
||||
void Register() override
|
||||
{
|
||||
OnCheckCast += SpellCheckCastFn(spell_q9452_cast_net_SpellScript::CheckCast);
|
||||
OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
|
||||
OnEffectHitTarget += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleActiveObject, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user