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

digsmart temp commit.

develop
expwnent 2013-04-07 13:08:32 -04:00
parent 0397912353
commit 329538edfd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/digSmart.cpp
Unescape Escape View File

@ -24,8 +24,6 @@ command_result digSmart (color_ostream &out, std::vector <std::string> & paramet
// The name string provided must correspond to the filename - skeleton.plug.so or skeleton.plug.dll in this case // The name string provided must correspond to the filename - skeleton.plug.so or skeleton.plug.dll in this case
DFHACK_PLUGIN("digSmart"); DFHACK_PLUGIN("digSmart");
static Plugin* digSmartPlugin;
void onDig(color_ostream& out, void* ptr); void onDig(color_ostream& out, void* ptr);
EventManager::EventHandler digHandler(onDig, 5); EventManager::EventHandler digHandler(onDig, 5);
@ -43,8 +41,8 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
" digSmart\n" " digSmart\n"
" Does nothing.\n" " Does nothing.\n"
)); ));
digSmartPlugin = Core::getInstance().getPluginManager()->getPluginByName("digSmart"); //digSmartPlugin = Core::getInstance().getPluginManager()->getPluginByName("digSmart");
EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, digHandler, digSmartPlugin); EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, digHandler, plugin_self);
return CR_OK; return CR_OK;
} }
@ -67,9 +65,7 @@ void onDig(color_ostream& out, void* ptr) {
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++ ) {
for ( int16_t c = -1; c <= 1; c++ ) { 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+c));
}
} }
} }
} }
@ -86,7 +82,6 @@ void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt)
if ( block->designation[pt.x&0xF][pt.y&0xF].bits.hidden ) if ( block->designation[pt.x&0xF][pt.y&0xF].bits.hidden )
return; return;
df::tiletype type = block->tiletype[pt.x&0xF][pt.y&0xF]; df::tiletype type = block->tiletype[pt.x&0xF][pt.y&0xF];
if ( ENUM_ATTR(tiletype, material, type) != df::enums::tiletype_material::MINERAL ) if ( ENUM_ATTR(tiletype, material, type) != df::enums::tiletype_material::MINERAL )
return; return;
@ -99,6 +94,13 @@ void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt)
if ( block->designation[pt.x&0xF][pt.y&0xF].bits.dig == df::enums::tile_dig_designation::Default ) if ( block->designation[pt.x&0xF][pt.y&0xF].bits.dig == df::enums::tile_dig_designation::Default )
return; return;
if ( block->designation[pt.x&0xF][pt.y&0xF].bits.dig != df::enums::tile_dig_designation::No )
return;
uint32_t xMax,yMax,zMax;
Maps::getSize(xMax,yMax,zMax);
if ( pt.x == 0 || pt.y == 0 || pt.x+1 == xMax || pt.y+1 == yMax )
return;
block->designation[pt.x&0xF][pt.y&0xF].bits.dig = df::enums::tile_dig_designation::Default; block->designation[pt.x&0xF][pt.y&0xF].bits.dig = df::enums::tile_dig_designation::Default;
block->flags.bits.designated = true; block->flags.bits.designated = true;