MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remember mouse pos from before item choosing

develop
Myk Taylor 2023-02-18 01:18:15 -08:00
parent 4001ef3815
commit ee827f5ca1
No known key found for this signature in database
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/lua/buildingplan.lua
Unescape Escape View File

@ -75,11 +75,12 @@ local function is_choosing_area()
return uibs.selection_pos.x >= 0 return uibs.selection_pos.x >= 0
end end
local function get_cur_area_dims() local function get_cur_area_dims(pos)
if not is_choosing_area() then return 1, 1, 1 end if not is_choosing_area() then return 1, 1, 1 end
return math.abs(uibs.selection_pos.x - uibs.pos.x) + 1, pos = pos or uibs.pos
math.abs(uibs.selection_pos.y - uibs.pos.y) + 1, return math.abs(uibs.selection_pos.x - pos.x) + 1,
math.abs(uibs.selection_pos.z - uibs.pos.z) + 1 math.abs(uibs.selection_pos.y - pos.y) + 1,
math.abs(uibs.selection_pos.z - pos.z) + 1
end end
local function get_quantity(filter) local function get_quantity(filter)
@ -716,7 +717,7 @@ function PlannerOverlay:onInput(keys)
chosen_items[idx] = items chosen_items[idx] = items
pending = pending - 1 pending = pending - 1
if pending == 0 then if pending == 0 then
self:place_building(chosen_items) self:place_building(pos, chosen_items)
end end
end, end,
}:show() }:show()
@ -725,7 +726,7 @@ function PlannerOverlay:onInput(keys)
end end
end end
else else
self:place_building() self:place_building(pos)
end end
return true return true
elseif not is_choosing_area() then elseif not is_choosing_area() then
@ -756,11 +757,12 @@ function PlannerOverlay:onRenderFrame(dc, rect)
if not is_choosing_area() then return end if not is_choosing_area() then return end
local pos = uibs.pos
local bounds = { local bounds = {
x1 = math.min(uibs.selection_pos.x, uibs.pos.x), x1 = math.min(uibs.selection_pos.x, pos.x),
x2 = math.max(uibs.selection_pos.x, uibs.pos.x), x2 = math.max(uibs.selection_pos.x, pos.x),
y1 = math.min(uibs.selection_pos.y, uibs.pos.y), y1 = math.min(uibs.selection_pos.y, pos.y),
y2 = math.max(uibs.selection_pos.y, uibs.pos.y), y2 = math.max(uibs.selection_pos.y, pos.y),
} }
local pen = #uibs.errors > 0 and BAD_PEN or GOOD_PEN local pen = #uibs.errors > 0 and BAD_PEN or GOOD_PEN
@ -772,18 +774,18 @@ function PlannerOverlay:onRenderFrame(dc, rect)
guidm.renderMapOverlay(get_overlay_pen, bounds) guidm.renderMapOverlay(get_overlay_pen, bounds)
end end
function PlannerOverlay:place_building(chosen_items) function PlannerOverlay:place_building(pos, chosen_items)
local direction = uibs.direction local direction = uibs.direction
local width, height, depth = get_cur_area_dims() local width, height, depth = get_cur_area_dims(pos)
local _, adjusted_width, adjusted_height = dfhack.buildings.getCorrectSize( local _, adjusted_width, adjusted_height = dfhack.buildings.getCorrectSize(
width, height, uibs.building_type, uibs.building_subtype, width, height, uibs.building_type, uibs.building_subtype,
uibs.custom_type, direction) uibs.custom_type, direction)
-- get the upper-left corner of the building/area at min z-level -- get the upper-left corner of the building/area at min z-level
local has_selection = is_choosing_area() local has_selection = is_choosing_area()
local start_pos = xyz2pos( local start_pos = xyz2pos(
has_selection and math.min(uibs.selection_pos.x, uibs.pos.x) or uibs.pos.x - adjusted_width//2, has_selection and math.min(uibs.selection_pos.x, pos.x) or pos.x - adjusted_width//2,
has_selection and math.min(uibs.selection_pos.y, uibs.pos.y) or uibs.pos.y - adjusted_height//2, has_selection and math.min(uibs.selection_pos.y, pos.y) or pos.y - adjusted_height//2,
has_selection and math.min(uibs.selection_pos.z, uibs.pos.z) or uibs.pos.z has_selection and math.min(uibs.selection_pos.z, pos.z) or pos.z
) )
if uibs.building_type == df.building_type.ScrewPump then if uibs.building_type == df.building_type.ScrewPump then
if direction == df.screw_pump_direction.FromSouth then if direction == df.screw_pump_direction.FromSouth then
@ -799,7 +801,7 @@ function PlannerOverlay:place_building(chosen_items)
and (width > 1 or height > 1 or depth > 1) then and (width > 1 or height > 1 or depth > 1) then
max_x = min_x + width - 1 max_x = min_x + width - 1
max_y = min_y + height - 1 max_y = min_y + height - 1
max_z = math.max(uibs.selection_pos.z, uibs.pos.z) max_z = math.max(uibs.selection_pos.z, pos.z)
end end
local blds = {} local blds = {}
local subtype = uibs.building_subtype local subtype = uibs.building_subtype