From 1219a211f4f830ef6c745f92b50fe8850f01b5ee Mon Sep 17 00:00:00 2001
From: Monica Moniot <mamoniot@protonmail.com>
Date: Mon, 17 Oct 2022 01:09:55 -0400
Subject: [PATCH] adding layout support

---
 cybersyn/control.lua           |   1 +
 cybersyn/graphics/place.png    | Bin 2532 -> 0 bytes
 cybersyn/scripts/constants.lua |  12 +++
 cybersyn/scripts/layout.lua    | 151 +++++++++++++++++++++++++++++++++
 cybersyn/scripts/main.lua      |  81 +-----------------
 5 files changed, 168 insertions(+), 77 deletions(-)
 delete mode 100644 cybersyn/graphics/place.png
 create mode 100644 cybersyn/scripts/layout.lua

diff --git a/cybersyn/control.lua b/cybersyn/control.lua
index 5f5a2ab..9ef9749 100644
--- a/cybersyn/control.lua
+++ b/cybersyn/control.lua
@@ -3,4 +3,5 @@
 require("scripts.constants")
 require("scripts.global")
 require("scripts.controller")
+require("scripts.layout")
 require("scripts.main")
diff --git a/cybersyn/graphics/place.png b/cybersyn/graphics/place.png
deleted file mode 100644
index 3f4233236012a0c3d07b99909145f407a013676f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2532
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

diff --git a/cybersyn/scripts/constants.lua b/cybersyn/scripts/constants.lua
index ac5a8a1..bc7fc57 100644
--- a/cybersyn/scripts/constants.lua
+++ b/cybersyn/scripts/constants.lua
@@ -18,3 +18,15 @@ STATUS_P = 2
 STATUS_P_TO_R = 3
 STATUS_R = 4
 STATUS_R_TO_D = 5
