From 7ac4c2f660c2733563eb4c841a1878cef23413b4 Mon Sep 17 00:00:00 2001 From: Will Berry <73126355+wdberry@users.noreply.github.com> Date: Wed, 29 Mar 2023 14:31:42 -0400 Subject: [PATCH 1/3] Remove LTNManager hard incompatibility flag in info.json --- cybersyn/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cybersyn/info.json b/cybersyn/info.json index 9bb2ecc..e1a036f 100644 --- a/cybersyn/info.json +++ b/cybersyn/info.json @@ -11,7 +11,6 @@ "? space-exploration >= 0.6.94", "? miniloader", "? nullius", - "? pypostprocessing", - "! LtnManager" + "? pypostprocessing" ] } From 3fc82e00d1f84b743c993fcb639c94bbb790c236 Mon Sep 17 00:00:00 2001 From: Will Berry <73126355+wdberry@users.noreply.github.com> Date: Wed, 29 Mar 2023 15:34:18 -0400 Subject: [PATCH 2/3] Remove superfluous conditional added prior to realizing filter can be cleared by right-clicking --- cybersyn/scripts/gui/inventory.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cybersyn/scripts/gui/inventory.lua b/cybersyn/scripts/gui/inventory.lua index 04ef2a6..14b55da 100644 --- a/cybersyn/scripts/gui/inventory.lua +++ b/cybersyn/scripts/gui/inventory.lua @@ -66,13 +66,9 @@ function inventory_tab.build(map_data, player_data) end end if search_network_name then - if search_network_name == (NETWORK_EACH or NETWORK_ANYTHING) then - goto has_match - end if search_network_name ~= station.network_name then goto continue end - ::has_match:: local train_flag = get_network_mask(station, station.network_name) if not bit32.btest(search_network_mask, train_flag) then goto continue From 03e2a2ba73b1149a124cc91d43cd717594f88b53 Mon Sep 17 00:00:00 2001 From: Will Berry <73126355+wdberry@users.noreply.github.com> Date: Mon, 3 Apr 2023 13:44:10 -0400 Subject: [PATCH 3/3] Fix clobbering of train network masks when debug revision runs after migration has already run --- cybersyn/scripts/migrations.lua | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/cybersyn/scripts/migrations.lua b/cybersyn/scripts/migrations.lua index b14c890..fe0786b 100644 --- a/cybersyn/scripts/migrations.lua +++ b/cybersyn/scripts/migrations.lua @@ -346,21 +346,28 @@ end ---NOTE: this runs before on_config_changed ---It does not have access to game +---NOTE 2: Everything in this section must be idempotent function on_debug_revision_change() local map_data = global if debug_revision == 1 then for _, e in pairs(map_data.refuelers) do - e.network_mask = e.network_flag - e.network_flag = nil + if e.network_flag ~= nil then + e.network_mask = e.network_flag + e.network_flag = nil + end end for _, e in pairs(map_data.stations) do - e.network_mask = e.network_flag - e.network_flag = nil + if e.network_flag ~= nil then + e.network_mask = e.network_flag + e.network_flag = nil + end end for _, e in pairs(map_data.trains) do - e.network_mask = e.network_flag - e.network_flag = nil + if e.network_flag ~= nil then + e.network_mask = e.network_flag + e.network_flag = nil + end end end end