|
|
@ -2,11 +2,10 @@ local _ENV = mkmodule('plugins.sort')
|
|
|
|
|
|
|
|
|
|
|
|
local gui = require('gui')
|
|
|
|
local gui = require('gui')
|
|
|
|
local overlay = require('plugins.overlay')
|
|
|
|
local overlay = require('plugins.overlay')
|
|
|
|
|
|
|
|
local setbelief = reqscript('modtools/set-belief')
|
|
|
|
local utils = require('utils')
|
|
|
|
local utils = require('utils')
|
|
|
|
local widgets = require('gui.widgets')
|
|
|
|
local widgets = require('gui.widgets')
|
|
|
|
|
|
|
|
|
|
|
|
local setbelief = reqscript("modtools/set-belief")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local CH_UP = string.char(30)
|
|
|
|
local CH_UP = string.char(30)
|
|
|
|
local CH_DN = string.char(31)
|
|
|
|
local CH_DN = string.char(31)
|
|
|
|
|
|
|
|
|
|
|
@ -22,12 +21,6 @@ local RANGED_WEAPON_SKILLS = {
|
|
|
|
df.job_skill.CROSSBOW,
|
|
|
|
df.job_skill.CROSSBOW,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
local LEADERSHIP_SKILLS = {
|
|
|
|
|
|
|
|
df.job_skill.MILITARY_TACTICS,
|
|
|
|
|
|
|
|
df.job_skill.LEADERSHIP,
|
|
|
|
|
|
|
|
df.job_skill.TEACHING,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function sort_noop(a, b)
|
|
|
|
local function sort_noop(a, b)
|
|
|
|
-- this function is used as a marker and never actually gets called
|
|
|
|
-- this function is used as a marker and never actually gets called
|
|
|
|
error('sort_noop should not be called')
|
|
|
|
error('sort_noop should not be called')
|
|
|
@ -55,22 +48,33 @@ local function sort_by_name_asc(unit_id_1, unit_id_2)
|
|
|
|
return utils.compare_name(name2, name1)
|
|
|
|
return utils.compare_name(name2, name1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local active_units = df.global.world.units.active
|
|
|
|
|
|
|
|
local active_idx_cache = {}
|
|
|
|
|
|
|
|
local function get_active_idx_cache()
|
|
|
|
|
|
|
|
local num_active_units = #active_units
|
|
|
|
|
|
|
|
if num_active_units == 0 or active_idx_cache[active_units[num_active_units-1].id] ~= num_active_units-1 then
|
|
|
|
|
|
|
|
active_idx_cache = {}
|
|
|
|
|
|
|
|
for i,active_unit in ipairs(active_units) do
|
|
|
|
|
|
|
|
active_idx_cache[active_unit.id] = i
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return active_idx_cache
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function sort_by_migrant_wave_desc(unit_id_1, unit_id_2)
|
|
|
|
local function sort_by_migrant_wave_desc(unit_id_1, unit_id_2)
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
local unit1 = df.unit.find(unit_id_1)
|
|
|
|
local cache = get_active_idx_cache()
|
|
|
|
local unit2 = df.unit.find(unit_id_2)
|
|
|
|
if not cache[unit_id_1] then return -1 end
|
|
|
|
if not unit1 then return -1 end
|
|
|
|
if not cache[unit_id_2] then return 1 end
|
|
|
|
if not unit2 then return 1 end
|
|
|
|
return utils.compare(cache[unit_id_2], cache[unit_id_1])
|
|
|
|
return utils.compare(unit2.id, unit1.id)
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function sort_by_migrant_wave_asc(unit_id_1, unit_id_2)
|
|
|
|
local function sort_by_migrant_wave_asc(unit_id_1, unit_id_2)
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
local unit1 = df.unit.find(unit_id_1)
|
|
|
|
local cache = get_active_idx_cache()
|
|
|
|
local unit2 = df.unit.find(unit_id_2)
|
|
|
|
if not cache[unit_id_1] then return -1 end
|
|
|
|
if not unit1 then return -1 end
|
|
|
|
if not cache[unit_id_2] then return 1 end
|
|
|
|
if not unit2 then return 1 end
|
|
|
|
return utils.compare(cache[unit_id_1], cache[unit_id_2])
|
|
|
|
return utils.compare(unit1.id, unit2.id)
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function sort_by_stress_desc(unit_id_1, unit_id_2)
|
|
|
|
local function sort_by_stress_desc(unit_id_1, unit_id_2)
|
|
|
@ -108,27 +112,6 @@ local function get_skill(unit_id, skill, unit)
|
|
|
|
utils.binsearch(unit.status.current_soul.skills, skill, 'id')
|
|
|
|
utils.binsearch(unit.status.current_soul.skills, skill, 'id')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function get_max_skill(unit_id, list)
|
|
|
|
|
|
|
|
local unit = df.unit.find(unit_id)
|
|
|
|
|
|
|
|
if not unit or not unit.status.current_soul then return end
|
|
|
|
|
|
|
|
local max
|
|
|
|
|
|
|
|
for _,skill in ipairs(list) do
|
|
|
|
|
|
|
|
local s = get_skill(unit_id, skill, unit)
|
|
|
|
|
|
|
|
if s then
|
|
|
|
|
|
|
|
if not max then
|
|
|
|
|
|
|
|
max = s
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
if max.rating == s.rating and max.experience < s.experience then
|
|
|
|
|
|
|
|
max = s
|
|
|
|
|
|
|
|
elseif max.rating < s.rating then
|
|
|
|
|
|
|
|
max = s
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return max
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function melee_skill_effectiveness(unit, skill_list)
|
|
|
|
local function melee_skill_effectiveness(unit, skill_list)
|
|
|
|
-- Physical attributes
|
|
|
|
-- Physical attributes
|
|
|
|
local strength = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.STRENGTH)
|
|
|
|
local strength = dfhack.units.getPhysicalAttrValue(unit, df.physical_attribute_type.STRENGTH)
|
|
|
@ -237,46 +220,6 @@ local function make_sort_by_ranged_skill_effectiveness_asc(list)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function make_sort_by_skill_list_desc(list)
|
|
|
|
|
|
|
|
return function(unit_id_1, unit_id_2)
|
|
|
|
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
|
|
|
|
if unit_id_1 == -1 then return -1 end
|
|
|
|
|
|
|
|
if unit_id_2 == -1 then return 1 end
|
|
|
|
|
|
|
|
local s1 = get_max_skill(unit_id_1, list)
|
|
|
|
|
|
|
|
local s2 = get_max_skill(unit_id_2, list)
|
|
|
|
|
|
|
|
if s1 == s2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
|
|
|
|
|
|
|
|
if not s2 then return -1 end
|
|
|
|
|
|
|
|
if not s1 then return 1 end
|
|
|
|
|
|
|
|
if s1.rating ~= s2.rating then
|
|
|
|
|
|
|
|
return utils.compare(s2.rating, s1.rating)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
if s1.experience ~= s2.experience then
|
|
|
|
|
|
|
|
return utils.compare(s2.experience, s1.experience)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return sort_by_name_desc(unit_id_1, unit_id_2)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function make_sort_by_skill_list_asc(list)
|
|
|
|
|
|
|
|
return function(unit_id_1, unit_id_2)
|
|
|
|
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
|
|
|
|
if unit_id_1 == -1 then return -1 end
|
|
|
|
|
|
|
|
if unit_id_2 == -1 then return 1 end
|
|
|
|
|
|
|
|
local s1 = get_max_skill(unit_id_1, list)
|
|
|
|
|
|
|
|
local s2 = get_max_skill(unit_id_2, list)
|
|
|
|
|
|
|
|
if s1 == s2 then return sort_by_name_desc(unit_id_1, unit_id_2) end
|
|
|
|
|
|
|
|
if not s2 then return 1 end
|
|
|
|
|
|
|
|
if not s1 then return -1 end
|
|
|
|
|
|
|
|
if s1.rating ~= s2.rating then
|
|
|
|
|
|
|
|
return utils.compare(s1.rating, s2.rating)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
if s1.experience ~= s2.experience then
|
|
|
|
|
|
|
|
return utils.compare(s1.experience, s2.experience)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return sort_by_name_desc(unit_id_1, unit_id_2)
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function make_sort_by_skill_desc(sort_skill)
|
|
|
|
local function make_sort_by_skill_desc(sort_skill)
|
|
|
|
return function(unit_id_1, unit_id_2)
|
|
|
|
return function(unit_id_1, unit_id_2)
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
|
if unit_id_1 == unit_id_2 then return 0 end
|
|
|
@ -443,12 +386,9 @@ end
|
|
|
|
local function ranged_combat_potential(unit)
|
|
|
|
local function ranged_combat_potential(unit)
|
|
|
|
-- Physical attributes
|
|
|
|
-- Physical attributes
|
|
|
|
local agility = unit.body.physical_attrs.AGILITY.max_value
|
|
|
|
local agility = unit.body.physical_attrs.AGILITY.max_value
|
|
|
|
local toughness = unit.body.physical_attrs.TOUGHNESS.max_value
|
|
|
|
|
|
|
|
local endurance = unit.body.physical_attrs.ENDURANCE.max_value
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- Mental attributes
|
|
|
|
-- Mental attributes
|
|
|
|
local focus = unit.status.current_soul.mental_attrs.FOCUS.max_value
|
|
|
|
local focus = unit.status.current_soul.mental_attrs.FOCUS.max_value
|
|
|
|
local willpower = unit.status.current_soul.mental_attrs.WILLPOWER.max_value
|
|
|
|
|
|
|
|
local spatial_sense = unit.status.current_soul.mental_attrs.SPATIAL_SENSE.max_value
|
|
|
|
local spatial_sense = unit.status.current_soul.mental_attrs.SPATIAL_SENSE.max_value
|
|
|
|
local kinesthetic_sense = unit.status.current_soul.mental_attrs.KINESTHETIC_SENSE.max_value
|
|
|
|
local kinesthetic_sense = unit.status.current_soul.mental_attrs.KINESTHETIC_SENSE.max_value
|
|
|
|
|
|
|
|
|
|
|
@ -490,8 +430,10 @@ local SORT_FNS = {
|
|
|
|
sort_by_any_melee_asc=make_sort_by_melee_skill_effectiveness_asc(MELEE_WEAPON_SKILLS),
|
|
|
|
sort_by_any_melee_asc=make_sort_by_melee_skill_effectiveness_asc(MELEE_WEAPON_SKILLS),
|
|
|
|
sort_by_any_ranged_desc=make_sort_by_ranged_skill_effectiveness_desc(RANGED_WEAPON_SKILLS),
|
|
|
|
sort_by_any_ranged_desc=make_sort_by_ranged_skill_effectiveness_desc(RANGED_WEAPON_SKILLS),
|
|
|
|
sort_by_any_ranged_asc=make_sort_by_ranged_skill_effectiveness_asc(RANGED_WEAPON_SKILLS),
|
|
|
|
sort_by_any_ranged_asc=make_sort_by_ranged_skill_effectiveness_asc(RANGED_WEAPON_SKILLS),
|
|
|
|
sort_by_leadership_desc=make_sort_by_skill_list_desc(LEADERSHIP_SKILLS),
|
|
|
|
sort_by_teacher_desc=make_sort_by_skill_desc(df.job_skill.TEACHING),
|
|
|
|
sort_by_leadership_asc=make_sort_by_skill_list_asc(LEADERSHIP_SKILLS),
|
|
|
|
sort_by_teacher_asc=make_sort_by_skill_asc(df.job_skill.TEACHING),
|
|
|
|
|
|
|
|
sort_by_tactics_desc=make_sort_by_skill_desc(df.job_skill.MILITARY_TACTICS),
|
|
|
|
|
|
|
|
sort_by_tactics_asc=make_sort_by_skill_asc(df.job_skill.MILITARY_TACTICS),
|
|
|
|
sort_by_axe_desc=make_sort_by_skill_desc(df.job_skill.AXE),
|
|
|
|
sort_by_axe_desc=make_sort_by_skill_desc(df.job_skill.AXE),
|
|
|
|
sort_by_axe_asc=make_sort_by_skill_asc(df.job_skill.AXE),
|
|
|
|
sort_by_axe_asc=make_sort_by_skill_asc(df.job_skill.AXE),
|
|
|
|
sort_by_sword_desc=make_sort_by_skill_desc(df.job_skill.SWORD),
|
|
|
|
sort_by_sword_desc=make_sort_by_skill_desc(df.job_skill.SWORD),
|
|
|
@ -512,36 +454,60 @@ local SORT_FNS = {
|
|
|
|
|
|
|
|
|
|
|
|
SquadAssignmentOverlay = defclass(SquadAssignmentOverlay, overlay.OverlayWidget)
|
|
|
|
SquadAssignmentOverlay = defclass(SquadAssignmentOverlay, overlay.OverlayWidget)
|
|
|
|
SquadAssignmentOverlay.ATTRS{
|
|
|
|
SquadAssignmentOverlay.ATTRS{
|
|
|
|
default_pos={x=-33, y=40},
|
|
|
|
default_pos={x=23, y=5},
|
|
|
|
default_enabled=true,
|
|
|
|
default_enabled=true,
|
|
|
|
viewscreens='dwarfmode/UnitSelector/SQUAD_FILL_POSITION',
|
|
|
|
viewscreens='dwarfmode/UnitSelector/SQUAD_FILL_POSITION',
|
|
|
|
frame={w=75, h=9},
|
|
|
|
frame={w=38, h=25},
|
|
|
|
frame_style=gui.FRAME_PANEL,
|
|
|
|
frame_style=gui.FRAME_PANEL,
|
|
|
|
frame_background=gui.CLEAR_PEN,
|
|
|
|
frame_background=gui.CLEAR_PEN,
|
|
|
|
|
|
|
|
autoarrange_subviews=true,
|
|
|
|
|
|
|
|
autoarrange_gap=1,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-- allow initial spacebar or two successive spacebars to fall through and
|
|
|
|
|
|
|
|
-- pause/unpause the game
|
|
|
|
|
|
|
|
local function search_on_char(ch, text)
|
|
|
|
|
|
|
|
if ch == ' ' then return text:match('%S$') end
|
|
|
|
|
|
|
|
return ch:match('[%l _-]')
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function SquadAssignmentOverlay:init()
|
|
|
|
function SquadAssignmentOverlay:init()
|
|
|
|
self.dirty = true
|
|
|
|
self.dirty = true
|
|
|
|
|
|
|
|
|
|
|
|
self:addviews{
|
|
|
|
self:addviews{
|
|
|
|
|
|
|
|
widgets.EditField{
|
|
|
|
|
|
|
|
view_id='search',
|
|
|
|
|
|
|
|
frame={l=0},
|
|
|
|
|
|
|
|
label_text='Search: ',
|
|
|
|
|
|
|
|
on_char=search_on_char,
|
|
|
|
|
|
|
|
on_change=function() self:refresh_list() end,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.Panel{
|
|
|
|
|
|
|
|
frame={l=0, r=0, h=15},
|
|
|
|
|
|
|
|
frame_style=gui.FRAME_INTERIOR,
|
|
|
|
|
|
|
|
subviews={
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort',
|
|
|
|
view_id='sort',
|
|
|
|
frame={l=0, t=0, w=29},
|
|
|
|
frame={t=0, l=0},
|
|
|
|
label='Sort by:',
|
|
|
|
label='Sort by:',
|
|
|
|
key='CUSTOM_SHIFT_S',
|
|
|
|
key='CUSTOM_SHIFT_S',
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='any melee skill'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc, pen=COLOR_GREEN},
|
|
|
|
{label='melee effectiveness'..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='melee effectiveness'..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='ranged effectiveness'..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='ranged effectiveness'..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_DN, value=sort_by_name_desc, pen=COLOR_GREEN},
|
|
|
|
{label='name'..CH_UP, value=sort_by_name_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='name'..CH_UP, value=sort_by_name_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='teacher skill'..CH_DN, value=SORT_FNS.sort_by_teacher_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='teacher skill'..CH_UP, value=SORT_FNS.sort_by_teacher_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='tactics skill'..CH_DN, value=SORT_FNS.sort_by_tactics_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='tactics skill'..CH_UP, value=SORT_FNS.sort_by_tactics_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc, pen=COLOR_GREEN},
|
|
|
|
{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='migrant wave'..CH_UP, value=sort_by_migrant_wave_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='stress'..CH_DN, value=sort_by_stress_desc, pen=COLOR_GREEN},
|
|
|
|
{label='stress'..CH_DN, value=sort_by_stress_desc, pen=COLOR_GREEN},
|
|
|
|
{label='stress'..CH_UP, value=sort_by_stress_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='stress'..CH_UP, value=sort_by_stress_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_DN, value=sort_by_mental_stability_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_UP, value=sort_by_mental_stability_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='axe skill'..CH_DN, value=SORT_FNS.sort_by_axe_desc, pen=COLOR_GREEN},
|
|
|
|
{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='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_DN, value=SORT_FNS.sort_by_sword_desc, pen=COLOR_GREEN},
|
|
|
@ -554,8 +520,6 @@ function SquadAssignmentOverlay:init()
|
|
|
|
{label='spear skill'..CH_UP, value=SORT_FNS.sort_by_spear_asc, pen=COLOR_YELLOW},
|
|
|
|
{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_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},
|
|
|
|
{label='crossbow skill'..CH_UP, value=SORT_FNS.sort_by_crossbow_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='mental stability'..CH_DN, value=sort_by_mental_stability_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_UP, value=sort_by_mental_stability_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='melee potential'..CH_DN, value=sort_by_melee_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
|
{label='melee potential'..CH_DN, value=sort_by_melee_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
|
{label='melee potential'..CH_UP, value=sort_by_melee_combat_potential_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='melee potential'..CH_UP, value=sort_by_melee_combat_potential_asc, pen=COLOR_YELLOW},
|
|
|
|
{label='ranged potential'..CH_DN, value=sort_by_ranged_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
|
{label='ranged potential'..CH_DN, value=sort_by_ranged_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
@ -564,19 +528,9 @@ function SquadAssignmentOverlay:init()
|
|
|
|
initial_option=SORT_FNS.sort_by_any_melee_desc,
|
|
|
|
initial_option=SORT_FNS.sort_by_any_melee_desc,
|
|
|
|
on_change=self:callback('refresh_list', 'sort'),
|
|
|
|
on_change=self:callback('refresh_list', 'sort'),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.EditField{
|
|
|
|
|
|
|
|
view_id='search',
|
|
|
|
|
|
|
|
frame={l=32, t=0},
|
|
|
|
|
|
|
|
label_text='Search: ',
|
|
|
|
|
|
|
|
on_char=function(ch) return ch:match('[%l _-]') end,
|
|
|
|
|
|
|
|
on_change=function() self:refresh_list() end,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.Panel{
|
|
|
|
|
|
|
|
frame={t=2, l=0, r=0, b=0},
|
|
|
|
|
|
|
|
subviews={
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_any_melee',
|
|
|
|
view_id='sort_any_melee',
|
|
|
|
frame={t=0, l=0, w=10},
|
|
|
|
frame={t=2, l=0, w=10},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='any melee', value=sort_noop},
|
|
|
|
{label='any melee', value=sort_noop},
|
|
|
|
{label='any melee'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc, pen=COLOR_GREEN},
|
|
|
|
{label='any melee'..CH_DN, value=SORT_FNS.sort_by_any_melee_desc, pen=COLOR_GREEN},
|
|
|
@ -588,7 +542,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_any_ranged',
|
|
|
|
view_id='sort_any_ranged',
|
|
|
|
frame={t=0, l=13, w=11},
|
|
|
|
frame={t=2, r=9, w=11},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='any ranged', value=sort_noop},
|
|
|
|
{label='any ranged', value=sort_noop},
|
|
|
|
{label='any ranged'..CH_DN, value=SORT_FNS.sort_by_any_ranged_desc, pen=COLOR_GREEN},
|
|
|
|
{label='any ranged'..CH_DN, value=SORT_FNS.sort_by_any_ranged_desc, pen=COLOR_GREEN},
|
|
|
@ -597,20 +551,9 @@ function SquadAssignmentOverlay:init()
|
|
|
|
option_gap=0,
|
|
|
|
option_gap=0,
|
|
|
|
on_change=self:callback('refresh_list', 'sort_any_ranged'),
|
|
|
|
on_change=self:callback('refresh_list', 'sort_any_ranged'),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='sort_leadership',
|
|
|
|
|
|
|
|
frame={t=0, l=27, w=11},
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='leadership', value=sort_noop},
|
|
|
|
|
|
|
|
{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'),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_name',
|
|
|
|
view_id='sort_name',
|
|
|
|
frame={t=0, l=41, w=5},
|
|
|
|
frame={t=2, r=0, w=5},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='name', value=sort_noop},
|
|
|
|
{label='name', value=sort_noop},
|
|
|
|
{label='name'..CH_DN, value=sort_by_name_desc, pen=COLOR_GREEN},
|
|
|
|
{label='name'..CH_DN, value=sort_by_name_desc, pen=COLOR_GREEN},
|
|
|
@ -619,9 +562,31 @@ function SquadAssignmentOverlay:init()
|
|
|
|
option_gap=0,
|
|
|
|
option_gap=0,
|
|
|
|
on_change=self:callback('refresh_list', 'sort_name'),
|
|
|
|
on_change=self:callback('refresh_list', 'sort_name'),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='sort_teacher',
|
|
|
|
|
|
|
|
frame={t=4, l=0, w=8},
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='teacher', value=sort_noop},
|
|
|
|
|
|
|
|
{label='teacher'..CH_DN, value=SORT_FNS.sort_by_teacher_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='teacher'..CH_UP, value=SORT_FNS.sort_by_teacher_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
option_gap=0,
|
|
|
|
|
|
|
|
on_change=self:callback('refresh_list', 'sort_teacher'),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='sort_tactics',
|
|
|
|
|
|
|
|
frame={t=4, l=10, w=8},
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='tactics', value=sort_noop},
|
|
|
|
|
|
|
|
{label='tactics'..CH_DN, value=SORT_FNS.sort_by_tactics_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='tactics'..CH_UP, value=SORT_FNS.sort_by_tactics_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
option_gap=0,
|
|
|
|
|
|
|
|
on_change=self:callback('refresh_list', 'sort_tactics'),
|
|
|
|
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_migrant_wave',
|
|
|
|
view_id='sort_migrant_wave',
|
|
|
|
frame={t=0, l=49, w=13},
|
|
|
|
frame={t=4, r=0, w=13},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='migrant wave', value=sort_noop},
|
|
|
|
{label='migrant wave', value=sort_noop},
|
|
|
|
{label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc, pen=COLOR_GREEN},
|
|
|
|
{label='migrant wave'..CH_DN, value=sort_by_migrant_wave_desc, pen=COLOR_GREEN},
|
|
|
@ -632,7 +597,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_stress',
|
|
|
|
view_id='sort_stress',
|
|
|
|
frame={t=0, l=65, w=7},
|
|
|
|
frame={t=6, l=0, w=7},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='stress', value=sort_noop},
|
|
|
|
{label='stress', value=sort_noop},
|
|
|
|
{label='stress'..CH_DN, value=sort_by_stress_desc, pen=COLOR_GREEN},
|
|
|
|
{label='stress'..CH_DN, value=sort_by_stress_desc, pen=COLOR_GREEN},
|
|
|
@ -641,9 +606,20 @@ function SquadAssignmentOverlay:init()
|
|
|
|
option_gap=0,
|
|
|
|
option_gap=0,
|
|
|
|
on_change=self:callback('refresh_list', 'sort_stress'),
|
|
|
|
on_change=self:callback('refresh_list', 'sort_stress'),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='sort_mental_stability',
|
|
|
|
|
|
|
|
frame={t=6, r=0, w=17},
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='mental stability', value=sort_noop},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_DN, value=sort_by_mental_stability_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_UP, value=sort_by_mental_stability_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
option_gap=0,
|
|
|
|
|
|
|
|
on_change=self:callback('refresh_list', 'sort_mental_stability'),
|
|
|
|
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_axe',
|
|
|
|
view_id='sort_axe',
|
|
|
|
frame={t=2, l=0, w=4},
|
|
|
|
frame={t=8, l=0, w=4},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='axe', value=sort_noop},
|
|
|
|
{label='axe', value=sort_noop},
|
|
|
|
{label='axe'..CH_DN, value=SORT_FNS.sort_by_axe_desc, pen=COLOR_GREEN},
|
|
|
|
{label='axe'..CH_DN, value=SORT_FNS.sort_by_axe_desc, pen=COLOR_GREEN},
|
|
|
@ -654,7 +630,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_sword',
|
|
|
|
view_id='sort_sword',
|
|
|
|
frame={t=2, l=7, w=6},
|
|
|
|
frame={t=8, w=6},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='sword', value=sort_noop},
|
|
|
|
{label='sword', value=sort_noop},
|
|
|
|
{label='sword'..CH_DN, value=SORT_FNS.sort_by_sword_desc, pen=COLOR_GREEN},
|
|
|
|
{label='sword'..CH_DN, value=SORT_FNS.sort_by_sword_desc, pen=COLOR_GREEN},
|
|
|
@ -665,7 +641,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_mace',
|
|
|
|
view_id='sort_mace',
|
|
|
|
frame={t=2, l=16, w=5},
|
|
|
|
frame={t=8, r=0, w=5},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='mace', value=sort_noop},
|
|
|
|
{label='mace', value=sort_noop},
|
|
|
|
{label='mace'..CH_DN, value=SORT_FNS.sort_by_mace_desc, pen=COLOR_GREEN},
|
|
|
|
{label='mace'..CH_DN, value=SORT_FNS.sort_by_mace_desc, pen=COLOR_GREEN},
|
|
|
@ -676,7 +652,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_hammer',
|
|
|
|
view_id='sort_hammer',
|
|
|
|
frame={t=2, l=23, w=7},
|
|
|
|
frame={t=10, l=0, w=7},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='hammer', value=sort_noop},
|
|
|
|
{label='hammer', value=sort_noop},
|
|
|
|
{label='hammer'..CH_DN, value=SORT_FNS.sort_by_hammer_desc, pen=COLOR_GREEN},
|
|
|
|
{label='hammer'..CH_DN, value=SORT_FNS.sort_by_hammer_desc, pen=COLOR_GREEN},
|
|
|
@ -687,7 +663,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_spear',
|
|
|
|
view_id='sort_spear',
|
|
|
|
frame={t=2, l=34, w=6},
|
|
|
|
frame={t=10, w=6},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='spear', value=sort_noop},
|
|
|
|
{label='spear', value=sort_noop},
|
|
|
|
{label='spear'..CH_DN, value=SORT_FNS.sort_by_spear_desc, pen=COLOR_GREEN},
|
|
|
|
{label='spear'..CH_DN, value=SORT_FNS.sort_by_spear_desc, pen=COLOR_GREEN},
|
|
|
@ -698,7 +674,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_crossbow',
|
|
|
|
view_id='sort_crossbow',
|
|
|
|
frame={t=2, l=43, w=9},
|
|
|
|
frame={t=10, r=0, w=9},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='crossbow', value=sort_noop},
|
|
|
|
{label='crossbow', value=sort_noop},
|
|
|
|
{label='crossbow'..CH_DN, value=SORT_FNS.sort_by_crossbow_desc, pen=COLOR_GREEN},
|
|
|
|
{label='crossbow'..CH_DN, value=SORT_FNS.sort_by_crossbow_desc, pen=COLOR_GREEN},
|
|
|
@ -707,20 +683,9 @@ function SquadAssignmentOverlay:init()
|
|
|
|
option_gap=0,
|
|
|
|
option_gap=0,
|
|
|
|
on_change=self:callback('refresh_list', 'sort_crossbow'),
|
|
|
|
on_change=self:callback('refresh_list', 'sort_crossbow'),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='sort_mental_stability',
|
|
|
|
|
|
|
|
frame={t=4, l=0, w=17},
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='mental stability', value=sort_noop},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_DN, value=sort_by_mental_stability_desc, pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='mental stability'..CH_UP, value=sort_by_mental_stability_asc, pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
option_gap=0,
|
|
|
|
|
|
|
|
on_change=self:callback('refresh_list', 'sort_mental_stability'),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_melee_combat_potential',
|
|
|
|
view_id='sort_melee_combat_potential',
|
|
|
|
frame={t=4, l=20, w=16},
|
|
|
|
frame={t=12, l=0, w=16},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='melee potential', value=sort_noop},
|
|
|
|
{label='melee potential', value=sort_noop},
|
|
|
|
{label='melee potential'..CH_DN, value=sort_by_melee_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
|
{label='melee potential'..CH_DN, value=sort_by_melee_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
@ -731,7 +696,7 @@ function SquadAssignmentOverlay:init()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
view_id='sort_ranged_combat_potential',
|
|
|
|
view_id='sort_ranged_combat_potential',
|
|
|
|
frame={t=4, l=39, w=17},
|
|
|
|
frame={t=12, r=0, w=17},
|
|
|
|
options={
|
|
|
|
options={
|
|
|
|
{label='ranged potential', value=sort_noop},
|
|
|
|
{label='ranged potential', value=sort_noop},
|
|
|
|
{label='ranged potential'..CH_DN, value=sort_by_ranged_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
|
{label='ranged potential'..CH_DN, value=sort_by_ranged_combat_potential_desc, pen=COLOR_GREEN},
|
|
|
@ -740,7 +705,46 @@ function SquadAssignmentOverlay:init()
|
|
|
|
option_gap=0,
|
|
|
|
option_gap=0,
|
|
|
|
on_change=self:callback('refresh_list', 'sort_ranged_combat_potential'),
|
|
|
|
on_change=self:callback('refresh_list', 'sort_ranged_combat_potential'),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='military',
|
|
|
|
|
|
|
|
frame={l=0},
|
|
|
|
|
|
|
|
key='CUSTOM_SHIFT_Q',
|
|
|
|
|
|
|
|
label='Units in other squads:',
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='Include', value='include', pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='Only', value='only', pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='Exclude', value='exclude', pen=COLOR_RED},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
initial_option='include',
|
|
|
|
|
|
|
|
on_change=function() self:refresh_list() end,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='officials',
|
|
|
|
|
|
|
|
frame={l=0},
|
|
|
|
|
|
|
|
key='CUSTOM_SHIFT_O',
|
|
|
|
|
|
|
|
label='Appointed officials:',
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='Include', value='include', pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='Only', value='only', pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='Exclude', value='exclude', pen=COLOR_RED},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
initial_option='include',
|
|
|
|
|
|
|
|
on_change=function() self:refresh_list() end,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
widgets.CycleHotkeyLabel{
|
|
|
|
|
|
|
|
view_id='nobles',
|
|
|
|
|
|
|
|
frame={l=0, w=20},
|
|
|
|
|
|
|
|
key='CUSTOM_SHIFT_N',
|
|
|
|
|
|
|
|
label='Nobility:',
|
|
|
|
|
|
|
|
options={
|
|
|
|
|
|
|
|
{label='Include', value='include', pen=COLOR_GREEN},
|
|
|
|
|
|
|
|
{label='Only', value='only', pen=COLOR_YELLOW},
|
|
|
|
|
|
|
|
{label='Exclude', value='exclude', pen=COLOR_RED},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
initial_option='include',
|
|
|
|
|
|
|
|
on_change=function() self:refresh_list() end,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -753,26 +757,69 @@ local function normalize_search_key(search_key)
|
|
|
|
return out
|
|
|
|
return out
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function filter_matches(unit_id, search)
|
|
|
|
local function is_in_military(unit)
|
|
|
|
|
|
|
|
return unit.military.squad_id > -1
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function is_elected_or_appointed_official(unit)
|
|
|
|
|
|
|
|
if #unit.occupations > 0 then return true end
|
|
|
|
|
|
|
|
for _, noble_pos in ipairs(dfhack.units.getNoblePositions(unit) or {}) do
|
|
|
|
|
|
|
|
if noble_pos.position.flags.ELECTED or
|
|
|
|
|
|
|
|
(noble_pos.position.mandate_max == 0 and noble_pos.position.demand_max == 0)
|
|
|
|
|
|
|
|
then
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return false
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function is_nobility(unit)
|
|
|
|
|
|
|
|
for _, noble_pos in ipairs(dfhack.units.getNoblePositions(unit) or {}) do
|
|
|
|
|
|
|
|
if not noble_pos.position.flags.ELECTED and
|
|
|
|
|
|
|
|
(noble_pos.position.mandate_max > 0 or noble_pos.position.demand_max > 0)
|
|
|
|
|
|
|
|
then
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
return false
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function filter_matches(unit_id, filter)
|
|
|
|
if unit_id == -1 then return true end
|
|
|
|
if unit_id == -1 then return true end
|
|
|
|
local unit = df.unit.find(unit_id)
|
|
|
|
local unit = df.unit.find(unit_id)
|
|
|
|
if not unit then return true end
|
|
|
|
if not unit then return false end
|
|
|
|
|
|
|
|
if filter.military == 'only' and not is_in_military(unit) then return false end
|
|
|
|
|
|
|
|
if filter.military == 'exclude' and is_in_military(unit) then return false end
|
|
|
|
|
|
|
|
if filter.officials == 'only' and not is_elected_or_appointed_official(unit) then return false end
|
|
|
|
|
|
|
|
if filter.officials == 'exclude' and is_elected_or_appointed_official(unit) then return false end
|
|
|
|
|
|
|
|
if filter.nobles == 'only' and not is_nobility(unit) then return false end
|
|
|
|
|
|
|
|
if filter.nobles == 'exclude' and is_nobility(unit) then return false end
|
|
|
|
|
|
|
|
if #filter.search == 0 then return true end
|
|
|
|
local search_key = dfhack.TranslateName(dfhack.units.getVisibleName(unit))
|
|
|
|
local search_key = dfhack.TranslateName(dfhack.units.getVisibleName(unit))
|
|
|
|
if unit.status.current_soul then
|
|
|
|
return normalize_search_key(search_key):find(dfhack.toSearchNormalized(filter.search))
|
|
|
|
for _,skill in ipairs(unit.status.current_soul.skills) do
|
|
|
|
|
|
|
|
search_key = (search_key or '') .. ' ' .. (df.job_skill[skill.id] or '')
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local function is_noop_filter(filter)
|
|
|
|
|
|
|
|
return #filter.search == 0 and
|
|
|
|
|
|
|
|
filter.military == 'include' and
|
|
|
|
|
|
|
|
filter.officials == 'include' and
|
|
|
|
|
|
|
|
filter.nobles == 'include'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return normalize_search_key(search_key):find(dfhack.toSearchNormalized(search))
|
|
|
|
|
|
|
|
|
|
|
|
local function is_filter_equal(a, b)
|
|
|
|
|
|
|
|
return a.search == b.search and
|
|
|
|
|
|
|
|
a.military == b.military and
|
|
|
|
|
|
|
|
a.officials == b.officials and
|
|
|
|
|
|
|
|
a.nobles == b.nobles
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local unit_selector = df.global.game.main_interface.unit_selector
|
|
|
|
local unit_selector = df.global.game.main_interface.unit_selector
|
|
|
|
|
|
|
|
|
|
|
|
-- this function uses the unused itemid and selected vectors to keep state,
|
|
|
|
-- this function uses the unused itemid and selected vectors to keep state,
|
|
|
|
-- taking advantage of the fact that they are reset by DF when the list of units changes
|
|
|
|
-- taking advantage of the fact that they are reset by DF when the list of units changes
|
|
|
|
local function filter_vector(search, prev_search)
|
|
|
|
local function filter_vector(filter, prev_filter)
|
|
|
|
local unid_is_filtered = #unit_selector.selected >= 0 and unit_selector.selected[0] ~= 0
|
|
|
|
local unid_is_filtered = #unit_selector.selected >= 0 and unit_selector.selected[0] ~= 0
|
|
|
|
if #search == 0 or #unit_selector.selected == 0 then
|
|
|
|
if is_noop_filter(filter) or #unit_selector.selected == 0 then
|
|
|
|
if not unid_is_filtered then
|
|
|
|
if not unid_is_filtered then
|
|
|
|
-- we haven't modified the unid vector; nothing to do here
|
|
|
|
-- we haven't modified the unid vector; nothing to do here
|
|
|
|
return
|
|
|
|
return
|
|
|
@ -783,8 +830,8 @@ local function filter_vector(search, prev_search)
|
|
|
|
unit_selector.selected[0] = 0
|
|
|
|
unit_selector.selected[0] = 0
|
|
|
|
return
|
|
|
|
return
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if unid_is_filtered and search == prev_search then
|
|
|
|
if unid_is_filtered and is_filter_equal(filter, prev_filter) then
|
|
|
|
-- prev filter still stands
|
|
|
|
-- filter hasn't changed; we don't need to refilter
|
|
|
|
return
|
|
|
|
return
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if unid_is_filtered then
|
|
|
|
if unid_is_filtered then
|
|
|
@ -797,7 +844,7 @@ local function filter_vector(search, prev_search)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
-- do the actual filtering
|
|
|
|
-- do the actual filtering
|
|
|
|
for idx=#unit_selector.unid-1,0,-1 do
|
|
|
|
for idx=#unit_selector.unid-1,0,-1 do
|
|
|
|
if not filter_matches(unit_selector.unid[idx], search) then
|
|
|
|
if not filter_matches(unit_selector.unid[idx], filter) then
|
|
|
|
unit_selector.unid:erase(idx)
|
|
|
|
unit_selector.unid:erase(idx)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -807,17 +854,18 @@ local SORT_WIDGET_NAMES = {
|
|
|
|
'sort',
|
|
|
|
'sort',
|
|
|
|
'sort_any_melee',
|
|
|
|
'sort_any_melee',
|
|
|
|
'sort_any_ranged',
|
|
|
|
'sort_any_ranged',
|
|
|
|
'sort_leadership',
|
|
|
|
|
|
|
|
'sort_name',
|
|
|
|
'sort_name',
|
|
|
|
|
|
|
|
'sort_teacher',
|
|
|
|
|
|
|
|
'sort_tactics',
|
|
|
|
'sort_migrant_wave',
|
|
|
|
'sort_migrant_wave',
|
|
|
|
'sort_stress',
|
|
|
|
'sort_stress',
|
|
|
|
|
|
|
|
'sort_mental_stability',
|
|
|
|
'sort_axe',
|
|
|
|
'sort_axe',
|
|
|
|
'sort_sword',
|
|
|
|
'sort_sword',
|
|
|
|
'sort_mace',
|
|
|
|
'sort_mace',
|
|
|
|
'sort_hammer',
|
|
|
|
'sort_hammer',
|
|
|
|
'sort_spear',
|
|
|
|
'sort_spear',
|
|
|
|
'sort_crossbow',
|
|
|
|
'sort_crossbow',
|
|
|
|
'sort_mental_stability',
|
|
|
|
|
|
|
|
'sort_melee_combat_potential',
|
|
|
|
'sort_melee_combat_potential',
|
|
|
|
'sort_ranged_combat_potential',
|
|
|
|
'sort_ranged_combat_potential',
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -832,9 +880,14 @@ function SquadAssignmentOverlay:refresh_list(sort_widget, sort_fn)
|
|
|
|
for _,widget_name in ipairs(SORT_WIDGET_NAMES) do
|
|
|
|
for _,widget_name in ipairs(SORT_WIDGET_NAMES) do
|
|
|
|
self.subviews[widget_name]:setOption(sort_fn)
|
|
|
|
self.subviews[widget_name]:setOption(sort_fn)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
local search = self.subviews.search.text
|
|
|
|
local filter = {
|
|
|
|
filter_vector(search, self.prev_search)
|
|
|
|
search=self.subviews.search.text,
|
|
|
|
self.prev_search = search
|
|
|
|
military=self.subviews.military:getOptionValue(),
|
|
|
|
|
|
|
|
officials=self.subviews.officials:getOptionValue(),
|
|
|
|
|
|
|
|
nobles=self.subviews.nobles:getOptionValue(),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
filter_vector(filter, self.prev_filter or {})
|
|
|
|
|
|
|
|
self.prev_filter = filter
|
|
|
|
utils.sort_vector(unit_selector.unid, nil, sort_fn)
|
|
|
|
utils.sort_vector(unit_selector.unid, nil, sort_fn)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|