Skip to content

Commit dc7057f

Browse files
committed
Use vanilla direction interface for siege engine facing direction
1 parent 8f51780 commit dc7057f

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

plugins/lua/buildingplan/planneroverlay.lua

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ local direction_panel_types = utils.invert{
239239
df.building_type.WaterWheel,
240240
df.building_type.AxleHorizontal,
241241
df.building_type.Rollers,
242+
df.building_type.SiegeEngine,
242243
}
243244

244245
local function has_direction_panel()
@@ -609,7 +610,7 @@ function PlannerOverlay:init()
609610

610611
local main_panel = widgets.Panel{
611612
view_id='main',
612-
frame={t=1, l=0, r=0, h=15},
613+
frame={t=1, l=0, r=0, h=14},
613614
frame_style=gui.FRAME_INTERIOR_MEDIUM,
614615
frame_background=gui.CLEAR_PEN,
615616
visible=self:callback('is_not_minimized'),
@@ -747,24 +748,6 @@ function PlannerOverlay:init()
747748
buildingplan.setSpecial(uibs.building_type, uibs.building_subtype, uibs.custom_type, 'engraved', val)
748749
end,
749750
},
750-
widgets.CycleHotkeyLabel {
751-
view_id='siege_facing',
752-
frame = {b=4, l=1, w=28},
753-
key='CUSTOM_T',
754-
key_back='CUSTOM_SHIFT_T',
755-
label='Facing:',
756-
visible=is_siege_engine,
757-
options={
758-
{label='North',value=0},
759-
{label='Northeast',value=1},
760-
{label='East',value=2},
761-
{label='Southeast',value=3},
762-
{label='South',value=4},
763-
{label='Southwest',value=5},
764-
{label='West',value=6},
765-
{label='Northwest',value=7},
766-
},
767-
},
768751
widgets.ToggleHotkeyLabel {
769752
view_id='empty',
770753
frame={b=4, l=1, w=22},
@@ -851,7 +834,7 @@ function PlannerOverlay:init()
851834
}
852835

853836
local divider_widget = widgets.Divider{
854-
frame={t=11, l=0, r=0, h=1},
837+
frame={t=10, l=0, r=0, h=1},
855838
frame_style=gui.FRAME_INTERIOR_MEDIUM,
856839
visible=self:callback('is_not_minimized'),
857840
}
@@ -1331,9 +1314,9 @@ function PlannerOverlay:place_building(placement_data, chosen_items)
13311314
end
13321315
local fields = {}
13331316
if is_siege_engine() then
1334-
local val = self.subviews.siege_facing:getOptionValue()
1335-
fields.facing = val
1336-
fields.resting_orientation = val
1317+
local facing = df.global.buildreq.direction
1318+
fields.facing = facing
1319+
fields.resting_orientation = facing
13371320
end
13381321
local bld, err = dfhack.buildings.constructBuilding{pos=pos,
13391322
type=uibs.building_type, subtype=subtype, custom=uibs.custom_type,

0 commit comments

Comments
 (0)