This commit is contained in:
2026-06-20 23:22:39 +09:00
parent 0d80a3fd69
commit 16377bdd3c
+17 -19
View File
@@ -1,31 +1,29 @@
local main = {}
function main.get_belt_penalty(belt_speed, inserter_stack_size, belt_stack_size)
function main.get_belt_penalty(belt_speed, inserter_stack_size)
local penalty = 0
local remaining = math.min(inserter_stack_size, belt_stack_size)
inserter_stack_size = inserter_stack_size - remaining
local item_center_offset = belt_speed
local acted = true
local items_left = inserter_stack_size - 1
local offset = belt_speed
local picked = true
while inserter_stack_size > 0 do
if item_center_offset > 0 then
inserter_stack_size = inserter_stack_size - remaining
item_center_offset = item_center_offset - 0.25
acted = true
while items_left > 0 do
if offset > 0 then
items_left = items_left - 1
offset = offset - 0.25
picked = true
end
item_center_offset = item_center_offset + belt_speed
offset = offset + belt_speed
if not acted and (item_center_offset > 0) then
inserter_stack_size = inserter_stack_size - remaining
item_center_offset = item_center_offset - 0.25
acted = true
if not picked and (offset > 0) then
items_left = items_left - 1
offset = offset - 0.25
picked = true
end
penalty = penalty + 1
remaining = math.min(inserter_stack_size, belt_stack_size)
acted = false
picked = false
end
return penalty
@@ -44,9 +42,9 @@ function main.calc(entity)
ticks_per_cycle = ticks_per_cycle < extension_time and extension_time or ticks_per_cycle
ticks_per_cycle = ticks_per_cycle < 2 and 2 or ticks_per_cycle
local pickup_belt_speed = pickup_target and (pickup_target.type == 'entity-ghost' and pickup_target.ghost_prototype.belt_speed or pickup_target.prototype.belt_speed) or nil
ticks_per_cycle = (pickup_belt_speed and (stack_size > 1)) and (ticks_per_cycle + main.get_belt_penalty(pickup_belt_speed, stack_size, entity.force.belt_stack_size_bonus or 1)) or ticks_per_cycle
ticks_per_cycle = (pickup_belt_speed and (stack_size > 1)) and (ticks_per_cycle + main.get_belt_penalty(pickup_belt_speed, stack_size)) or ticks_per_cycle
local drop_belt_speed = drop_target and (drop_target.type == 'entity-ghost' and drop_target.ghost_prototype.belt_speed or drop_target.prototype.belt_speed) or nil
ticks_per_cycle = (drop_belt_speed and (stack_size > 1)) and (ticks_per_cycle + main.get_belt_penalty(drop_belt_speed, stack_size, entity.force.belt_stack_size_bonus or 1)) or ticks_per_cycle
ticks_per_cycle = (drop_belt_speed and (stack_size > 1)) and (ticks_per_cycle + main.get_belt_penalty(drop_belt_speed, stack_size)) or ticks_per_cycle
stack_size = drop_belt_speed and math.min(stack_size, drop_belt_speed * ticks_per_cycle * 4) or stack_size
stack_size = pickup_belt_speed and math.min(stack_size, pickup_belt_speed * ticks_per_cycle * 8) or stack_size
return stack_size * 60 / ticks_per_cycle