Skip to content

Fix the prioritize overlay appearing for followed units #1531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plule wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the prioritize overlay appearing for followed units #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Template for new versions:

## Fixes

- `prioritize`: Fix the overlay appearing where it should not when following a unit

## Misc Improvements

## Removed
Expand Down
31 changes: 24 additions & 7 deletions prioritize.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,11 +658,28 @@ end
-- EnRouteOverlay
--

--- Return the selected active construction or destruction job
local function getSelectedActiveBuildingJob()
-- This is not relying on dfhack.gui.getSelectedJob() because we don't want
-- the job of a selected or followed unit, only of a selected building
local building = dfhack.gui.getSelectedBuilding(true)
if not building then
return nil
end

-- Find if the building is being constructed
for _, job in ipairs(building.jobs) do
if not job.flags.suspend and (job.job_type == df.job_type.ConstructBuilding or job.job_type == df.job_type.ConstructBuilding) then
return job
end
end

return nil
end


local function is_visible()
local job = dfhack.gui.getSelectedJob(true)
return job and not job.flags.suspend and
(job.job_type == df.job_type.DestroyBuilding or
job.job_type == df.job_type.ConstructBuilding)
return getSelectedActiveBuildingJob() ~= nil
end

EnRouteOverlay = defclass(EnRouteOverlay, overlay.OverlayWidget)
Expand Down Expand Up @@ -693,7 +710,7 @@ function EnRouteOverlay:init()
label='Make top priority:',
key='CUSTOM_CTRL_T',
on_change=function(val)
local job = dfhack.gui.getSelectedJob(true)
local job = getSelectedActiveBuildingJob()
if not job then return end
job.flags.do_now = val
end,
Expand All @@ -712,7 +729,7 @@ function EnRouteOverlay:get_builder_name_pen()
end

function EnRouteOverlay:zoom_to_builder()
local job = dfhack.gui.getSelectedJob(true)
local job = getSelectedActiveBuildingJob()
if not job then return end
local builder = dfhack.job.getWorker(job)
if builder then
Expand All @@ -721,7 +738,7 @@ function EnRouteOverlay:zoom_to_builder()
end

function EnRouteOverlay:render(dc)
local job = dfhack.gui.getSelectedJob(true)
local job = getSelectedActiveBuildingJob()
self.builder = dfhack.job.getWorker(job)
self.subviews.do_now:setOption(job.flags.do_now)
EnRouteOverlay.super.render(self, dc)
Expand Down