Improvements to probe by matthew-cline

develop
Petr Mrázek 2011-07-06 01:28:23 +02:00
parent da2fb1cb1a
commit dfe58b6757
1 changed files with 229 additions and 99 deletions

@ -13,15 +13,101 @@ using namespace std;
#define DFHACK_WANT_TILETYPES 1 #define DFHACK_WANT_TILETYPES 1
#include <DFHack.h> #include <DFHack.h>
#include <dfhack/extra/MapExtras.h> #include <dfhack/extra/MapExtras.h>
#include <xgetopt.h>
#include <dfhack/extra/termutil.h> #include <dfhack/extra/termutil.h>
bool parseOptions(int argc, char **argv, bool &showBlock, bool &showDesig,
bool &showOccup, bool &showTile, bool &showMisc)
{
// With no options set, show everything.
showBlock = true;
showDesig = true;
showOccup = true;
showTile = true;
showMisc = true;
bool _showBlock = false;
bool _showDesig = false;
bool _showOccup = false;
bool _showTile = false;
bool _showMisc = false;
char c;
xgetopt opt(argc, argv, "bdotm");
opt.opterr = 0;
while ((c = opt()) != -1)
{
switch (c)
{
case 'b':
_showBlock = true;
break;
case 'd':
_showDesig = true;
break;
case 'o':
_showOccup = true;
break;
case 't':
_showTile = true;
break;
case 'm':
_showMisc = true;
break;
case '?':
switch (opt.optopt)
{
// For when we take arguments
default:
if (isprint(opt.optopt))
std::cerr << "Unknown option -" << opt.optopt << "!"
<< std::endl;
else
std::cerr << "Unknown option character " << (int) opt.optopt << "!"
<< std::endl;
}
default:
// Um.....
return false;
}
}
// If any options set, show only those requested via options.
if(_showBlock || _showDesig || _showOccup || _showTile || _showMisc)
{
showBlock = false;
showDesig = false;
showOccup = false;
showTile = false;
showMisc = false;
showBlock = _showBlock;
showDesig = _showDesig;
showOccup = _showOccup;
showTile = _showTile;
showMisc = _showMisc;
}
return true;
}
using namespace DFHack; using namespace DFHack;
int main (int numargs, const char ** args) int main (int numargs, char ** args)
{ {
bool temporary_terminal = TemporaryTerminal(); bool temporary_terminal = TemporaryTerminal();
DFHack::ContextManager DFMgr("Memory.xml"); DFHack::ContextManager DFMgr("Memory.xml");
DFHack::Context *DF = DFMgr.getSingleContext(); DFHack::Context *DF = DFMgr.getSingleContext();
bool showBlock, showDesig, showOccup, showTile, showMisc;
if (!parseOptions(numargs, args, showBlock, showDesig, showOccup,
showTile, showMisc))
{
return -1;
}
BEGIN_PROBE: BEGIN_PROBE:
try try
{ {
@ -73,7 +159,12 @@ int main (int numargs, const char ** args)
int32_t cursorX, cursorY, cursorZ; int32_t cursorX, cursorY, cursorZ;
Gui->getCursorCoords(cursorX,cursorY,cursorZ); Gui->getCursorCoords(cursorX,cursorY,cursorZ);
if(cursorX != -30000) if(cursorX == -30000)
{
std::cerr << "No cursor; place cursor over tile to probe."
<< endl;
}
else
{ {
DFCoord cursor (cursorX,cursorY,cursorZ); DFCoord cursor (cursorX,cursorY,cursorZ);
@ -86,21 +177,39 @@ int main (int numargs, const char ** args)
mapblock40d & block = b->raw; mapblock40d & block = b->raw;
if(b) if(b)
{ {
printf("block addr: 0x%x\n", block.origin); printf("block addr: 0x%x\n\n", block.origin);
if (showBlock)
{
printf("block flags:\n");
print_bits<uint32_t>(block.blockflags.whole,std::cout);
std::cout << endl << endl;
}
int16_t tiletype = mc.tiletypeAt(cursor); int16_t tiletype = mc.tiletypeAt(cursor);
naked_designation &des = block.designation[tileX][tileY].bits; naked_designation &des = block.designation[tileX][tileY].bits;
uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation); uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation);
uint32_t occupr = block.origin + occup + (tileX * 16 + tileY) * sizeof(t_occupancy); uint32_t occupr = block.origin + occup + (tileX * 16 + tileY) * sizeof(t_occupancy);
if(showDesig)
{
printf("designation offset: 0x%x\n", designato); printf("designation offset: 0x%x\n", designato);
print_bits<uint32_t>(block.designation[tileX][tileY].whole,std::cout); print_bits<uint32_t>(block.designation[tileX][tileY].whole,
std::cout << endl; std::cout);
std::cout << endl << endl;
}
if(showOccup)
{
printf("occupancy offset: 0x%x\n", occupr); printf("occupancy offset: 0x%x\n", occupr);
print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,std::cout); print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,
std::cout << endl; std::cout);
std::cout << endl << endl;
}
if(showTile)
{
// tiletype // tiletype
std::cout <<"tiletype: " << tiletype; std::cout <<"tiletype: " << tiletype;
if(tileName(tiletype)) if(tileName(tiletype))
@ -109,25 +218,40 @@ int main (int numargs, const char ** args)
DFHack::TileShape shape = tileShape(tiletype); DFHack::TileShape shape = tileShape(tiletype);
DFHack::TileMaterial material = tileMaterial(tiletype); DFHack::TileMaterial material = tileMaterial(tiletype);
DFHack::TileSpecial special = tileSpecial(tiletype); DFHack::TileSpecial special = tileSpecial(tiletype);
printf("%-10s: %4d %s\n","Class" ,shape, TileShapeString[ shape ]); printf("%-10s: %4d %s\n","Class" ,shape,
printf("%-10s: %4d %s\n","Material" ,material,TileMaterialString[ material ]); TileShapeString[ shape ]);
printf("%-10s: %4d %s\n","Special" ,special, TileSpecialString[ special ]); printf("%-10s: %4d %s\n","Material" ,
printf("%-10s: %4d\n" ,"Variant" ,tileVariant(tiletype)); material,TileMaterialString[ material ]);
printf("%-10s: %s\n" ,"Direction",tileDirection(tiletype).getStr()); printf("%-10s: %4d %s\n","Special" ,
special, TileSpecialString[ special ]);
printf("%-10s: %4d\n" ,"Variant" ,
tileVariant(tiletype));
printf("%-10s: %s\n" ,"Direction",
tileDirection(tiletype).getStr());
std::cout << std::endl; std::cout << std::endl;
std::cout <<"temperature1: " << mc.temperature1At(cursor) << " U" << std::endl; }
std::cout <<"temperature2: " << mc.temperature2At(cursor) << " U" << std::endl;
if(showMisc)
{
std::cout <<"temperature1: " << mc.temperature1At(cursor)
<< " U" << std::endl;
std::cout <<"temperature2: " << mc.temperature2At(cursor)
<< " U" << std::endl;
// biome, geolayer // biome, geolayer
std::cout << "biome: " << des.biome << std::endl; std::cout << "biome: " << des.biome << std::endl;
std::cout << "geolayer: " << des.geolayer_index << std::endl; std::cout << "geolayer: " << des.geolayer_index
<< std::endl;
int16_t base_rock = mc.baseMaterialAt(cursor); int16_t base_rock = mc.baseMaterialAt(cursor);
if(base_rock != -1) if(base_rock != -1)
{ {
cout << "Layer material: " << dec << base_rock; cout << "Layer material: " << dec << base_rock;
if(hasmats) if(hasmats)
cout << " / " << Materials->inorganic[base_rock].id << " / " << Materials->inorganic[base_rock].name << endl; cout << " / " << Materials->inorganic[base_rock].id
<< " / "
<< Materials->inorganic[base_rock].name
<< endl;
else else
cout << endl; cout << endl;
} }
@ -136,7 +260,10 @@ int main (int numargs, const char ** args)
{ {
cout << "Vein material (final): " << dec << vein_rock; cout << "Vein material (final): " << dec << vein_rock;
if(hasmats) if(hasmats)
cout << " / " << Materials->inorganic[vein_rock].id << " / " << Materials->inorganic[vein_rock].name << endl; cout << " / " << Materials->inorganic[vein_rock].id
<< " / "
<< Materials->inorganic[vein_rock].name
<< endl;
else else
cout << endl; cout << endl;
} }
@ -197,13 +324,16 @@ int main (int numargs, const char ** args)
PRINT_FLAG( feature_global ); PRINT_FLAG( feature_global );
} }
#undef PRINT_FLAG #undef PRINT_FLAG
cout << "local feature idx: " << block.local_feature << endl; cout << "local feature idx: " << block.local_feature
cout << "global feature idx: " << block.global_feature << endl; << endl;
cout << "global feature idx: " << block.global_feature
<< endl;
cout << "mystery: " << block.mystery << endl; cout << "mystery: " << block.mystery << endl;
std::cout << std::endl; std::cout << std::endl;
} }
} }
} }
}
DF->Detach(); DF->Detach();
if(temporary_terminal) if(temporary_terminal)
{ {