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

Merge pull request #3040 from myk002/myk_revflood 

[reveal] anchor revflood at a unit's position
develop
Myk 2023-03-19 14:37:29 -07:00 committed by GitHub
parent 490ffe19ba 4a3363da9c
commit b03a35ba8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/plugins/reveal.rst
Unescape Escape View File

@ -17,7 +17,7 @@ reveal
:summary: Switch between reveal and unreveal.
.. dfhack-command:: revflood
:summary: Hide everything, then reveal tiles with a path to the cursor.
:summary: Hide everything, then reveal tiles with a path to a unit.
.. dfhack-command:: nopause
:summary: Disable pausing.
@ -44,9 +44,10 @@ Usage
where (for example) you abandoned with the fort revealed and no longer need
the saved map data when you load a new fort.
``revflood``
Hide everything, then reveal tiles with a path to the cursor. This allows
reparing maps that you accidentally saved while they were revealed. Note
that tiles behind constructed walls are also revealed as a workaround for
Hide everything, then reveal tiles with a path to the keyboard cursor (if
enabled) or the selected unit (if a unit is selected) or else a random citizen.
This allows reparing maps that you accidentally saved while they were revealed.
Note that tiles behind constructed walls are also revealed as a workaround for
:bug:`1871`.
``nopause 1|0``
Disables pausing (both manual and automatic) with the exception of the pause

30
plugins/reveal.cpp
Unescape Escape View File

@ -12,6 +12,7 @@
#include "modules/World.h"
#include "modules/MapCache.h"
#include "modules/Gui.h"
#include "modules/Units.h"
#include "modules/Screen.h"
#include "df/block_square_event_frozen_liquidst.h"
@ -502,21 +503,32 @@ command_result revflood(color_ostream &out, vector<string> & params)
out.printerr("Only in proper dwarf mode.\n");
return CR_FAILURE;
}
int32_t cx, cy, cz;
df::coord pos;
Maps::getSize(x_max,y_max,z_max);
Gui::getCursorCoords(cx,cy,cz);
if(cx == -30000)
{
out.printerr("Cursor is not active. Point the cursor at some empty space you want to be unhidden.\n");
Gui::getCursorCoords(pos);
if (!pos.isValid()) {
df::unit *unit = Gui::getSelectedUnit(out, true);
if (unit)
pos = Units::getPosition(unit);
}
if (!pos.isValid()) {
vector<df::unit *> citizens;
Units::getCitizens(citizens);
if (citizens.size())
pos = Units::getPosition(citizens[0]);
}
if(!pos.isValid()) {
out.printerr("Please select a unit or place the keyboard cursor at some empty space you want to be unhidden.\n");
return CR_FAILURE;
}
DFCoord xy ((uint32_t)cx,(uint32_t)cy,cz);
MapCache * MCache = new MapCache;
df::tiletype tt = MCache->tiletypeAt(xy);
df::tiletype tt = MCache->tiletypeAt(pos);
if(isWallTerrain(tt))
{
out.printerr("Point the cursor at some empty space you want to be unhidden.\n");
out.printerr("Please select a unit or place the keyboard cursor at some empty space you want to be unhidden.\n");
delete MCache;
return CR_FAILURE;
}
@ -534,7 +546,7 @@ command_result revflood(color_ostream &out, vector<string> & params)
}
MCache->trash();
unhideFlood_internal(MCache, xy);
unhideFlood_internal(MCache, pos);
MCache->WriteAll();
delete MCache;