Make new probe tool out of the 'vecc' thing.

examples/buildingsdump.cpp

@@ -18,7 +18,7 @@ using namespace std;
 #include <modules/Buildings.h>
 #include <modules/Materials.h>
 #include <modules/Position.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 
 int main (int argc,const char* argv[])
 {

examples/construction_dump.cpp

@@ -19,7 +19,7 @@ using namespace std;
 #include <modules/Materials.h>
 #include <modules/Position.h>
 #include <modules/Constructions.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 
 using namespace DFHack;
 

examples/creaturedump.cpp

@@ -16,7 +16,7 @@ using namespace std;
 #include <modules/Materials.h>
 #include <modules/Creatures.h>
 #include <modules/Translation.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 
 enum likeType
 {

examples/spatterdump.cpp

@@ -21,7 +21,7 @@ using namespace std;
 #include <modules/Materials.h>
 #include <modules/Position.h>
 #include <modules/Maps.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 
 using namespace DFHack;
 

examples/treedump.cpp

@@ -20,7 +20,7 @@ using namespace std;
 #include <modules/Vegetation.h>
 #include <modules/Materials.h>
 #include <modules/Position.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 
 int main (int numargs, const char ** args)
 {

examples/veccheck.cpp

@@ -21,7 +21,7 @@ using namespace std;
 #include <modules/Position.h>
 #include <modules/Maps.h>
 #include <modules/Constructions.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 #include <DFTileTypes.h>
 
 using namespace DFHack;
@@ -136,9 +136,11 @@ int main (int numargs, const char ** args)
         uint32_t tileX = cursorX % 16;
         uint32_t blockY = cursorY / 16;
         uint32_t tileY = cursorY % 16;
+        t_temperatures tmpb1, tmpb2;
         mapblock40d block;
         if(Maps->ReadBlock40d(blockX,blockY,cursorZ,&block))
         {
+            Maps->ReadTemperatures(blockX,blockY,cursorZ,&tmpb1, &tmpb2);
             printf("block addr: 0x%x\n", block.origin);
             int16_t tiletype = block.tiletypes[tileX][tileY];
             naked_designation &des = block.designation[tileX][tileY].bits;
@@ -147,87 +149,17 @@ int main (int numargs, const char ** args)
             cout << endl;
             print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,cout);
             cout << endl;
+            
             // tiletype
             cout <<"tiletype: " << tiletype;
             if(tileTypeTable[tiletype].name)
                 cout << " = " << tileTypeTable[tiletype].name;
             cout << endl;
-            // local feature present
-            if(des.feature_local)
-            {
-                cout << "local feature present: " << p->readWord(block.origin + block_feature1) << endl;
-                int16_t idx = p->readWord(block.origin + block_feature1);
-                if(idx != -1)
-                {
-                    uint64_t block48_x = cursorX / 48 + regionX;
-                    cout << "cursorX: " << cursorX << ", regionX:" << regionX << endl;
-                    cout << "bigblock_x: " << block48_x << endl;
             
-                    // region X coord offset by 8 big blocks (48x48 tiles)
-                    uint16_t region_x_plus8 = ( block48_x + 8 ) / 16;
-                    //uint16_t v12b = block48_x / 16;
-                    //cout << "v12: " << v12 << " : " << v12b <<  endl;
-                    // plain region Y coord
-                    uint64_t region_y_local = (cursorY / 48 + regionY) / 16;
-                    cout << "region_y_local: " << region_y_local << endl;
             
-                    // deref pointer to the humongo-structure
+            cout <<"temperature1: " << tmpb1[tileX][tileY] << " U" << endl;
-                    uint32_t base = p->readDWord(feature1_start_ptr);
+            cout <<"temperature2: " << tmpb2[tileX][tileY] << " U" << endl;
-                    cout << "base! : " << base << endl;
-                    // this is just a few pointers to arrays of 16B (4 DWORD) structs
-                    uint32_t array_elem = p->readDWord(base + (region_x_plus8 / 16) * 4);
-                    cout << "array_elem : " << array_elem << endl;
-                    // second element of the struct is a pointer
-                    uint32_t wtf = p->readDWord(array_elem + (16*(region_y_local/16)) + 4); // rounding!
             
-                    cout << "wtf : " << wtf << " @" << array_elem + (16*(region_y_local/16)) <<  endl;
-                    if(wtf)
-                    {
-                        //v14 = v10 + 24 * ((signed __int16)_tX + 16 * v9 % 16);
-                        uint32_t feat_vector = wtf + 24 * ((region_y_local % 16) + 16 * (region_x_plus8 % 16));
-                        cout << "local feature vector: " << feat_vector << endl;
-                        DfVector<uint32_t> p_features(p, feat_vector);
-                        /*
-                        for(int k = 0 ; k < p_features.size();k++)
-                        {
-                            printf("feature %d addr: 0x%x\n", k, p_features[k]);
-                            string name = p->readClassName(p->readDWord( p_features[k] ));
-                            cout << name << endl;
-                        }
-                        */
-                        printf("feature %d addr: 0x%x\n", idx, p_features[idx]);
-                        string name = p->readClassName(p->readDWord( p_features[idx] ));
-                        bool discovered = p->readDWord( p_features[idx] + 4 );
-                        cout << name << endl;
-                        if(discovered)
-                        {
-                            cout << "You've discovered it already!" << endl;
-                        }
-                    }
-                }
-            }
-            // global feature present
-            if(des.feature_global)
-            {
-                int16_t idx = p->readWord(block.origin + block_feature2);
-                cout << "global feature present: " << idx << endl;
-                if(idx != -1)
-                {
-                    DfVector<uint32_t> p_features (p,mem->getAddress("global_feature_vector"));
-                    if(idx < p_features.size())
-                    {
-                        uint32_t feat_ptr = p->readDWord(p_features[idx] + mem->getOffset("global_feature_funcptr_"));
-                        printf("feature descriptor?: 0x%x\n", feat_ptr);
-                        string name = p->readClassName(p->readDWord( feat_ptr));
-                        bool discovered = p->readDWord( p_features[idx] + 4 );
-                        cout << name << endl;
-                        if(discovered)
-                        {
-                            cout << "You've discovered it already!" << endl;
-                        }
-                    }
-                }
-            }
             // biome, geolayer
             cout << "biome: " << des.biome << endl;
             cout << "geolayer: " << des.geolayer_index << endl;
@@ -262,16 +194,6 @@ int main (int numargs, const char ** args)
             else
                 cout << " ";
             cout << endl;
-            /*
-            block.designation[tx][ty].bits.moss = 1;
-            block.designation[tx][ty].bits.geolayer_index = 15;
-            block.tiletypes[tx][ty] = 344;
-            
-            print_bits<uint32_t>(block.designation[tx][ty].whole,cout);
-            Maps->WriteDesignations(bx,by,cz,&(block.designation));
-            Maps->WriteTileTypes(bx,by,cz,&(block.tiletypes));
-            */
-            
         }
     }
     #ifndef LINUX_BUILD

examples/veinlook.cpp

@@ -24,7 +24,7 @@ using namespace std;
 #include <DFMemInfo.h>
 #include <modules/Maps.h>
 #include <modules/Materials.h>
-#include "miscutils.h"
+#include <DFMiscUtils.h>
 using namespace DFHack;
 
 
@@ -537,8 +537,6 @@ main(int argc, char *argv[])
     map <int16_t, uint32_t> materials;
     materials.clear();
     mapblock40d blocks[3][3];
-    vector<DFHack::t_matgloss> stonetypes;
-    vector<DFHack::t_matgloss> creature_types;
     vector<DFHack::t_effect_df40d> effects;
     vector< vector <uint16_t> > layerassign;
     vector<t_vein> veinVector;
@@ -583,14 +581,14 @@ main(int argc, char *argv[])
     z_max = z_max_a;
     
     // get stone matgloss mapping
-    if(!Mats->ReadInorganicMaterials(stonetypes))
+    if(!Mats->ReadInorganicMaterials())
     {
         error = "Can't read stone types.";
         pDF = 0;
         finish(0);
     }
     
-    if(!Mats->ReadCreatureTypes(creature_types))
+    if(!Mats->ReadCreatureTypes())
     {
         error = "Can't read stone types.";
         pDF = 0;
@@ -745,7 +743,7 @@ main(int argc, char *argv[])
                 // extra processing of the block in the middle
                 if(i == 0 && j == 0)
                 {
-                    do_features(DF, Block, cursorX, cursorY, 50,10, stonetypes);
+                    do_features(DF, Block, cursorX, cursorY, 50,10, Mats->inorganic);
                     // read veins
                     Maps->ReadVeins(cursorX+i,cursorY+j,cursorZ,&veinVector,&IceVeinVector,&splatter);
                     
@@ -882,7 +880,7 @@ main(int argc, char *argv[])
                         }
                     }
                     gotoxy(50,3);
-                    cprintf("Mineral: %s",stonetypes[veinVector[vein].type].id);
+                    cprintf("Mineral: %s",Mats->inorganic[veinVector[vein].type].id);
                 }
                 else if (vein < mineralsize + icesize)
                 {
@@ -922,7 +920,7 @@ main(int argc, char *argv[])
                         }
                     }
                     gotoxy(50,3);
