Merge branch 'aperx' into main

This commit is contained in:
2025-12-17 01:27:33 +09:00
committed by GitHub
45 changed files with 426 additions and 1969 deletions

View File

@@ -10,7 +10,7 @@ Commands.new("lawnmower", { "exp-commands_lawnmower.description" })
:register(function(player, range)
--- @cast range number
local surface = player.surface
-- Intentionally left as player.position to allow use in remote view
local entities = surface.find_entities_filtered{ position = player.position, radius = range, type = "corpse" }
for _, entity in pairs(entities) do
@@ -18,7 +18,7 @@ Commands.new("lawnmower", { "exp-commands_lawnmower.description" })
entity.destroy()
end
end
local replace_tiles = {}
local tiles = surface.find_tiles_filtered{ position = player.position, radius = range, name = { "nuclear-ground" } }
for i, tile in pairs(tiles) do

View File

@@ -19,11 +19,24 @@ Storage.register(research, function(tbl)
research = tbl
end)
local mod_set = "base"
for _, mod_name in ipairs(config.mod_set_lookup) do
if script.active_mods[mod_name] then
mod_set = mod_name
break
end
end
if script.active_mods["space-age"] and script.active_mods["PHI-CL"] and settings.startup["PHI-VP"] and settings.startup["PHI-VP-MAIN"] then
mod_set = "space-age"
end
--- @param force LuaForce
--- @param silent boolean True when no message should be printed
local function queue_research(force, silent)
local res_q = force.research_queue
local res = force.technologies[config.bonus_inventory.log[config.mod_set].name]
local res = force.technologies[config.bonus_inventory.log[mod_set].name]
if #res_q < config.queue_amount then
for i = #res_q, config.queue_amount - 1 do

View File

@@ -77,6 +77,6 @@ add(require("modules/exp_scenario/gui/player_stats"))
add(require("modules/exp_scenario/gui/production_stats"))
add(require("modules/exp_scenario/gui/quick_actions"))
add(require("modules/exp_scenario/gui/research_milestones"))
add(require("modules/exp_scenario/gui/science_production"))
-- add(require("modules/exp_scenario/gui/science_production"))
add(require("modules/exp_scenario/gui/surveillance"))
add(require("modules/exp_scenario/gui/task_list"))