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

Further simplify check for engraved slabs

develop
John Cosker 2023-02-09 08:28:33 -05:00
parent 27ff6c9649
commit 6795a4a2c8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/autoslab.cpp
Unescape Escape View File

@ -193,13 +193,6 @@ static void checkslabs(color_ostream &out)
histToJob[order->hist_figure_id] = order->id; histToJob[order->hist_figure_id] = order->id;
} }
// Get list of engraved slab items on map
std::vector<df::item *> engravedSlabs;
std::copy_if(world->items.all.begin(), world->items.all.end(),
std::back_inserter(engravedSlabs),
[](df::item *item)
{ return item->getType() == df::item_type::SLAB && item->getSlabEngravingType() == df::slab_engraving_type::Memorial; });
// Build list of ghosts // Build list of ghosts
std::vector<df::unit *> ghosts; std::vector<df::unit *> ghosts;
std::copy_if(world->units.all.begin(), world->units.all.end(), std::copy_if(world->units.all.begin(), world->units.all.end(),
@ -211,11 +204,10 @@ static void checkslabs(color_ostream &out)
{ {
// Only create a job is the map has no existing jobs for that historical figure or no existing engraved slabs // Only create a job is the map has no existing jobs for that historical figure or no existing engraved slabs
if (histToJob.count(ghost->hist_figure_id) == 0 && if (histToJob.count(ghost->hist_figure_id) == 0 &&
!std::any_of(engravedSlabs.begin(), !std::any_of(world->items.other.SLAB.begin(),
engravedSlabs.end(), world->items.other.SLAB.end(),
[&ghost](df::item *slab){ [&ghost,&out](df::item_slabst *slab){
auto slabst = virtual_cast<df::item_slabst>(slab); return slab->engraving_type == df::slab_engraving_type::Memorial && slab->topic == ghost->hist_figure_id;
return slabst->topic == ghost->hist_figure_id;
}) })
) )
{ {