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

digSmart: framework in place for finding the bug. When a tile is actively being dug, the dig designation is cleared. If you designate the tile again for digging, multiple dwarves might try to dig it at the same time, leading to job cancellation spam when one finishes.

develop
expwnent 2013-05-31 12:23:28 -04:00
parent 20fa38da7e
commit b945b36016
1 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/digSmart.cpp
Unescape Escape View File

@ -30,6 +30,7 @@ command_result digSmart (color_ostream &out, std::vector <std::string> & paramet
DFHACK_PLUGIN("digSmart"); DFHACK_PLUGIN("digSmart");
void onDig(color_ostream& out, void* ptr); void onDig(color_ostream& out, void* ptr);
void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, set<df::coord>& jobLocations);
EventManager::EventHandler digHandler(onDig, 0); EventManager::EventHandler digHandler(onDig, 0);
vector<df::coord> queue; vector<df::coord> queue;
map<df::coord, int32_t> visitCount; map<df::coord, int32_t> visitCount;
@ -52,9 +53,9 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
return CR_OK; return CR_OK;
} }
void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt);
void onTick(color_ostream& out, void* ptr) { void onTick(color_ostream& out, void* ptr) {
/*
MapExtras::MapCache cache; MapExtras::MapCache cache;
for ( size_t a = 0; a < queue.size(); a++ ) { for ( size_t a = 0; a < queue.size(); a++ ) {
df::coord pos = queue[a]; df::coord pos = queue[a];
@ -66,6 +67,24 @@ void onTick(color_ostream& out, void* ptr) {
} }
cache.trash(); cache.trash();
queue.clear(); queue.clear();
*/
map<df::coord,int> toRemove;
for ( auto a = visitCount.begin(); a != visitCount.end(); a++ ) {
if ( (*a).second <= 0 )
continue;
df::coord pt = (*a).first;
df::map_block* block = Maps::getTileBlock(pt);
if ( block->designation[pt.x&0xF][pt.y&0xF].bits.dig != df::enums::tile_dig_designation::Default ) {
out.print("%d: %d,%d,%d: Default -> %d\n", __LINE__, pt.x,pt.y,pt.z, (int32_t)block->designation[pt.x&0xF][pt.y&0xF].bits.dig);
toRemove[pt]++;
}
}
for ( auto a = toRemove.begin(); a != toRemove.end(); a++ )
visitCount.erase((*a).first);
EventManager::EventHandler handler(onTick, 1);
EventManager::registerTick(handler, 1, plugin_self);
} }
void onDig(color_ostream& out, void* ptr) { void onDig(color_ostream& out, void* ptr) {
@ -83,6 +102,22 @@ void onDig(color_ostream& out, void* ptr) {
return; return;
out.print("%d\n", __LINE__); out.print("%d\n", __LINE__);
set<df::coord> jobLocations;
for ( df::job_list_link* link = &df::global::world->job_list; link != NULL; link = link->next ) {
if ( link->item == NULL )
continue;
if ( link->item->job_type != df::enums::job_type::Dig &&
link->item->job_type != df::enums::job_type::CarveUpwardStaircase &&
link->item->job_type != df::enums::job_type::CarveDownwardStaircase &&
link->item->job_type != df::enums::job_type::CarveUpDownStaircase &&
link->item->job_type != df::enums::job_type::CarveRamp &&
link->item->job_type != df::enums::job_type::DigChannel )
continue;
jobLocations.insert(link->item->pos);
}
//queue.push_back(job->pos); //queue.push_back(job->pos);
//EventManager::EventHandler handler(onTick, 1); //EventManager::EventHandler handler(onTick, 1);
//EventManager::registerTick(handler, 5, plugin_self); //EventManager::registerTick(handler, 5, plugin_self);
@ -90,18 +125,13 @@ out.print("%d\n", __LINE__);
df::coord pos = job->pos; df::coord pos = job->pos;
for ( int16_t a = -1; a <= 1; a++ ) { for ( int16_t a = -1; a <= 1; a++ ) {
for ( int16_t b = -1; b <= 1; b++ ) { for ( int16_t b = -1; b <= 1; b++ ) {
maybeExplore(out, cache, df::coord(pos.x+a,pos.y+b,pos.z)); maybeExplore(out, cache, df::coord(pos.x+a,pos.y+b,pos.z), jobLocations);
}
}
for ( int16_t a = -1; a <= 1; a++ ) {
for ( int16_t b = -1; b <= 1; b++ ) {
maybeExplore(out, cache, df::coord(pos.x+a,pos.y+b,pos.z));
} }
} }
cache.trash(); cache.trash();
} }
void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt) { void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, set<df::coord>& jobLocations) {
if ( !Maps::isValidTilePos(pt) ) { if ( !Maps::isValidTilePos(pt) ) {
return; return;
} }
@ -132,8 +162,8 @@ void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt)
Maps::getSize(xMax,yMax,zMax); Maps::getSize(xMax,yMax,zMax);
if ( pt.x == 0 || pt.y == 0 || pt.x+1 == xMax*16 || pt.y+1 == yMax*16 ) if ( pt.x == 0 || pt.y == 0 || pt.x+1 == xMax*16 || pt.y+1 == yMax*16 )
return; return;
if ( visitCount[pt] > 0 ) { if ( jobLocations.find(pt) != jobLocations.end() ) {
// return; return;
} }
df::enums::tile_dig_designation::tile_dig_designation dig1,dig2; df::enums::tile_dig_designation::tile_dig_designation dig1,dig2;
@ -152,5 +182,7 @@ command_result digSmart (color_ostream &out, std::vector <std::string> & paramet
{ {
if (!parameters.empty()) if (!parameters.empty())
return CR_WRONG_USAGE; return CR_WRONG_USAGE;
EventManager::EventHandler handler(onTick, 1);
EventManager::registerTick(handler, 1, plugin_self);
return CR_OK; return CR_OK;
} }