From 2620bfbb43aa0c698c53d88e3cf9ef9455897181 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Mon, 14 Aug 2023 17:56:48 -0700 Subject: [PATCH] tweak color and layout --- plugins/lua/sort.lua | 100 +++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/plugins/lua/sort.lua b/plugins/lua/sort.lua index 0500cd3e0..743820103 100644 --- a/plugins/lua/sort.lua +++ b/plugins/lua/sort.lua @@ -226,28 +226,28 @@ function SquadAssignmentOverlay:init() label='Sort by:', key='CUSTOM_SHIFT_S', options={ - {label='any melee skill'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc}, - {label='any melee skill'..CH_UP, value=SORT_FNS.sort_by_any_melee_asc}, - {label='any ranged skill'..CH_DN, value=SORT_FNS.sort_by_any_ranged_desc}, - {label='any ranged skill'..CH_UP, value=SORT_FNS.sort_by_any_ranged_asc}, - {label='any leader skill'..CH_DN, value=SORT_FNS.sort_by_leadership_desc}, - {label='any leader skill'..CH_UP, value=SORT_FNS.sort_by_leadership_asc}, - {label='name'..CH_DN, value=sort_by_name_desc}, - {label='name'..CH_UP, value=sort_by_name_asc}, - {label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc}, - {label='migrant wave'..CH_UP, value=sort_by_migrant_wave_asc}, - {label='axe skill'..CH_DN, value=SORT_FNS.sort_by_axe_desc}, - {label='axe skill'..CH_UP, value=SORT_FNS.sort_by_axe_asc}, - {label='sword skill'..CH_DN, value=SORT_FNS.sort_by_sword_desc}, - {label='sword skill'..CH_UP, value=SORT_FNS.sort_by_sword_asc}, - {label='mace skill'..CH_DN, value=SORT_FNS.sort_by_mace_desc}, - {label='mace skill'..CH_UP, value=SORT_FNS.sort_by_mace_asc}, - {label='hammer skill'..CH_DN, value=SORT_FNS.sort_by_hammer_desc}, - {label='hammer skill'..CH_UP, value=SORT_FNS.sort_by_hammer_asc}, - {label='spear skill'..CH_DN, value=SORT_FNS.sort_by_spear_desc}, - {label='spear skill'..CH_UP, value=SORT_FNS.sort_by_spear_asc}, - {label='crossbow skill'..CH_DN, value=SORT_FNS.sort_by_crossbow_desc}, - {label='crossbow skill'..CH_UP, value=SORT_FNS.sort_by_crossbow_asc}, + {label='any melee skill'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc, pen=COLOR_GREEN}, + {label='any melee skill'..CH_UP, value=SORT_FNS.sort_by_any_melee_asc, pen=COLOR_YELLOW}, + {label='any ranged skill'..CH_DN, value=SORT_FNS.sort_by_any_ranged_desc, pen=COLOR_GREEN}, + {label='any ranged skill'..CH_UP, value=SORT_FNS.sort_by_any_ranged_asc, pen=COLOR_YELLOW}, + {label='any leader skill'..CH_DN, value=SORT_FNS.sort_by_leadership_desc, pen=COLOR_GREEN}, + {label='any leader skill'..CH_UP, value=SORT_FNS.sort_by_leadership_asc, pen=COLOR_YELLOW}, + {label='name'..CH_DN, value=sort_by_name_desc, pen=COLOR_GREEN}, + {label='name'..CH_UP, value=sort_by_name_asc, pen=COLOR_YELLOW}, + {label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc, pen=COLOR_GREEN}, + {label='migrant wave'..CH_UP, value=sort_by_migrant_wave_asc, pen=COLOR_YELLOW}, + {label='axe skill'..CH_DN, value=SORT_FNS.sort_by_axe_desc, pen=COLOR_GREEN}, + {label='axe skill'..CH_UP, value=SORT_FNS.sort_by_axe_asc, pen=COLOR_YELLOW}, + {label='sword skill'..CH_DN, value=SORT_FNS.sort_by_sword_desc, pen=COLOR_GREEN}, + {label='sword skill'..CH_UP, value=SORT_FNS.sort_by_sword_asc, pen=COLOR_YELLOW}, + {label='mace skill'..CH_DN, value=SORT_FNS.sort_by_mace_desc, pen=COLOR_GREEN}, + {label='mace skill'..CH_UP, value=SORT_FNS.sort_by_mace_asc, pen=COLOR_YELLOW}, + {label='hammer skill'..CH_DN, value=SORT_FNS.sort_by_hammer_desc, pen=COLOR_GREEN}, + {label='hammer skill'..CH_UP, value=SORT_FNS.sort_by_hammer_asc, pen=COLOR_YELLOW}, + {label='spear skill'..CH_DN, value=SORT_FNS.sort_by_spear_desc, pen=COLOR_GREEN}, + {label='spear skill'..CH_UP, value=SORT_FNS.sort_by_spear_asc, pen=COLOR_YELLOW}, + {label='crossbow skill'..CH_DN, value=SORT_FNS.sort_by_crossbow_desc, pen=COLOR_GREEN}, + {label='crossbow skill'..CH_UP, value=SORT_FNS.sort_by_crossbow_asc, pen=COLOR_YELLOW}, }, initial_option=SORT_FNS.sort_by_any_melee_desc, on_change=self:callback('refresh_list', 'sort'), @@ -267,8 +267,8 @@ function SquadAssignmentOverlay:init() frame={t=0, l=0, w=10}, options={ {label='any melee', value=sort_noop}, - {label='any melee'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc}, - {label='any melee'..CH_UP, value=SORT_FNS.sort_by_any_melee_asc}, + {label='any melee'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc, pen=COLOR_GREEN}, + {label='any melee'..CH_UP, value=SORT_FNS.sort_by_any_melee_asc, pen=COLOR_YELLOW}, }, initial_option=SORT_FNS.sort_by_any_melee_desc, option_gap=0, @@ -279,8 +279,8 @@ function SquadAssignmentOverlay:init() frame={t=0, l=13, w=11}, options={ {label='any ranged', value=sort_noop}, - {label='any ranged'..CH_DN, value=SORT_FNS.sort_by_any_ranged_desc}, - {label='any ranged'..CH_UP, value=SORT_FNS.sort_by_any_ranged_asc}, + {label='any ranged'..CH_DN, value=SORT_FNS.sort_by_any_ranged_desc, pen=COLOR_GREEN}, + {label='any ranged'..CH_UP, value=SORT_FNS.sort_by_any_ranged_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_any_ranged'), @@ -290,8 +290,8 @@ function SquadAssignmentOverlay:init() frame={t=0, l=27, w=11}, options={ {label='leadership', value=sort_noop}, - {label='leadership'..CH_DN, value=SORT_FNS.sort_by_leadership_desc}, - {label='leadership'..CH_UP, value=SORT_FNS.sort_by_leadership_asc}, + {label='leadership'..CH_DN, value=SORT_FNS.sort_by_leadership_desc, pen=COLOR_GREEN}, + {label='leadership'..CH_UP, value=SORT_FNS.sort_by_leadership_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_leadership'), @@ -301,8 +301,8 @@ function SquadAssignmentOverlay:init() frame={t=0, l=41, w=5}, options={ {label='name', value=sort_noop}, - {label='name'..CH_DN, value=sort_by_name_desc}, - {label='name'..CH_UP, value=sort_by_name_asc}, + {label='name'..CH_DN, value=sort_by_name_desc, pen=COLOR_GREEN}, + {label='name'..CH_UP, value=sort_by_name_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_name'), @@ -312,74 +312,74 @@ function SquadAssignmentOverlay:init() frame={t=0, l=48, w=13}, options={ {label='migrant wave', value=sort_noop}, - {label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc}, - {label='migrant wave'..CH_UP, value=sort_by_migrant_wave_asc}, + {label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc, pen=COLOR_GREEN}, + {label='migrant wave'..CH_UP, value=sort_by_migrant_wave_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_migrant_wave'), }, widgets.CycleHotkeyLabel{ view_id='sort_axe', - frame={t=2, l=0, w=4}, + frame={t=2, l=2, w=4}, options={ {label='axe', value=sort_noop}, - {label='axe'..CH_DN, value=SORT_FNS.sort_by_axe_desc}, - {label='axe'..CH_UP, value=SORT_FNS.sort_by_axe_asc}, + {label='axe'..CH_DN, value=SORT_FNS.sort_by_axe_desc, pen=COLOR_GREEN}, + {label='axe'..CH_UP, value=SORT_FNS.sort_by_axe_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_axe'), }, widgets.CycleHotkeyLabel{ view_id='sort_sword', - frame={t=2, l=7, w=6}, + frame={t=2, l=9, w=6}, options={ {label='sword', value=sort_noop}, - {label='sword'..CH_DN, value=SORT_FNS.sort_by_sword_desc}, - {label='sword'..CH_UP, value=SORT_FNS.sort_by_sword_asc}, + {label='sword'..CH_DN, value=SORT_FNS.sort_by_sword_desc, pen=COLOR_GREEN}, + {label='sword'..CH_UP, value=SORT_FNS.sort_by_sword_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_sword'), }, widgets.CycleHotkeyLabel{ view_id='sort_mace', - frame={t=2, l=16, w=5}, + frame={t=2, l=18, w=5}, options={ {label='mace', value=sort_noop}, - {label='mace'..CH_DN, value=SORT_FNS.sort_by_mace_desc}, - {label='mace'..CH_UP, value=SORT_FNS.sort_by_mace_asc}, + {label='mace'..CH_DN, value=SORT_FNS.sort_by_mace_desc, pen=COLOR_GREEN}, + {label='mace'..CH_UP, value=SORT_FNS.sort_by_mace_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_mace'), }, widgets.CycleHotkeyLabel{ view_id='sort_hammer', - frame={t=2, l=23, w=7}, + frame={t=2, l=25, w=7}, options={ {label='hammer', value=sort_noop}, - {label='hammer'..CH_DN, value=SORT_FNS.sort_by_hammer_desc}, - {label='hammer'..CH_UP, value=SORT_FNS.sort_by_hammer_asc}, + {label='hammer'..CH_DN, value=SORT_FNS.sort_by_hammer_desc, pen=COLOR_GREEN}, + {label='hammer'..CH_UP, value=SORT_FNS.sort_by_hammer_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_hammer'), }, widgets.CycleHotkeyLabel{ view_id='sort_spear', - frame={t=2, l=34, w=6}, + frame={t=2, l=36, w=6}, options={ {label='spear', value=sort_noop}, - {label='spear'..CH_DN, value=SORT_FNS.sort_by_spear_desc}, - {label='spear'..CH_UP, value=SORT_FNS.sort_by_spear_asc}, + {label='spear'..CH_DN, value=SORT_FNS.sort_by_spear_desc, pen=COLOR_GREEN}, + {label='spear'..CH_UP, value=SORT_FNS.sort_by_spear_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_spear'), }, widgets.CycleHotkeyLabel{ view_id='sort_crossbow', - frame={t=2, l=43, w=9}, + frame={t=2, l=45, w=9}, options={ {label='crossbow', value=sort_noop}, - {label='crossbow'..CH_DN, value=SORT_FNS.sort_by_crossbow_desc}, - {label='crossbow'..CH_UP, value=SORT_FNS.sort_by_crossbow_asc}, + {label='crossbow'..CH_DN, value=SORT_FNS.sort_by_crossbow_desc, pen=COLOR_GREEN}, + {label='crossbow'..CH_UP, value=SORT_FNS.sort_by_crossbow_asc, pen=COLOR_YELLOW}, }, option_gap=0, on_change=self:callback('refresh_list', 'sort_crossbow'),