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

beginning of textures

develop
Myk Taylor 2023-02-16 21:17:55 -08:00
parent b3198c88a0
commit e92a54deaa
No known key found for this signature in database
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/buildingplan/buildingplan.cpp
Unescape Escape View File

@ -220,7 +220,7 @@ static void do_cycle(color_ostream &out) {
cycle_requested = false; cycle_requested = false;
buildingplan_cycle(out, tasks, planned_buildings); buildingplan_cycle(out, tasks, planned_buildings);
call_buildingplan_lua(&out, "reset_counts"); call_buildingplan_lua(&out, "signal_reset");
} }
DFhackCExport command_result plugin_onupdate(color_ostream &out) { DFhackCExport command_result plugin_onupdate(color_ostream &out) {
@ -428,7 +428,7 @@ static bool setSetting(color_ostream &out, string name, bool value) {
} }
validate_config(out, true); validate_config(out, true);
call_buildingplan_lua(&out, "reset_counts"); call_buildingplan_lua(&out, "signal_reset");
return true; return true;
} }

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

@ -64,9 +64,11 @@ function get_job_item(btype, subtype, custom, index)
return obj return obj
end end
local texpos_base = -1
local reset_counts_flag = false local reset_counts_flag = false
local reset_inspector_flag = false local reset_inspector_flag = false
function reset_counts() function signal_reset()
texpos_base = dfhack.textures.getControlPanelTexposStart()
reset_counts_flag = true reset_counts_flag = true
reset_inspector_flag = true reset_inspector_flag = true
end end
@ -168,12 +170,22 @@ function ItemLine:init()
self.visible = function() return #get_cur_filters() >= self.idx end self.visible = function() return #get_cur_filters() >= self.idx end
self:addviews{ self:addviews{
widgets.Label{ widgets.Label{
frame={t=0, l=0}, frame={t=0, l=23},
text={{text=function() return self:get_item_line_text() end}}, text={
{tile=2600},
{gap=6, tile=2602},
{tile=2600},
{gap=1, tile=2602},
},
}, },
widgets.Label{ widgets.Label{
frame={t=0, l=22}, frame={t=0, l=0},
text='[filter][x]', text={
{width=21, text=function() return self:get_item_line_text() end},
{gap=3, text='filter'},
{gap=2, text='x'},
{gap=3, text=function() return self.note end},
},
}, },
} }
end end
@ -231,14 +243,13 @@ function ItemLine:get_item_line_text()
local quantity = get_quantity(filter) local quantity = get_quantity(filter)
self.desc = self.desc or get_desc(filter) self.desc = self.desc or get_desc(filter)
local line = ('%d %s%s'):format(quantity, self.desc, quantity == 1 and '' or 's')
self.available = self.available or countAvailableItems(uibs.building_type, self.available = self.available or countAvailableItems(uibs.building_type,
uibs.building_subtype, uibs.custom_type, idx - 1) uibs.building_subtype, uibs.custom_type, idx - 1)
local note = self.available >= quantity and self.note = self.available >= quantity and
'Can build now' or 'Will wait for item' 'Can build now' or 'Will build later'
return ('%-21s%s%s'):format(line:sub(1,21), (' '):rep(14), note) return ('%d %s%s'):format(quantity, self.desc, quantity == 1 and '' or 's')
end end
function ItemLine:reduce_quantity() function ItemLine:reduce_quantity()