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

Merge pull request #121 from jagoly/mixed-station-fix

Browse Source 
fixed provide/request orders for the same item getting generated simultaneously
This commit is contained in:
Monica Moniot
2023-10-10 19:51:57 -04:00
committed by GitHub
parent f0b8665403 6501193a93
commit 7989695194
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,6 +304,12 @@ local function tick_dispatch(map_data, mod_settings)
goto continue goto continue
end end
--don't request when already providing
local item_deliveries = station.deliveries[item_name]
if item_deliveries and item_deliveries < 0 then
goto continue
end
r_station_i = i r_station_i = i
r_threshold = threshold r_threshold = threshold
best_r_prior = prior best_r_prior = prior
@@ -348,7 +354,7 @@ local function tick_dispatch(map_data, mod_settings)
---@type uint ---@type uint
local j = 1 local j = 1
while j <= #p_stations do while j <= #p_stations do
local p_flag, r_flag, netand, best_p_train_id, best_t_prior, best_capacity, best_t_to_p_dist, effective_count, override_threshold, p_prior, best_p_to_r_dist, effective_threshold, slot_threshold local p_flag, r_flag, netand, best_p_train_id, best_t_prior, best_capacity, best_t_to_p_dist, effective_count, override_threshold, p_prior, best_p_to_r_dist, effective_threshold, slot_threshold, item_deliveries
local p_station_id = p_stations[j] local p_station_id = p_stations[j]
local p_station = stations[p_station_id] local p_station = stations[p_station_id]
@@ -483,6 +489,12 @@ local function tick_dispatch(map_data, mod_settings)
goto p_continue goto p_continue
end end
--don't provide when already requesting
item_deliveries = p_station.deliveries[item_name]
if item_deliveries and item_deliveries > 0 then
goto p_continue
end
p_station_i = j p_station_i = j
best_train_id = best_p_train_id best_train_id = best_p_train_id
best_p_prior = p_prior best_p_prior = p_prior