Merge pull request #44 from mamoniot/experimental

Merge changes from experimental in

cybersyn/changelog.txt

@@ -1,4 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.14
+Date: 2023-3-14
+  Features:
+    - Added opt-in WIP train and station manager gui (highly experimental, use at your own risk)
+  Bugfixes:
+    - Provider override thresholds now correctly override the required train capacity as well; fix contributed by shopt
+    - Fixed a rare crash relating to an uninitialized network mask on a new station
+    - Fixed a SE space elevator bug that caused incorrect orders when the provider and requester station had the same name
+    - Added an incompatibility error with picker dollies, proper compatibility to come in a later update
+---------------------------------------------------------------------------------------------------
 Version: 1.2.13
 Date: 2023-2-5
   Features:

cybersyn/scripts/main.lua

@@ -821,6 +821,13 @@ local function setup_se_compat()
 	end)
 end
 
+local function setup_picker_dollies_compat()
+	IS_PICKER_DOLLIES_PRESENT = remote.interfaces["PickerDollies"] and remote.interfaces["PickerDollies"]["add_blacklist_name"]
+	if IS_PICKER_DOLLIES_PRESENT then
+		remote.call("PickerDollies", "add_blacklist_name", COMBINATOR_NAME)
+		remote.call("PickerDollies", "add_blacklist_name", COMBINATOR_OUT_NAME)
+	end
+end
 
 local function grab_all_settings()
 	mod_settings.enable_planner = settings.global["cybersyn-enable-planner"].value --[[@as boolean]]
@@ -924,6 +931,7 @@ local function main()
 		mod_settings.invert_sign = false
 		init_global()
 		setup_se_compat()
+		setup_picker_dollies_compat()
 		if MANAGER_ENABLED then
 			manager.on_init()
 		end
@@ -939,6 +947,7 @@ local function main()
 
 	script.on_load(function()
 		setup_se_compat()
+		setup_picker_dollies_compat()
 	end)
 
 	if MANAGER_ENABLED then
@@ -949,6 +958,12 @@ local function main()
 		script.on_nth_tick(mod_settings.manager_update_rate, function()
 			manager.tick(global)
 		end)
+	else
+		local button_flow = mod_gui.get_button_flow(player)
+		local button = button_flow["top_left_button"]
+		if button then
+		    button.destroy()
+		end
 	end
 
 end