tentative item reading stuff

examples/CMakeLists.txt

@@ -39,8 +39,8 @@ ADD_EXECUTABLE(dfsuspend suspendtest.cpp)
 TARGET_LINK_LIBRARIES(dfsuspend dfhack)
 
 # itemdump - dump the item under the cursor
-# ADD_EXECUTABLE(dfitemdump dfitemdump.cpp)
+ADD_EXECUTABLE(dfitemdump dfitemdump.cpp)
-# TARGET_LINK_LIBRARIES(dfitemdump dfhack)
+TARGET_LINK_LIBRARIES(dfitemdump dfhack)
 
 # hotkeynotedump - dumps the hotkeys and notes for the loaded map
 # Author: belal

examples/dfitemdump.cpp

@@ -1,5 +1,8 @@
-// Item dump
+/*
-
+ * dumps vtables, items types and class name for all items in game
+ * best used this way : ./dfitemdump | sort -ug
+ */
+#include <stdio.h>
 #include <iostream>
 #include <iomanip>
 #include <sstream>
@@ -12,285 +15,63 @@ using namespace std;
 #include <DFTypes.h>
 #include <DFHackAPI.h>
 #include <DFMemInfo.h>
+#include <DFProcess.h>
+#include <DFVector.h>
+#include <modules/Materials.h>
 
-struct matGlosses 
-{
-    vector<DFHack::t_matgloss> plantMat;
-    vector<DFHack::t_matgloss> woodMat;
-    vector<DFHack::t_matgloss> stoneMat;
-    vector<DFHack::t_matgloss> metalMat;
-    vector<DFHack::t_matgloss> creatureMat;
-};
-
-string getMaterialType(DFHack::t_item item, const string & itemtype,const matGlosses & mat)
-{
-    // plant thread seeds
-    if(itemtype == "item_plant" || itemtype == "item_thread" || itemtype == "item_seeds" || itemtype == "item_leaves" )
-    {
-        if(item.material.type >= 0 && item.material.type < mat.plantMat.size())
-        {
-            return mat.plantMat[item.material.type].id;
-        }
-        else
-        {
-            return "some invalid plant material";
-        }
-    }
-    else if (itemtype == "item_drink") // drinks must have different offset for materials
-    {
-        return "Booze or something";
-    }
-    // item_skin_raw item_bones item_skull item_fish_raw item_pet item_skin_tanned item_shell
-    else if(itemtype == "item_skin_raw" ||
-            itemtype == "item_skin_tanned" ||
-            itemtype == "item_fish_raw" ||
-            itemtype == "item_pet" ||
-            itemtype == "item_shell" ||
-            itemtype == "item_horn"||
-            itemtype == "item_skull" ||
-            itemtype == "item_bones" ||
-            itemtype == "item_corpse" ||
-            itemtype == "item_meat"
-            )
-    {
-        if(item.material.type >= 0 && item.material.type < mat.creatureMat.size())
-            return mat.creatureMat[item.material.type].id;
-        return "bad material";
-    }
-    else if(itemtype == "item_wood")
-    {
-        if(item.material.type >= 0 && item.material.type < mat.woodMat.size())
-            return mat.woodMat[item.material.type].id;
-        return "bad material";
-    }
-    else if(itemtype == "item_bar")
-    {
-        if(item.material.type >= 0 && item.material.type < mat.metalMat.size())
-            return mat.metalMat[item.material.type].id;
-        return "bad material";
-    }
-    else
-    {
-        /*
-    Mat_Wood,
-    Mat_Stone,
-    Mat_Metal,
-    Mat_Plant,
-    Mat_Leather = 10,
-    Mat_SilkCloth = 11,
-    Mat_PlantCloth = 12,
-    Mat_GreenGlass = 13,
-    Mat_ClearGlass = 14,
-    Mat_CrystalGlass = 15,
-    Mat_Ice = 17,
-    Mat_Charcoal =18,
-    Mat_Potash = 19,
-    Mat_Ashes = 20,
-    Mat_PearlAsh = 21,
-    Mat_Soap = 24,
-    */
-        switch (item.material.type)
-        {
-        case DFHack::Mat_Wood:
-            if(item.material.index >= 0 && item.material.index < mat.woodMat.size())
-                return mat.woodMat[item.material.index].id;
-            return "bad material";
-            
-        case DFHack::Mat_Stone:
-            if(item.material.index >= 0 && item.material.index < mat.stoneMat.size())
-                return mat.stoneMat[item.material.index].id;
-            return "bad material";
-            
-        case DFHack::Mat_Metal:
-            if(item.material.index >= 0 && item.material.index < mat.metalMat.size())
-                return mat.metalMat[item.material.index].id;
-            return "bad material";
-            
-        //case DFHack::Mat_Plant:
-        case DFHack::Mat_PlantCloth:
-            //return mat.plantMat[item.material.index].id;
-            if(item.material.index >= 0 && item.material.index < mat.plantMat.size())
-                return string(mat.plantMat[item.material.index].id) + " plant";
-            return "bad material";
-            
-        case 3: // bone
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id) + " bone";
-            return "bad material";
-            
-        case 25: // fat
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id) + " fat";
-            return "bad material";
-            
-        case 23: // tallow
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id) + " tallow";
-            return "bad material";
-        case 9: // shell
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id) + " shell";
-            return "bad material";
-            
-        case DFHack::Mat_Leather: // really a generic creature material. meat for item_food, leather for item_box...
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id);
-            return "bad material";
-            
-        case DFHack::Mat_SilkCloth:
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id) + " silk";
-            return "bad material";
-            
-        case DFHack::Mat_Soap:
-            if(item.material.index >= 0 && item.material.index < mat.creatureMat.size())
-                return string(mat.creatureMat[item.material.index].id) + " soap";
-            return "bad material";
-            
-        case DFHack::Mat_GreenGlass:
-            return "Green Glass";
-            
-        case DFHack::Mat_ClearGlass:
-            return "Clear Glass";
-            
-        case DFHack::Mat_CrystalGlass:
-            return "Crystal Glass";
-            
-        case DFHack::Mat_Ice:
-            return "Ice";
-            
-        case DFHack::Mat_Charcoal:
-            return "Charcoal";
-            
-        /*case DFHack::Mat_Potash:
-            return "Potash";*/
-        
-        case DFHack::Mat_Ashes:
-            return "Ashes";
-            
-        case DFHack::Mat_PearlAsh:
-            return "Pearlash";
-            
-        default:
-            cout << "unknown material hit: " << item.material.type << " " << item.material.index  << " " << itemtype << endl;
-            return "Invalid";
-        }
-    }   
-    return "Invalid";
-}
-void printItem(DFHack::t_item item, const string & typeString,const matGlosses & mat)
-{
-    cout << dec << "Item at x:" << item.x << " y:" << item.y << " z:" << item.z << endl;
-    cout << "Type: " << (int) item.type << " " << typeString << " Address: " << hex << item.origin << endl;
-    cout << "Material: ";
-    
-    string itemType = getMaterialType(item,typeString,mat);
-    cout << itemType << endl;
-}
 
