From eac9c1f0b992fd3622fd7dd864b2acc2781ec778 Mon Sep 17 00:00:00 2001 From: ariel- Date: Tue, 21 Feb 2017 22:37:53 -0300 Subject: Core/Scripts: fix Nightfall proc chance and reduce it for victims with level above 60 Closes #15734 --- src/server/game/Scripting/ScriptMgr.cpp | 11 +++++++++++ src/server/game/Scripting/ScriptMgr.h | 5 +++++ 2 files changed, 16 insertions(+) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index f04f288a828..3e19033ef1d 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1559,6 +1559,17 @@ bool ScriptMgr::OnItemRemove(Player* player, Item* item) return tmpscript->OnRemove(player, item); } +bool ScriptMgr::OnCastItemCombatSpell(Player* player, Unit* victim, SpellInfo const* spellInfo, Item* item) +{ + ASSERT(player); + ASSERT(victim); + ASSERT(spellInfo); + ASSERT(item); + + GET_SCRIPT_RET(ItemScript, item->GetScriptId(), tmpscript, true); + return tmpscript->OnCastItemCombatSpell(player, victim, spellInfo, item); +} + bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, Creature* target) { ASSERT(caster); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index c47c75f3a9a..10df2ecf970 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -53,6 +53,7 @@ class Player; class Quest; class ScriptMgr; class Spell; +class SpellInfo; class SpellScript; class SpellCastTargets; class Transport; @@ -378,6 +379,9 @@ class TC_GAME_API ItemScript : public ScriptObject // Called when the item is destroyed. virtual bool OnRemove(Player* /*player*/, Item* /*item*/) { return false; } + + // Called before casting a combat spell from this item (chance on hit spells of item template, can be used to prevent cast if returning false) + virtual bool OnCastItemCombatSpell(Player* /*player*/, Unit* /*victim*/, SpellInfo const* /*spellInfo*/, Item* /*item*/) { return true; } }; class TC_GAME_API UnitScript : public ScriptObject @@ -955,6 +959,7 @@ class TC_GAME_API ScriptMgr bool OnItemUse(Player* player, Item* item, SpellCastTargets const& targets); bool OnItemExpire(Player* player, ItemTemplate const* proto); bool OnItemRemove(Player* player, Item* item); + bool OnCastItemCombatSpell(Player* player, Unit* victim, SpellInfo const* spellInfo, Item* item); public: /* CreatureScript */ -- cgit v1.2.3