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

merged item support by belal

develop
Petr Mrázek 2009-11-17 14:52:47 +00:00
parent 6975661733
commit 2f710730ac
5 changed files with 175 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
library/DFHackAPI.cpp
Unescape Escape View File

@ -86,6 +86,7 @@ class API::Private
bool vegetationInited; bool vegetationInited;
bool creaturesInited; bool creaturesInited;
bool cursorWindowInited; bool cursorWindowInited;
bool itemsInited;
bool nameTablesInited; bool nameTablesInited;
@ -98,6 +99,8 @@ class API::Private
DfVector *p_trans; DfVector *p_trans;
DfVector *p_generic; DfVector *p_generic;
DfVector *p_dwarf_names; DfVector *p_dwarf_names;
DfVector *p_itm;
/* /*
string getLastNameByAddress(const uint32_t &address, bool use_generic=false); string getLastNameByAddress(const uint32_t &address, bool use_generic=false);
string getSquadNameByAddress(const uint32_t &address, bool use_generic=false); string getSquadNameByAddress(const uint32_t &address, bool use_generic=false);
@ -120,6 +123,7 @@ API::API(const string path_to_xml)
d->buildingsInited = false; d->buildingsInited = false;
d->vegetationInited = false; d->vegetationInited = false;
d->cursorWindowInited = false; d->cursorWindowInited = false;
d->itemsInited = false;
d->pm = NULL; d->pm = NULL;
} }
@ -1206,4 +1210,45 @@ memory_info API::getMemoryInfo()
Process * API::getProcess() Process * API::getProcess()
{ {
return d->p; return d->p;
}
uint32_t API::InitReadItems()
{
int items = d->offset_descriptor->getAddress("items");
assert(items);
d->p_itm = new DfVector( d->dm->readVector(items,4));
d->itemsInited = true;
return d->p_itm->getSize();
}
bool API::ReadItem(const uint32_t &index, t_item & item)
{
assert(d->buildingsInited && d->itemsInited); //should change to the generic init rather than buildings
t_item_df40d item_40d;
// read pointer from vector at position
uint32_t temp = *(uint32_t *) d->p_itm->at(index);
//read building from memory
Mread(temp, sizeof(t_item_df40d), (uint8_t *)&item_40d);
// transform
int32_t type = -1;
d->offset_descriptor->resolveClassId(temp, type);
item.origin = temp;
item.vtable = item_40d.vtable;
item.x = item_40d.x;
item.y = item_40d.y;
item.z = item_40d.z;
item.type = type;
item.ID = item_40d.ID;
item.flags = item_40d.flags;
return true;
}
void API::FinishReadItems()
{
delete d->p_itm;
d->p_itm = NULL;
d->itemsInited = false;
} }

4
library/DFHackAPI.h
Unescape Escape View File

@ -185,6 +185,10 @@ namespace DFHack
*/ */
void InitReadNameTables(); void InitReadNameTables();
void FinishReadNameTables(); void FinishReadNameTables();
uint32_t InitReadItems();
bool ReadItem(const uint32_t &index, t_item & item);
void FinishReadItems();
memory_info getMemoryInfo(); memory_info getMemoryInfo();
Process * getProcess(); Process * getProcess();

30
library/DFTypes.h
Unescape Escape View File