+DFHack::Materials * Materials;
 
 int main ()
 {
-    DFHack::API DF("Memory.xml");
+	DFHack::API DF("Memory.xml");
-    try
+	DFHack::Process * p;
-    {
+	unsigned int i;
-        DF.Attach();
+
-    }
+	try
-    catch (exception& e)
+	{
-    {
+		DF.Attach();
-        cerr << e.what() << endl;
+	}
-        #ifndef LINUX_BUILD
+	catch (exception& e)
-            cin.ignore();
+	{
-        #endif
+		cerr << e.what() << endl;
-        return 1;
+#ifndef LINUX_BUILD
-    }
+		cin.ignore();
-    
+#endif
-    DFHack::memory_info * mem = DF.getMemoryInfo();
+		return 1;
-    DF.InitViewAndCursor();
+	}
-    matGlosses mat;
+
-    DF.ReadPlantMatgloss(mat.plantMat);
+	DFHack::memory_info * mem = DF.getMemoryInfo();
-    DF.ReadWoodMatgloss(mat.woodMat);
+	Materials = DF.getMaterials();
-    DF.ReadStoneMatgloss(mat.stoneMat);
+	Materials->ReadAllMaterials();
-    DF.ReadMetalMatgloss(mat.metalMat);
+	p = DF.getProcess();
-    DF.ReadCreatureMatgloss(mat.creatureMat);
+	DFHack::DfVector <uint32_t> p_items (p, p->getDescriptor()->getAddress ("items_vector"));
-
+	uint32_t size = p_items.size();
-//    vector <string> objecttypes;
+
-//    DF.getClassIDMapping(objecttypes);
+
-    
+	printf("vtable\ttype\tname\n");
-    uint32_t numItems;
+	for(i=0;i<size;i++)
-    DF.InitReadItems(numItems);
+	{
-    DF.InitViewAndCursor();
+		uint32_t vtable = p->readDWord(p_items[i]);
-    
+		uint32_t func0 = p->readDWord(vtable);
-    cout << "q to quit, anything else to look up items at that location\n";
+		uint64_t func = p->readQuad(func0);
-    while(1)
+		uint32_t type = (func>>8)&0xffff;
-    {
+		string desc = p->readClassName(vtable);
-        string input;
+
-        DF.ForceResume();
+		if( (func&0xFFFFFFFFFF000000LL) != 0xCCCCC30000000000LL )
-        getline (cin, input);
+		{
-        DF.Suspend();
+			if(func == 0xCCCCCCCCCCC3C033LL)
-        //FIXME: why twice?
+				type = 0;
-        uint32_t numItems;
+			else
-        DF.InitReadItems(numItems);
+				printf("bad func vtable=%p func=%.16LX\n", (void*)vtable, func);
-        if(input == "q")
+		}
-        {
+
-            break;
+		printf("%d\t%p\t%s\n", type, (void*)vtable, desc.c_str());
-        }
+	}
-        
+
-        int32_t x,y,z;
+#ifndef LINUX_BUILD
-        DF.getCursorCoords(x,y,z);
+	cout << "Done. Press any key to continue" << endl;
-        vector <DFHack::t_item> foundItems;
+	cin.ignore();
-        for(uint32_t i = 0; i < numItems; i++)
+#endif
-        {
+	return 0;
-            DFHack::t_item temp;
-            DF.ReadItem(i, temp);
-            if(temp.x == x && temp.y == y && temp.z == z)
-            {
-                foundItems.push_back(temp);
-                //cout << buildingtypes[temp.type] << " 0x" << hex << temp.origin << endl;
-            }
-        }
-        if(foundItems.size() == 0){
-            cerr << "No Items at x:" << x << " y:" << y << " z:" << z << endl;
-        }
-        else if(foundItems.size() == 1)
-        {
-            string itemtype;
-            mem->resolveClassIDToClassname(foundItems[0].type,itemtype);
-            printItem(foundItems[0], itemtype ,mat);
-        }
-        else
-        {
-            cerr << "Please Select which item you want to display\n";
-            string itemtype;
-            for(uint32_t j = 0; j < foundItems.size(); ++j)
-            {
-                mem->resolveClassIDToClassname(foundItems[j].type,itemtype);
-                cerr << j << " " << itemtype << endl;
-            }
-            uint32_t value;
-            string input2;
-            stringstream ss;
-            getline(cin, input2);
-            ss.str(input2);
-            ss >> value;
-            while(value >= foundItems.size())
-            {
-                cerr << "invalid choice, please try again" << endl;
-                input2.clear();
-                ss.clear();
-                getline (cin, input2);
-                ss.str(input2);
-                ss >> value;
-            }
-            mem->resolveClassIDToClassname(foundItems[value].type,itemtype);
-            printItem(foundItems[value], itemtype ,mat);
-        }
-        DF.FinishReadItems();
-    }    
-    DF.Detach();
-    #ifndef LINUX_BUILD
-        cout << "Done. Press any key to continue" << endl;
-        cin.ignore();
-    #endif
-    return 0;
 }

output/Memory.xml

@@ -1492,6 +1492,13 @@ map_data_1b60_offset          0x1B9c
 	<Offset name="descriptor_color_v">0x70</Offset>
 	<Offset name="descriptor_color_b">0x74</Offset>
 
+	Items
+	=====
+	<Address name="items_vector">0x166FE00</Address>
+
+	<Offset name="item_improvement_vector">0xA0</Offset>
+	<Offset name="item_improvement_quality">0x14</Offset> 
+        
     </Entry>
                             .-"""-.
                            '       \