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

Prospector plugin tool thing. How to pass them parameters?

develop
Petr Mrázek 2011-06-20 05:08:21 +02:00
parent c6dc4900d2
commit b41ab40bb6
2 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/CMakeLists.txt
Unescape Escape View File

@ -20,3 +20,4 @@ ENDMACRO()
DFHACK_PLUGIN(reveal reveal.cpp) DFHACK_PLUGIN(reveal reveal.cpp)
DFHACK_PLUGIN(kittens kittens.cpp) DFHACK_PLUGIN(kittens kittens.cpp)
DFHACK_PLUGIN(prospector prospector.cpp)

65
tools/supported/prospector.cpp → plugins/prospector.cpp
Unescape Escape View File

@ -15,8 +15,8 @@
using namespace std; using namespace std;
#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>
#include <dfhack/Core.h>
typedef std::map<int16_t, unsigned int> MatMap; typedef std::map<int16_t, unsigned int> MatMap;
typedef std::vector< pair<int16_t, unsigned int> > MatSorter; typedef std::vector< pair<int16_t, unsigned int> > MatSorter;
@ -24,8 +24,8 @@ typedef std::vector< pair<int16_t, unsigned int> > MatSorter;
typedef std::vector<DFHack::t_feature> FeatureList; typedef std::vector<DFHack::t_feature> FeatureList;
typedef std::vector<DFHack::t_feature*> FeatureListPointer; typedef std::vector<DFHack::t_feature*> FeatureListPointer;
typedef std::map<DFHack::DFCoord, FeatureListPointer> FeatureMap; typedef std::map<DFHack::DFCoord, FeatureListPointer> FeatureMap;
typedef std::vector<DFHack::dfh_plant> PlantList; typedef std::vector<DFHack::df_plant *> PlantList;
/*
bool parseOptions(int argc, char **argv, bool &showHidden, bool &showPlants, bool parseOptions(int argc, char **argv, bool &showHidden, bool &showPlants,
bool &showSlade, bool &showTemple) bool &showSlade, bool &showTemple)
{ {
@ -67,7 +67,7 @@ bool parseOptions(int argc, char **argv, bool &showHidden, bool &showPlants,
} }
return true; return true;
} }
*/
template<template <typename> class P = std::greater > template<template <typename> class P = std::greater >
struct compare_pair_second struct compare_pair_second
{ {
@ -103,50 +103,40 @@ void printMats(MatMap &mat, std::vector<DFHack::t_matgloss> &materials)
std::cout << ">>> TOTAL = " << total << std::endl << std::endl; std::cout << ">>> TOTAL = " << total << std::endl << std::endl;
} }
int main(int argc, char *argv[]) DFhackCExport const char * plugin_name ( void )
{ {
bool temporary_terminal = TemporaryTerminal(); return "prospector";
bool showHidden = false; }
DFhackCExport int plugin_run (DFHack::Core * c)
{
bool showHidden = true;
bool showPlants = true; bool showPlants = true;
bool showSlade = true; bool showSlade = true;
bool showTemple = true; bool showTemple = true;
/*
if (!parseOptions(argc, argv, showHidden, showPlants, showSlade, showTemple)) if (!parseOptions(argc, argv, showHidden, showPlants, showSlade, showTemple))
{ {
return -1; return -1;
} }
*/
uint32_t x_max = 0, y_max = 0, z_max = 0; uint32_t x_max = 0, y_max = 0, z_max = 0;
DFHack::ContextManager manager("Memory.xml"); c->Suspend();
DFHack::Maps *maps = c->getMaps();
DFHack::Context *context = manager.getSingleContext();
if (!context->Attach())
{
std::cerr << "Unable to attach to DF!" << std::endl;
if(temporary_terminal)
std::cin.ignore();
return 1;
}
DFHack::Maps *maps = context->getMaps();
if (!maps->Start()) if (!maps->Start())
{ {
std::cerr << "Cannot get map info!" << std::endl; std::cerr << "Cannot get map info!" << std::endl;
context->Detach(); c->Resume();
if(temporary_terminal)
std::cin.ignore();
return 1; return 1;
} }
maps->getSize(x_max, y_max, z_max); maps->getSize(x_max, y_max, z_max);
MapExtras::MapCache map(maps); MapExtras::MapCache map(maps);
DFHack::Materials *mats = context->getMaterials(); DFHack::Materials *mats = c->getMaterials();
if (!mats->ReadInorganicMaterials()) if (!mats->ReadInorganicMaterials())
{ {
std::cerr << "Unable to read inorganic material definitons!" << std::endl; std::cerr << "Unable to read inorganic material definitons!" << std::endl;
context->Detach(); c->Resume();
if(temporary_terminal)
std::cin.ignore();
return 1; return 1;
} }
if (showPlants && !mats->ReadOrganicMaterials()) if (showPlants && !mats->ReadOrganicMaterials())
@ -182,8 +172,8 @@ int main(int argc, char *argv[])
} }
uint32_t vegCount = 0; uint32_t vegCount = 0;
DFHack::Vegetation *veg = context->getVegetation(); DFHack::Vegetation *veg = c->getVegetation();
if (showPlants && !veg->Start(vegCount)) if (showPlants && !veg->Start())
{ {
std::cerr << "Unable to read vegetation; plants won't be listed!" << std::endl; std::cerr << "Unable to read vegetation; plants won't be listed!" << std::endl;
} }
@ -315,12 +305,12 @@ int main(int argc, char *argv[])
// and we can check visibility more easily here // and we can check visibility more easily here
if (showPlants) if (showPlants)
{ {
PlantList plants; PlantList * plants;
if (maps->ReadVegetation(b_x, b_y, z, &plants)) if (maps->ReadVegetation(b_x, b_y, z, plants))
{ {
for (PlantList::const_iterator it = plants.begin(); it != plants.end(); it++) for (PlantList::const_iterator it = plants->begin(); it != plants->end(); it++)
{ {
const DFHack::t_plant & plant = (*it).sdata; const DFHack::df_plant & plant = *(*it);
DFHack::DFCoord loc(plant.x, plant.y); DFHack::DFCoord loc(plant.x, plant.y);
loc = loc % 16; loc = loc % 16;
if (showHidden || !b->DesignationAt(loc).bits.hidden) if (showHidden || !b->DesignationAt(loc).bits.hidden)
@ -385,12 +375,7 @@ int main(int argc, char *argv[])
} }
mats->Finish(); mats->Finish();
maps->Finish(); maps->Finish();
context->Detach(); c->Resume();
if(temporary_terminal)
{
std::cout << " Press any key to finish.";
std::cin.ignore();
}
std::cout << std::endl; std::cout << std::endl;
return 0; return 0;
} }