Skip to content
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

Ignore all fruit gatherers when checking stranded #903

Merged
merged 7 commits into from
Nov 30, 2023
Merged

Ignore all fruit gatherers when checking stranded #903

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b12b1f
Ignore all fruit gatherers when checking stranded
azrazalea Nov 26, 2023
2405d54
Fix null error when unit has no job
azrazalea Nov 28, 2023
dafeb35
Add fix to changelog
azrazalea Nov 29, 2023
a5a99bb
Add digging to list of auto ignored jobs
azrazalea Nov 30, 2023
96471b8
Change onZoom to pass boolean to center
azrazalea Nov 30, 2023
b333661
Merge branch 'master' into warn-stranded-fix-stepladders
azrazalea Nov 30, 2023
b17acef
Run pre-commit
azrazalea Nov 30, 2023
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
3 changes: 2 additions & 1 deletion warn-stranded.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ local function getStrandedUnits()
or 0
end

if unitIgnored(unit) then
-- Ignore units who are gathering plants to avoid errors with stepladders
if unitIgnored(unit) or (unit.job.current_job and unit.job.current_job.job_type == df.job_type.GatherPlants) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest also ignoring mining job types since they can un-strand themselves. There's a handy attr in df.job_types you can check instead of having to itemize all the dig job types

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

df.job_type.attrs[unit.job.current_job.job_type].type == 'Digging'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, I'll get that added tonight

table.insert(ensure_key(ignoredGroup, walkGroup), unit)
else
table.insert(ensure_key(grouped, walkGroup), unit)
Expand Down