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

feat(Core/Scripts): Optimize GuildScript (#18714)

Browse Source 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update GuildScript.h
This commit is contained in:
天鹿
2024-04-12 21:56:12 +08:00
committed by GitHub
parent 1ecce50e06
commit e2a07cf9b7
2 changed files with 41 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/server/game/Scripting/ScriptDefines/GuildScript.cpp
View File

@@ -21,112 +21,73 @@
void ScriptMgr::OnGuildAddMember(Guild* guild, Player* player, uint8& plRank) void ScriptMgr::OnGuildAddMember(Guild* guild, Player* player, uint8& plRank)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_ADD_MEMBER, script->OnAddMember(guild, player, plRank));
{
script->OnAddMember(guild, player, plRank);
});
} }
void ScriptMgr::OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked) void ScriptMgr::OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_REMOVE_MEMBER, script->OnRemoveMember(guild, player, isDisbanding, isKicked));
{
script->OnRemoveMember(guild, player, isDisbanding, isKicked);
});
} }
void ScriptMgr::OnGuildMOTDChanged(Guild* guild, const std::string& newMotd) void ScriptMgr::OnGuildMOTDChanged(Guild* guild, const std::string& newMotd)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_MOTD_CHANGED, script->OnMOTDChanged(guild, newMotd));
{
script->OnMOTDChanged(guild, newMotd);
});
} }
void ScriptMgr::OnGuildInfoChanged(Guild* guild, const std::string& newInfo) void ScriptMgr::OnGuildInfoChanged(Guild* guild, const std::string& newInfo)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_INFO_CHANGED, script->OnInfoChanged(guild, newInfo));
{
script->OnInfoChanged(guild, newInfo);
});
} }
void ScriptMgr::OnGuildCreate(Guild* guild, Player* leader, const std::string& name) void ScriptMgr::OnGuildCreate(Guild* guild, Player* leader, const std::string& name)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_CREATE, script->OnCreate(guild, leader, name));
{
script->OnCreate(guild, leader, name);
});
} }
void ScriptMgr::OnGuildDisband(Guild* guild) void ScriptMgr::OnGuildDisband(Guild* guild)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_DISBAND, script->OnDisband(guild));
{
script->OnDisband(guild);
});
} }
void ScriptMgr::OnGuildMemberWitdrawMoney(Guild* guild, Player* player, uint32& amount, bool isRepair) void ScriptMgr::OnGuildMemberWitdrawMoney(Guild* guild, Player* player, uint32& amount, bool isRepair)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_MEMBER_WITDRAW_MONEY, script->OnMemberWitdrawMoney(guild, player, amount, isRepair));
{
script->OnMemberWitdrawMoney(guild, player, amount, isRepair);
});
} }
void ScriptMgr::OnGuildMemberDepositMoney(Guild* guild, Player* player, uint32& amount) void ScriptMgr::OnGuildMemberDepositMoney(Guild* guild, Player* player, uint32& amount)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_MEMBER_DEPOSIT_MONEY, script->OnMemberDepositMoney(guild, player, amount));
{
script->OnMemberDepositMoney(guild, player, amount);
});
} }
void ScriptMgr::OnGuildItemMove(Guild* guild, Player* player, Item* pItem, bool isSrcBank, uint8 srcContainer, uint8 srcSlotId, void ScriptMgr::OnGuildItemMove(Guild* guild, Player* player, Item* pItem, bool isSrcBank, uint8 srcContainer, uint8 srcSlotId, bool isDestBank, uint8 destContainer, uint8 destSlotId)
bool isDestBank, uint8 destContainer, uint8 destSlotId)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_ITEM_MOVE, script->OnItemMove(guild, player, pItem, isSrcBank, srcContainer, srcSlotId, isDestBank, destContainer, destSlotId));
{
script->OnItemMove(guild, player, pItem, isSrcBank, srcContainer, srcSlotId, isDestBank, destContainer, destSlotId);
});
} }
void ScriptMgr::OnGuildEvent(Guild* guild, uint8 eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank) void ScriptMgr::OnGuildEvent(Guild* guild, uint8 eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2, uint8 newRank)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_EVENT, script->OnEvent(guild, eventType, playerGuid1, playerGuid2, newRank));
{
script->OnEvent(guild, eventType, playerGuid1, playerGuid2, newRank);
});
} }
void ScriptMgr::OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint32 itemOrMoney, uint16 itemStackCount, uint8 destTabId) void ScriptMgr::OnGuildBankEvent(Guild* guild, uint8 eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint32 itemOrMoney, uint16 itemStackCount, uint8 destTabId)
{ {
ExecuteScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_HOOKS(GuildScript, GUILDHOOK_ON_BANK_EVENT, script->OnBankEvent(guild, eventType, tabId, playerGuid, itemOrMoney, itemStackCount, destTabId));
{
script->OnBankEvent(guild, eventType, tabId, playerGuid, itemOrMoney, itemStackCount, destTabId);
});
} }
bool ScriptMgr::CanGuildSendBankList(Guild const* guild, WorldSession* session, uint8 tabId, bool sendAllSlots) bool ScriptMgr::CanGuildSendBankList(Guild const* guild, WorldSession* session, uint8 tabId, bool sendAllSlots)
{ {
auto ret = IsValidBoolScript<GuildScript>([&](GuildScript* script) CALL_ENABLED_BOOLEAN_HOOKS(GuildScript, GUILDHOOK_CAN_GUILD_SEND_BANK_LIST, !script->CanGuildSendBankList(guild, session, tabId, sendAllSlots));
{
return !script->CanGuildSendBankList(guild, session, tabId, sendAllSlots);
});
if (ret && *ret)
{
return false;
}
return true;
} }
GuildScript::GuildScript(const char* name) GuildScript::GuildScript(const char* name, std::vector<uint16> enabledHooks)
: ScriptObject(name) : ScriptObject(name, GUILDHOOK_END)
{ {
ScriptRegistry<GuildScript>::AddScript(this); // If empty - enable all available hooks.
if (enabledHooks.empty())
for (uint16 i = 0; i < GUILDHOOK_END; ++i)
enabledHooks.emplace_back(i);
ScriptRegistry<GuildScript>::AddScript(this, std::move(enabledHooks));
} }
template class AC_GAME_API ScriptRegistry<GuildScript>; template class AC_GAME_API ScriptRegistry<GuildScript>;

