Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/BattlegroundScore.h
This commit is contained in:
commit
3a248fbfec
26 files changed
+382
-14
No files matched your search
@@ -2026,7 +2026,6 @@ class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScriptLoa
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
enum DeathComesFromOnHigh
|
||||
{
|
||||
SPELL_FORGE_CREDIT = 51974,
|
||||
@@ -2097,6 +2096,37 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
// 52694 - Recall Eye of Acherus
|
||||
class spell_q12641_recall_eye_of_acherus : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_q12641_recall_eye_of_acherus() : SpellScriptLoader("spell_q12641_recall_eye_of_acherus") { }
|
||||
|
||||
class spell_q12641_recall_eye_of_acherus_SpellScript : public SpellScript
|
||||
{
|
||||
PrepareSpellScript(spell_q12641_recall_eye_of_acherus_SpellScript);
|
||||
|
||||
void HandleDummy(SpellEffIndex /*effIndex*/)
|
||||
{
|
||||
if (Player* player = GetCaster()->GetCharmerOrOwner()->ToPlayer())
|
||||
{
|
||||
player->StopCastingCharm();
|
||||
player->StopCastingBindSight();
|
||||
}
|
||||
}
|
||||
|
||||
void Register() override
|
||||
{
|
||||
OnEffectHitTarget += SpellEffectFn(spell_q12641_recall_eye_of_acherus_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
|
||||
}
|
||||
};
|
||||
|
||||
SpellScript* GetSpellScript() const override
|
||||
{
|
||||
return new spell_q12641_recall_eye_of_acherus_SpellScript();
|
||||
}
|
||||
};
|
||||
|
||||
// 51769 - Emblazon Runeblade
|
||||
class spell_q12619_emblazon_runeblade : public SpellScriptLoader
|
||||
{
|
||||
@@ -2364,6 +2394,7 @@ void AddSC_quest_spell_scripts()
|
||||
new spell_q12308_escape_from_silverbrook_summon_worgen();
|
||||
new spell_q12308_escape_from_silverbrook();
|
||||
new spell_q12641_death_comes_from_on_high();
|
||||
new spell_q12641_recall_eye_of_acherus();
|
||||
new spell_q12619_emblazon_runeblade();
|
||||
new spell_q12619_emblazon_runeblade_effect();
|
||||
new spell_q12919_gymers_grab();
|
||||
|
||||
@@ -291,7 +291,7 @@ class spell_sha_earth_shield : public SpellScriptLoader
|
||||
amount = GetUnitOwner()->SpellHealingBonusTaken(caster, GetSpellInfo(), amount, HEAL);
|
||||
|
||||
//! WORKAROUND
|
||||
// If target is affected by healing reduction, modifier is guaranteed to be negative
|
||||
// If target is affected by healing reduction, modifier is guaranteed to be negative
|
||||
// value (e.g. -50). To revert the effect, multiply amount with reciprocal of relative value:
|
||||
// (100 / ((-1) * modifier)) * 100 = (-1) * 100 * 100 / modifier = -10000 / modifier
|
||||
if (int32 modifier = GetUnitOwner()->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT))
|
||||
|
||||
Reference in new issue
Block a user