feat(Core/Scripts): Optimize AllSpellScript (#18702)

* Add files via upload

* Update AllSpellScript.h
This commit is contained in:
天鹿
2024-04-12 21:59:37 +08:00
committed by GitHub
parent 170817e66d
commit d87af54675
2 changed files with 41 additions and 91 deletions

View File

@@ -21,147 +21,78 @@
void ScriptMgr::OnCalcMaxDuration(Aura const* aura, int32& maxDuration) void ScriptMgr::OnCalcMaxDuration(Aura const* aura, int32& maxDuration)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_CALC_MAX_DURATION, script->OnCalcMaxDuration(aura, maxDuration));
{
script->OnCalcMaxDuration(aura, maxDuration);
});
} }
bool ScriptMgr::CanModAuraEffectDamageDone(AuraEffect const* auraEff, Unit* target, AuraApplication const* aurApp, uint8 mode, bool apply) bool ScriptMgr::CanModAuraEffectDamageDone(AuraEffect const* auraEff, Unit* target, AuraApplication const* aurApp, uint8 mode, bool apply)
{ {
auto ret = IsValidBoolScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AllSpellScript, ALLSPELLHOOK_CAN_MOD_AURA_EFFECT_DAMAGE_DONE, !script->CanModAuraEffectDamageDone(auraEff, target, aurApp, mode, apply));
{
return !script->CanModAuraEffectDamageDone(auraEff, target, aurApp, mode, apply);
});
if (ret && *ret)
{
return false;
}
return true;
} }
bool ScriptMgr::CanModAuraEffectModDamagePercentDone(AuraEffect const* auraEff, Unit* target, AuraApplication const* aurApp, uint8 mode, bool apply) bool ScriptMgr::CanModAuraEffectModDamagePercentDone(AuraEffect const* auraEff, Unit* target, AuraApplication const* aurApp, uint8 mode, bool apply)
{ {
auto ret = IsValidBoolScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AllSpellScript, ALLSPELLHOOK_CAN_MOD_AURA_EFFECT_MOD_DAMAGE_PERCENT_DONE, !script->CanModAuraEffectModDamagePercentDone(auraEff, target, aurApp, mode, apply));
{
return !script->CanModAuraEffectModDamagePercentDone(auraEff, target, aurApp, mode, apply);
});
if (ret && *ret)
{
return false;
}
return true;
} }
void ScriptMgr::OnSpellCheckCast(Spell* spell, bool strict, SpellCastResult& res) void ScriptMgr::OnSpellCheckCast(Spell* spell, bool strict, SpellCastResult& res)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_SPELL_CHECK_CAST, script->OnSpellCheckCast(spell, strict, res));
{
script->OnSpellCheckCast(spell, strict, res);
});
} }
bool ScriptMgr::CanPrepare(Spell* spell, SpellCastTargets const* targets, AuraEffect const* triggeredByAura) bool ScriptMgr::CanPrepare(Spell* spell, SpellCastTargets const* targets, AuraEffect const* triggeredByAura)
{ {
auto ret = IsValidBoolScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AllSpellScript, ALLSPELLHOOK_CAN_PREPARE, !script->CanPrepare(spell, targets, triggeredByAura));
{
return !script->CanPrepare(spell, targets, triggeredByAura);
});
if (ret && *ret)
{
return false;
}
return true;
} }
bool ScriptMgr::CanScalingEverything(Spell* spell) bool ScriptMgr::CanScalingEverything(Spell* spell)
{ {
auto ret = IsValidBoolScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AllSpellScript, ALLSPELLHOOK_CAN_SCALING_EVERYTHING, script->CanScalingEverything(spell));
{
return script->CanScalingEverything(spell);
});
if (ret && *ret)
{
return true;
}
return false;
} }
bool ScriptMgr::CanSelectSpecTalent(Spell* spell) bool ScriptMgr::CanSelectSpecTalent(Spell* spell)
{ {
auto ret = IsValidBoolScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AllSpellScript, ALLSPELLHOOK_CAN_SELECT_SPEC_TALENT, !script->CanSelectSpecTalent(spell));
{
return !script->CanSelectSpecTalent(spell);
});
if (ret && *ret)
{
return false;
}
return true;
} }
void ScriptMgr::OnScaleAuraUnitAdd(Spell* spell, Unit* target, uint32 effectMask, bool checkIfValid, bool implicit, uint8 auraScaleMask, TargetInfo& targetInfo) void ScriptMgr::OnScaleAuraUnitAdd(Spell* spell, Unit* target, uint32 effectMask, bool checkIfValid, bool implicit, uint8 auraScaleMask, TargetInfo& targetInfo)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_SCALE_AURA_UNIT_ADD, script->OnScaleAuraUnitAdd(spell, target, effectMask, checkIfValid, implicit, auraScaleMask, targetInfo));
{
script->OnScaleAuraUnitAdd(spell, target, effectMask, checkIfValid, implicit, auraScaleMask, targetInfo);
});
} }
void ScriptMgr::OnRemoveAuraScaleTargets(Spell* spell, TargetInfo& targetInfo, uint8 auraScaleMask, bool& needErase) void ScriptMgr::OnRemoveAuraScaleTargets(Spell* spell, TargetInfo& targetInfo, uint8 auraScaleMask, bool& needErase)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_REMOVE_AURA_SCALE_TARGETS, script->OnRemoveAuraScaleTargets(spell, targetInfo, auraScaleMask, needErase));
{
script->OnRemoveAuraScaleTargets(spell, targetInfo, auraScaleMask, needErase);
});
} }
void ScriptMgr::OnBeforeAuraRankForLevel(SpellInfo const* spellInfo, SpellInfo const* latestSpellInfo, uint8 level) void ScriptMgr::OnBeforeAuraRankForLevel(SpellInfo const* spellInfo, SpellInfo const* latestSpellInfo, uint8 level)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_BEFORE_AURA_RANK_FOR_LEVEL, script->OnBeforeAuraRankForLevel(spellInfo, latestSpellInfo, level));
{
script->OnBeforeAuraRankForLevel(spellInfo, latestSpellInfo, level);
});
} }
void ScriptMgr::OnDummyEffect(WorldObject* caster, uint32 spellID, SpellEffIndex effIndex, GameObject* gameObjTarget) void ScriptMgr::OnDummyEffect(WorldObject* caster, uint32 spellID, SpellEffIndex effIndex, GameObject* gameObjTarget)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_DUMMY_EFFECT_GAMEOBJECT, script->OnDummyEffect(caster, spellID, effIndex, gameObjTarget));
{
script->OnDummyEffect(caster, spellID, effIndex, gameObjTarget);
});
} }
void ScriptMgr::OnDummyEffect(WorldObject* caster, uint32 spellID, SpellEffIndex effIndex, Creature* creatureTarget) void ScriptMgr::OnDummyEffect(WorldObject* caster, uint32 spellID, SpellEffIndex effIndex, Creature* creatureTarget)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_DUMMY_EFFECT_CREATURE, script->OnDummyEffect(caster, spellID, effIndex, creatureTarget));
{
script->OnDummyEffect(caster, spellID, effIndex, creatureTarget);
});
} }
void ScriptMgr::OnDummyEffect(WorldObject* caster, uint32 spellID, SpellEffIndex effIndex, Item* itemTarget) void ScriptMgr::OnDummyEffect(WorldObject* caster, uint32 spellID, SpellEffIndex effIndex, Item* itemTarget)
{ {
ExecuteScript<AllSpellScript>([&](AllSpellScript* script) CALL_ENABLED_HOOKS(AllSpellScript, ALLSPELLHOOK_ON_DUMMY_EFFECT_ITEM, script->OnDummyEffect(caster, spellID, effIndex, itemTarget));
{
script->OnDummyEffect(caster, spellID, effIndex, itemTarget);
});
} }
AllSpellScript::AllSpellScript(char const* name) AllSpellScript::AllSpellScript(char const* name, std::vector<uint16> enabledHooks)
: ScriptObject(name) : ScriptObject(name, ALLSPELLHOOK_END)
{ {
ScriptRegistry<AllSpellScript>::AddScript(this); // If empty - enable all available hooks.
if (enabledHooks.empty())
for (uint16 i = 0; i < ALLSPELLHOOK_END; ++i)
enabledHooks.emplace_back(i);
ScriptRegistry<AllSpellScript>::AddScript(this, std::move(enabledHooks));
} }
template class AC_GAME_API ScriptRegistry<AllSpellScript>; template class AC_GAME_API ScriptRegistry<AllSpellScript>;

