Remove shortcut when GUI is disabled and enable keybind

This commit is contained in:
Will Berry
2023-03-14 21:46:52 -04:00
parent e498005c85
commit 28c489eae5
3 changed files with 34 additions and 28 deletions

View File

@@ -360,30 +360,35 @@ styles.ltnm_tabbed_pane = {
}, },
} }
data:extend({ if settings.startup["cybersyn-manager-enabled"].value then
-- custom inputs
--{ data:extend({
-- type = "custom-input", -- custom inputs
-- name = "cybersyn-toggle-gui", {
-- key_sequence = "CONTROL + T", type = "custom-input",
--}, name = "cybersyn-toggle-gui",
--{ key_sequence = "CONTROL + T",
-- type = "custom-input", action = "lua",
-- name = "ltnm-linked-focus-search", },
-- key_sequence = "", --{
-- linked_game_control = "focus-search", -- type = "custom-input",
--}, -- name = "ltnm-linked-focus-search",
-- shortcuts -- key_sequence = "",
{ -- linked_game_control = "focus-search",
type = "shortcut", --},
name = "cybersyn-toggle-gui", -- shortcuts
icon = data_util.build_sprite(nil, { 0, 0 }, util.paths.shortcut_icons, 32, 2), {
disabled_icon = data_util.build_sprite(nil, { 48, 0 }, util.paths.shortcut_icons, 32, 2), type = "shortcut",
small_icon = data_util.build_sprite(nil, { 0, 32 }, util.paths.shortcut_icons, 24, 2), name = "cybersyn-toggle-gui",
disabled_small_icon = data_util.build_sprite(nil, { 36, 32 }, util.paths.shortcut_icons, 24, 2), icon = data_util.build_sprite(nil, { 0, 0 }, util.paths.shortcut_icons, 32, 2),
toggleable = true, disabled_icon = data_util.build_sprite(nil, { 48, 0 }, util.paths.shortcut_icons, 32, 2),
action = "lua", small_icon = data_util.build_sprite(nil, { 0, 32 }, util.paths.shortcut_icons, 24, 2),
--associated_control_input = "cybersyn-toggle-gui", disabled_small_icon = data_util.build_sprite(nil, { 36, 32 }, util.paths.shortcut_icons, 24, 2),
technology_to_unlock = "cybersyn-train-network", toggleable = true,
}, action = "lua",
}) associated_control_input = "cybersyn-toggle-gui",
technology_to_unlock = "cybersyn-train-network",
},
})
end

View File

@@ -47,7 +47,7 @@ end
local manager_gui = {} local manager_gui = {}
function manager_gui.on_lua_shortcut(e) function manager_gui.on_lua_shortcut(e)
if e.prototype_name == "cybersyn-toggle-gui" then if e.prototype_name == "cybersyn-toggle-gui" or e.input_name == "cybersyn-toggle-gui" then
manager.wrapper(e, manager.handle.manager_toggle) manager.wrapper(e, manager.handle.manager_toggle)
end end
end end

View File

@@ -954,6 +954,7 @@ local function main()
script.on_event(defines.events.on_player_removed, manager.on_player_removed) script.on_event(defines.events.on_player_removed, manager.on_player_removed)
script.on_event(defines.events.on_player_created, manager.on_player_created) script.on_event(defines.events.on_player_created, manager.on_player_created)
script.on_event(defines.events.on_lua_shortcut, manager.on_lua_shortcut) script.on_event(defines.events.on_lua_shortcut, manager.on_lua_shortcut)
script.on_event("cybersyn-toggle-gui", manager.on_lua_shortcut)
-- TODO: rework this to work as a per-player runtime setting -- TODO: rework this to work as a per-player runtime setting
script.on_nth_tick(mod_settings.manager_update_rate, function() script.on_nth_tick(mod_settings.manager_update_rate, function()
manager.tick(global) manager.tick(global)