From 41bac6a6648c21d9a56a2fad342895ef2172f8f0 Mon Sep 17 00:00:00 2001 From: MewMew Date: Tue, 1 Oct 2019 03:16:56 +0200 Subject: [PATCH] player.spectator addition --- maps/biter_battles_v2/biter_battles_v2.lua | 1 + maps/biter_battles_v2/gui.lua | 3 +++ 2 files changed, 4 insertions(+) diff --git a/maps/biter_battles_v2/biter_battles_v2.lua b/maps/biter_battles_v2/biter_battles_v2.lua index 5ac230bd..bef61f49 100644 --- a/maps/biter_battles_v2/biter_battles_v2.lua +++ b/maps/biter_battles_v2/biter_battles_v2.lua @@ -175,6 +175,7 @@ local function on_player_joined_game(event) if player.gui.left["map_pregen"] then player.gui.left["map_pregen"].destroy() end if player.online_time == 0 then + player.spectator = true player.force = game.forces.spectator if surface.is_chunk_generated({0,0}) then player.teleport(surface.find_non_colliding_position("character", {0,0}, 3, 0.5), surface) diff --git a/maps/biter_battles_v2/gui.lua b/maps/biter_battles_v2/gui.lua index 35f9a01f..8c8aa9d5 100644 --- a/maps/biter_battles_v2/gui.lua +++ b/maps/biter_battles_v2/gui.lua @@ -257,6 +257,7 @@ function join_team(player, force_name, forced_join) refresh_gui() game.permissions.get_group("Default").add_player(player) game.print("Team " .. player.force.name .. " player " .. player.name .. " is no longer spectating.", {r = 0.98, g = 0.66, b = 0.22}) + player.spectator = false return end local pos = surface.find_non_colliding_position("character", game.forces[force_name].get_spawn_position(surface), 3, 1) @@ -278,6 +279,7 @@ function join_team(player, force_name, forced_join) player.insert {name = 'iron-gear-wheel', count = 8} player.insert {name = 'iron-plate', count = 16} global.chosen_team[player.name] = force_name + player.spectator = false refresh_gui() end @@ -295,6 +297,7 @@ function spectate(player, forced_join) game.permissions.get_group("spectator").add_player(player) global.spectator_rejoin_delay[player.name] = game.tick create_main_gui(player) + player.spectator = true end local function join_gui_click(name, player)