diff --git a/NEWS b/NEWS index 039749951..3b55d696e 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ DFHack future New commands: - - digSmart - automatically dig out specified veins as they are revealed + - digFlood - automatically dig out specified veins as they are revealed - restrictliquid - Restrict traffic on every visible square with liquid. - restrictice - Restrict traffic on squares above visible ice. - treefarm - automatically chop trees and dig obsidian diff --git a/Readme.rst b/Readme.rst index d0050a818..fb1ae83cb 100644 --- a/Readme.rst +++ b/Readme.rst @@ -1026,23 +1026,23 @@ Options: :down: down stairs :clear: clear designation -digSmart +digFlood -------- -Automatically digs out specified veins as they are discovered. It runs once every time a dwarf finishes a dig job. It will only dig out appropriate tiles that are adjacent to the finished dig job. To add a vein type, use `digSmart 1 [type]`. This will also enable the plugin. To remove a vein type, use `digSmart 0 [type] 1` to disable, then remove, then re-enable. +Automatically digs out specified veins as they are discovered. It runs once every time a dwarf finishes a dig job. It will only dig out appropriate tiles that are adjacent to the finished dig job. To add a vein type, use `digFlood 1 [type]`. This will also enable the plugin. To remove a vein type, use `digFlood 0 [type] 1` to disable, then remove, then re-enable. -`digSmart 0` disable +`digFlood 0` disable -`digSmart 1` enable +`digFlood 1` enable -`digSmart 0 MICROCLINE COAL_BITUMINOUS 1` disable plugin, remove microcline and bituminous coal from monitoring, then re-enable the plugin +`digFlood 0 MICROCLINE COAL_BITUMINOUS 1` disable plugin, remove microcline and bituminous coal from monitoring, then re-enable the plugin -`digSmart CLEAR` remove all inorganics from monitoring +`digFlood CLEAR` remove all inorganics from monitoring -`digSmart digAll1` ignore the monitor list and dig any vein +`digFlood digAll1` ignore the monitor list and dig any vein -`digSmart digAll0` disable digAll mode +`digFlood digAll0` disable digAll mode -See `help digSmart` for details. +See `help digFlood` for details. filltraffic ----------- diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 586baeda3..4186a7013 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -147,7 +147,7 @@ if (BUILD_SUPPORTED) DFHACK_PLUGIN(autoSyndrome autoSyndrome.cpp) DFHACK_PLUGIN(syndromeTrigger syndromeTrigger.cpp) DFHACK_PLUGIN(infiniteSky infiniteSky.cpp) - DFHACK_PLUGIN(digSmart digSmart.cpp) + DFHACK_PLUGIN(digFlood digFlood.cpp) DFHACK_PLUGIN(createitem createitem.cpp) DFHACK_PLUGIN(outsideOnly outsideOnly.cpp) DFHACK_PLUGIN(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote) diff --git a/plugins/digSmart.cpp b/plugins/digFlood.cpp similarity index 92% rename from plugins/digSmart.cpp rename to plugins/digFlood.cpp index 9c97df4c7..9893fa46c 100644 --- a/plugins/digSmart.cpp +++ b/plugins/digFlood.cpp @@ -21,9 +21,9 @@ using namespace DFHack; using namespace std; -command_result digSmart (color_ostream &out, std::vector & parameters); +command_result digFlood (color_ostream &out, std::vector & parameters); -DFHACK_PLUGIN("digSmart"); +DFHACK_PLUGIN("digFlood"); void onDig(color_ostream& out, void* ptr); void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, set& jobLocations); @@ -36,22 +36,22 @@ set autodigMaterials; DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { commands.push_back(PluginCommand( - "digSmart", "Automatically dig out veins as you discover them.", - digSmart, false, + "digFlood", "Automatically dig out veins as you discover them.", + digFlood, false, "Example:\n" - " digSmart 0\n" + " digFlood 0\n" " disable plugin\n" - " digSmart 1\n" + " digFlood 1\n" " enable plugin\n" - " digSmart 0 MICROCLINE COAL_BITUMINOUS 1\n" + " digFlood 0 MICROCLINE COAL_BITUMINOUS 1\n" " disable plugin and remove microcline and bituminous coal from being monitored, then re-enable plugin" - " digSmart 1 MICROCLINE 0 COAL_BITUMINOUS 1\n" + " digFlood 1 MICROCLINE 0 COAL_BITUMINOUS 1\n" " don't monitor microcline, do monitor COAL_BITUMINOUS, then enable plugin\n" - " digSmart CLEAR\n" + " digFlood CLEAR\n" " remove all inorganics from monitoring\n" - " digSmart digAll1\n" + " digFlood digAll1\n" " enable digAll mode: dig any vein, regardless of the monitor list\n" - " digSmart digAll0\n" + " digFlood digAll0\n" " disable digAll mode\n" "\n" "Note that while order matters, multiple commands can be sequenced in one line. It is recommended to alter your dfhack.init file so that you won't have to type in every mineral type you want to dig every time you start the game. Material names are case sensitive.\n" @@ -145,7 +145,7 @@ void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, // *df::global::process_jobs = true; } -command_result digSmart (color_ostream &out, std::vector & parameters) +command_result digFlood (color_ostream &out, std::vector & parameters) { bool adding = true; set toAdd, toRemove;