etlegacy/wolfadmin
0
0
Fork 0
mirror of https://github.com/etlegacy/wolfadmin.git synced 2024-11-22 04:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid objective carrier being balanced to the other team (issue #37)

Browse source
This commit is contained in:
Timo Smit 2016-08-04 18:37:53 +02:00
parent fc88fcfc4b
commit 2524a1be9e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
luascripts/admin/balancer.lua
View file

@ -109,17 +109,19 @@ function balancer.findPlayer(team, teamGreater, teamSmaller)
for _, playerId in ipairs(team) do
local health = tonumber(et.gentity_get(playerId, "health"))
local blueflag = et.gentity_get(playerId, "ps.powerups", 5) -- bg_public.h enum powerup_t PW_REDFLAG 6 and PW_BLUEFLAG 7
local redflag = et.gentity_get(playerId, "ps.powerups", 6)
if
(not bits.hasbit(playerSelection, balancer.BALANCE_ONLY_DEAD) or health <= 0)
-- TODO: find secure way to check for objective drops
-- and
-- (not bits.hasbit(playerSelection, balancer.BALANCE_NOT_OBJECTIVE) or stats.get(playerId, "hasObjective"))
and
(not bits.hasbit(playerSelection, balancer.BALANCE_NOT_OBJECTIVE) or (blueflag ~= 0 and redflag ~= 0))
then
table.insert(players, playerId)
end
end
if bits.hasbit(playerSelection, balancer.BALANCE_ONLY_DEAD) and #players == 0 then
if #players == 0 then
players = team
end