+
+TRAIN_LAYOUT_NA = "N"
+TRAIN_LAYOUT_CARGO = "C"
+TRAIN_LAYOUT_FLUID = "F"
+--TRAIN_LAYOUT_ARTILLERY = "A"
+
+STATION_LAYOUT_NA = "N"
+STATION_LAYOUT_CARGO = "C"
+STATION_LAYOUT_FLUID = "F"
+STATION_LAYOUT_BOTH = "."
+
+LONGEST_INSERTER_REACH = 2
diff --git a/cybersyn/scripts/layout.lua b/cybersyn/scripts/layout.lua
new file mode 100644
index 0000000..2e9b8ad
--- /dev/null
+++ b/cybersyn/scripts/layout.lua
@@ -0,0 +1,151 @@
+
+
+
+function update_train_layout(map_data, train)
+	local carriages = train.entity.carriages
+	local layout = ""
+	local i = 1
+	local item_slot_capacity = 0
+	local fluid_capacity = 0
+	for _, carriage in pairs(carriages) do
+		if carriage.type == "cargo-wagon" then
+			layout = layout..TRAIN_LAYOUT_CARGO
+			local inv = carriage.get_inventory(defines.inventory.cargo_wagon)
+			item_slot_capacity = item_slot_capacity + #inv
+		elseif carriage.type == "fluid-wagon" then
+			layout = layout..TRAIN_LAYOUT_FLUID
+			fluid_capacity = fluid_capacity + carriage.prototype.fluid_capacity
+		--elseif carriage.type == "artillery-wagon" then
+			--layout = layout..TRAIN_LAYOUT_ARTILLERY
+		else
+			layout = layout..TRAIN_LAYOUT_NA
+		end
+		i = i + 1
+	end
+	local layout_id = 0
+	for id, cur_layout in pairs(map_data.layouts) do
+		if layout == cur_layout then
+			layout = cur_layout
+			layout_id = id
+			break
+		end
+	end
+	if layout_id == 0 then
+		--define new layout
+		layout_id = map_data.layout_top_id
+		map_data.layout_top_id = map_data.layout_top_id + 1
+
+		map_data.layouts[layout_id] = layout
+		map_data.layout_train_count[layout_id] = 1
+		for _, station in pairs(map_data.stations) do
+			if string.find(layout, station.layout_pattern) ~= nil then
+				station.accepted_layouts[layout_id] = true
+			end
+		end
+	else
+		map_data.layout_train_count[layout_id] = map_data.layout_train_count[layout_id] + 1
+	end
+	train.layout_id = layout_id
+	train.item_slot_capacity = item_slot_capacity
+	train.fluid_capacity = fluid_capacity
+end
+
+local area = require("__flib__.area")
+function reset_station_layout(map_data, station)
+	--station.entity
+	local station_rail = station.entity.connected_rail
+	local rail_direction_from_station
+	if station.entity.connected_rail_direction == defines.rail_direction.front then
+		rail_direction_from_station = defines.rail_direction.back
+	else
+		rail_direction_from_station = defines.rail_direction.front
+	end
+	local station_direction = station.entity.direction
+	local surface = station.entity.surface
+	local middle_x = station_rail.position.x
+	local middle_y = station_rail.position.y
+	local reach = LONGEST_INSERTER_REACH + 1 - DELTA
+	local search_area
+	local area_delta
+	local direction_filter
+	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}}
+		area_delta = {x = 0, y = -7}
+		direction_filter = {defines.direction.east, defines.direction.west}
+	elseif station_direction == defines.direction.east then
+		search_area = {left_top = {y = middle_y - reach, x = middle_x}, right_bottom = {y = middle_y + reach, x = middle_x - 6}}
+		area_delta = {y = 0, x = -7}
+		direction_filter = {defines.direction.north, defines.direction.south}
+	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}}
+		area_delta = {x = 0, y = 7}
+		direction_filter = {defines.direction.east, defines.direction.west}
+	elseif station_direction == defines.direction.west then
+		search_area = {left_top = {y = middle_y - reach, x = middle_x + 6}, right_bottom = {y = middle_y + reach, x = middle_x}}
+		area_delta = {y = 0, x = 7}
+		direction_filter = {defines.direction.north, defines.direction.south}
+	else
+		assert(false, "cybersyn: invalid station direction")
+	end
+	local length = 2
+	local pre_rail = station_rail
+	local layout_pattern = "^"
+	local layout_min_size = 10000
+	local type_filter = {"inserter", "pump"}
+	for i = 1, 100 do
+		local rail, rail_direction, rail_connection_direction = pre_rail.get_connected_rail({rail_direction = rail_direction_from_station, rail_connection_direction = defines.rail_connection_direction.straight})
+		if rail_connection_direction ~= defines.rail_connection_direction.straight or not rail.valid then
+			break
+		end
+		length = length + 2
+		if length%7 <= 1 then
+			local supports_cargo = false
+			local supports_fluid = false
+			local entities = surface.find_entities_filtered({
+				area = search_area,
+				type = type_filter,
+				direction = direction_filter,
+			})
+			for _, entity in pairs(entities) do
+				if entity.type == "inserter" then
+					--local pickup_pos = entity.prototype.inserter_pickup_position + entity.position
+					--local drop_pos = entity.prototype.inserter_drop_position + entity.position
+					--TODO: add further checks
+					supports_cargo = true
+				elseif entity.type == "pump" then
+					if entity.pump_rail_target then
+						supports_fluid = true
+					end
+				end
+			end
+
+			if supports_cargo then
+				if supports_fluid then
+					layout_pattern = layout_pattern..STATION_LAYOUT_BOTH
+				else
+					layout_pattern = layout_pattern..STATION_LAYOUT_CARGO
+				end
+			elseif supports_fluid then
+				layout_pattern = layout_pattern..STATION_LAYOUT_FLUID
+			else
+				layout_pattern = layout_pattern..STATION_LAYOUT_NA
+			end
+			if layout_min_size <= 0 then
+				layout_pattern = layout_pattern.."?"
+			else
+				layout_min_size = layout_min_size - 1
+			end
+			search_area = area.move(search_area, area_delta)
+		end
+	end
+	layout_pattern = layout_pattern..STATION_LAYOUT_NA.."*$"
+	station.layout_pattern = layout_pattern
+	local accepted_layouts = station.accepted_layouts
+	for id, layout in pairs(map_data.layouts) do
+		if string.find(layout, layout_pattern) ~= nil then
+			accepted_layouts[id] = true
+		else
+			accepted_layouts[id] = nil
+		end
+	end
+end
diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index e34bb42..9845c02 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -62,10 +62,8 @@ local function on_station_built(map_data, stop)
 
 	local in_pos
 	local out_pos
-	local direction
 	local search_area
 	if stop.direction == 0 then
-		direction = 0
 		in_pos = {pos_x, pos_y - 1}
 		out_pos = {pos_x - 1, pos_y - 1}
 		search_area = {
@@ -73,7 +71,6 @@ local function on_station_built(map_data, stop)
 			{pos_x - DELTA + 1, pos_y - DELTA}
 		}
 	elseif stop.direction == 2 then
