Experimental (#23)

1.2.6

cybersyn/changelog.txt

@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.6
+Date: 2022-12-30
+  Bugfixes:
+    - Fixed a crash when deconstructing the connected rail of a station
+    - Improved the stability of migrations
+---------------------------------------------------------------------------------------------------
 Version: 1.2.5
 Date: 2022-12-30
   Bugfixes:

cybersyn/info.json

@@ -1,6 +1,6 @@
 {
     "name": "cybersyn",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "title": "Project Cybersyn",
     "author": "Mami",
     "factorio_version": "1.1",

cybersyn/scripts/factorio-api.lua

@@ -169,6 +169,29 @@ end
 ---@param start_at_depot boolean?
 function set_manifest_schedule(map_data, train, depot_stop, same_depot, p_stop, p_enable_inactive, r_stop, r_enable_inactive, manifest, start_at_depot)
 	--NOTE: can only return false if start_at_depot is false, it should be incredibly rare that this function returns false
+	if not p_stop.connected_rail or not r_stop.connected_rail then
+		--NOTE: create a schedule that cannot be fulfilled, the train will be stuck but it will give the player information what went wrong
+		train.schedule = {current = 1, records = {
+			create_inactivity_order(depot_stop.backer_name),
+			create_loading_order(p_stop, manifest, p_enable_inactive),
+			create_unloading_order(r_stop, r_enable_inactive),
+		}}
+		lock_train(train)
+		send_alert_station_of_train_broken(map_data, train)
+		return true
+	end
+	if same_depot and not depot_stop.connected_rail then
+		--NOTE: create a schedule that cannot be fulfilled, the train will be stuck but it will give the player information what went wrong
+		train.schedule = {current = 1, records = {
+			create_inactivity_order(depot_stop.backer_name),
+			create_loading_order(p_stop, manifest, p_enable_inactive),
+			create_unloading_order(r_stop, r_enable_inactive),
+		}}
+		lock_train(train)
+		send_alert_depot_of_train_broken(map_data, train)
+		return true
+	end
+
 	local old_schedule
 	if not start_at_depot then
 		old_schedule = train.schedule
@@ -269,6 +292,11 @@ function add_refueler_schedule(map_data, train, stop)
 		schedule.current = i
 	end
 
+	if not stop.connected_rail then
+		send_alert_refueler_of_train_broken(map_data, train)
+		return false
+	end
+
 	local t_surface = train.front_stock.surface
 	local f_surface = stop.surface
 	local t_surface_i = t_surface.index
@@ -279,7 +307,7 @@ function add_refueler_schedule(map_data, train, stop)
 		table_insert(schedule.records, i, create_inactivity_order(stop.backer_name))
 
 		train.schedule = schedule
-		return
+		return true
 	elseif IS_SE_PRESENT then
 		local t_zone = remote.call("space-exploration", "get_zone_from_surface_index", {surface_index = t_surface_i})--[[@as {}]]
 		local other_zone = remote.call("space-exploration", "get_zone_from_surface_index", {surface_index = f_surface_i})--[[@as {}]]
@@ -302,7 +330,7 @@ function add_refueler_schedule(map_data, train, stop)
 			end
 
 			train.schedule = schedule
-			return
+			return true
 		end
 	end
 	--create an order that probably cannot be fulfilled and alert the player

cybersyn/scripts/migrations.lua

@@ -161,21 +161,23 @@ local migrations_table = {
 		settings.global["cybersyn-invert-sign"] = setting
 
 		for id, comb in pairs(map_data.to_comb) do
-			local control = get_comb_control(comb)
-			local params = control.parameters
-			local params_old = map_data.to_comb_params[id]
-			local bits = params.second_constant or 0
-			local bits_old = params_old.second_constant or 0
+			if comb.valid then
+				local control = get_comb_control(comb)
+				local params = control.parameters
+				local params_old = map_data.to_comb_params[id]
+				local bits = params.second_constant or 0
+				local bits_old = params_old.second_constant or 0
 
-			bits = bit32.replace(bits, 1, SETTING_ENABLE_INACTIVE)--[[@as int]]
-			bits = bit32.replace(bits, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
-			bits_old = bit32.replace(bits_old, 1, SETTING_ENABLE_INACTIVE)--[[@as int]]
-			bits_old = bit32.replace(bits_old, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
-			params.second_constant = bits
-			params_old.second_constant = bits_old
+				bits = bit32.replace(bits, 1, SETTING_ENABLE_INACTIVE)--[[@as int]]
+				bits = bit32.replace(bits, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
+				bits_old = bit32.replace(bits_old, 1, SETTING_ENABLE_INACTIVE)--[[@as int]]
+				bits_old = bit32.replace(bits_old, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
+				params.second_constant = bits
+				params_old.second_constant = bits_old
 
-			control.parameters = params
-			map_data.to_comb_params[id] = params_old
+				control.parameters = params
+				map_data.to_comb_params[id] = params_old
+			end
 		end
 		for _, station in pairs(map_data.stations) do
 			station.enable_inactive = true
@@ -239,19 +241,21 @@ local migrations_table = {
 		settings.global["cybersyn-invert-sign"] = setting
 
 		for id, comb in pairs(map_data.to_comb) do
-			local control = get_comb_control(comb)
-			local params = control.parameters
-			local params_old = map_data.to_comb_params[id]
-			local bits = params.second_constant or 0
-			local bits_old = params_old.second_constant or 0
+			if comb.valid then
+				local control = get_comb_control(comb)
+				local params = control.parameters
+				local params_old = map_data.to_comb_params[id]
+				local bits = params.second_constant or 0
+				local bits_old = params_old.second_constant or 0
 
-			bits = bit32.replace(bits, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
-			bits_old = bit32.replace(bits_old, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
-			params.second_constant = bits
-			params_old.second_constant = bits_old
+				bits = bit32.replace(bits, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
+				bits_old = bit32.replace(bits_old, 1, SETTING_USE_ANY_DEPOT)--[[@as int]]
+				params.second_constant = bits
+				params_old.second_constant = bits_old
 
-			control.parameters = params
-			map_data.to_comb_params[id] = params_old
+				control.parameters = params
+				map_data.to_comb_params[id] = params_old
+			end
 		end
 		for train_id, train in pairs(map_data.trains) do
 			train.use_any_depot = true

cybersyn/scripts/train-events.lua

@@ -355,13 +355,14 @@ local function on_train_leaves_stop(map_data, mod_settings, train_id, train)
 						end
 					end
 					if best_refueler_id then
-						train.status = STATUS_TO_F
-						train.refueler_id = best_refueler_id
 						local refueler = map_data.refuelers[best_refueler_id]
-						refueler.trains_total = refueler.trains_total + 1
-						add_refueler_schedule(map_data, train.entity, refueler.entity_stop)
-						interface_raise_train_status_changed(train_id, STATUS_R, STATUS_TO_F)
-						return
+						if add_refueler_schedule(map_data, train.entity, refueler.entity_stop) then
+							train.status = STATUS_TO_F
+							train.refueler_id = best_refueler_id
+							refueler.trains_total = refueler.trains_total + 1
+							interface_raise_train_status_changed(train_id, STATUS_R, STATUS_TO_F)
+							return
+						end
 					end
 				end
 			end