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

better description string for inspection overlay

develop
Myk Taylor 2023-02-16 03:08:55 -08:00
parent 18ad29dde4
commit 56c8927316
No known key found for this signature in database
2 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,6 +357,20 @@ static bool registerPlannedBuilding(color_ostream &out, PlannedBuilding & pb) {
return true;
}
static string get_desc_string(color_ostream &out, df::job_item *jitem,
const vector<df::job_item_vector_id> &vec_ids) {
vector<string> descs;
for (auto &vec_id : vec_ids) {
df::job_item jitem_copy = *jitem;
jitem_copy.vector_id = vec_id;
call_buildingplan_lua(&out, "get_desc", 1, 1,
[&](lua_State *L) { Lua::Push(L, &jitem_copy); },
[&](lua_State *L) {
descs.emplace_back(lua_tostring(L, -1)); });
}
return join_strings(" or ", descs);
}
static void printStatus(color_ostream &out) {
DEBUG(status,out).print("entering buildingplan_printStatus\n");
out.print("buildingplan is %s\n\n", is_enabled ? "enabled" : "disabled");
@ -369,32 +383,22 @@ static void printStatus(color_ostream &out) {
map<string, int32_t> counts;
int32_t total = 0;
for (auto &buckets : tasks) {
for (auto &bucket_queue : buckets.second) {
Bucket &tqueue = bucket_queue.second;
for (auto it = tqueue.begin(); it != tqueue.end();) {
auto & task = *it;
auto id = task.first;
df::building *bld = NULL;
if (!planned_buildings.count(id) ||
!(bld = planned_buildings.at(id).getBuildingIfValidOrRemoveIfNot(out))) {
DEBUG(status,out).print("discarding invalid task: bld=%d, job_item_idx=%d\n",
id, task.second);
it = tqueue.erase(it);
for (auto &entry : planned_buildings) {
auto &pb = entry.second;
auto bld = pb.getBuildingIfValidOrRemoveIfNot(out);
if (!bld || bld->jobs.size() != 1)
continue;
}
auto *jitem = bld->jobs[0]->job_items[task.second];
auto &job_items = bld->jobs[0]->job_items;
if (job_items.size() != pb.vector_ids.size())
continue;
int job_item_idx = 0;
for (auto &vec_ids : pb.vector_ids) {
auto &jitem = job_items[job_item_idx++];
int32_t quantity = jitem->quantity;
if (quantity) {
string desc = "none";
call_buildingplan_lua(&out, "get_desc", 1, 1,
[&](lua_State *L) { Lua::Push(L, jitem); },
[&](lua_State *L) { desc = lua_tostring(L, -1); });
counts[desc] += quantity;
counts[get_desc_string(out, jitem, vec_ids)] += quantity;
total += quantity;
}
++it;
}
}
}
@ -514,20 +518,41 @@ static int countAvailableItems(color_ostream &out, df::building_type type, int16
return count;
}
static int getQueuePosition(color_ostream &out, df::building *bld, int index) {
DEBUG(status,out).print("entering getQueuePosition\n");
static bool validate_pb(color_ostream &out, df::building *bld, int index) {
if (!isPlannedBuilding(out, bld) || bld->jobs.size() != 1)
return 0;
return false;
auto &job_items = bld->jobs[0]->job_items;
if (job_items.size() <= index)
return 0;
return false;
PlannedBuilding &pb = planned_buildings.at(bld->id);
if (pb.vector_ids.size() <= index)
return false;
return true;
}
static string getDescString(color_ostream &out, df::building *bld, int index) {
DEBUG(status,out).print("entering getDescString\n");
if (!validate_pb(out, bld, index))
return 0;
auto &job_item = job_items[index];
PlannedBuilding &pb = planned_buildings.at(bld->id);
auto &jitem = bld->jobs[0]->job_items[index];
return get_desc_string(out, jitem, pb.vector_ids[index]);
}
static int getQueuePosition(color_ostream &out, df::building *bld, int index) {
DEBUG(status,out).print("entering getQueuePosition\n");
if (!validate_pb(out, bld, index))
return 0;
PlannedBuilding &pb = planned_buildings.at(bld->id);
auto &job_item = bld->jobs[0]->job_items[index];
if (job_item->quantity <= 0)
return 0;
int min_pos = -1;
for (auto &vec_id : pb.vector_ids[index]) {
@ -559,6 +584,7 @@ DFHACK_PLUGIN_LUA_FUNCTIONS {
DFHACK_LUA_FUNCTION(doCycle),
DFHACK_LUA_FUNCTION(scheduleCycle),
DFHACK_LUA_FUNCTION(countAvailableItems),
DFHACK_LUA_FUNCTION(getDescString),
DFHACK_LUA_FUNCTION(getQueuePosition),
DFHACK_LUA_END
};

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

@ -183,13 +183,15 @@ end
function get_desc(filter)
local desc = 'Unknown'
if filter.has_tool_use then
if filter.has_tool_use and filter.has_tool_use > -1 then
desc = to_title_case(df.tool_uses[filter.has_tool_use])
end
if filter.item_type then
elseif filter.flags2 and filter.flags2.screw then
desc = 'Screw'
elseif filter.item_type and filter.item_type > -1 then
desc = to_title_case(df.item_type[filter.item_type])
end
if filter.flags2 and filter.flags2.building_material then
elseif filter.vector_id and filter.vector_id > -1 then
desc = to_title_case(df.job_item_vector_id[filter.vector_id])
elseif filter.flags2 and filter.flags2.building_material then
desc = 'Generic material';
if filter.flags2.fire_safe then
desc = 'Fire-safe material';
@ -197,10 +199,6 @@ function get_desc(filter)
if filter.flags2.magma_safe then
desc = 'Magma-safe material';
end
elseif filter.flags2 and filter.flags2.screw then
desc = 'Screw'
elseif filter.vector_id then
desc = to_title_case(df.job_item_vector_id[filter.vector_id])
end
if desc:endswith('s') then
@ -208,6 +206,8 @@ function get_desc(filter)
end
if desc == 'Trappart' then
desc = 'Mechanism'
elseif desc == 'Wood' then
desc = 'Log'
end
return desc
end
@ -510,7 +510,7 @@ function InspectorLine:init()
self:addviews{
widgets.Label{
frame={t=0, l=0},
text={{text=function() return get_desc(get_building_filters()[self.idx]) end}},
text={{text=function() return getDescString(dfhack.gui.getSelectedBuilding(), self.idx-1) end}},
},
widgets.Label{
frame={t=1, l=2},