public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Scripts): Optimize AchievementScript (#18705)

Browse Source 
* Add files via upload

* Update AchievementScript.h
This commit is contained in:
天鹿
2024-04-12 22:00:31 +08:00
committed by GitHub
parent b3a332f57c
commit 0e1888ac92
2 changed files with 25 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/server/game/Scripting/ScriptDefines/AchievementScript.cpp
View File

@@ -21,69 +21,38 @@
void ScriptMgr::SetRealmCompleted(AchievementEntry const* achievement) void ScriptMgr::SetRealmCompleted(AchievementEntry const* achievement)
{ {
ExecuteScript<AchievementScript>([&](AchievementScript* script) CALL_ENABLED_HOOKS(AchievementScript, ACHIEVEMENTHOOK_SET_REALM_COMPLETED, script->SetRealmCompleted(achievement));
{
script->SetRealmCompleted(achievement);
});
} }
bool ScriptMgr::IsCompletedCriteria(AchievementMgr* mgr, AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement, CriteriaProgress const* progress) bool ScriptMgr::IsCompletedCriteria(AchievementMgr* mgr, AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement, CriteriaProgress const* progress)
{ {
auto ret = IsValidBoolScript<AchievementScript>([&](AchievementScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AchievementScript, ACHIEVEMENTHOOK_IS_COMPLETED_CRITERIA, !script->IsCompletedCriteria(mgr, achievementCriteria, achievement, progress));
{
return !script->IsCompletedCriteria(mgr, achievementCriteria, achievement, progress);
});
if (ret && *ret)
{
return false;
}
return true;
} }
bool ScriptMgr::IsRealmCompleted(AchievementGlobalMgr const* globalmgr, AchievementEntry const* achievement, SystemTimePoint completionTime) bool ScriptMgr::IsRealmCompleted(AchievementGlobalMgr const* globalmgr, AchievementEntry const* achievement, SystemTimePoint completionTime)
{ {
auto ret = IsValidBoolScript<AchievementScript>([&](AchievementScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AchievementScript, ACHIEVEMENTHOOK_IS_REALM_COMPLETED, !script->IsRealmCompleted(globalmgr, achievement, completionTime));
{
return !script->IsRealmCompleted(globalmgr, achievement, completionTime);
});
if (ret && *ret)
{
return false;
}
return true;
} }
void ScriptMgr::OnBeforeCheckCriteria(AchievementMgr* mgr, std::list<AchievementCriteriaEntry const*> const* achievementCriteriaList) void ScriptMgr::OnBeforeCheckCriteria(AchievementMgr* mgr, std::list<AchievementCriteriaEntry const*> const* achievementCriteriaList)
{ {
ExecuteScript<AchievementScript>([&](AchievementScript* script) CALL_ENABLED_HOOKS(AchievementScript, ACHIEVEMENTHOOK_ON_BEFORE_CHECK_CRITERIA, script->OnBeforeCheckCriteria(mgr, achievementCriteriaList));
{
script->OnBeforeCheckCriteria(mgr, achievementCriteriaList);
});
} }
bool ScriptMgr::CanCheckCriteria(AchievementMgr* mgr, AchievementCriteriaEntry const* achievementCriteria) bool ScriptMgr::CanCheckCriteria(AchievementMgr* mgr, AchievementCriteriaEntry const* achievementCriteria)
{ {
auto ret = IsValidBoolScript<AchievementScript>([&](AchievementScript* script) CALL_ENABLED_BOOLEAN_HOOKS(AchievementScript, ACHIEVEMENTHOOK_CAN_CHECK_CRITERIA, !script->CanCheckCriteria(mgr, achievementCriteria));
{
return !script->CanCheckCriteria(mgr, achievementCriteria);
});
if (ret && *ret)
{
return false;
}
return true;
} }
AchievementScript::AchievementScript(const char* name) AchievementScript::AchievementScript(const char* name, std::vector<uint16> enabledHooks)
: ScriptObject(name) : ScriptObject(name, ACHIEVEMENTHOOK_END)
{ {
ScriptRegistry<AchievementScript>::AddScript(this); // If empty - enable all available hooks.
if (enabledHooks.empty())
for (uint16 i = 0; i < ACHIEVEMENTHOOK_END; ++i)
enabledHooks.emplace_back(i);
ScriptRegistry<AchievementScript>::AddScript(this, std::move(enabledHooks));
} }
template class AC_GAME_API ScriptRegistry<AchievementScript>; template class AC_GAME_API ScriptRegistry<AchievementScript>;

13
src/server/game/Scripting/ScriptDefines/AchievementScript.h
View File

@@ -21,11 +21,22 @@
#include "Duration.h" #include "Duration.h"
#include "ScriptObject.h" #include "ScriptObject.h"
#include <list> #include <list>
#include <vector>
enum AchievementHook
{
ACHIEVEMENTHOOK_SET_REALM_COMPLETED,
ACHIEVEMENTHOOK_IS_COMPLETED_CRITERIA,
ACHIEVEMENTHOOK_IS_REALM_COMPLETED,
ACHIEVEMENTHOOK_ON_BEFORE_CHECK_CRITERIA,
ACHIEVEMENTHOOK_CAN_CHECK_CRITERIA,
ACHIEVEMENTHOOK_END
};
class AchievementScript : public ScriptObject class AchievementScript : public ScriptObject
{ {
protected: protected:
AchievementScript(const char* name); AchievementScript(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; }