From 98cba87bec930c8fa87952df7919c23ce8902387 Mon Sep 17 00:00:00 2001 From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com> Date: Sat, 9 Mar 2024 19:00:15 +0100 Subject: [PATCH 1/2] feat(server/player): adding custom group info --- server/player.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/player.lua b/server/player.lua index e6a9755..05cca7d 100644 --- a/server/player.lua +++ b/server/player.lua @@ -329,10 +329,10 @@ local function createCharacterTable(info) ---@param rank number ---@param isJob boolean ---@return boolean - function self.addGroup(name, rank, isJob) + function self.addGroup(name, rank, info, isJob) local groupRank = tonumber(rank) or 1 - local groupInfo = Config.groups?[name] - local bossRank = groupInfo and groupInfo.minimumBossRank + local groupInfo = info or Config.groups?[name] + local bossRank = groupInfo?.minimumBossRank -- if not groupInfo then return end if isJob then @@ -343,8 +343,8 @@ local function createCharacterTable(info) self.groups[name] = { name = name, - label = groupInfo and groupInfo.label or name, - rankName = groupInfo and groupInfo.ranks[groupRank] or groupRank, + label = groupInfo?.label or name, + rankName = groupInfo?.ranks?[groupRank] or groupRank, rank = groupRank, isJob = isJob, isBoss = bossRank and groupRank >= bossRank From d5c3acbd81467d4c6e57cb2252b3abbfcb0fdc19 Mon Sep 17 00:00:00 2001 From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com> Date: Sat, 9 Mar 2024 19:02:18 +0100 Subject: [PATCH 2/2] tweak(server/player): adding job group --- server/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/player.lua b/server/player.lua index 05cca7d..10d655b 100644 --- a/server/player.lua +++ b/server/player.lua @@ -388,7 +388,7 @@ local function createCharacterTable(info) ---@return boolean function self.setJob(name, rank) self.removeGroup(self.job) - local job = self.addGroup(name, rank, true) + local job = self.addGroup(name, rank, nil, true) if job then self.job = job.name self.jobInfo = job