From 7aeab435981cb510e9c448eb8a951449664de685 Mon Sep 17 00:00:00 2001 From: Will Berry <73126355+wdberry@users.noreply.github.com> Date: Thu, 9 Mar 2023 13:24:23 -0500 Subject: [PATCH] Changed default for network filter to be nothing rather than network each --- cybersyn/locale/en/manager.cfg | 2 +- cybersyn/scripts/gui/manager.lua | 2 +- cybersyn/scripts/gui/stations.lua | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cybersyn/locale/en/manager.cfg b/cybersyn/locale/en/manager.cfg index 5bfca09..ad64f1d 100644 --- a/cybersyn/locale/en/manager.cfg +++ b/cybersyn/locale/en/manager.cfg @@ -36,7 +36,7 @@ inventory=Inventory keep-open=Keep open loading-at=Loading at name=Name -network-name-label=Network: +network-name-label=Network Filter: network-id-label=Network ID: network-id=Network ID no-alerts=[img=warning-white] No alerts diff --git a/cybersyn/scripts/gui/manager.lua b/cybersyn/scripts/gui/manager.lua index 0a8844a..d28e180 100644 --- a/cybersyn/scripts/gui/manager.lua +++ b/cybersyn/scripts/gui/manager.lua @@ -79,7 +79,7 @@ function manager.create(player) --}, { type = "empty-widget", style = "flib_horizontal_pusher" }, { type = "label", style = "caption_label", caption = { "cybersyn-gui.network-name-label" } }, - { type= "choose-elem-button", name="network", style="slot_button_in_shallow_frame", elem_type="signal", tooltip={"cybersyn-gui.network-tooltip"}, signal=NETWORK_SIGNAL_GUI_DEFAULT, handler=manager.handle.manager_update_network_name, }, + { type= "choose-elem-button", name="network", style="slot_button_in_shallow_frame", elem_type="signal", tooltip={"cybersyn-gui.network-tooltip"}, handler=manager.handle.manager_update_network_name, }, { type = "label", style = "caption_label", caption = { "cybersyn-gui.network-id-label" } }, { name = "manager_network_mask_field", diff --git a/cybersyn/scripts/gui/stations.lua b/cybersyn/scripts/gui/stations.lua index 2117adb..abe61fc 100644 --- a/cybersyn/scripts/gui/stations.lua +++ b/cybersyn/scripts/gui/stations.lua @@ -99,15 +99,15 @@ function stations_tab.build(map_data, player_data) end if search_network_name then - --setting default for GUI to NETWORK_EACH, which will match all - if search_network_name == (NETWORK_EACH or NETWORK_ANYTHING) then --NETWORK_ANYTHING prevents crash due station having a nil issue, may need to be addressed in a different way + --nil matches all? + if search_network_name == nil then goto has_match end if search_network_name ~= station.network_name then goto continue end ::has_match:: - local train_flag = get_network_flag(station, station.network_name) --we already validated search network name or a "match anything" + local train_flag = get_network_flag(station, station.network_name) if not bit32.btest(search_network_mask, train_flag) then goto continue end @@ -213,7 +213,7 @@ function stations_tab.build(map_data, player_data) for i, station_id in pairs(stations_sorted) do --- @type Station local station = stations[station_id] - local network_sprite = "virtual-signal/signal-everything" + local network_sprite = "utility/close_black" local network_name = station.network_name local network_flag = get_network_flag(station, network_name) if network_name ~= nil then