tons of stuff

develop
Petr Mrázek 2009-11-07 23:35:38 +00:00
parent a7bf3595b7
commit 215bb64a1e
2 changed files with 89 additions and 53 deletions

@ -647,25 +647,25 @@ uint32_t DFHackAPIImpl::InitReadCreatures()
creature_type_offset = offset_descriptor->getOffset("creature_type"); creature_type_offset = offset_descriptor->getOffset("creature_type");
creature_flags1_offset = offset_descriptor->getOffset("creature_flags1"); creature_flags1_offset = offset_descriptor->getOffset("creature_flags1");
creature_flags2_offset = offset_descriptor->getOffset("creature_flags2"); creature_flags2_offset = offset_descriptor->getOffset("creature_flags2");
creature_first_name_offset = offset_descriptor->getOffset("first_name"); creature_first_name_offset = offset_descriptor->getOffset("creature_first_name");
creature_nick_name_offset = offset_descriptor->getOffset("nick_name"); creature_nick_name_offset = offset_descriptor->getOffset("creature_nick_name");
creature_last_name_offset = offset_descriptor->getOffset("last_name"); creature_last_name_offset = offset_descriptor->getOffset("creature_last_name");
creature_custom_profession_offset = offset_descriptor->getOffset("custom_profession"); creature_custom_profession_offset = offset_descriptor->getOffset("creature_custom_profession");
creature_profession_offset = offset_descriptor->getOffset("creature_profession"); creature_profession_offset = offset_descriptor->getOffset("creature_creature_profession");
creature_sex_offset = offset_descriptor->getOffset("sex"); creature_sex_offset = offset_descriptor->getOffset("creature_sex");
creature_id_offset = offset_descriptor->getOffset("id"); creature_id_offset = offset_descriptor->getOffset("creature_id");
creature_squad_name_offset = offset_descriptor->getOffset("squad_name"); creature_squad_name_offset = offset_descriptor->getOffset("creature_squad_name");
creature_squad_leader_id_offset = offset_descriptor->getOffset("squad_leader_id"); creature_squad_leader_id_offset = offset_descriptor->getOffset("creature_squad_leader_id");
creature_money_offset = offset_descriptor->getOffset("money"); creature_money_offset = offset_descriptor->getOffset("creature_money");
creature_current_job_offset = offset_descriptor->getOffset("current_job"); creature_current_job_offset = offset_descriptor->getOffset("creature_current_job");
creature_current_job_id_offset = offset_descriptor->getOffset("current_job_id"); creature_current_job_id_offset = offset_descriptor->getOffset("creature_current_job_id");
creature_strength_offset = offset_descriptor->getOffset("strength"); creature_strength_offset = offset_descriptor->getOffset("creature_strength");
creature_agility_offset = offset_descriptor->getOffset("agility"); creature_agility_offset = offset_descriptor->getOffset("creature_agility");
creature_toughness_offset = offset_descriptor->getOffset("toughness"); creature_toughness_offset = offset_descriptor->getOffset("creature_toughness");
creature_skills_offset = offset_descriptor->getOffset("skills"); creature_skills_offset = offset_descriptor->getOffset("creature_skills");
creature_labors_offset = offset_descriptor->getOffset("labors"); creature_labors_offset = offset_descriptor->getOffset("creature_labors");
creature_happiness_offset = offset_descriptor->getOffset("happiness"); creature_happiness_offset = offset_descriptor->getOffset("creature_happiness");
creature_traits_offset = offset_descriptor->getOffset("traits"); creature_traits_offset = offset_descriptor->getOffset("creature_traits");
assert(creatures && creature_pos_offset && creature_type_offset && assert(creatures && creature_pos_offset && creature_type_offset &&
creature_flags1_offset && creature_flags2_offset && creature_nick_name_offset creature_flags1_offset && creature_flags2_offset && creature_nick_name_offset
&& creature_custom_profession_offset && creature_custom_profession_offset

@ -389,6 +389,14 @@
<Address name="vegetation">0x01587A24</Address> <Address name="vegetation">0x01587A24</Address>
<Address name="creatures">0x01583224</Address> <Address name="creatures">0x01583224</Address>
<!-- translation tables -->
<Address name="translation_vector">0x015c6ef0</Address>
<Address name="language_vector">0x015c6ed0</Address>
<Offset name="word_table">0x40</Offset>
<!-- job object offsets -->
<Offset name="current_job_id">0x08</Offset>
<!-- size of the map --> <!-- size of the map -->
<Address name="x_count">0x015C4D70</Address> <Address name="x_count">0x015C4D70</Address>
<Address name="y_count">0x015C4D74</Address> <Address name="y_count">0x015C4D74</Address>
@ -408,31 +416,28 @@
<Offset name="biome_stuffs">0x1D64</Offset> <Offset name="biome_stuffs">0x1D64</Offset>
<!-- creature offsets --> <!-- creature offsets -->
<Offset name="first_name">0x00</Offset> <Offset name="creature_first_name">0x00</Offset>
<Offset name="nick_name">0x1C</Offset> <Offset name="creature_nick_name">0x1C</Offset>
<Offset name="creature_position">0x94</Offset> <Offset name="creature_last_name">0x38</Offset>
<Offset name="creature_custom_profession">0x6c</Offset>
<Offset name="creature_profession">0x88</Offset> <Offset name="creature_profession">0x88</Offset>
<Offset name="creature_type">0x8C</Offset> <Offset name="creature_race">0x8C</Offset>
<Offset name="creature_position">0x94</Offset>
<Offset name="creature_flags1">0xE4</Offset> <Offset name="creature_flags1">0xE4</Offset>
<Offset name="creature_flags2">0xE8</Offset> <Offset name="creature_flags2">0xE8</Offset>
<Offset name="custom_profession">0x6c</Offset> <Offset name="creature_sex">0xF2</Offset>
<Offset name="profession">0x88</Offset> <Offset name="creature_id">0xF4</Offset>
<Offset name="race">0x8C</Offset> <Offset name="creature_squad_name">0x1A4</Offset>
<Offset name="flags1">0xFC</Offset> <Offset name="creature_squad_leader_id">0x228</Offset>
<Offset name="flags2">0x100</Offset> <Offset name="creature_money">0x2F8</Offset><!-- this is wrong -->
<Offset name="sex">0x10A</Offset> <Offset name="creature_current_job">0x2AC</Offset>
<Offset name="id">0x10C</Offset> <Offset name="creature_strength">0x438</Offset>
<Offset name="squad_name">0x1D8</Offset> <Offset name="creature_agility">0x43C</Offset>
<Offset name="squad_leader_id">0x268</Offset> <Offset name="creature_toughness">0x440</Offset>
<Offset name="money">0x2F8</Offset> <Offset name="creature_skills">0x444</Offset>
<Offset name="current_job">0x314</Offset> <Offset name="creature_labors">0x474</Offset>
<Offset name="strength">0x4f0</Offset> <Offset name="creature_happiness">0x520</Offset>
<Offset name="agility">0x4f4</Offset> <Offset name="creature_traits">0x5D0</Offset>
<Offset name="toughness">0x4f8</Offset>
<Offset name="skills">0x504</Offset>
<Offset name="labors">0x544</Offset>
<Offset name="happiness">0x610</Offset>
<Offset name="traits">0x700</Offset>
<!-- tree and shrub offsets --> <!-- tree and shrub offsets -->
<Offset name="tree_desc_offset">0x70</Offset> <Offset name="tree_desc_offset">0x70</Offset>
@ -561,11 +566,30 @@
<Address name="buildings">0x014ee978</Address> <Address name="buildings">0x014ee978</Address>
<Address name="vegetation">0x014F4B4C</Address> <Address name="vegetation">0x014F4B4C</Address>
<Address name="creatures">0x014edfcc</Address> <Address name="creatures">0x014edfcc</Address>
<!-- translation tables -->
<Address name="translation_vector">0x01534270</Address>
<Address name="language_vector">0x01534240</Address>
<Offset name="word_table">0x58</Offset>
<!-- creature offsets --> <!-- creature offsets -->
<Offset name="creature_flags1">0xFC</Offset> <Offset name="creature_flags1">0xFC</Offset>
<Offset name="creature_flags2">0x100</Offset> <Offset name="creature_flags2">0x100</Offset>
<Offset name="creature_sex">0x10A</Offset>
<Offset name="creature_id">0x10C</Offset>
<Offset name="creature_squad_name">0x1D8</Offset>
<Offset name="creature_squad_leader_id">0x268</Offset>
<Offset name="creature_money">0x2F8</Offset>
<Offset name="creature_current_job">0x314</Offset>
<Offset name="creature_strength">0x4F0</Offset>
<Offset name="creature_agility">0x4F4</Offset>
<Offset name="creature_toughness">0x4F8</Offset>
<Offset name="creature_skills">0x504</Offset>
<Offset name="creature_likes">0x51C</Offset>
<Offset name="creature_labors">0x544</Offset>
<Offset name="creature_happiness">0x610</Offset>
<Offset name="creature_traits">0x700</Offset>
<!-- tree and shrub offsets --> <!-- tree and shrub offsets -->
<Offset name="tree_desc_offset">0x70</Offset> <Offset name="tree_desc_offset">0x70</Offset>
@ -634,6 +658,10 @@
<Address name="vegetation">0x015BD924</Address> <Address name="vegetation">0x015BD924</Address>
<Address name="creatures">0x015B6DA4</Address> <Address name="creatures">0x015B6DA4</Address>
<!-- translation tables -->
<Address name="translation_vector">0x015FD07C</Address>
<Address name="language_vector">0x015FD04C</Address>
<!-- size of the map --> <!-- size of the map -->
<Address name="x_count">0x015FACEC</Address> <Address name="x_count">0x015FACEC</Address>
<Address name="y_count">0x015FACF0</Address> <Address name="y_count">0x015FACF0</Address>
@ -650,7 +678,7 @@
<Address name="matgloss">0x015FCE3C</Address> <Address name="matgloss">0x015FCE3C</Address>
<!-- door: 0x8db5e4 --> <!-- door: 0x8db5e4 -->
<VTable rebase="-0xDC00" /> <VTable rebase="-0xDC00" />
</Entry> </Entry>
<Entry version="v0.28.181.40d13" os="windows" id="40d13win" base="40d12win" rebase="0x5090"> <Entry version="v0.28.181.40d13" os="windows" id="40d13win" base="40d12win" rebase="0x5090">
<!-- identification --> <!-- identification -->
@ -682,13 +710,7 @@
<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 -->
<!-- translation tables --> </Entry>
<Address name="translation_vector">0x01604134</Address>
<Address name="language_vector">0x01604104</Address>
<Offset name="last_name">0x38</Offset>
<Offset name="word_table">0x58</Offset>
<Offset name="current_job_id">0x08</Offset>
</Entry>
.-"""-. .-"""-.
' \ ' \
@ -727,13 +749,27 @@
<Address name="creatures">0x093326AC</Address> <Address name="creatures">0x093326AC</Address>
<!-- creature offsets --> <!-- creature offsets -->
<Offset name="first_name">0x00</Offset> <Offset name="creature_first_name">0x00</Offset>
<Offset name="nick_name">0x04</Offset> <Offset name="creature_nick_name">0x04</Offset>
<Offset name="last_name">0x38</Offset> <Offset name="creature_last_name">0x08</Offset>
<Offset name="creature_position">0x4C</Offset> <Offset name="creature_position">0x4C</Offset>
<Offset name="creature_type">0x44</Offset> <Offset name="creature_type">0x44</Offset>
<Offset name="creature_flags1">0x90</Offset> <Offset name="creature_flags1">0x90</Offset>
<Offset name="creature_flags2">0x94</Offset> <Offset name="creature_flags2">0x94</Offset>
<Offset name="creature_custom_profession">0x003c</Offset>
<Offset name="creature_profession">0x0040</Offset>
<Offset name="creature_sex">0x009E</Offset>
<Offset name="creature_id">0x00A0</Offset>
<Offset name="creature_squad_name">0x0100</Offset>
<Offset name="creature_money">0x02F8</Offset>
<Offset name="creature_current_job">0x0200</Offset>
<Offset name="creature_strength">0x0334</Offset>
<Offset name="creature_agility">0x0338</Offset>
<Offset name="creature_toughness">0x033C</Offset>
<Offset name="creature_skills">0x0340</Offset>
<Offset name="creature_labors">0x0364</Offset>
<Offset name="creature_happiness">0x0400</Offset>
<Offset name="creature_traits">0x0490</Offset>
<!-- tree and shrub offsets --> <!-- tree and shrub offsets -->
<Offset name="tree_desc_offset">0x40</Offset> <Offset name="tree_desc_offset">0x40</Offset>