xevion/project-cybersyn
1
0
Fork 0
mirror of https://github.com/Xevion/project-cybersyn.git synced 2025-12-10 10:08:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'make-gui-work' into gui-trains-tab

Browse Source
This commit is contained in:
Will Berry
2023-03-10 19:38:31 -05:00
parent 6a89b5162c 0cd1292ed6
commit a9d4a22310
3 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cybersyn/scripts/gui/inventory.lua
View File

@@ -96,12 +96,22 @@ function inventory_tab.build(map_data, player_data)
end
if search_item then
if not station.deliveries then
goto continue
if station.deliveries then
for item_name, _ in pairs(station.deliveries) do
if item_name == search_item then
goto has_match
end
end
end
for item_name, _ in pairs(station.deliveries) do
if item_name == search_item then
goto has_match
local comb1_signals, _ = get_signals(station)
if comb1_signals then
for _, signal_ID in pairs(comb1_signals) do
local item = signal_ID.signal.name
if item then
if string.match(item, search_item) then
goto has_match
end
end
end
end
goto continue

18
cybersyn/scripts/gui/manager.lua
View File

@@ -69,14 +69,14 @@ function manager.create(player)
clear_and_focus_on_right_click = true,
handler = manager.handle.manager_update_text_search, --on_gui_text_changed
},
-- item search box commented out. It *works*, but, the filtering logic only checks delivieres, so I'm not sure what Mami intended it for, so I'm leaving it off for now...
--{ type = "label", style = "subheader_caption_label", caption = { "cybersyn-gui.search-item-label" } },
--{
-- name = "manager_item_search_field",
-- type = "textfield",
-- clear_and_focus_on_right_click = true,
-- handler = manager.handle.manager_update_item_search, --on_gui_text_changed
--},
--item search box commented out. It *works*, but, the filtering logic only checks delivieres, so I'm not sure what Mami intended it for, so I'm leaving it off for now...
{ type = "label", style = "subheader_caption_label", caption = { "cybersyn-gui.search-item-label" } },
{
name = "manager_item_search_field",
type = "textfield",
clear_and_focus_on_right_click = true,
handler = manager.handle.manager_update_item_search, --on_gui_text_changed
},
{ 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"}, handler=manager.handle.manager_update_network_name, },
@@ -276,7 +276,7 @@ end
--- @param refs table<string, LuaGuiElement>
--- @param e GuiEventData
function manager.handle.manager_update_item_search(player, player_data, refs, e)
local query = e.text
local query = e.element.text
if query then
-- Input sanitization
for pattern, replacement in pairs(constants.input_sanitizers) do

21
cybersyn/scripts/gui/stations.lua
View File

@@ -102,7 +102,6 @@ function stations_tab.build(map_data, player_data, query_limit)
if search_network_name ~= station.network_name then
goto continue
end
::has_match::
local train_flag = get_network_flag(station, station.network_name)
if not bit32.btest(search_network_mask, train_flag) then
goto continue
@@ -124,12 +123,22 @@ function stations_tab.build(map_data, player_data, query_limit)
if search_item then
if not station.deliveries then
goto continue
if station.deliveries then
for item_name, _ in pairs(station.deliveries) do
if item_name == search_item then
goto has_match
end
end
end
for item_name, _ in pairs(station.deliveries) do
if item_name == search_item then
goto has_match
local comb1_signals, _ = get_signals(station)
if comb1_signals then
for _, signal_ID in pairs(comb1_signals) do
local item = signal_ID.signal.name
if item then
if string.match(item, search_item) then
goto has_match
end
end
end
end
goto continue