biter_battles autorestart server commands

control.lua

@@ -10,10 +10,9 @@ require "antigrief_admin_panel"
 require "group"
 require "player_list"
 require "poll"
-require "score"
+--require "score"
 
 ---- enable modules here ----
---require "maps.tools.map_pregen"
 --require "maps.tools.cheat_mode"
 --require "maps.modules.hunger"
 --require "maps.modules.fish_respawner"
@@ -41,7 +40,7 @@ require "score"
 --require "maps.spiral_troopers"
 --require "maps.fish_defender"
 --require "maps.mountain_fortress"
-require "maps.stoneblock"
+--require "maps.stoneblock"
 --require "maps.deep_jungle"
 --require "maps.crossing"
 --require "maps.anarchy"

maps/biter_battles.lua

@@ -11,6 +11,7 @@ require "maps.modules.custom_death_messages"
 local biter_battles_terrain = require 'biter_battles_terrain'
 local event = require 'utils.event'
 local math_random = math.random
+local insert = table.insert
 
 local food_names = {
 	["science-pack-1"] = 				"red science",
@@ -138,6 +139,22 @@ local function show_mvps(player)
 		local l = t.add({type = "label", caption = mvp.deaths.name .. " died " .. mvp.deaths.score .. " times"})						
 		l.style.font = "default-bold"
 		l.style.font_color = {r=0.33, g=0.66, b=0.9}
+		
+		if not global.results_sent_north then
+			local result = {}
+			insert(result, 'NORTH: \\n')
+			insert(result, 'MVP Defender: \\n')
+			insert(result, mvp.killscore.name .. " with a score of " .. mvp.killscore.score .. "\\n" )
+			insert(result, '\\n')
+			insert(result, 'MVP Builder: \\n')
+			insert(result, mvp.built_entities.name .. " built " .. mvp.built_entities.score .. " things\\n" )
+			insert(result, '\\n')
+			insert(result, 'MVP Deaths: \\n')
+			insert(result, mvp.deaths.name .. " died " .. mvp.deaths.score .. " times" )		
+			local message = table.concat(result)
+			server_commands.to_discord_embed(message)
+			global.results_sent_north = true
+		end
 	end
 	
 	local l = frame.add({type = "label", caption = "MVPs - South:"})
@@ -167,6 +184,22 @@ local function show_mvps(player)
 		local l = t.add({type = "label", caption = mvp.deaths.name .. " died " .. mvp.deaths.score .. " times"})						
 		l.style.font = "default-bold"
 		l.style.font_color = {r=0.33, g=0.66, b=0.9}
+		
+		if not global.results_sent_south then
+			local result = {}
+			insert(result, 'SOUTH: \\n')
+			insert(result, 'MVP Defender: \\n')
+			insert(result, mvp.killscore.name .. " with a score of " .. mvp.killscore.score .. "\\n" )
+			insert(result, '\\n')
+			insert(result, 'MVP Builder: \\n')
+			insert(result, mvp.built_entities.name .. " built " .. mvp.built_entities.score .. " things\\n" )
+			insert(result, '\\n')
+			insert(result, 'MVP Deaths: \\n')
+			insert(result, mvp.deaths.name .. " died " .. mvp.deaths.score .. " times" )		
+			local message = table.concat(result)
+			server_commands.to_discord_embed(message)
+			global.results_sent_south = true
+		end
 	end
 end
 
@@ -1131,8 +1164,7 @@ local function send_near_biter_to_silo()
 		})
 end
 
-local function on_tick(event)
-	
+local function on_tick(event)	
 	if global.rocket_silo_destroyed then
 		if not global.game_restart_timeout then global.game_restart_timeout = 7200 end
 		if not global.game_restart_timer_completed then			
@@ -1145,27 +1177,32 @@ local function on_tick(event)
 			if global.game_restart_timeout < 0 then
 				global.game_restart_timer_completed = true
 				game.print("Map is restarting!", { r=0.22, g=0.88, b=0.22})
-				game.write_file("commandPipe", ":loadscenario --force", false, 0)
+				local message = 'Map is restarting! '
+				server_commands.to_discord_bold(table.concat{'*** ', message, ' ***'})
+				server_commands.start_scenario('Biter_Battles')
 			end
 		end
 	end
 	
-	if global.spy_fish_timeout["south"] then		
-		if (global.spy_fish_timeout["south"] - game.tick) % 300 == 0 then
-			reveal_team("north")						
+	if global.spy_fish_timeout then
+		if global.spy_fish_timeout["south"] then		
+			if (global.spy_fish_timeout["south"] - game.tick) % 300 == 0 then
+				reveal_team("north")						
+			end	
+			if game.tick - global.spy_fish_timeout["south"] > 0 then
+				global.spy_fish_timeout["south"] = nil
+			end
 		end	
-		if game.tick - global.spy_fish_timeout["south"] > 0 then
-			global.spy_fish_timeout["south"] = nil
-		end
-	end	
-	if global.spy_fish_timeout["north"] then		
-		if (global.spy_fish_timeout["north"] - game.tick) % 300 == 0 then
-			reveal_team("south")						
+		if global.spy_fish_timeout["north"] then		
+			if (global.spy_fish_timeout["north"] - game.tick) % 300 == 0 then
+				reveal_team("south")						
+			end	
+			if game.tick - global.spy_fish_timeout["north"] > 0 then
+				global.spy_fish_timeout["north"] = nil
+			end
 		end	
-		if game.tick - global.spy_fish_timeout["north"] > 0 then
-			global.spy_fish_timeout["north"] = nil
-		end
-	end	
+	end
+	
 	if game.tick % 12600 == 6300 then	
 		clear_corpses()
 		if global.biter_rage["north"] >= 1 then

maps/stoneblock.lua

@@ -353,7 +353,7 @@ local function on_tick(event)
 	if game.tick % 3600 ~= 1 then return end
 	if math_random(1,8) ~= 1 then return end
 	
-	local surface = game.surfaces["mountain_fortress"]
+	local surface = game.surfaces["stoneblock"]
 	
 	local spawners = surface.find_entities_filtered({force = "enemy", type = "unit-spawner"})
 	if not spawners[1] then return end