View File

@@ -19,6 +19,25 @@
#define SCRIPT_OBJECT_ALL_SPELL_SCRIPT_H_ #define SCRIPT_OBJECT_ALL_SPELL_SCRIPT_H_
#include "ScriptObject.h" #include "ScriptObject.h"
#include <vector>
enum AllSpellHook
{
ALLSPELLHOOK_ON_CALC_MAX_DURATION,
ALLSPELLHOOK_CAN_MOD_AURA_EFFECT_DAMAGE_DONE,
ALLSPELLHOOK_CAN_MOD_AURA_EFFECT_MOD_DAMAGE_PERCENT_DONE,
ALLSPELLHOOK_ON_SPELL_CHECK_CAST,
ALLSPELLHOOK_CAN_PREPARE,
ALLSPELLHOOK_CAN_SCALING_EVERYTHING,
ALLSPELLHOOK_CAN_SELECT_SPEC_TALENT,
ALLSPELLHOOK_ON_SCALE_AURA_UNIT_ADD,
ALLSPELLHOOK_ON_REMOVE_AURA_SCALE_TARGETS,
ALLSPELLHOOK_ON_BEFORE_AURA_RANK_FOR_LEVEL,
ALLSPELLHOOK_ON_DUMMY_EFFECT_GAMEOBJECT,
ALLSPELLHOOK_ON_DUMMY_EFFECT_CREATURE,
ALLSPELLHOOK_ON_DUMMY_EFFECT_ITEM,
ALLSPELLHOOK_END
};
enum SpellCastResult : uint8; enum SpellCastResult : uint8;
enum SpellEffIndex : uint8; enum SpellEffIndex : uint8;
@@ -26,7 +45,7 @@ enum SpellEffIndex : uint8;
class AllSpellScript : public ScriptObject class AllSpellScript : public ScriptObject
{ {
protected: protected:
AllSpellScript(const char* name); AllSpellScript(const char* name, std::vector<uint16> enabledHooks = std::vector<uint16>());
public: public:
[[nodiscard]] bool IsDatabaseBound() const override { return false; } [[nodiscard]] bool IsDatabaseBound() const override { return false; }