forked from Not/srb2k-leaderboard
Merge branch 'lonsfor-patch-1'
This commit is contained in:
commit
14645dbc90
117
leaderboard.lua
117
leaderboard.lua
@ -12,6 +12,8 @@ local splits = {}
|
||||
local PATCH = nil
|
||||
local help = true
|
||||
local EncoreInitial = nil
|
||||
local cv_teamchange
|
||||
local scoreTable
|
||||
|
||||
-- Tracks if stats have been written or not
|
||||
local StatTrack = false
|
||||
@ -81,11 +83,24 @@ local cv_gui = CV_RegisterVar({
|
||||
PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
|
||||
})
|
||||
|
||||
local cv_afk = CV_RegisterVar({
|
||||
local AntiAFK = true
|
||||
CV_RegisterVar({
|
||||
name = "lb_afk",
|
||||
defaultvalue = 1,
|
||||
flags = CV_NETVAR,
|
||||
PossibleValue = CV_OnOff
|
||||
flags = CV_NETVAR | CV_CALL,
|
||||
PossibleValue = CV_OnOff,
|
||||
func = function(v)
|
||||
-- Set players afkTime and toggle AntiAFK
|
||||
if v.value then
|
||||
for p in players.iterate do
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
|
||||
AntiAFK = true
|
||||
else
|
||||
AntiAFK = false
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
local cv_enable = CV_RegisterVar({
|
||||
@ -239,7 +254,7 @@ if f then
|
||||
flags = tonumber(t[7])
|
||||
end
|
||||
|
||||
local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
|
||||
scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
|
||||
|
||||
local spl = {}
|
||||
if t[6] != nil then
|
||||
@ -660,7 +675,7 @@ function ticsToTime(tics, pure)
|
||||
|
||||
return string.format(
|
||||
"%d:%02d:%02d",
|
||||
G_TicsToMinutes(tics),
|
||||
G_TicsToMinutes(tics, true),
|
||||
G_TicsToSeconds(tics),
|
||||
G_TicsToCentiseconds(tics)
|
||||
)
|
||||
@ -907,9 +922,9 @@ local function drawScroll(v, player, scoreTable, gui)
|
||||
local x = 10
|
||||
if #scoreTable >= 10 then
|
||||
x = x + 8
|
||||
end
|
||||
if #scoreTable >= 100 then
|
||||
x = x + 8
|
||||
if #scoreTable >= 100 then
|
||||
x = x + 8
|
||||
end
|
||||
end
|
||||
|
||||
local y = FixedInt(scrollY)
|
||||
@ -961,8 +976,6 @@ local function drawScoreboard(v, player)
|
||||
|
||||
cachePatches(v)
|
||||
|
||||
local scoreTable = getScoreTable(gamemap, Flags)
|
||||
|
||||
local gui = cv_gui.value
|
||||
if leveltime < START_TIME or player.exiting or player.lives == 0 then
|
||||
gui = GUI_ON
|
||||
@ -1009,7 +1022,7 @@ end
|
||||
|
||||
-- Find location of player and scroll to it
|
||||
function scroll_to(player)
|
||||
local m = getScoreTable(gamemap, Flags) or {}
|
||||
local m = scoreTable or {}
|
||||
|
||||
scrollToPos = 2
|
||||
for pos, score in ipairs(m) do
|
||||
@ -1038,7 +1051,8 @@ local function writeStats()
|
||||
end
|
||||
|
||||
local function saveTime(player)
|
||||
local scoreTable = getScoreTable(gamemap, Flags) or {}
|
||||
|
||||
scoreTable = $ or {}
|
||||
|
||||
local pskin = skins[player.mo.skin]
|
||||
local newscore = score_t(
|
||||
@ -1145,28 +1159,30 @@ local function think()
|
||||
end
|
||||
|
||||
if disable then
|
||||
if cv_afk.value and ingame() > 1 then
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
|
||||
if p.cmd.buttons then
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
if AntiAFK then
|
||||
if ingame() > 1 then
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
|
||||
if p.cmd.buttons then
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
|
||||
--Away from kart
|
||||
if p.afkTime + AFK_BALANCE_WARN == leveltime then
|
||||
chatprintf(p, "[AFK] \x89You will be moved to spectator in 10 seconds!", false)
|
||||
S_StartSound(nil, 26, p)
|
||||
end
|
||||
if p.afkTime + AFK_BALANCE < leveltime then
|
||||
p.spectator = true
|
||||
chatprint("\x89" + p.name + " was moved to the other team for game balance", true)
|
||||
--Away from kart
|
||||
if p.afkTime + AFK_BALANCE_WARN == leveltime then
|
||||
chatprintf(p, "[AFK] \x89You will be moved to spectator in 10 seconds!", false)
|
||||
S_StartSound(nil, 26, p)
|
||||
end
|
||||
if p.afkTime + AFK_BALANCE < leveltime then
|
||||
p.spectator = true
|
||||
chatprint("\x89" + p.name + " was moved to the other team for game balance", true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator then
|
||||
p.afkTime = leveltime
|
||||
else
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator then
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1217,29 +1233,34 @@ local function think()
|
||||
end
|
||||
if clearcheats then
|
||||
clearcheats = false
|
||||
for p in players.iterate do
|
||||
p.SPBAKARTBIG = false
|
||||
p.SPBAjustice = false
|
||||
p.SPBAshutup = false
|
||||
for q in players.iterate do
|
||||
q.SPBAKARTBIG = false
|
||||
q.SPBAjustice = false
|
||||
q.SPBAshutup = false
|
||||
end
|
||||
end
|
||||
for p in players.iterate do
|
||||
if not p.spectator then
|
||||
if p.SPBAKARTBIG then
|
||||
Flags = $ | F_SPBBIG
|
||||
end
|
||||
if p.SPBAjustice then
|
||||
Flags = $ | F_SPBJUS
|
||||
end
|
||||
|
||||
if p then
|
||||
if p.SPBAKARTBIG then
|
||||
Flags = $ | F_SPBBIG
|
||||
end
|
||||
if p.SPBAjustice then
|
||||
Flags = $ | F_SPBJUS
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
if not (Flags & F_SPBATK) then
|
||||
hud.enable("freeplay")
|
||||
end
|
||||
end
|
||||
|
||||
local cv_teamchange = CV_FindVar("allowteamchange")
|
||||
scoreTable = getScoreTable(gamemap, Flags)
|
||||
|
||||
if not cv_teamchange then
|
||||
cv_teamchange = CV_FindVar("allowteamchange")
|
||||
end
|
||||
|
||||
if p then
|
||||
-- Scroll controller
|
||||
-- Spectators can't input buttons so let the gamer do it
|
||||
@ -1292,11 +1313,17 @@ local function interThink()
|
||||
COM_BufInsertText(server, "map " + nextMap)
|
||||
nextMap = nil
|
||||
end
|
||||
if not CV_FindVar("allowteamchange").value then
|
||||
|
||||
if not cv_teamchange then
|
||||
cv_teamchange = CV_FindVar("allowteamchange")
|
||||
end
|
||||
|
||||
if not cv_teamchange.value then
|
||||
allowJoin(true)
|
||||
end
|
||||
end
|
||||
addHook("IntermissionThinker", interThink)
|
||||
addHook("VoteThinker", interThink)
|
||||
|
||||
-- Returns the values clamed between min, max
|
||||
function clamp(min_v, v, max_v)
|
||||
|
Loading…
Reference in New Issue
Block a user