Skip to content

Fix confirm hover instructions #1333

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

Merged
myk002 merged 2 commits into from
Nov 11, 2024
Merged

Fix confirm hover instructions #1333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d62447a
Fix confirm hover instructions
robob27 Nov 11, 2024
7078644
Update changelog.txt
myk002 Nov 11, 2024
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
16 changes: 8 additions & 8 deletions internal/confirm/specs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ ConfirmSpec{
message='Are you sure you want to delete this route?',
intercept_keys='_MOUSE_L',
context='dwarfmode/Hauling',
predicate=function() return mi.current_hover == df.main_hover_instruction.RouteRemove end,
predicate=function() return mi.current_hover == df.main_hover_instruction.HAULING_REMOVE_ROUTE end,
pausable=true,
}

Expand All @@ -223,7 +223,7 @@ ConfirmSpec{
message='Are you sure you want to delete this stop?',
intercept_keys='_MOUSE_L',
context='dwarfmode/Hauling',
predicate=function() return mi.current_hover == df.main_hover_instruction.StopRemove end,
predicate=function() return mi.current_hover == df.main_hover_instruction.HAULING_REMOVE_STOP end,
pausable=true,
}

Expand All @@ -234,7 +234,7 @@ ConfirmSpec{
intercept_keys='_MOUSE_L',
context='dwarfmode/ViewSheets/BUILDING/TradeDepot',
predicate=function()
return mi.current_hover == df.main_hover_instruction.BuildingRemove and has_caravans()
return mi.current_hover == df.main_hover_instruction.BUILDING_SHEET_REMOVE and has_caravans()
end,
}

Expand All @@ -244,7 +244,7 @@ ConfirmSpec{
message='Are you sure you want to disband this squad?',
intercept_keys='_MOUSE_L',
context='dwarfmode/Squads',
predicate=function() return mi.current_hover == df.main_hover_instruction.SquadDisband end,
predicate=function() return mi.current_hover == df.main_hover_instruction.SQUAD_DISBAND end,
pausable=true,
}

Expand Down Expand Up @@ -438,7 +438,7 @@ ConfirmSpec{
message='Are you sure you want to remove this manager order?',
intercept_keys='_MOUSE_L',
context='dwarfmode/Info/WORK_ORDERS/Default',
predicate=function() return mi.current_hover == df.main_hover_instruction.ManagerOrderRemove end,
predicate=function() return mi.current_hover == df.main_hover_instruction.WORK_ORDERS_REMOVE end,
pausable=true,
}

Expand All @@ -460,8 +460,8 @@ ConfirmSpec{
intercept_keys='_MOUSE_L',
context='dwarfmode/Burrow',
predicate=function()
return mi.current_hover == df.main_hover_instruction.BurrowRemove or
mi.current_hover == df.main_hover_instruction.BurrowRemovePaint
return mi.current_hover == df.main_hover_instruction.BURROW_REMOVE_EXISTING or
mi.current_hover == df.main_hover_instruction.BURROW_PAINT_REMOVE
end,
pausable=true,
}
Expand All @@ -472,7 +472,7 @@ ConfirmSpec{
message='Are you sure you want to remove this stockpile?',
intercept_keys='_MOUSE_L',
context='dwarfmode/Stockpile',
predicate=function() return mi.current_hover == df.main_hover_instruction.StockpileRemove end,
predicate=function() return mi.current_hover == df.main_hover_instruction.STOCKPILE_REMOVE_EXISTING end,
pausable=true,
}

Expand Down