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

Potential item search implementation

Browse Source
This commit is contained in:
Will Berry
2023-03-10 13:57:28 -05:00
parent 681358705f
commit 726b8162be
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,12 +96,21 @@ function inventory_tab.build(map_data, player_data)
end end
if search_item then if search_item then
if not station.deliveries then if station.deliveries then
goto continue for item_name, _ in pairs(station.deliveries) do
end if item_name == search_item then
for item_name, _ in pairs(station.deliveries) do goto has_match
if item_name == search_item then end
goto has_match end
else
local comb1_signals, _ = get_signals(station)
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
end end
goto continue goto continue

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

@@ -69,14 +69,14 @@ function manager.create(player)
clear_and_focus_on_right_click = true, clear_and_focus_on_right_click = true,
handler = manager.handle.manager_update_text_search, --on_gui_text_changed 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... --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" } }, { type = "label", style = "subheader_caption_label", caption = { "cybersyn-gui.search-item-label" } },
--{ {
-- name = "manager_item_search_field", name = "manager_item_search_field",
-- type = "textfield", type = "textfield",
-- clear_and_focus_on_right_click = true, clear_and_focus_on_right_click = true,
-- handler = manager.handle.manager_update_item_search, --on_gui_text_changed handler = manager.handle.manager_update_item_search, --on_gui_text_changed
--}, },
{ type = "empty-widget", style = "flib_horizontal_pusher" }, { type = "empty-widget", style = "flib_horizontal_pusher" },
{ type = "label", style = "caption_label", caption = { "cybersyn-gui.network-name-label" } }, { 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, }, { 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, },

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

@@ -99,14 +99,9 @@ function stations_tab.build(map_data, player_data, query_limit)
end end
if search_network_name then if search_network_name then
--nil matches all?
if search_network_name == nil then
goto has_match
end
if search_network_name ~= station.network_name then if search_network_name ~= station.network_name then
goto continue goto continue
end end
::has_match::
local train_flag = get_network_flag(station, station.network_name) local train_flag = get_network_flag(station, station.network_name)
if not bit32.btest(search_network_mask, train_flag) then if not bit32.btest(search_network_mask, train_flag) then
goto continue goto continue
@@ -128,12 +123,22 @@ function stations_tab.build(map_data, player_data, query_limit)
if search_item then if search_item then
if not station.deliveries then
goto continue if station.deliveries then
end for item_name, _ in pairs(station.deliveries) do
for item_name, _ in pairs(station.deliveries) do if item_name == search_item then
if item_name == search_item then goto has_match
goto has_match end
end
else
local comb1_signals, _ = get_signals(station)
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
end end
goto continue goto continue
@@ -289,7 +294,7 @@ function stations_tab.handle.open_station_gui(player, player_data, refs, e)
if e.shift then if e.shift then
if station_entity.surface ~= player.surface then if station_entity.surface ~= player.surface then
util.error_flying_text(gui.player, { "cybersyn-message.error-cross-surface-camera-invalid" }) util.error_flying_text(player, { "cybersyn-message.error-cross-surface-camera-invalid" })
else else
player.zoom_to_world(station_entity.position, 1, station_entity) player.zoom_to_world(station_entity.position, 1, station_entity)