-		direction = 2
 		in_pos = {pos_x, pos_y}
 		out_pos = {pos_x, pos_y - 1}
 		search_area = {
@@ -81,7 +78,6 @@ local function on_station_built(map_data, stop)
 			{pos_x - DELTA + 1, pos_y - DELTA + 1}
 		}
 	elseif stop.direction == 4 then
-		direction = 4
 		in_pos = {pos_x - 1, pos_y}
 		out_pos = {pos_x, pos_y}
 		search_area = {
@@ -89,7 +85,6 @@ local function on_station_built(map_data, stop)
 			{pos_x - DELTA + 1, pos_y - DELTA + 1}
 		}
 	elseif stop.direction == 6 then
-		direction = 6
 		in_pos = {pos_x - 1, pos_y - 1}
 		out_pos = {pos_x - 1, pos_y}
 		search_area = {
@@ -103,7 +98,7 @@ local function on_station_built(map_data, stop)
 	local entity_in = nil
 	local entity_out = nil
 	local entities = stop.surface.find_entities(search_area)
-	for _, cur_entity in pairs (entities) do
+	for _, cur_entity in pairs(entities) do
 		if cur_entity.valid then
 			if cur_entity.name == "entity-ghost" then
 				if cur_entity.ghost_name == STATION_IN_NAME then
@@ -134,7 +129,7 @@ local function on_station_built(map_data, stop)
 		entity_out = stop.surface.create_entity({
 			name = STATION_OUT_NAME,
 			position = out_pos,
-			direction = direction,
+			direction = stop.direction,
 			force = stop.force
 		})
 	end
@@ -153,7 +148,8 @@ local function on_station_built(map_data, stop)
 		p_threshold = 0,
 		locked_slots = 0,
 		deliveries = {},
-		accepted_layouts = {}
+		accepted_layouts = {},
+		layout_pattern = ".*",--TODO: change this
 	}
 
 	map_data.stations[stop.unit_number] = station
@@ -227,75 +223,6 @@ local function find_and_add_all_stations(map_data)
 	end
 end
 
-local function update_train_layout(map_data, train)
-	local carriages = train.entity.carriages
-	local layout = ""
-	local i = 1
-	local item_slot_capacity = 0
-	local fluid_capacity = 0
-	for _, carriage in pairs(carriages) do
-		if carriage.type == "cargo-wagon" then
-			layout = layout.."C"
-			local inv = carriage.get_inventory(defines.inventory.cargo_wagon)
-			item_slot_capacity = item_slot_capacity + #inv
-		elseif carriage.type == "fluid-wagon" then
-			layout = layout.."F"
-			fluid_capacity = fluid_capacity + carriage.prototype.fluid_capacity
-		else
-			layout = layout.."?"
-		end
-		i = i + 1
-	end
-	local layout_id = 0
-	for id, cur_layout in pairs(map_data.layouts) do
-		if layout == cur_layout then
-			layout_id = id
-			break
-		end
-	end
-	if layout_id == 0 then
-		--define new layout
-		layout_id = map_data.layout_top_id
-		map_data.layout_top_id = map_data.layout_top_id + 1
-
-		map_data.layouts[layout_id] = layout
-		map_data.layout_train_count[layout_id] = 1
-		--for station_id, station in pairs(map_data.stations) do
-		--	if #layout >= #station.train_layout then
-		--		local is_approved = true
-		--		for i, v in ipairs(station.train_layout) do
-		--			local c = string.sub(layout, i, i)
-		--			if v == "C" then
-		--				if c ~= "C" and c ~= "?" then
-		--					is_approved = false
-		--					break
-		--				end
-		--			elseif v == "F" then
-		--				if c ~= "F" then
-		--					is_approved = false
-		--					break
-		--				end
-		--			end
-		--		end
-		--		for i = #station.train_layout, #layout do
-		--			local c = string.sub(layout, i, i)
-		--			if c ~= "?" then
-		--				is_approved = false
-		--				break
-		--			end
-		--		end
-		--		if is_approved then
-		--			station.accepted_layouts[layout_id] = true
-		--		end
-		--	end
-		--end
-	else
-		map_data.layout_train_count[layout_id] = map_data.layout_train_count[layout_id] + 1
-	end
-	train.layout_id = layout_id
-	train.item_slot_capacity = item_slot_capacity
-	train.fluid_capacity = fluid_capacity
-end
 
 
 local function on_train_arrives_depot(map_data, train_entity)