Skip to content

Account for tile batching when calculating range. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RoqueDeicide wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Account for tile batching when calculating range. #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions control.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,15 @@ local function adjust_player_range(player, entities)
-- LOGGER.log("filtering and calculating buckets")
local force = player.force
local targets = {}

-- Bot capacity modifier is the amount by which to reduce the contribution of each entity
-- to its total count in order to attempt to account for batching that can be done by the game.
local bot_capacity = 1 + force.worker_robots_storage_bonus
local bot_capacity_modifier = 1
if bot_capacity > 1 then
bot_capacity_modifier = bot_capacity * 0.75
end

for index,entity in pairs(entities) do
if entity.valid then
if entity.to_be_deconstructed(force) or entity.to_be_upgraded() then
Expand Down Expand Up @@ -229,7 +238,13 @@ local function adjust_player_range(player, entities)
if buckets[bucket] == nil then
buckets[bucket] = 0
end
buckets[bucket] = buckets[bucket] + 1
-- Decrease the increment to allow the range to be bigger, if bots can batch build tasks.
-- Currently batching is only done when placing tiles.
local increment = 1
if entity.type == "tile-ghost" and bot_capacity > 1 then
increment = increment / bot_capacity_modifier
end
buckets[bucket] = buckets[bucket] + increment
if bucket > maxn then
maxn = bucket
end
Expand Down Expand Up @@ -264,7 +279,7 @@ local function adjust_player_range(player, entities)
local desired = original_range
for i=1, maxn do
if buckets[i] ~= nil then
assigned = assigned + buckets[i]
assigned = assigned + math.ceil(buckets[i])
if assigned >= bots then
desired = math.ceil(math.sqrt(i)) + 1
-- game.print("assigned: " .. assigned .. " i: " .. i .. " desired: " .. desired)
Expand Down