Skip to content

Commit

Permalink
chore. command writing format
Browse files Browse the repository at this point in the history
  • Loading branch information
@pangolp
pangolp committed Apr 30, 2024
1 parent 48d9890 commit 8aefba4
Showing 1 changed file with 44 additions and 62 deletions.
106 changes: 44 additions & 62 deletions src/Individual_XP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
#include "Object.h"
#include "DataMap.h"

#if AC_COMPILER == AC_COMPILER_GNU
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif

using namespace Acore::ChatCommands;

/*
Expand Down Expand Up @@ -112,31 +108,31 @@ class Individual_XP : public PlayerScript

};

class Individual_XP_command : public CommandScript
class IndividualXPCommand : public CommandScript
{
public:
Individual_XP_command() : CommandScript("Individual_XP_command") { }
std::vector<ChatCommand> GetCommands() const override
IndividualXPCommand() : CommandScript("IndividualXPCommand") {}

ChatCommandTable GetCommands() const override
{
static std::vector<ChatCommand> IndividualXPCommandTable =
static ChatCommandTable IndividualXPCommandTable =
{
{ "enable", SEC_PLAYER, false, &HandleEnableCommand, "" },
{ "disable", SEC_PLAYER, false, &HandleDisableCommand, "" },
{ "view", SEC_PLAYER, false, &HandleViewCommand, "" },
{ "set", SEC_PLAYER, false, &HandleSetCommand, "" },
{ "default", SEC_PLAYER, false, &HandleDefaultCommand, "" },
{ "", SEC_PLAYER, false, &HandleXPCommand, "" }
{ "enable", HandleEnableCommand, SEC_PLAYER, Console::No },
{ "disable", HandleDisableCommand, SEC_PLAYER, Console::No },
{ "view", HandleViewCommand, SEC_PLAYER, Console::No },
{ "set", HandleSetCommand, SEC_PLAYER, Console::No },
{ "default", HandleDefaultCommand, SEC_PLAYER, Console::No }
};

static std::vector<ChatCommand> IndividualXPBaseTable =
static ChatCommandTable IndividualXPBaseTable =
{
{ "xp", SEC_PLAYER, false, nullptr, "", IndividualXPCommandTable }
{ "xp", IndividualXPCommandTable }
};

return IndividualXPBaseTable;
return IndividualXPBaseTable;
}

static bool HandleXPCommand(ChatHandler* handler, char const* args)
static bool HandleViewCommand(ChatHandler* handler)
{
if (!IndividualXpEnabled)
{
Expand All @@ -145,40 +141,25 @@ class Individual_XP_command : public CommandScript
return false;
}

if (!*args)
return false;

return true;
}

static bool HandleViewCommand(ChatHandler* handler, char const* /*args*/)
{
if (!IndividualXpEnabled)
{
handler->PSendSysMessage(ACORE_STRING_MODULE_DISABLED);
handler->SetSentErrorMessage(true);
return false;
}
Player* player = handler->GetSession()->GetPlayer();

Player* me = handler->GetSession()->GetPlayer();
if (!me)
if (!player)
return false;

if (me->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN))
if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN))
{
handler->PSendSysMessage(ACORE_STRING_RATES_DISABLED);
handler->SetSentErrorMessage(true);
return false;
}
else
{
me->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_VIEW, me->CustomData.GetDefault<PlayerXpRate>("Individual_XP")->XPRate);
player->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_VIEW, player->CustomData.GetDefault<PlayerXpRate>("Individual_XP")->XPRate);
}
return true;
}

// Set Command
static bool HandleSetCommand(ChatHandler* handler, char const* args)
static bool HandleSetCommand(ChatHandler* handler, uint32 rate)
{
if (!IndividualXpEnabled)
{
Expand All @@ -187,14 +168,14 @@ class Individual_XP_command : public CommandScript
return false;
}

if (!*args)
if (!rate)
return false;

Player* me = handler->GetSession()->GetPlayer();
if (!me)
Player* player = handler->GetSession()->GetPlayer();

if (!player)
return false;

uint32 rate = (uint32)atol(args);
if (rate > MaxRate)
{
handler->PSendSysMessage(ACORE_STRING_MAX_RATE, MaxRate);
Expand All @@ -208,13 +189,12 @@ class Individual_XP_command : public CommandScript
return false;
}

me->CustomData.GetDefault<PlayerXpRate>("Individual_XP")->XPRate = rate;
me->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_SET, rate);
player->CustomData.GetDefault<PlayerXpRate>("Individual_XP")->XPRate = rate;
player->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_SET, rate);
return true;
}

// Disable Command
static bool HandleDisableCommand(ChatHandler* handler, char const* /*args*/)
static bool HandleDisableCommand(ChatHandler* handler)
{
if (!IndividualXpEnabled)
{
Expand All @@ -223,18 +203,18 @@ class Individual_XP_command : public CommandScript
return false;
}

Player* me = handler->GetSession()->GetPlayer();
if (!me)
Player* player = handler->GetSession()->GetPlayer();

if (!player)
return false;

// Turn Disabled On But Don't Change Value...
me->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
me->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_DISABLED);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
player->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_DISABLED);
return true;
}

// Enable Command
static bool HandleEnableCommand(ChatHandler* handler, char const* /*args*/)
static bool HandleEnableCommand(ChatHandler* handler)
{
if (!IndividualXpEnabled)
{
Expand All @@ -243,17 +223,18 @@ class Individual_XP_command : public CommandScript
return false;
}

Player* me = handler->GetSession()->GetPlayer();
if (!me)
Player* player = handler->GetSession()->GetPlayer();

if (!player)
return false;

me->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
me->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_ENABLED);
player->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN);
player->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_ENABLED);
return true;
}

// Default Command
static bool HandleDefaultCommand(ChatHandler* handler, char const* /*args*/)
static bool HandleDefaultCommand(ChatHandler* handler)
{
if (!IndividualXpEnabled)
{
Expand All @@ -262,12 +243,13 @@ class Individual_XP_command : public CommandScript
return false;
}

Player* me = handler->GetSession()->GetPlayer();
if (!me)
Player* player = handler->GetSession()->GetPlayer();

if (!player)
return false;

me->CustomData.GetDefault<PlayerXpRate>("Individual_XP")->XPRate = DefaultRate;
me->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_DEFAULT, DefaultRate);
player->CustomData.GetDefault<PlayerXpRate>("Individual_XP")->XPRate = DefaultRate;
player->GetSession()->SendAreaTriggerMessage(ACORE_STRING_COMMAND_DEFAULT, DefaultRate);
return true;
}
};
Expand All @@ -277,5 +259,5 @@ void AddIndividual_XPScripts()
new Individual_XP_conf();
new Individual_Xp_Announce();
new Individual_XP();
new Individual_XP_command();
new IndividualXPCommand();
}

0 comments on commit 8aefba4

Please sign in to comment.