diff options
| author | Petr Mrázek | 2012-03-24 00:13:16 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-03-24 00:13:16 +0100 |
| commit | addb5c87aa73fa08258923444a031e011f2e8a50 (patch) | |
| tree | 246dca11f301b840c4d5c438ee8c67248af4980f /plugins/liquids.cpp | |
| parent | 078caf363f693a8f7744de85a0539de4f68346cc (diff) | |
| download | dfhack-addb5c87aa73fa08258923444a031e011f2e8a50.tar.gz dfhack-addb5c87aa73fa08258923444a031e011f2e8a50.tar.bz2 dfhack-addb5c87aa73fa08258923444a031e011f2e8a50.tar.xz | |
liquids vs liquidsgo: FIGHT!
liquidsgo WINS, renamed to liquids to not confuse users.
Diffstat (limited to 'plugins/liquids.cpp')
| -rw-r--r-- | plugins/liquids.cpp | 640 |
1 files changed, 279 insertions, 361 deletions
diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp index 3bf67f4d..5f4d5b4f 100644 --- a/plugins/liquids.cpp +++ b/plugins/liquids.cpp @@ -1,3 +1,25 @@ +// plugin liquids +// +// This is a rewrite of the liquids module which can also be used non-interactively (hotkey). +// First the user sets the mode and other parameters with the interactive command liqiudsgo +// just like in the original liquids module. +// They are stored in statics to allow being used after the interactive session was closed. +// After defining an action the non-interactive command liquids-here can be used to call the +// execute method without the necessity to go back to the console. This allows convenient painting +// of liquids and obsidian using the ingame cursor and a hotkey. +// +// Commands: +// liquids - basically the original liquids with the map changing stuff moved to an execute method +// liquids-here - runs the execute method with the last settings from liquids +// (intended to be mapped to a hotkey) +// Options: +// ?, help - print some help +// +// TODO: +// - maybe allow all parameters be passed as command line options? tedious parsing but might be useful +// - grab the code from digcircle to get a circle brush - could be nice when painting with obsidian +// - maybe store the last parameters in a file to make them persistent after dfhack is closed? + #include <iostream> #include <vector> #include <stack> @@ -19,14 +41,16 @@ using std::set; #include "modules/Gui.h" #include "TileTypes.h" #include "modules/MapCache.h" +#include "Brushes.h" using namespace MapExtras; using namespace DFHack; using namespace df::enums; -typedef vector <df::coord> coord_vec; CommandHistory liquids_hist; command_result df_liquids (color_ostream &out, vector <string> & parameters); +command_result df_liquids_here (color_ostream &out, vector <string> & parameters); +command_result df_liquids_execute (color_ostream &out); DFHACK_PLUGIN("liquids"); @@ -34,7 +58,14 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug { liquids_hist.load("liquids.history"); commands.clear(); - commands.push_back(PluginCommand("liquids", "Place magma, water or obsidian.", df_liquids, true)); + commands.push_back(PluginCommand( + "liquids", "Place magma, water or obsidian.", + df_liquids, true)); // interactive, needs console for prompt + commands.push_back(PluginCommand( + "liquids-here", "Use settings from liquids at cursor position.", + df_liquids_here, Gui::cursor_hotkey, // non-interactive, needs ingame cursor + " Identical to pressing enter in liquids, intended for use as keybinding.\n" + " Can (but doesn't need to) be called while liquids is running in the console.")); return CR_OK; } @@ -44,196 +75,29 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out ) return CR_OK; } -class Brush -{ -public: - virtual ~Brush(){}; - virtual coord_vec points(MapCache & mc,DFHack::DFCoord start) = 0; -}; -/** - * generic 3D rectangle brush. you can specify the dimensions of - * the rectangle and optionally which tile is its 'center' - */ -class RectangleBrush : public Brush -{ -public: - RectangleBrush(int x, int y, int z = 1, int centerx = -1, int centery = -1, int centerz = -1) - { - if(centerx == -1) - cx_ = x/2; - else - cx_ = centerx; - if(centery == -1) - cy_ = y/2; - else - cy_ = centery; - if(centerz == -1) - cz_ = z/2; - else - cz_ = centerz; - x_ = x; - y_ = y; - z_ = z; - }; - coord_vec points(MapCache & mc, DFHack::DFCoord start) - { - coord_vec v; - DFHack::DFCoord iterstart(start.x - cx_, start.y - cy_, start.z - cz_); - DFHack::DFCoord iter = iterstart; - for(int xi = 0; xi < x_; xi++) - { - for(int yi = 0; yi < y_; yi++) - { - for(int zi = 0; zi < z_; zi++) - { - if(mc.testCoord(iter)) - v.push_back(iter); - iter.z++; - } - iter.z = iterstart.z; - iter.y++; - } - iter.y = iterstart.y; - iter.x ++; - } - return v; - }; - ~RectangleBrush(){}; -private: - int x_, y_, z_; - int cx_, cy_, cz_; -}; - -/** - * stupid block brush, legacy. use when you want to apply something to a whole DF map block. - */ -class BlockBrush : public Brush -{ -public: - BlockBrush(){}; - ~BlockBrush(){}; - coord_vec points(MapCache & mc, DFHack::DFCoord start) - { - coord_vec v; - DFHack::DFCoord blockc = start / 16; - DFHack::DFCoord iterc = blockc * 16; - if( !mc.testCoord(start) ) - return v; - auto starty = iterc.y; - for(int xi = 0; xi < 16; xi++) - { - for(int yi = 0; yi < 16; yi++) - { - v.push_back(iterc); - iterc.y++; - } - iterc.y = starty; - iterc.x ++; - } - return v; - }; -}; - -/** - * Column from a position through open space tiles - * example: create a column of magma - */ -class ColumnBrush : public Brush -{ -public: - ColumnBrush(){}; - ~ColumnBrush(){}; - coord_vec points(MapCache & mc, DFHack::DFCoord start) - { - coord_vec v; - bool juststarted = true; - while (mc.testCoord(start)) - { - df::tiletype tt = mc.tiletypeAt(start); - if(DFHack::LowPassable(tt) || juststarted && DFHack::HighPassable(tt)) - { - v.push_back(start); - juststarted = false; - start.z++; - } - else break; - } - return v; - }; -}; - -/** - * Flood-fill water tiles from cursor (for wclean) - * example: remove salt flag from a river - */ -class FloodBrush : public Brush -{ -public: - FloodBrush(Core *c){c_ = c;}; - ~FloodBrush(){}; - coord_vec points(MapCache & mc, DFHack::DFCoord start) - { - coord_vec v; - - std::stack<DFCoord> to_flood; - to_flood.push(start); - - std::set<DFCoord> seen; - - while (!to_flood.empty()) { - DFCoord xy = to_flood.top(); - to_flood.pop(); - - df::tile_designation des = mc.designationAt(xy); - - if (seen.find(xy) == seen.end() - && des.bits.flow_size - && des.bits.liquid_type == tile_liquid::Water) { - v.push_back(xy); - seen.insert(xy); - - maybeFlood(DFCoord(xy.x - 1, xy.y, xy.z), to_flood, mc); - maybeFlood(DFCoord(xy.x + 1, xy.y, xy.z), to_flood, mc); - maybeFlood(DFCoord(xy.x, xy.y - 1, xy.z), to_flood, mc); - maybeFlood(DFCoord(xy.x, xy.y + 1, xy.z), to_flood, mc); - - df::tiletype tt = mc.tiletypeAt(xy); - if (LowPassable(tt)) - { - maybeFlood(DFCoord(xy.x, xy.y, xy.z - 1), to_flood, mc); - } - if (HighPassable(tt)) - { - maybeFlood(DFCoord(xy.x, xy.y, xy.z + 1), to_flood, mc); - } - } - } - - return v; - } -private: - void maybeFlood(DFCoord c, std::stack<DFCoord> &to_flood, MapCache &mc) { - if (mc.testCoord(c)) { - to_flood.push(c); - } - } - Core *c_; -}; +// static stuff to be remembered between sessions +static string brushname = "point"; +static string mode="magma"; +static string flowmode="f+"; +static string setmode ="s."; +static unsigned int amount = 7; +static int width = 1, height = 1, z_levels = 1; command_result df_liquids (color_ostream &out_, vector <string> & parameters) { - int32_t x,y,z; - - assert(out_.is_console()); + if(!out_.is_console()) + return CR_FAILURE; Console &out = static_cast<Console&>(out_); for(size_t i = 0; i < parameters.size();i++) { if(parameters[i] == "help" || parameters[i] == "?") { - out.print("This tool allows placing magma, water and other similar things.\n" - "It is interactive and further help is available when you run it.\n" - ); + out.print( "This tool allows placing magma, water and other similar things.\n" + "It is interactive and further help is available when you run it.\n" + "The settings will be remembered until dfhack is closed and you can call\n" + "'liquids-here' (mapped to a hotkey) to paint liquids at the cursor position\n" + "without the need to go back to the dfhack console.\n"); return CR_OK; } } @@ -244,23 +108,22 @@ command_result df_liquids (color_ostream &out_, vector <string> & parameters) return CR_FAILURE; } - Brush * brush = new RectangleBrush(1,1); - string brushname = "point"; bool end = false; + out << "Welcome to the liquid spawner.\nType 'help' or '?' for a list of available commands, 'q' to quit.\nPress return after a command to confirm." << std::endl; - string mode="magma"; - string flowmode="f+"; - string setmode ="s."; - unsigned int amount = 7; - int width = 1, height = 1, z_levels = 1; while(!end) { string command = ""; + std::stringstream str; - str <<"[" << mode << ":" << brushname << ":" << amount << ":" << flowmode << ":" << setmode << "]#"; + str <<"[" << mode << ":" << brushname; + if (brushname == "range") + str << "(w" << width << ":h" << height << ":z" << z_levels << ")"; + str << ":" << amount << ":" << flowmode << ":" << setmode << "]#"; if(out.lineedit(str.str(),command,liquids_hist) == -1) return CR_FAILURE; + if(command=="help" || command == "?") { out << "Modes:" << endl @@ -296,6 +159,7 @@ command_result df_liquids (color_ostream &out_, vector <string> & parameters) << endl << "Usage: point the DF cursor at a tile you want to modify" << endl << "and use the commands available :)" << endl; + out << endl << "Settings will be remembered until you quit DF. You can call liquids-here to execute the last configured action. Useful in combination with keybindings." << endl; } else if(command == "m") { @@ -327,9 +191,7 @@ command_result df_liquids (color_ostream &out_, vector <string> & parameters) } else if(command == "point" || command == "p") { - delete brush; brushname = "point"; - brush = new RectangleBrush(1,1); } else if(command == "range" || command == "r") { @@ -354,35 +216,27 @@ command_result df_liquids (color_ostream &out_, vector <string> & parameters) range_hist.add(command); z_levels = command == "" ? z_levels : atoi (command.c_str()); if(z_levels < 1) z_levels = 1; - delete brush; if(width == 1 && height == 1 && z_levels == 1) { - brushname="point"; + brushname = "point"; } else { brushname = "range"; } - brush = new RectangleBrush(width,height,z_levels,0,0,0); } else if(command == "block") { - delete brush; brushname = "block"; - brush = new BlockBrush(); } else if(command == "column") { - delete brush; brushname = "column"; - brush = new ColumnBrush(); } - else if(command == "flood") - { - delete brush; - brushname = "flood"; - brush = new FloodBrush(&Core::getInstance()); - } + else if(command == "flood") + { + brushname = "flood"; + } else if(command == "q") { end = true; @@ -430,184 +284,248 @@ command_result df_liquids (color_ostream &out_, vector <string> & parameters) amount = 7; else if(command.empty()) { - CoreSuspender suspend; + df_liquids_execute(out); + } + else + { + out << command << " : unknown command." << endl; + } + } + return CR_OK; +} + +command_result df_liquids_here (color_ostream &out, vector <string> & parameters) +{ + for(size_t i = 0; i < parameters.size();i++) + { + if(parameters[i] == "help" || parameters[i] == "?") + { + out << "This command is supposed to be mapped to a hotkey." << endl; + out << "It will use the current/last parameters set in liquids." << endl; + return CR_OK; + } + } - do + out.print("Run liquids-here with these parameters: "); + out << "[" << mode << ":" << brushname; + if (brushname == "range") + out << "(w" << width << ":h" << height << ":z" << z_levels << ")"; + out << ":" << amount << ":" << flowmode << ":" << setmode << "]\n"; + + return df_liquids_execute(out); +} + +command_result df_liquids_execute(color_ostream &out) +{ + // create brush type depending on old parameters + Brush * brush; + + if (brushname == "point") + { + brush = new RectangleBrush(1,1,1,0,0,0); + //width = 1; + //height = 1; + //z_levels = 1; + } + else if (brushname == "range") + { + brush = new RectangleBrush(width,height,z_levels,0,0,0); + } + else if(brushname == "block") + { + brush = new BlockBrush(); + } + else if(brushname == "column") + { + brush = new ColumnBrush(); + } + else if(brushname == "flood") + { + brush = new FloodBrush(&Core::getInstance()); + } + else + { + // this should never happen! + out << "Old brushtype is invalid! Resetting to point brush.\n"; + brushname = "point"; + width = 1; + height = 1; + z_levels = 1; + brush = new RectangleBrush(width,height,z_levels,0,0,0); + } + + CoreSuspender suspend; + + do + { + if (!Maps::IsValid()) + { + out << "Can't see any DF map loaded." << endl; + break;; + } + int32_t x,y,z; + if(!Gui::getCursorCoords(x,y,z)) + { + out << "Can't get cursor coords! Make sure you have a cursor active in DF." << endl; + break; + } + out << "cursor coords: " << x << "/" << y << "/" << z << endl; + MapCache mcache; + DFHack::DFCoord cursor(x,y,z); + coord_vec all_tiles = brush->points(mcache,cursor); + out << "working..." << endl; + if(mode == "obsidian") + { + coord_vec::iterator iter = all_tiles.begin(); + while (iter != all_tiles.end()) + { + mcache.setTiletypeAt(*iter, tiletype::LavaWall); + mcache.setTemp1At(*iter,10015); + mcache.setTemp2At(*iter,10015); + df::tile_designation des = mcache.designationAt(*iter); + des.bits.flow_size = 0; + mcache.setDesignationAt(*iter, des); + iter ++; + } + } + if(mode == "obsidian_floor") + { + coord_vec::iterator iter = all_tiles.begin(); + while (iter != all_tiles.end()) + { + mcache.setTiletypeAt(*iter, findRandomVariant(tiletype::LavaFloor1)); + iter ++; + } + } + else if(mode == "riversource") + { + coord_vec::iterator iter = all_tiles.begin(); + while (iter != all_tiles.end()) + { + mcache.setTiletypeAt(*iter, tiletype::RiverSource); + + df::tile_designation a = mcache.designationAt(*iter); + a.bits.liquid_type = tile_liquid::Water; + a.bits.liquid_static = false; + a.bits.flow_size = 7; + mcache.setTemp1At(*iter,10015); + mcache.setTemp2At(*iter,10015); + mcache.setDesignationAt(*iter,a); + + Block * b = mcache.BlockAt((*iter)/16); + DFHack::t_blockflags bf = b->BlockFlags(); + bf.bits.liquid_1 = true; + bf.bits.liquid_2 = true; + b->setBlockFlags(bf); + + iter++; + } + } + else if(mode=="wclean") + { + coord_vec::iterator iter = all_tiles.begin(); + while (iter != all_tiles.end()) { - if (!Maps::IsValid()) + DFHack::DFCoord current = *iter; + df::tile_designation des = mcache.designationAt(current); + des.bits.water_salt = false; + des.bits.water_stagnant = false; + mcache.setDesignationAt(current,des); + iter++; + } + } + else if(mode== "magma" || mode== "water" || mode == "flowbits") + { + set <Block *> seen_blocks; + coord_vec::iterator iter = all_tiles.begin(); + while (iter != all_tiles.end()) + { + DFHack::DFCoord current = *iter; // current tile coord + DFHack::DFCoord curblock = current /16; // current block coord + // check if the block is actually there + if(!mcache.BlockAt(curblock)) { - out << "Can't see any DF map loaded." << endl; - break;; + iter ++; + continue; } - if(!Gui::getCursorCoords(x,y,z)) + df::tile_designation des = mcache.designationAt(current); + df::tiletype tt = mcache.tiletypeAt(current); + // don't put liquids into places where they don't belong... + if(!DFHack::FlowPassable(tt)) { - out << "Can't get cursor coords! Make sure you have a cursor active in DF." << endl; - break; + iter++; + continue; } - out << "cursor coords: " << x << "/" << y << "/" << z << endl; - MapCache mcache; - DFHack::DFCoord cursor(x,y,z); - coord_vec all_tiles = brush->points(mcache,cursor); - out << "working..." << endl; - if(mode == "obsidian") + if(mode != "flowbits") { - coord_vec::iterator iter = all_tiles.begin(); - while (iter != all_tiles.end()) + if(setmode == "s.") { - mcache.setTiletypeAt(*iter, tiletype::LavaWall); - mcache.setTemp1At(*iter,10015); - mcache.setTemp2At(*iter,10015); - df::tile_designation des = mcache.designationAt(*iter); - des.bits.flow_size = 0; - mcache.setDesignationAt(*iter, des); - iter ++; + des.bits.flow_size = amount; } - } - if(mode == "obsidian_floor") - { - coord_vec::iterator iter = all_tiles.begin(); - while (iter != all_tiles.end()) + else if(setmode == "s+") { - mcache.setTiletypeAt(*iter, findRandomVariant(tiletype::LavaFloor1)); - iter ++; + if(des.bits.flow_size < amount) + des.bits.flow_size = amount; } - } - else if(mode == "riversource") - { - coord_vec::iterator iter = all_tiles.begin(); - while (iter != all_tiles.end()) + else if(setmode == "s-") { - mcache.setTiletypeAt(*iter, tiletype::RiverSource); - - df::tile_designation a = mcache.designationAt(*iter); - a.bits.liquid_type = tile_liquid::Water; - a.bits.liquid_static = false; - a.bits.flow_size = 7; - mcache.setTemp1At(*iter,10015); - mcache.setTemp2At(*iter,10015); - mcache.setDesignationAt(*iter,a); - - Block * b = mcache.BlockAt((*iter)/16); - DFHack::t_blockflags bf = b->BlockFlags(); - bf.bits.liquid_1 = true; - bf.bits.liquid_2 = true; - b->setBlockFlags(bf); - - iter++; + if (des.bits.flow_size > amount) + des.bits.flow_size = amount; } - } - else if(mode=="wclean") - { - coord_vec::iterator iter = all_tiles.begin(); - while (iter != all_tiles.end()) + if(amount != 0 && mode == "magma") { - DFHack::DFCoord current = *iter; - df::tile_designation des = mcache.designationAt(current); - des.bits.water_salt = false; - des.bits.water_stagnant = false; - mcache.setDesignationAt(current,des); - iter++; + des.bits.liquid_type = tile_liquid::Magma; + mcache.setTemp1At(current,12000); + mcache.setTemp2At(current,12000); } - } - else if(mode== "magma" || mode== "water" || mode == "flowbits") - { - set <Block *> seen_blocks; - coord_vec::iterator iter = all_tiles.begin(); - while (iter != all_tiles.end()) + else if(amount != 0 && mode == "water") { - DFHack::DFCoord current = *iter; // current tile coord - DFHack::DFCoord curblock = current /16; // current block coord - // check if the block is actually there - if(!mcache.BlockAt(curblock)) - { - iter ++; - continue; - } - df::tile_designation des = mcache.designationAt(current); - df::tiletype tt = mcache.tiletypeAt(current); - // don't put liquids into places where they don't belong... - if(!DFHack::FlowPassable(tt)) - { - iter++; - continue; - } - if(mode != "flowbits") - { - if(setmode == "s.") - { - des.bits.flow_size = amount; - } - else if(setmode == "s+") - { - if(des.bits.flow_size < amount) - des.bits.flow_size = amount; - } - else if(setmode == "s-") - { - if (des.bits.flow_size > amount) - des.bits.flow_size = amount; - } - if(amount != 0 && mode == "magma") - { - des.bits.liquid_type = tile_liquid::Magma; - mcache.setTemp1At(current,12000); - mcache.setTemp2At(current,12000); - } - else if(amount != 0 && mode == "water") - { - des.bits.liquid_type = tile_liquid::Water; - mcache.setTemp1At(current,10015); - mcache.setTemp2At(current,10015); - } - else if(amount == 0 && (mode == "water" || mode == "magma")) - { - // reset temperature to sane default - mcache.setTemp1At(current,10015); - mcache.setTemp2At(current,10015); - } - mcache.setDesignationAt(current,des); - } - seen_blocks.insert(mcache.BlockAt(current / 16)); - iter++; + des.bits.liquid_type = tile_liquid::Water; + mcache.setTemp1At(current,10015); + mcache.setTemp2At(current,10015); } - set <Block *>::iterator biter = seen_blocks.begin(); - while (biter != seen_blocks.end()) + else if(amount == 0 && (mode == "water" || mode == "magma")) { - DFHack::t_blockflags bflags = (*biter)->BlockFlags(); - if(flowmode == "f+") - { - bflags.bits.liquid_1 = true; - bflags.bits.liquid_2 = true; - (*biter)->setBlockFlags(bflags); - } - else if(flowmode == "f-") - { - bflags.bits.liquid_1 = false; - bflags.bits.liquid_2 = false; - (*biter)->setBlockFlags(bflags); - } - else - { - out << "flow bit 1 = " << bflags.bits.liquid_1 << endl; - out << "flow bit 2 = " << bflags.bits.liquid_2 << endl; - } - biter ++; + // reset temperature to sane default + mcache.setTemp1At(current,10015); + mcache.setTemp2At(current,10015); } + mcache.setDesignationAt(current,des); + } + seen_blocks.insert(mcache.BlockAt(current / 16)); + iter++; + } + set <Block *>::iterator biter = seen_blocks.begin(); + while (biter != seen_blocks.end()) + { + DFHack::t_blockflags bflags = (*biter)->BlockFlags(); + if(flowmode == "f+") + { + bflags.bits.liquid_1 = true; + bflags.bits.liquid_2 = true; + (*biter)->setBlockFlags(bflags); + } + else if(flowmode == "f-") + { + bflags.bits.liquid_1 = false; + bflags.bits.liquid_2 = false; + (*biter)->setBlockFlags(bflags); } - if(mcache.WriteAll()) - out << "OK" << endl; else - out << "Something failed horribly! RUN!" << endl; - } while (0); + { + out << "flow bit 1 = " << bflags.bits.liquid_1 << endl; + out << "flow bit 2 = " << bflags.bits.liquid_2 << endl; + } + biter ++; + } } + if(mcache.WriteAll()) + out << "OK" << endl; else - { - out << command << " : unknown command." << endl; - } - } - - //cleanup - delete brush; + out << "Something failed horribly! RUN!" << endl; + } while (0); + // cleanup + delete brush; return CR_OK; } |