-                    cprintf("Spatter: %s",PrintSplatterType(splatter[realvein].mat1,splatter[realvein].mat2,creature_types).c_str());
+                    cprintf("Spatter: %s",PrintSplatterType(splatter[realvein].mat1,splatter[realvein].mat2,Mats->race).c_str());
                 }
             }
         }

tools/CMakeLists.txt

@@ -29,6 +29,10 @@ TARGET_LINK_LIBRARIES(dfcleanmap dfhack)
 ADD_EXECUTABLE(dfunstuck unstuck.cpp)
 TARGET_LINK_LIBRARIES(dfunstuck dfhack)
 
+# probe - map tile probe
+ADD_EXECUTABLE(dfprobe probe.cpp)
+TARGET_LINK_LIBRARIES(dfprobe dfhack)
+
 IF(UNIX)
 # incrementalsearch - a bit like cheat engine, only DF-specific, very basic
 # and Linux-only

tools/probe.cpp

@@ -0,0 +1,137 @@
+// Just show some position data
+
+#include <iostream>
+#include <iomanip>
+#include <climits>
+#include <integers.h>
+#include <vector>
+#include <sstream>
+#include <ctime>
+#include <cstdio>
+using namespace std;
+
+#include <DFGlobal.h>
+#include <DFTypes.h>
+#include <DFHackAPI.h>
+#include <DFProcess.h>
+#include <DFMemInfo.h>
+#include <DFVector.h>
+#include <DFTypes.h>
+#include <modules/Materials.h>
+#include <modules/Position.h>
+#include <modules/Maps.h>
+#include <modules/Constructions.h>
+#include <DFMiscUtils.h>
+#include <DFTileTypes.h>
+
+using namespace DFHack;
+int main (int numargs, const char ** args)
+{
+    DFHack::API DF("Memory.xml");
+    try
+    {
+        DF.Attach();
+    }
+    catch (exception& e)
+    {
+        cerr << e.what() << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
+    
+    DFHack::Position *Pos = DF.getPosition();
+    DFHack::memory_info* mem = DF.getMemoryInfo();
+    DFHack::Maps *Maps = DF.getMaps();
+    DFHack::Process * p = DF.getProcess();
+    uint32_t designatus = mem->getOffset("map_data_designation");
+    uint32_t block_feature1 = mem->getOffset("map_data_feature_local");
+    uint32_t block_feature2 = mem->getOffset("map_data_feature_global");
+    uint32_t region_x_offset = mem->getAddress("region_x");
+    uint32_t region_y_offset = mem->getAddress("region_y");
+    uint32_t region_z_offset = mem->getAddress("region_z");
+    uint32_t feature1_start_ptr = mem->getAddress("local_feature_start_ptr");
+    int32_t regionX, regionY, regionZ;
+    
+    // read position of the region inside DF world
+    p->readDWord (region_x_offset, (uint32_t &)regionX);
+    p->readDWord (region_y_offset, (uint32_t &)regionY);
+    p->readDWord (region_z_offset, (uint32_t &)regionZ);
+    
+    Maps->Start();
+    
+    int32_t cursorX, cursorY, cursorZ;
+    Pos->getCursorCoords(cursorX,cursorY,cursorZ);
+    if(cursorX != -30000)
+    {
+        uint32_t blockX = cursorX / 16;
+        uint32_t tileX = cursorX % 16;
+        uint32_t blockY = cursorY / 16;
+        uint32_t tileY = cursorY % 16;
+        t_temperatures tmpb1, tmpb2;
+        mapblock40d block;
+        if(Maps->ReadBlock40d(blockX,blockY,cursorZ,&block))
+        {
+            Maps->ReadTemperatures(blockX,blockY,cursorZ,&tmpb1, &tmpb2);
+            printf("block addr: 0x%x\n", block.origin);
+            int16_t tiletype = block.tiletypes[tileX][tileY];
+            naked_designation &des = block.designation[tileX][tileY].bits;
+            uint32_t &desw = block.designation[tileX][tileY].whole;
+            print_bits<uint32_t>(block.designation[tileX][tileY].whole,cout);
+            cout << endl;
+            print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,cout);
+            cout << endl;
+            
+            // tiletype
+            cout <<"tiletype: " << tiletype;
+            if(tileTypeTable[tiletype].name)
+                cout << " = " << tileTypeTable[tiletype].name;
+            cout << endl;
+            
+            
+            cout <<"temperature1: " << tmpb1[tileX][tileY] << " U" << endl;
+            cout <<"temperature2: " << tmpb2[tileX][tileY] << " U" << endl;
+            
+            // biome, geolayer
+            cout << "biome: " << des.biome << endl;
+            cout << "geolayer: " << des.geolayer_index << endl;
+            // liquids
+            if(des.flow_size)
+            {
+                if(des.liquid_type == DFHack::liquid_magma)
+                    cout <<"magma: ";
+                else cout <<"water: ";
+                cout << des.flow_size << endl;
+            }
+            if(des.flow_forbid)
+                cout << "flow forbid" << endl;
+            if(des.pile)
+                cout << "stockpile?" << endl;
+            if(des.rained)
+                cout << "rained?" << endl;
+            if(des.smooth)
+                cout << "smooth?" << endl;
+            uint32_t designato = block.origin + designatus + (tileX * 16 + tileY) * sizeof(t_designation);
+            printf("designation offset: 0x%x\n", designato);
+            if(des.light)
+                cout << "Light ";
+            else
+                cout << "      ";
+            if(des.skyview)
+                cout << "SkyView ";
+            else
+                cout << "        ";
+            if(des.subterranean)
+                cout << "Underground ";
+            else
+                cout << "            ";
+            cout << endl;
+        }
+    }
+    #ifndef LINUX_BUILD
+    cout << "Done. Press any key to continue" << endl;
+    cin.ignore();
+    #endif
+    return 0;
+}