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

enable reveal 

`reveal demon` is disabled due to double popup bug
`reveal` also has guidance text that appears if the player is in graphics mode explaining the limitations of the new renderer
develop
Kelly Kinkade 2023-01-06 13:56:19 -06:00
parent 9de09ac779
commit 779e159512
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/CMakeLists.txt
Unescape Escape View File

@ -151,7 +151,7 @@ dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
#add_subdirectory(remotefortressreader) #add_subdirectory(remotefortressreader)
#dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename) #dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename)
#add_subdirectory(rendermax) #add_subdirectory(rendermax)
#dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua) dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua)
#dfhack_plugin(search search.cpp) #dfhack_plugin(search search.cpp)
#dfhack_plugin(seedwatch seedwatch.cpp) #dfhack_plugin(seedwatch seedwatch.cpp)
#dfhack_plugin(showmood showmood.cpp) #dfhack_plugin(showmood showmood.cpp)

16
plugins/reveal.cpp
Unescape Escape View File

@ -12,6 +12,7 @@
#include "modules/World.h" #include "modules/World.h"
#include "modules/MapCache.h" #include "modules/MapCache.h"
#include "modules/Gui.h" #include "modules/Gui.h"
#include "modules/Screen.h"
#include "df/block_square_event_frozen_liquidst.h" #include "df/block_square_event_frozen_liquidst.h"
#include "df/construction.h" #include "df/construction.h"
@ -184,16 +185,18 @@ command_result reveal(color_ostream &out, vector<string> & params)
else if(params[i] == "help" || params[i] == "?") else if(params[i] == "help" || params[i] == "?")
return CR_WRONG_USAGE; return CR_WRONG_USAGE;
} }
auto& con = out;
if(params.size() && params[0] == "hell") if(params.size() && params[0] == "hell")
{ {
no_hell = false; no_hell = false;
} }
if(params.size() && params[0] == "demon") if(params.size() && params[0] == "demon")
{ {
no_hell = false; con.printerr("`reveal demon` is currently disabled to prevent a hang due to a bug in the base game\n");
pause = false; return CR_FAILURE;
//no_hell = false;
//pause = false;
} }
auto & con = out;
if(revealed != NOT_REVEALED) if(revealed != NOT_REVEALED)
{ {
con.printerr("Map is already revealed or this is a different map.\n"); con.printerr("Map is already revealed or this is a different map.\n");
@ -256,7 +259,14 @@ command_result reveal(color_ostream &out, vector<string> & params)
revealed = DEMON_REVEALED; revealed = DEMON_REVEALED;
} }
is_active = nopause_state || (revealed == REVEALED); is_active = nopause_state || (revealed == REVEALED);
bool graphics_mode = Screen::inGraphicsMode();
con.print("Map revealed.\n"); con.print("Map revealed.\n");
if (graphics_mode) {
con.print("Note that in graphics mode, tiles that are not adjacent to open\n"
"space will not render but can still be examined by hovering over\n"
"them with the mouse. Switching to text mode (in the game settings)\n"
"will allow the display the revealed tiles.\n");
}
if(!no_hell) if(!no_hell)
con.print("Unpausing can unleash the forces of hell, so it has been temporarily disabled.\n"); con.print("Unpausing can unleash the forces of hell, so it has been temporarily disabled.\n");
con.print("Run 'unreveal' to revert to previous state.\n"); con.print("Run 'unreveal' to revert to previous state.\n");