Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve: better player group flags management #942

Merged
merged 8 commits into from
May 9, 2023
Merged

improve: better player group flags management #942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a55bddf
improve: better player group flags management
dudantas Mar 21, 2023
54444d1
improve: add talkactions to manage flags
dudantas Apr 27, 2023
534190c
Merge branch 'main' into improve-flags-management
dudantas Apr 28, 2023
ee1a96d
fix: check params
dudantas May 5, 2023
7349c0c
fix wrong player
dudantas May 6, 2023
76e89f3
Merge branch 'main' into improve-flags-management
dudantas May 9, 2023
9ce787a
Code format - (Clang-format)
github-actions[bot] May 9, 2023
9175c2e
Merge branch 'main' into improve-flags-management
dudantas May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/creatures/players/player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,15 @@ class Player final : public Creature, public Cylinder {
}

bool hasFlag(PlayerFlags_t flag) const {
return group->flags[Groups::getFlagNumber(flag)];
return group->flags[static_cast<std::size_t>(flag)];
}

void setFlag(PlayerFlags_t flag) const {
group->flags[static_cast<std::size_t>(flag)] = true;
}

void removeFlag(PlayerFlags_t flag) const {
group->flags[static_cast<std::size_t>(flag)] = false;
}

BedItem* getBedItem() {
Expand Down
39 changes: 39 additions & 0 deletions src/lua/functions/creatures/player/player_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3319,3 +3319,42 @@ int PlayerFunctions::luaPlayerGetBossBonus(lua_State* L) {
lua_pushnumber(L, static_cast<lua_Number>(bonusBoss));
return 1;
}

int PlayerFunctions::luaPlayerHasGroupFlag(lua_State* L) {
// player:hasGroupFlag(flag)
const Player* player = getUserdata<Player>(L, 1);
if (!player) {
reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
pushBoolean(L, false);
return 0;
}

pushBoolean(L, player->hasFlag(getNumber<PlayerFlags_t>(L, 2)));
return 1;
}

int PlayerFunctions::luaPlayerSetGroupFlag(lua_State* L) {
// player:setGroupFlag(flag)
const Player* player = getUserdata<Player>(L, 1);
if (!player) {
reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
pushBoolean(L, false);
return 0;
}

player->setFlag(getNumber<PlayerFlags_t>(L, 2));
return 1;
}

int PlayerFunctions::luaPlayerRemoveGroupFlag(lua_State* L) {
// player:removeGroupFlag(flag)
const Player* player = getUserdata<Player>(L, 1);
if (!player) {
reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
pushBoolean(L, false);
return 0;
}

player->removeFlag(getNumber<PlayerFlags_t>(L, 2));
return 1;
}
8 changes: 8 additions & 0 deletions src/lua/functions/creatures/player/player_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ class PlayerFunctions final : LuaScriptInterface {
registerMethod(L, "Player", "getSlotBossId", PlayerFunctions::luaPlayerGetSlotBossId);
registerMethod(L, "Player", "getBossBonus", PlayerFunctions::luaPlayerGetBossBonus);

registerMethod(L, "Player", "hasGroupFlag", PlayerFunctions::luaPlayerHasGroupFlag);
registerMethod(L, "Player", "setGroupFlag", PlayerFunctions::luaPlayerSetGroupFlag);
registerMethod(L, "Player", "removeGroupFlag", PlayerFunctions::luaPlayerRemoveGroupFlag);

GroupFunctions::init(L);
GuildFunctions::init(L);
MountFunctions::init(L);
Expand Down Expand Up @@ -581,6 +585,10 @@ class PlayerFunctions final : LuaScriptInterface {
static int luaPlayerGetSlotBossId(lua_State* L);
static int luaPlayerGetBossBonus(lua_State* L);

static int luaPlayerHasGroupFlag(lua_State* L);
static int luaPlayerSetGroupFlag(lua_State* L);
static int luaPlayerRemoveGroupFlag(lua_State* L);

friend class CreatureFunctions;
};

Expand Down