1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-02-07 13:31:40 +02:00

small update

This commit is contained in:
hanakocz 2020-03-16 21:55:08 +01:00
parent 9e2537a468
commit dc8bd97058
3 changed files with 3 additions and 11 deletions

View File

@ -298,7 +298,9 @@ commands.add_command(
local radius = {{x = (pos.x + -param), y = (pos.y + -param)}, {x = (pos.x + param), y = (pos.y + param)}} local radius = {{x = (pos.x + -param), y = (pos.y + -param)}, {x = (pos.x + param), y = (pos.y + param)}}
for _, entity in pairs(player.surface.find_entities_filtered{area = radius, type = "corpse"}) do for _, entity in pairs(player.surface.find_entities_filtered{area = radius, type = "corpse"}) do
entity.destroy() if entity.corpse_expires then
entity.destroy()
end
end end
player.print("Cleared biter-corpses.", Color.success) player.print("Cleared biter-corpses.", Color.success)
end) end)

View File

@ -1,9 +1,6 @@
-- chronosphere -- -- chronosphere --
require "functions.soft_reset"
require "functions.basic_markets"
require "modules.difficulty_vote" require "modules.difficulty_vote"
require "modules.biters_yield_coins" require "modules.biters_yield_coins"
require "modules.no_deconstruction_of_neutral_entities" require "modules.no_deconstruction_of_neutral_entities"
--require "modules.no_solar" --require "modules.no_solar"
@ -24,13 +21,10 @@ local Tick_functions = require "maps.chronosphere.tick_functions"
local Event_functions = require "maps.chronosphere.event_functions" local Event_functions = require "maps.chronosphere.event_functions"
local Chrono = require "maps.chronosphere.chrono" local Chrono = require "maps.chronosphere.chrono"
local Locomotive = require "maps.chronosphere.locomotive" local Locomotive = require "maps.chronosphere.locomotive"
--local Modifier = require "player_modifiers"
local update_gui = require "maps.chronosphere.gui" local update_gui = require "maps.chronosphere.gui"
local math_random = math.random local math_random = math.random
local math_floor = math.floor local math_floor = math.floor
local math_sqrt = math.sqrt local math_sqrt = math.sqrt
--local chests = {}
--local acus = {}
global.objective = {} global.objective = {}
global.objective.config = {} global.objective.config = {}
global.flame_boots = {} global.flame_boots = {}
@ -132,7 +126,6 @@ local function reset_map()
for _,player in pairs(game.players) do for _,player in pairs(game.players) do
if player.controller_type == defines.controllers.editor then player.toggle_map_editor() end if player.controller_type == defines.controllers.editor then player.toggle_map_editor() end
end end
global.chunk_queue = {}
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 if game.surfaces["cargo_wagon"] then game.delete_surface(game.surfaces["cargo_wagon"]) end
--chests = {} --chests = {}
@ -525,7 +518,6 @@ event.on_nth_tick(2, tick)
event.add(defines.events.on_entity_damaged, on_entity_damaged) event.add(defines.events.on_entity_damaged, on_entity_damaged)
event.add(defines.events.on_entity_died, on_entity_died) event.add(defines.events.on_entity_died, on_entity_died)
event.add(defines.events.on_player_joined_game, on_player_joined_game) event.add(defines.events.on_player_joined_game, on_player_joined_game)
event.add(defines.events.on_player_left_game, on_player_left_game)
event.add(defines.events.on_pre_player_left_game, on_pre_player_left_game) event.add(defines.events.on_pre_player_left_game, on_pre_player_left_game)
event.add(defines.events.on_pre_player_mined_item, pre_player_mined_item) event.add(defines.events.on_pre_player_mined_item, pre_player_mined_item)
event.add(defines.events.on_player_mined_entity, on_player_mined_entity) event.add(defines.events.on_player_mined_entity, on_player_mined_entity)

View File

@ -990,9 +990,7 @@ local function on_chunk_generated(event)
if string.sub(event.surface.name, 0, 12) ~= "chronosphere" then return end if string.sub(event.surface.name, 0, 12) ~= "chronosphere" then return end
if event.surface.index == global.objective.nextsurface then return end if event.surface.index == global.objective.nextsurface then return end
process_chunk(event.surface, event.area.left_top) process_chunk(event.surface, event.area.left_top)
--global.chunk_queue[#global.chunk_queue + 1] = {left_top = {x = event.area.left_top.x, y = event.area.left_top.y}, surface_index = event.surface.index}
end end
local event = require 'utils.event' local event = require 'utils.event'
--event.on_nth_tick(4, process_chunk_queue)
event.add(defines.events.on_chunk_generated, on_chunk_generated) event.add(defines.events.on_chunk_generated, on_chunk_generated)