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

clean up top-level logic

develop
myk002 2021-06-02 22:43:23 -07:00
parent fc932d2850
commit 02d7d4c5b6
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
plugins/dig-now.cpp
Unescape Escape View File

@ -287,27 +287,14 @@ static bool carve_tile(color_ostream &out, MapExtras::MapCache &map,
return false; return false;
} }
command_result dig_dug(color_ostream &out, std::vector<std::string> &) { static void do_dig(color_ostream &out, std::vector<DFCoord> &dug_coords,
CoreSuspender suspend; const DFCoord &start, const DFCoord &end) {
if (!Maps::IsValid()) {
out.printerr("Map is not available!\n");
return CR_FAILURE;
}
// scan the whole map for now. we can add in boundaries later.
uint32_t endx, endy, endz;
Maps::getTileSize(endx, endy, endz);
// use the proxy layer for the layer material-setting ease-of-use functions. // use the proxy layer for the layer material-setting ease-of-use functions.
MapExtras::MapCache map; MapExtras::MapCache map;
// tracks which positions to unhide for (uint32_t z = start.z; z <= end.z; ++z) {
std::vector<DFCoord> dug_coords; for (uint32_t y = start.y; y <= end.y; ++y) {
for (uint32_t x = start.x; x <= end.x; ++x) {
for (uint32_t z = 0; z <= endz; ++z) {
for (uint32_t y = 0; y <= endy; ++y) {
for (uint32_t x = 0; x <= endx; ++x) {
// this will return NULL if the map block hasn't been allocated // this will return NULL if the map block hasn't been allocated
// yet, but that means there aren't any designations anyway. // yet, but that means there aren't any designations anyway.
if (!Maps::getTileBlock(x, y, z)) if (!Maps::getTileBlock(x, y, z))
@ -348,16 +335,36 @@ command_result dig_dug(color_ostream &out, std::vector<std::string> &) {
} }
map.WriteAll(); map.WriteAll();
}
command_result dig_now(color_ostream &out, std::vector<std::string> &) {
CoreSuspender suspend;
if (!Maps::IsValid()) {
out.printerr("Map is not available!\n");
return CR_FAILURE;
}
// tracks which positions to unhide
std::vector<DFCoord> dug_coords;
// scan the whole map for now. we can add in configurable boundaries later
DFCoord start(0, 0, 0);
uint32_t endx, endy, endz;
Maps::getTileSize(endx, endy, endz);
DFCoord end(endx, endy, endz);
do_dig(out, dug_coords, start, end);
// unhide newly dug tiles. we can't do this in the loop above since our // unhide newly dug tiles. we can't do this in do_dig() since our MapCache
// MapCache wouldn't detect the changes made by reveal.unhideFlood() without // wouldn't detect the changes made by reveal.unhideFlood() without
// invalidating and reinitializing on every call. // invalidating and reinitializing on every call
for (DFCoord pos : dug_coords) { for (DFCoord pos : dug_coords) {
if (Maps::getTileDesignation(pos)->bits.hidden) if (Maps::getTileDesignation(pos)->bits.hidden)
flood_unhide(out, pos); flood_unhide(out, pos);
} }
// Force the game to recompute its walkability cache // force the game to recompute its walkability cache
world->reindex_pathfinding = true; world->reindex_pathfinding = true;
return CR_OK; return CR_OK;
@ -366,7 +373,7 @@ command_result dig_dug(color_ostream &out, std::vector<std::string> &) {
DFhackCExport command_result plugin_init(color_ostream &, DFhackCExport command_result plugin_init(color_ostream &,
std::vector<PluginCommand> &commands) { std::vector<PluginCommand> &commands) {
commands.push_back(PluginCommand( commands.push_back(PluginCommand(
"dig-now", "Simulate completion of dig designations", dig_dug, false)); "dig-now", "Instantly complete dig designations", dig_now, false));
return CR_OK; return CR_OK;
} }