Skip to content

Commit

Permalink
fix(player): Update gang grade name on change. Include bankAuth in Pl…
Browse files Browse the repository at this point in the history
…ayerData
  • Loading branch information
citRaTTV authored and ChatDisabled committed Feb 10, 2025
1 parent 22d4efa commit ebfbd3e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
10 changes: 10 additions & 0 deletions server/player.lua
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ function SetPlayerPrimaryGang(citizenid, gangName)
name = gangName,
label = gang.label,
isboss = gang.grades[grade].isboss,
bankAuth = gang.grades[grade].bankAuth,
grade = {
name = gang.grades[grade].name,
level = grade
Expand Down Expand Up @@ -543,6 +544,7 @@ function RemovePlayerFromGang(citizenid, gangName)
name = 'none',
label = gang.label,
isboss = false,
bankAuth = false,
grade = {
name = gang.grades[0].name,
level = 0
Expand Down Expand Up @@ -668,6 +670,7 @@ function CheckPlayerData(source, playerData)
type = job.type,
onduty = playerData.job?.onduty or false,
isboss = job.grades[jobGrade].isboss or false,
bankAuth = job.grades[jobGrade].bankAuth or false,
grade = {
name = job.grades[jobGrade].name,
level = jobGrade,
Expand All @@ -685,6 +688,7 @@ function CheckPlayerData(source, playerData)
name = playerData.gang?.name or 'none',
label = gang.label,
isboss = gang.grades[gangGrade].isboss or false,
bankAuth = gang.grades[gangGrade].bankAuth or false,
grade = {
name = gang.grades[gangGrade].name,
level = gangGrade
Expand Down Expand Up @@ -936,6 +940,7 @@ function CreatePlayer(playerData, Offline)
name = 'unemployed',
label = 'Civilian',
isboss = false,
bankAuth = false,
onduty = true,
payment = 10,
grade = {
Expand All @@ -953,6 +958,7 @@ function CreatePlayer(playerData, Offline)
self.PlayerData.job.grade.name = jobGrade.name
self.PlayerData.job.payment = jobGrade.payment or 30
self.PlayerData.job.isboss = jobGrade.isboss or false
self.PlayerData.job.bankAuth = jobGrade.bankAuth or false
else
self.PlayerData.job.grade = {
name = 'No Grades',
Expand All @@ -978,6 +984,7 @@ function CreatePlayer(playerData, Offline)
name = 'none',
label = 'No Gang Affiliation',
isboss = false,
bankAuth = false,
grade = {
name = 'none',
level = 0
Expand All @@ -989,13 +996,16 @@ function CreatePlayer(playerData, Offline)
local gangGrade = gang.grades[self.PlayerData.gang.grade.level]

if gangGrade then
self.PlayerData.gang.grade.name = gangGrade.name
self.PlayerData.gang.isboss = gangGrade.isboss or false
self.PlayerData.gang.bankAuth = gangGrade.bankAuth or false
else
self.PlayerData.gang.grade = {
name = 'No Grades',
level = 0,
}
self.PlayerData.gang.isboss = false
self.PlayerData.gang.bankAuth = false
end
end

Expand Down
2 changes: 2 additions & 0 deletions types.lua
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,14 @@
---@field type? string
---@field onduty boolean
---@field isboss boolean
---@field bankAuth boolean
---@field grade {name: string, level: number}

---@class PlayerGang
---@field name string
---@field label string
---@field isboss boolean
---@field bankAuth boolean
---@field grade {name: string, level: number}

---@class PlayerSkin
Expand Down

0 comments on commit ebfbd3e

Please sign in to comment.