From f0406f408ee0fe70979329ee419606d2fc04a608 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 29 Apr 2010 17:00:34 +0200 Subject: [PATCH] tentative item reading stuff --- examples/CMakeLists.txt | 6 +- examples/dfitemdump.cpp | 335 +++++++--------------------------------- output/Memory.xml | 7 + 3 files changed, 68 insertions(+), 280 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 18cdcd23e..64615906e 100644 --- a/examples/CMakeLists.txt +++ b/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) -# TARGET_LINK_LIBRARIES(dfitemdump dfhack) +ADD_EXECUTABLE(dfitemdump dfitemdump.cpp) +TARGET_LINK_LIBRARIES(dfitemdump dfhack) # hotkeynotedump - dumps the hotkeys and notes for the loaded map # Author: belal @@ -134,4 +134,4 @@ dfvecc #dfcatsplosion RUNTIME DESTINATION bin ) -ENDIF(UNIX) \ No newline at end of file +ENDIF(UNIX) diff --git a/examples/dfitemdump.cpp b/examples/dfitemdump.cpp index 919eb4940..19a49cdce 100644 --- a/examples/dfitemdump.cpp +++ b/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 #include #include #include @@ -12,285 +15,63 @@ using namespace std; #include #include #include +#include +#include +#include -struct matGlosses -{ - vector plantMat; - vector woodMat; - vector stoneMat; - vector metalMat; - vector 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"); - try - { - DF.Attach(); - } - catch (exception& e) - { - cerr << e.what() << endl; - #ifndef LINUX_BUILD - cin.ignore(); - #endif - return 1; - } - - DFHack::memory_info * mem = DF.getMemoryInfo(); - DF.InitViewAndCursor(); - matGlosses mat; - DF.ReadPlantMatgloss(mat.plantMat); - DF.ReadWoodMatgloss(mat.woodMat); - DF.ReadStoneMatgloss(mat.stoneMat); - DF.ReadMetalMatgloss(mat.metalMat); - DF.ReadCreatureMatgloss(mat.creatureMat); + DFHack::API DF("Memory.xml"); + DFHack::Process * p; + unsigned int i; + + try + { + DF.Attach(); + } + catch (exception& e) + { + cerr << e.what() << endl; +#ifndef LINUX_BUILD + cin.ignore(); +#endif + return 1; + } + + DFHack::memory_info * mem = DF.getMemoryInfo(); + Materials = DF.getMaterials(); + Materials->ReadAllMaterials(); + p = DF.getProcess(); + DFHack::DfVector p_items (p, p->getDescriptor()->getAddress ("items_vector")); + uint32_t size = p_items.size(); + + + printf("vtable\ttype\tname\n"); + for(i=0;ireadDWord(p_items[i]); + uint32_t func0 = p->readDWord(vtable); + uint64_t func = p->readQuad(func0); + uint32_t type = (func>>8)&0xffff; + string desc = p->readClassName(vtable); + + if( (func&0xFFFFFFFFFF000000LL) != 0xCCCCC30000000000LL ) + { + if(func == 0xCCCCCCCCCCC3C033LL) + type = 0; + else + printf("bad func vtable=%p func=%.16LX\n", (void*)vtable, func); + } + + printf("%d\t%p\t%s\n", type, (void*)vtable, desc.c_str()); + } -// vector objecttypes; -// DF.getClassIDMapping(objecttypes); - - uint32_t numItems; - DF.InitReadItems(numItems); - DF.InitViewAndCursor(); - - cout << "q to quit, anything else to look up items at that location\n"; - while(1) - { - string input; - DF.ForceResume(); - getline (cin, input); - DF.Suspend(); - //FIXME: why twice? - uint32_t numItems; - DF.InitReadItems(numItems); - if(input == "q") - { - break; - } - - int32_t x,y,z; - DF.getCursorCoords(x,y,z); - vector foundItems; - for(uint32_t i = 0; i < numItems; i++) - { - 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; +#ifndef LINUX_BUILD + cout << "Done. Press any key to continue" << endl; + cin.ignore(); +#endif + return 0; } diff --git a/output/Memory.xml b/output/Memory.xml index 4b2d0649a..0a098ef1c 100755 --- a/output/Memory.xml +++ b/output/Memory.xml @@ -1491,6 +1491,13 @@ map_data_1b60_offset 0x1B9c 0x6C floats ! 0x70 0x74 + + Items + ===== +
0x166FE00
+ + 0xA0 + 0x14 .-"""-.