23
src/server/game/Scripting/ScriptDefines/GuildScript.h
View File

@@ -20,11 +20,29 @@
#include "ObjectGuid.h" #include "ObjectGuid.h"
#include "ScriptObject.h" #include "ScriptObject.h"
#include <vector>
enum GuildHook
{
GUILDHOOK_ON_ADD_MEMBER,
GUILDHOOK_ON_REMOVE_MEMBER,
GUILDHOOK_ON_MOTD_CHANGED,
GUILDHOOK_ON_INFO_CHANGED,
GUILDHOOK_ON_CREATE,
GUILDHOOK_ON_DISBAND,
GUILDHOOK_ON_MEMBER_WITDRAW_MONEY,
GUILDHOOK_ON_MEMBER_DEPOSIT_MONEY,
GUILDHOOK_ON_ITEM_MOVE,
GUILDHOOK_ON_EVENT,
GUILDHOOK_ON_BANK_EVENT,
GUILDHOOK_CAN_GUILD_SEND_BANK_LIST,
GUILDHOOK_END
};
class GuildScript : public ScriptObject class GuildScript : public ScriptObject
{ {
protected: protected:
GuildScript(const char* name); GuildScript(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; }
@@ -54,8 +72,7 @@ public:
virtual void OnMemberDepositMoney(Guild* /*guild*/, Player* /*player*/, uint32& /*amount*/) { } virtual void OnMemberDepositMoney(Guild* /*guild*/, Player* /*player*/, uint32& /*amount*/) { }
// Called when a guild member moves an item in a guild bank. // Called when a guild member moves an item in a guild bank.
virtual void OnItemMove(Guild* /*guild*/, Player* /*player*/, Item* /*pItem*/, bool /*isSrcBank*/, uint8 /*srcContainer*/, uint8 /*srcSlotId*/, virtual void OnItemMove(Guild* /*guild*/, Player* /*player*/, Item* /*pItem*/, bool /*isSrcBank*/, uint8 /*srcContainer*/, uint8 /*srcSlotId*/, bool /*isDestBank*/, uint8 /*destContainer*/, uint8 /*destSlotId*/) { }
bool /*isDestBank*/, uint8 /*destContainer*/, uint8 /*destSlotId*/) { }
virtual void OnEvent(Guild* /*guild*/, uint8 /*eventType*/, ObjectGuid::LowType /*playerGuid1*/, ObjectGuid::LowType /*playerGuid2*/, uint8 /*newRank*/) { } virtual void OnEvent(Guild* /*guild*/, uint8 /*eventType*/, ObjectGuid::LowType /*playerGuid1*/, ObjectGuid::LowType /*playerGuid2*/, uint8 /*newRank*/) { }