xevion/project-cybersyn
1
0
Fork 0
mirror of https://github.com/Xevion/project-cybersyn.git synced 2025-12-10 16:08:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

localized math

Browse Source
This commit is contained in:
Monica Moniot
2022-11-03 13:03:52 -04:00
parent 89997e057f
commit 7f555cedd7
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cybersyn/scripts/central-planning.lua
View File

@@ -1,6 +1,9 @@
--By Mami --By Mami
local get_distance = require("__flib__.misc").get_distance local get_distance = require("__flib__.misc").get_distance
local math = math local min = math.min
local max = math.max
local abs = math.abs
local ceil = math.ceil
local INF = math.huge local INF = math.huge
local btest = bit32.btest local btest = bit32.btest
local band = bit32.band local band = bit32.band
@@ -246,7 +249,7 @@ local function send_train_between(map_data, r_station_id, p_station_id, depot, p
if effective_item_count >= p_threshold then if effective_item_count >= p_threshold then
local r = requests[item_name] local r = requests[item_name]
if r then if r then
local item = {name = item_name, type = item_type, count = math.min(r, effective_item_count)} local item = {name = item_name, type = item_type, count = min(r, effective_item_count)}
if item_name == primary_item_name then if item_name == primary_item_name then
manifest[#manifest + 1] = manifest[1] manifest[#manifest + 1] = manifest[1]
manifest[1] = item manifest[1] = item
@@ -258,10 +261,10 @@ local function send_train_between(map_data, r_station_id, p_station_id, depot, p
end end
end end
local locked_slots = math.max(p_station.locked_slots, r_station.locked_slots) local locked_slots = max(p_station.locked_slots, r_station.locked_slots)
local total_slots_left = train.item_slot_capacity local total_slots_left = train.item_slot_capacity
if locked_slots > 0 then if locked_slots > 0 then
total_slots_left = math.max(total_slots_left - #train.entity.cargo_wagons*locked_slots, math.min(total_slots_left, #train.entity.cargo_wagons)) total_slots_left = max(total_slots_left - #train.entity.cargo_wagons*locked_slots, min(total_slots_left, #train.entity.cargo_wagons))
end end
local total_liquid_left = train.fluid_capacity local total_liquid_left = train.fluid_capacity
@@ -279,7 +282,7 @@ local function send_train_between(map_data, r_station_id, p_station_id, depot, p
end end
elseif total_slots_left > 0 then elseif total_slots_left > 0 then
local stack_size = game.item_prototypes[item.name].stack_size local stack_size = game.item_prototypes[item.name].stack_size
local slots = math.ceil(item.count/stack_size) local slots = ceil(item.count/stack_size)
if slots > total_slots_left then if slots > total_slots_left then
item.count = total_slots_left*stack_size item.count = total_slots_left*stack_size
end end
@@ -396,11 +399,11 @@ function tick(map_data, mod_settings)
if item_name == SIGNAL_PRIORITY then if item_name == SIGNAL_PRIORITY then
station.priority = item_count station.priority = item_count
elseif item_name == REQUEST_THRESHOLD then elseif item_name == REQUEST_THRESHOLD then
station.r_threshold = math.abs(item_count) station.r_threshold = abs(item_count)
elseif item_name == PROVIDE_THRESHOLD then elseif item_name == PROVIDE_THRESHOLD then
station.p_threshold = math.abs(item_count) station.p_threshold = abs(item_count)
elseif item_name == LOCKED_SLOTS then elseif item_name == LOCKED_SLOTS then
station.locked_slots = math.max(item_count, 0) station.locked_slots = max(item_count, 0)
end end
signals[k] = nil signals[k] = nil
end end

3
cybersyn/scripts/layout.lua
View File

@@ -1,6 +1,7 @@
--By Mami --By Mami
local area = require("__flib__.area") local area = require("__flib__.area")
local abs = math.abs local abs = math.abs
local floor = math.floor
local function iterr(a, i) local function iterr(a, i)
i = i + 1 i = i + 1
@@ -255,7 +256,7 @@ function set_r_wagon_combs(map_data, station, train)
local inv = carriage.get_fluid_contents() local inv = carriage.get_fluid_contents()
for fluid_name, count in pairs(inv) do for fluid_name, count in pairs(inv) do
local i = #signals + 1 local i = #signals + 1
signals[i] = {index = i, signal = {type = "fluid", name = fluid_name}, count = -math.floor(count)} signals[i] = {index = i, signal = {type = "fluid", name = fluid_name}, count = -floor(count)}
end end
set_combinator_output(map_data, comb, signals) set_combinator_output(map_data, comb, signals)
end end