Merge pull request #233 from hanakocz/master

soft_reset timescheduling

functions/soft_reset.lua

@@ -1,7 +1,138 @@
 local Server = require 'utils.server'
 local Modifers = require 'player_modifiers'
+local Global = require 'utils.global'
+local Event = require 'utils.event'
 
 local Public = {}
+local resettable = {}
+
+---------------------------global table-----------------------------------------
+Global.register(
+    resettable,
+    function(tbl)
+        resettable = tbl
+    end
+)
+
+function Public.reset_table()
+    for k, _ in pairs(resettable) do
+        resettable[k] = nil
+    end
+    resettable.soft_reset_counter = 0
+    resettable.original_surface_name = nil
+    resettable.schedule_step = 0
+    resettable.schedule_max_step = 0
+    resettable.schedule = {}
+    resettable.initial_tick = 0
+end
+
+function Public.get_table()
+    return resettable
+end
+
+local on_init = function ()
+    Public.reset_table()
+end
+
+Event.on_init(on_init)
+
+-------------------------scheduled deletion-------------------------------------
+local function add_step()
+    if resettable.schedule_step ~= resettable.schedule_max_step then
+        resettable.schedule_step = resettable.schedule_step + 1
+    end
+end
+
+local function scheduled_surface_clearing()
+    if resettable.initial_tick > game.tick then return end
+    local step = resettable.schedule_step
+    local schedule = resettable.schedule
+    if schedule[step] then
+        local surface = schedule[step].surface
+        if not surface.valid then
+            schedule[step] = nil
+            add_step()
+            return
+        end
+        if schedule[step].operation == "biter_clearing" then
+            local biters = surface.find_entities_filtered{type = "unit", limit = 10000}
+            for _,biter in pairs(biters) do
+                if biter.valid then biter.destroy() end
+            end
+            schedule[step] = nil
+            add_step()
+        elseif schedule[step].operation == "nest_clearing" then
+            local nests = surface.find_entities_filtered{type = "unit-spawner"}
+            for _, nest in pairs(nests) do
+                if nest.valid then nest.destroy() end
+            end
+            schedule[step] = nil
+            add_step()
+        elseif schedule[step].operation == "scrap_clearing" then
+            local scrap = surface.find_entities_filtered{force = "neutral", limit = 5000}
+            for _, e in pairs(scrap) do
+                if e.valid then e.destroy() end
+            end
+            schedule[step] = nil
+            add_step()
+        elseif schedule[step].operation == "clear" then
+            surface.clear()
+            schedule[step] = nil
+            add_step()
+        elseif schedule[step].operation == "delete" then
+            game.delete_surface(surface)
+            schedule[step] = nil
+            add_step()
+        end
+    end
+end
+
+function Public.add_schedule_to_delete_surface(surface)
+    local step = resettable.schedule_max_step
+    local add = 1
+    resettable.schedule[step + add] = {operation = "nest_clearing", surface = surface}
+    add = add + 1
+    local count_biters = surface.count_entities_filtered{type = "unit"}
+    for i = 1, count_biters, 10000 do
+        resettable.schedule[step + add] = {operation = "biter_clearing", surface = surface}
+        add = add + 1
+    end
+    local count_scrap = surface.count_entities_filtered{force = "neutral"}
+    for i = 1, count_scrap, 5000 do
+        resettable.schedule[step + add] = {operation = "scrap_clearing", surface = surface}
+        add = add + 1
+    end
+    resettable.schedule[step + add] = {operation = "clear", surface = surface}
+    add = add + 1
+    resettable.schedule[step + add] = {operation = "delete", surface = surface}
+    resettable.schedule_max_step = resettable.schedule_max_step + add
+    if resettable.schedule_step == step then
+        resettable.schedule_step = resettable.schedule_step + 1
+    end
+    if resettable.initial_tick <= game.tick then
+        --add offset for starting of deletion, so new map can generate peacefully for a minute and tiny bit
+        resettable.initial_tick = game.tick + 4000
+    end
+end
+
+function Public.change_entities_to_neutral(surface, force, delete_pollution)
+    local entities = surface.find_entities_filtered{force = force or "player"}
+    for _, entity in pairs(entities) do
+        if entity.valid then
+            entity.force = "neutral"
+            entity.active = false
+        end
+    end
+    if delete_pollution then
+        local pollution = surface.get_total_pollution()
+        surface.clear_pollution()
+        game.pollution_statistics.on_flow("power-switch", -pollution)
+    end
+end
+
+Event.on_nth_tick(10, scheduled_surface_clearing)
+
+---------------------------soft reset-------------------------------------------
 
 local function reset_forces(new_surface, old_surface)
     for _, f in pairs(game.forces) do