@ -511,6 +511,36 @@ struct t_creature
uint8_t sex; uint8_t sex;
}; };
//raw
struct t_item_df40d
{
uint32_t vtable;
uint16_t x;
uint16_t y;
uint16_t z;
uint32_t unk1;
uint32_t flags;
uint32_t unk2;
uint32_t ID;
// not complete
};
//cooked
struct t_item
{
uint32_t origin;
uint32_t vtable;
uint32_t x;
uint32_t y;
uint32_t z;
uint32_t flags;
uint32_t ID;
uint32_t type;
// FIXME: not complete, we need building presence bitmaps for stuff like farm plots and stockpiles, orientation (N,E,S,W) and state (open/closed)
};
// TODO: research this further? consult DF hacker wizards? // TODO: research this further? consult DF hacker wizards?
union t_designation union t_designation
{ {

91
output/Memory.xml
Unescape Escape View File

@ -920,6 +920,97 @@
<String name="md5">59ab29021aca9f3c66b1ab102fb3ceea</String> <String name="md5">59ab29021aca9f3c66b1ab102fb3ceea</String>
<!-- map_data = 0x01601D84 --> <!-- map_data = 0x01601D84 -->
<!-- door: 0x8e15d4, no VTable rebase needed --> <!-- door: 0x8e15d4, no VTable rebase needed -->
<Address name="items">15BDF50</Address>
<VTable>
<class vtable="0x008E04D4" name="item_liquid_misc" />
<class vtable="0x008E07AC" name="item_remains" />
<class vtable="0x008E0A84" name="item_vermin" />
<class vtable="0x008E0D5C" name="item_plant" />
<class vtable="0x008EFBB4" name="item_glob" />
<class vtable="0x008EFFEC" name="item_contaminant" />
<class vtable="0x008F15BC" name="item_meat" />
<class vtable="0x008F1894" name="item_fish" />
<class vtable="0x008F211C" name="item_door" />
<class vtable="0x008F23F4" name="item_bed" />
<class vtable="0x008F26CC" name="item_chair" />
<class vtable="0x008F29A4" name="item_flask" />
<class vtable="0x008F2C7C" name="item_barrel" />
<class vtable="0x008F2F54" name="item_table" />
<class vtable="0x008F322C" name="item_weapon" />
<class vtable="0x008F3504" name="item_armor" />
<class vtable="0x008F37DC" name="item_shoes" />
<class vtable="0x008F3AB4" name="item_shield" />
<class vtable="0x008F3D8C" name="item_helm" />
<class vtable="0x008F4064" name="item_gloves" />
<class vtable="0x008F433C" name="item_box" />
<class vtable="0x008F4614" name="item_ammo" />
<class vtable="0x008F48EC" name="item_pants" />
<class vtable="0x008F4BC4" name="item_backpack" />
<class vtable="0x008F4E9C" name="item_quiver" />
<class vtable="0x008F5174" name="item_coin" />
<class vtable="0x008F5DDC" name="item_powder_misc" />
<class vtable="0x008F60F4" name="item_corpse" />
<class vtable="0x008F63CC" name="item_corpsepiece" />
<class vtable="0x008F66A4" name="item_chain" />
<class vtable="0x008F697C" name="item_cage" />
<class vtable="0x008FF454" name="item_seeds" />
<class vtable="0x008FF72C" name="item_skin_raw" />
<class vtable="0x008FFA04" name="item_bones" />
<class vtable="0x008FFCDC" name="item_skull" />
<class vtable="0x008FFFB4" name="item_thread" />
<class vtable="0x0091142C" name="item_bar" />
<class vtable="0x00911704" name="item_smallgem" />
<class vtable="0x009119DC" name="item_blocks" />
<class vtable="0x00911CB4" name="item_rough" />
<class vtable="0x00911F8C" name="item_stone" />
<class vtable="0x00912264" name="item_rock" />
<class vtable="0x0091253C" name="item_wood" />
<class vtable="0x00912814" name="item_extract" />
<class vtable="0x00912AEC" name="item_potion" />
<class vtable="0x00912DC4" name="item_drink" />
<class vtable="0x0091309C" name="item_fish_raw" />
<class vtable="0x00913374" name="item_pet" />
<class vtable="0x0091364C" name="item_skin_tanned" />
<class vtable="0x00913924" name="item_shell" />
<class vtable="0x00913BFC" name="item_leaves" />
<class vtable="0x00913ED4" name="item_ballistaarrowhead" />
<class vtable="0x009141AC" name="item_cheese" />
<class vtable="0x00914484" name="item_food" />
<class vtable="0x0091475C" name="item_cloth" />
<class vtable="0x00914A34" name="item_floodgate" />
<class vtable="0x00914D0C" name="item_hatch_cover" />
<class vtable="0x00914FE4" name="item_grate" />
<class vtable="0x009152BC" name="item_goblet" />
<class vtable="0x00915594" name="item_instrument" />
<class vtable="0x0091586C" name="item_toy" />
<class vtable="0x00915B44" name="item_window" />
<class vtable="0x00915E1C" name="item_bucket" />
<class vtable="0x009160F4" name="item_animaltrap" />
<class vtable="0x009163CC" name="item_coffin" />
<class vtable="0x009166A4" name="item_statue" />
<class vtable="0x0091697C" name="item_quern" />
<class vtable="0x00916C54" name="item_millstone" />
<class vtable="0x00916F2C" name="item_bin" />
<class vtable="0x00917204" name="item_armorstand" />
<class vtable="0x009174DC" name="item_weaponrack" />
<class vtable="0x009177B4" name="item_cabinet" />
<class vtable="0x00917A8C" name="item_figurine" />
<class vtable="0x00917D64" name="item_amulet" />
<class vtable="0x0091803C" name="item_scepter" />
<class vtable="0x00918314" name="item_crown" />
<class vtable="0x009185EC" name="item_ring" />
<class vtable="0x009188C4" name="item_earring" />
<class vtable="0x00918B9C" name="item_bracelet" />
<class vtable="0x00918E74" name="item_gem" />
<class vtable="0x0091914C" name="item_anvil" />
<class vtable="0x00919424" name="item_totem" />
<class vtable="0x009196FC" name="item_catapultparts" />
<class vtable="0x009199D4" name="item_ballistaparts" />
<class vtable="0x00919CAC" name="item_siegeammo" />
<class vtable="0x00919F84" name="item_pipe_section" />
<class vtable="0x0091A25C" name="item_trapparts" />
<class vtable="0x0091A534" name="item_trapcomp" />
</VTable>
</Entry> </Entry>
.-"""-. .-"""-.

5
tools/CMakeLists.txt
Unescape Escape View File

@ -53,6 +53,10 @@ ENDIF(UNIX)
ADD_EXECUTABLE(dfsuspend suspendtest.cpp) ADD_EXECUTABLE(dfsuspend suspendtest.cpp)
TARGET_LINK_LIBRARIES(dfsuspend dfhack) TARGET_LINK_LIBRARIES(dfsuspend dfhack)
# itemdump - dump the item under the cursor
ADD_EXECUTABLE(dfitemdump dfitemdump.cpp)
TARGET_LINK_LIBRARIES(dfitemdump dfhack)
IF(UNIX) IF(UNIX)
install(TARGETS install(TARGETS
dfexpbench dfexpbench
@ -66,6 +70,7 @@ dfmaterialtest
dfbuildingsdump dfbuildingsdump
dfposition dfposition
dfincremental dfincremental
dfitemdump
dfsuspend dfsuspend
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
) )