Skip to content

Alteration to salary #42

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

Merged
TovarischPootis merged 14 commits into from
Apr 2, 2021
Merged

Alteration to salary #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c98e7f9
Alteration to salary
raecyst Mar 29, 2021
54589ad
Fixed class commit
raecyst Mar 29, 2021
6c6d297
Another quick fix
raecyst Mar 29, 2021
e2ddc9c
Update gamemode/core/hooks/sv_hooks.lua
raecyst Mar 29, 2021
dd44cd0
Update gamemode/core/hooks/sv_hooks.lua
raecyst Mar 29, 2021
c0dcc47
Update gamemode/core/hooks/sv_hooks.lua
raecyst Mar 29, 2021
5345385
Hook to hide players in Scoreboard
raecyst Mar 31, 2021
d15e50a
Merge branch '1.2-wip' of https://github.com/SeamusMcGowan/NutScript-…
raecyst Mar 31, 2021
cf3733d
Optimization
raecyst Mar 31, 2021
844532b
Update cl_scoreboard.lua
raecyst Mar 31, 2021
1b24b74
Update sv_hooks.lua
zoephix Mar 31, 2021
03c8139
Update cl_scoreboard.lua
zoephix Mar 31, 2021
ccdff98
Update plugins/scoreboard/derma/cl_scoreboard.lua
raecyst Apr 1, 2021
0846cf9
Update plugins/scoreboard/derma/cl_scoreboard.lua
raecyst Apr 2, 2021
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: 5 additions & 5 deletions gamemode/core/hooks/sv_hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,9 +722,11 @@ function GM:CreateSalaryTimer(client)
if (not character) then return end

local faction = nut.faction.indices[character:getFaction()]
if (not faction or not isnumber(faction.pay) or faction.pay <= 0) then
return
end
local class = nut.class.indices[character:getClass()]

local pay = hook.Run("GetSalaryAmount", client, faction, class) or (class and class.pay) or (faction and faction.pay) or nil

if (!pay) then return end

local timerID = "nutSalary"..client:SteamID()
local timerFunc = timer.Exists(timerID) and timer.Adjust or timer.Create
Expand All @@ -736,8 +738,6 @@ function GM:CreateSalaryTimer(client)
return
end


local pay = hook.Run("GetSalaryAmount", client, faction) or faction.pay
character:giveMoney(pay)
client:notifyLocalized("salary", nut.currency.get(pay))
end)
Expand Down
6 changes: 6 additions & 0 deletions plugins/scoreboard/derma/cl_scoreboard.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ local PANEL = {}
elseif (!visible and amount > 0) then
v:SetVisible(true)
end

local faction = nut.faction.indices[k]

if (amount != 0) then
v:SetVisible(hook.Run("ShowFactionInScoreboard", faction) ~= false or LocalPlayer():IsAdmin())
end
end

for k, v in pairs(self.slots) do
Expand Down