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

Merge branch 'develop' into myk_dig_now

develop
Myk 2023-04-24 14:13:25 -07:00 committed by GitHub
parent 74e1aa70d9 1abd8cd086
commit 99b6aa0f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.txt
Unescape Escape View File

@ -36,7 +36,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## New Plugins ## New Plugins
## Fixes ## Fixes
- `dig-now`: properly detect and complete smoothing designations that have been converted into active jobs - `buildingplan`: fixed size limit calculations for rollers
`- `dig-now`: properly detect and complete smoothing designations that have been converted into active jobs
## Misc Improvements ## Misc Improvements
- `buildingplan`: planner panel is minimized by default and now remembers minimized state - `buildingplan`: planner panel is minimized by default and now remembers minimized state

5
plugins/lua/buildingplan/planneroverlay.lua
Unescape Escape View File

@ -34,9 +34,10 @@ local function get_selection_size_limits()
or btype == df.building_type.RoadPaved or btype == df.building_type.RoadPaved
or btype == df.building_type.RoadDirt then or btype == df.building_type.RoadDirt then
return {w=31, h=31} return {w=31, h=31}
elseif btype == df.building_type.AxleHorizontal elseif btype == df.building_type.AxleHorizontal then
or btype == df.building_type.Rollers then
return uibs.direction == 1 and {w=1, h=31} or {w=31, h=1} return uibs.direction == 1 and {w=1, h=31} or {w=31, h=1}
elseif btype == df.building_type.Rollers then
return (uibs.direction == 1 or uibs.direction == 3) and {w=31, h=1} or {w=1, h=31}
end end
end end

2
scripts

@ -1 +1 @@
Subproject commit 5da969fce69a5b9330f183cc0629798bf9907b69 Subproject commit 68f6d354b0d815ad0985dbe9b5faa140c980af14