Merge branch 'bartavelle' of gitosis@bigbox.banquise.net:dfhack into bartavelle

dfhack/include/config.h

@@ -1,6 +1,6 @@
-#ifndef CONFIG_H
+#ifndef CONFIG_H
-#define CONFIG_H
+#define CONFIG_H
-
+
-#define MEMXML_DATA_PATH .
+#define MEMXML_DATA_PATH .
-
+
-#endif // CONFIG_H
+#endif // CONFIG_H

output/Memory.xml

@@ -1399,6 +1399,7 @@ map_data_1b60_offset          0x1B9c
         <Offset name="creature_pickup_equipment_bit">0X21C</Offset>
         <!--<Offset name="creature_mood">0x238</Offset>-->
         
+        <Offset name="creature_mood">0x288</Offset>
         <Offset name="creature_physical">0x464</Offset>
         <!--
         <Offset name="creature_strength">0x464</Offset>

tools/CMakeLists.txt

@@ -9,6 +9,10 @@ ENDIF(UNIX)
 ADD_EXECUTABLE(dfreveal reveal.cpp)
 TARGET_LINK_LIBRARIES(dfreveal dfhack)
 
+# a reveal clone
+ADD_EXECUTABLE(dfmoodump moodump.cpp)
+TARGET_LINK_LIBRARIES(dfmoodump dfhack)
+
 # prospector - produces a list of available materials and their quantities
 ADD_EXECUTABLE(dfprospector prospector.cpp)
 TARGET_LINK_LIBRARIES(dfprospector dfhack)
@@ -63,6 +67,7 @@ dfincremental
 #dfmagma_create
 dfprospector
 dfreveal
+dfmoodump
 RUNTIME DESTINATION bin
 )
-ENDIF(UNIX)
+ENDIF(UNIX)

tools/moodump.cpp

@@ -0,0 +1,136 @@
+#include <iostream>
+#include <climits>
+#include <integers.h>
+#include <vector>
+#include <stdio.h>
+using namespace std;
+
+#include <DFGlobal.h>
+#include <DFError.h>
+#include <DFTypes.h>
+#include <DFHackAPI.h>
+#include <DFMemInfo.h>
+#include <DFProcess.h>
+#include <modules/Materials.h>
+#include <modules/Creatures.h>
+#include <modules/Translation.h>
+
+struct matGlosses 
+{
+    vector<DFHack::t_matglossPlant> plantMat;
+    vector<DFHack::t_matgloss> woodMat;
+    vector<DFHack::t_matgloss> stoneMat;
+    vector<DFHack::t_matgloss> metalMat;
+    vector<DFHack::t_matgloss> creatureMat;
+};
+
+vector<DFHack::t_creaturetype> creaturestypes;
+matGlosses mat;
+vector< vector <DFHack::t_itemType> > itemTypes;
+DFHack::memory_info *mem;
+vector< vector<string> > englishWords;
+vector< vector<string> > foreignWords;
+
+int main (int numargs, char ** args)
+{
+    DFHack::API DF("Memory.xml");
+    DFHack::Process * p;
+    try
+    {
+        DF.Attach();
+    }
+    catch (exception& e)
+    {
+        cerr << e.what() << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
+    p = DF.getProcess();
+    string check = "";
+    if(numargs == 2)
+        check = args[1];
+    
+    DFHack::Creatures * Creatures = DF.getCreatures();
+    DFHack::Materials * Materials = DF.getMaterials();
+    DFHack::Translation * Tran = DF.getTranslation();
+    
+    uint32_t numCreatures;
+    if(!Creatures->Start(numCreatures))
+    {
+        cerr << "Can't get creatures" << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
+    if(!numCreatures)
+    {
+        cerr << "No creatures to print" << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
+    mem = DF.getMemoryInfo();
+    // get stone matgloss mapping
+    if(!Materials->ReadCreatureTypesEx(creaturestypes))
+    {
+        cerr << "Can't get the creature types." << endl;
+        return 1; 
+    }
+        
+    if(!Tran->Start())
+    {
+        cerr << "Can't get name tables" << endl;
+        return 1;
+    }
+    vector<uint32_t> addrs;
+    //DF.InitViewAndCursor();
+    for(uint32_t i = 0; i < numCreatures; i++)
+    {
+        DFHack::t_creature temp;
+	unsigned int current_job;
+	unsigned int mat_start;
+	unsigned int mat_end;
+	unsigned int j,k;
+	unsigned int matptr;
+	unsigned int tmp;
+
+    Creatures->ReadCreature(i,temp);
+	if(temp.mood>=0)
+	{
+		current_job = p->readDWord(temp.origin + 0x390);
+		if(current_job == 0)
+			continue;
+		mat_start = p->readDWord(current_job + 0xa4 + 4*3);
+		mat_end = p->readDWord(current_job + 0xa4 + 4*4);
+		for(j=mat_start;j<mat_end;j+=4)
+		{
+			matptr = p->readDWord(j);
+			for(k=0;k<4;k++)
+				printf("%.4X ", p->readWord(matptr + k*2));
+			for(k=0;k<3;k++)
+				printf("%.8X ", p->readDWord(matptr + k*4 + 0x8));
+			for(k=0;k<2;k++)
+				printf("%.4X ", p->readWord(matptr + k*2 + 0x14));
+			for(k=0;k<3;k++)
+				printf("%.8X ", p->readDWord(matptr + k*4 + 0x18));
+			for(k=0;k<4;k++)
+				printf("%.2X ", p->readByte(matptr + k + 0x24));
+			for(k=0;k<6;k++)
+				printf("%.8X ", p->readDWord(matptr + k*4 + 0x28));
+			for(k=0;k<4;k++)
+				printf("%.2X ", p->readByte(matptr + k + 0x40));
+			for(k=0;k<9;k++)
+				printf("%.8X ", p->readDWord(matptr + k*4 + 0x44));
+			printf(" [%p]\n", matptr);
+		}
+	}
+    }
+    Creatures->Finish();
+    DF.Detach();
+    return 0;
+}
+