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

fixed parallel wagon combinators not working

Browse Source
This commit is contained in:
Monica Moniot
2022-11-30 17:11:59 -05:00
parent ddd1c8a955
commit f1dc9fbf56
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@@ -1,5 +1,6 @@
bugs: bugs:
request threshold is being bypassed somehow request threshold is being bypassed somehow
wagon control combinators don't work parallel to the tracks
major: major:
do hardcore testing do hardcore testing

15
cybersyn/scripts/layout.lua
View File

@@ -358,27 +358,22 @@ function reset_station_layout(map_data, station, forbidden_entity)
local reach = LONGEST_INSERTER_REACH + 1 local reach = LONGEST_INSERTER_REACH + 1
local search_area local search_area
local area_delta local area_delta
local direction_filter
local is_ver local is_ver
if station_direction == defines.direction.north then if station_direction == defines.direction.north then
search_area = {left_top = {x = middle_x - reach, y = middle_y}, right_bottom = {x = middle_x + reach, y = middle_y + 6}} search_area = {left_top = {x = middle_x - reach, y = middle_y}, right_bottom = {x = middle_x + reach, y = middle_y + 6}}
area_delta = {x = 0, y = 7} area_delta = {x = 0, y = 7}
direction_filter = {defines.direction.east, defines.direction.west}
is_ver = true is_ver = true
elseif station_direction == defines.direction.east then elseif station_direction == defines.direction.east then
search_area = {left_top = {y = middle_y - reach, x = middle_x - 6}, right_bottom = {y = middle_y + reach, x = middle_x}} search_area = {left_top = {y = middle_y - reach, x = middle_x - 6}, right_bottom = {y = middle_y + reach, x = middle_x}}
area_delta = {x = -7, y = 0} area_delta = {x = -7, y = 0}
direction_filter = {defines.direction.north, defines.direction.south}
is_ver = false is_ver = false
elseif station_direction == defines.direction.south then elseif station_direction == defines.direction.south then
search_area = {left_top = {x = middle_x - reach, y = middle_y - 6}, right_bottom = {x = middle_x + reach, y = middle_y}} search_area = {left_top = {x = middle_x - reach, y = middle_y - 6}, right_bottom = {x = middle_x + reach, y = middle_y}}
area_delta = {x = 0, y = -7} area_delta = {x = 0, y = -7}
direction_filter = {defines.direction.east, defines.direction.west}
is_ver = true is_ver = true
elseif station_direction == defines.direction.west then elseif station_direction == defines.direction.west then
search_area = {left_top = {y = middle_y - reach, x = middle_x}, right_bottom = {y = middle_y + reach, x = middle_x + 6}} search_area = {left_top = {y = middle_y - reach, x = middle_x}, right_bottom = {y = middle_y + reach, x = middle_x + 6}}
area_delta = {x = 7, y = 0} area_delta = {x = 7, y = 0}
direction_filter = {defines.direction.north, defines.direction.south}
is_ver = false is_ver = false
else else
assert(false, "cybersyn: invalid station direction") assert(false, "cybersyn: invalid station direction")
@@ -403,7 +398,6 @@ function reset_station_layout(map_data, station, forbidden_entity)
local entities = surface.find_entities_filtered({ local entities = surface.find_entities_filtered({
area = search_area, area = search_area,
type = type_filter, type = type_filter,
direction = direction_filter,
}) })
for _, entity in pairs(entities) do for _, entity in pairs(entities) do
if entity.valid and entity ~= forbidden_entity then if entity.valid and entity ~= forbidden_entity then
@@ -432,7 +426,14 @@ function reset_station_layout(map_data, station, forbidden_entity)
end end
elseif entity.type == "pump" then elseif entity.type == "pump" then
if not supports_fluid and entity.pump_rail_target then if not supports_fluid and entity.pump_rail_target then
supports_fluid = true local direction = entity.direction
if is_ver then
if direction == defines.direction.east or direction == defines.direction.west then
supports_fluid = true
end
elseif direction == defines.direction.north or direction == defines.direction.south then
supports_fluid = true
end
end end
elseif entity.name == COMBINATOR_NAME then elseif entity.name == COMBINATOR_NAME then
local param = map_data.to_comb_params[entity.unit_number] local param = map_data.to_comb_params[entity.unit_number]