@@ -49,17 +180,14 @@ local function equip_players(player_starting_items)
 end
 
 function Public.soft_reset_map(old_surface, map_gen_settings, player_starting_items)
-    if not global.soft_reset_counter then
-        global.soft_reset_counter = 0
+    if not resettable.original_surface_name then
+        resettable.original_surface_name = old_surface.name
     end
-    if not global.original_surface_name then
-        global.original_surface_name = old_surface.name
-    end
-    global.soft_reset_counter = global.soft_reset_counter + 1
+    resettable.soft_reset_counter = resettable.soft_reset_counter + 1
 
     local new_surface =
         game.create_surface(
-        global.original_surface_name .. '_' .. tostring(global.soft_reset_counter),
+        resettable.original_surface_name .. '_' .. tostring(resettable.soft_reset_counter),
         map_gen_settings
     )
     new_surface.request_to_generate_chunks({0, 0}, 1)
@@ -69,23 +197,20 @@ function Public.soft_reset_map(old_surface, map_gen_settings, player_starting_it
     teleport_players(new_surface)
     equip_players(player_starting_items)
 
-    game.delete_surface(old_surface)
+    Public.change_entities_to_neutral(old_surface)
+    Public.add_schedule_to_delete_surface(old_surface)
 
-    local message = table.concat({'>> Welcome to ', global.original_surface_name, '!'})
-    if global.soft_reset_counter > 1 then
+    local message = {'modules.soft_reset_welcome', resettable.original_surface_name}
+    if resettable.soft_reset_counter > 1 then
         message =
-            table.concat(
             {
-                '>> The world has been reshaped, welcome to ',
-                global.original_surface_name,
-                ' number ',
-                tostring(global.soft_reset_counter),
-                '!'
+                'modules.soft_reset_reshape',
+                resettable.original_surface_name,
+                tostring(resettable.soft_reset_counter),
             }
-        )
     end
     game.print(message, {r = 0.98, g = 0.66, b = 0.22})
-    Server.to_discord_embed(message)
+    Server.to_discord_embed(message, true)
 
     return new_surface
 end

locale/en/modules.cfg

@@ -9,6 +9,9 @@ difficulty_vote_closed2ago=Votes have closed __1__ minutes ago.
 difficulty_vote_close_button=Close (__1__ minutes left)
 difficulty_vote_vote=Vote difficulty:
 
+soft_reset_welcome=>> Welcome to __1__!
+soft_reset_reshape=>> The world has been reshaped, welcome to __1__ number __2__!
+
 [modules_towny]
 map_info=__1__\n\n__2__\n\n__3__\n\n__4__\n\n__5__
 map_info1=To ally or settle with another town, drop a fish on their market or character. (Default Hotkey Z)\nThey will have to do the same to you to complete the request.\nCoal yields the opposite result, as it will make foes or banish settlers.

maps/chronosphere/chrono.lua

@@ -42,7 +42,7 @@ function Public.reset_surfaces()
 		if player.controller_type == defines.controllers.editor then player.toggle_map_editor() end
 	end
 
-	if game.surfaces["chronosphere"] then game.delete_surface(game.surfaces["chronosphere"]) end
+	--if game.surfaces["chronosphere"] then game.delete_surface(game.surfaces["chronosphere"]) end
 	if game.surfaces["cargo_wagon"] then game.delete_surface(game.surfaces["cargo_wagon"]) end
 	for i = 13, 16, 1 do
 		objective.upgrades[i] = 0

maps/chronosphere/main.lua

@@ -105,8 +105,8 @@ local function chronojump(choice)
 	game.forces.player.set_spawn_position({12, 10}, surface)
 	Locomotive.locomotive_spawn(surface, {x = 16, y = 10}, Chrono.get_wagons(false))
 	Event_functions.render_train_hp()
-	Tick_functions.change_to_neutral(oldsurface)
-	Tick_functions.add_schedule(oldsurface)
+	Reset.change_entities_to_neutral(oldsurface, "player", true)
+	Reset.add_schedule_to_delete_surface(oldsurface)
 	Chrono.post_jump()
 	Event_functions.flamer_nerfs()
 	Minimap.update_surface()
@@ -146,10 +146,6 @@ local function tick()
 	local objective = Chrono_table.get_table()
 	local tick = game.tick
 	Ai.Tick_actions(tick)
-
-	if tick % 60 == 10 and objective.passivetimer > 64 then
-		Tick_functions.scheduled_surface_clearing()
-	end
 	if tick % 60 == 30 and objective.passivetimer < 64 then
 		Tick_functions.request_chunks()
 	end

maps/chronosphere/table.lua

@@ -64,9 +64,6 @@ function Public.reset_schedule_table()
   for k, _ in pairs(schedulesphere) do
     schedulesphere[k] = nil
   end
-  schedulesphere.schedule_step = 0
-  schedulesphere.schedule_max_step = 0
-  schedulesphere.schedule = {}
   schedulesphere.lab_cells = {}
 end
 

maps/chronosphere/tick_functions.lua

@@ -343,95 +343,6 @@ function Public.update_charges(tick)
 	end
 end
 
-local function add_step()
-  local scheduletable = Chrono_table.get_schedule_table()
-  if scheduletable.schedule_step ~= scheduletable.schedule_max_step then
-    scheduletable.schedule_step = scheduletable.schedule_step + 1
-  end
-end
-
-function Public.scheduled_surface_clearing()
-  local scheduletable = Chrono_table.get_schedule_table()
-  local step = scheduletable.schedule_step
-  local schedule = scheduletable.schedule
-  if schedule[step] then
-    local surface = schedule[step].surface
-    if not surface.valid then
-      schedule[step] = nil
-      add_step()
-      return
-    end
-    if schedule[step].operation == "biter_clearing" then
-      local biters = surface.find_entities_filtered{type = "unit", force = "enemy", limit = 10000}
-      for _,biter in pairs(biters) do
-        if biter.valid then biter.destroy() end
-      end
-      schedule[step] = nil
-      add_step()
-    elseif schedule[step].operation == "nest_clearing" then
-      local nests = surface.find_entities_filtered{type = "unit-spawner", force = "enemy"}
-      for _, nest in pairs(nests) do
-        if nest.valid then nest.destroy() end
-      end
-      schedule[step] = nil
-      add_step()
-    elseif schedule[step].operation == "scrap_clearing" then
-      local scrap = surface.find_entities_filtered{force = "neutral", limit = 5000}
-      for _, e in pairs(scrap) do
-        if e.valid then e.destroy() end
-      end
-      schedule[step] = nil
-      add_step()
-    elseif schedule[step].operation == "clear" then
-      surface.clear()
-      schedule[step] = nil
-      add_step()
-    elseif schedule[step].operation == "delete" then
-      game.delete_surface(surface)
-      schedule[step] = nil
-      add_step()
-    end
-  end
-end
-
-function Public.add_schedule(surface)
-  local scheduletable = Chrono_table.get_schedule_table()
-  local step = scheduletable.schedule_max_step
-  local add = 1
-  scheduletable.schedule[step + add] = {operation = "nest_clearing", surface = surface}
-  add = add + 1
-  local count_biters = surface.count_entities_filtered{type = "unit", force = "enemy"}
-  for i = 1, count_biters, 10000 do
-    scheduletable.schedule[step + add] = {operation = "biter_clearing", surface = surface}
-    add = add + 1
-  end
-  local count_scrap = surface.count_entities_filtered{force = "neutral"}
-  for i = 1, count_scrap, 5000 do
-    scheduletable.schedule[step + add] = {operation = "scrap_clearing", surface = surface}
-    add = add + 1
-  end
-  scheduletable.schedule[step + add] = {operation = "clear", surface = surface}
-  add = add + 1
-  scheduletable.schedule[step + add] = {operation = "delete", surface = surface}
-  scheduletable.schedule_max_step = scheduletable.schedule_max_step + add
-  if scheduletable.schedule_step == step then
-    scheduletable.schedule_step = scheduletable.schedule_step + 1
-  end
-end
-
-function Public.change_to_neutral(surface)
-  local entities = surface.find_entities_filtered{force = "player"}
-  for _, entity in pairs(entities) do
-    if entity.valid then
-      entity.force = "neutral"
-      entity.active = false
-    end
-  end
-  local pollution = surface.get_total_pollution()
-  surface.clear_pollution()
-  game.pollution_statistics.on_flow("power-switch", -pollution)
-end
-
 local function shoot_laser(surface, source, enemy)
   local force = source.force
   surface.create_entity{name = "laser-beam", position = source.position, force = "player", target = enemy, source = source, max_length = 32, duration = 60 }