From c7d607193d8b2175a43ae7f9e57d559a427a6bcc Mon Sep 17 00:00:00 2001 From: MewMew Date: Fri, 29 Nov 2019 04:38:33 +0100 Subject: [PATCH] tourney mode disables difficuly voting for non-admins --- maps/biter_battles_v2/difficulty_vote.lua | 18 +++++++++++++++--- maps/biter_battles_v2/team_manager.lua | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/maps/biter_battles_v2/difficulty_vote.lua b/maps/biter_battles_v2/difficulty_vote.lua index 49058899..69adc9d5 100644 --- a/maps/biter_battles_v2/difficulty_vote.lua +++ b/maps/biter_battles_v2/difficulty_vote.lua @@ -29,7 +29,7 @@ end local function poll_difficulty(player) if player.gui.center["difficulty_poll"] then player.gui.center["difficulty_poll"].destroy() return end - if bb_config.only_admins_vote then + if bb_config.only_admins_vote or global.tournament_mode then if not player.admin then return end end @@ -86,7 +86,7 @@ local function on_player_joined_game(event) local player = game.players[event.player_index] if game.tick < timeout then if not global.difficulty_player_votes[player.name] then - if bb_config.only_admins_vote then + if bb_config.only_admins_vote or global.tournament_mode then if player.admin then poll_difficulty(player) end else poll_difficulty(player) @@ -120,7 +120,19 @@ local function on_gui_click(event) if event.element.parent.name ~= "difficulty_poll" then return end if event.element.name == "close" then event.element.parent.destroy() return end if game.tick > timeout then event.element.parent.destroy() return end - local i = tonumber(event.element.name) + local i = tonumber(event.element.name) + + if bb_config.only_admins_vote or global.tournament_mode then + if player.admin then + game.print(player.name .. " has voted for " .. difficulties[i].name .. " difficulty!", difficulties[i].print_color) + global.difficulty_player_votes[player.name] = i + set_difficulty() + difficulty_gui() + end + event.element.parent.destroy() + return + end + game.print(player.name .. " has voted for " .. difficulties[i].name .. " difficulty!", difficulties[i].print_color) global.difficulty_player_votes[player.name] = i set_difficulty() diff --git a/maps/biter_battles_v2/team_manager.lua b/maps/biter_battles_v2/team_manager.lua index 2575b1ef..715db152 100644 --- a/maps/biter_battles_v2/team_manager.lua +++ b/maps/biter_battles_v2/team_manager.lua @@ -160,8 +160,8 @@ local function draw_manager_gui(player) button = t.add({ type = "button", name = "team_manager_activate_tournament", - caption = "Tournament Mode Activated", - tooltip = "Only admins can move players. Active players can no longer go spectate. New joining players are spectators." + caption = "Tournament Mode Enabled", + tooltip = "Only admins can move players and vote for difficulty.\nActive players can no longer go spectate.\nNew joining players are spectators." }) button.style.font_color = {r = 222, g = 22, b = 22} else