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

Merge remote branch 'upstream/master'

develop
doomchild 2010-04-22 09:01:04 -05:00
parent b0bda21d8e a6c42c6468
commit 6903a46d90
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dfhack/modules/Materials.cpp
Unescape Escape View File

@ -230,6 +230,8 @@ bool Materials::ReadDescriptorColors (vector<t_descriptor_color> & color)
uint32_t size = p_colors.size();
color.clear();
if(size == 0)
return false;
color.reserve(size);
for (uint32_t i = 0; i < size;i++)
{
@ -241,6 +243,7 @@ bool Materials::ReadDescriptorColors (vector<t_descriptor_color> & color)
col.b = p->readFloat( p_colors[i] + p->getDescriptor()->getOffset ("descriptor_color_b") );
color.push_back(col);
}
return true;
}
bool Materials::ReadCreatureTypesEx (vector<t_creaturetype> & creatures)

20
output/Memory.xml
Unescape Escape View File

@ -433,13 +433,13 @@ size=212
55/type = MOOD
56/name = "Strange Mood Jeweller"
56/type = MOOD
57/name = "Strange Mood C"
57/name = "Strange Mood Forge"
57/type = MOOD
58/name = "Strange Mood Metal"
58/name = "Strange Mood Magma Forge"
58/type = MOOD
59/name = "Strange Mood E"
59/name = "Strange Mood Brooding"
59/type = MOOD
60/name = "Strange Mood F"
60/name = "Strange Mood Fell"
60/type = MOOD
61/name = "Strange Mood Carpenter"
61/type = MOOD
@ -1408,12 +1408,22 @@ map_data_1b60_offset 0x1B9c
<Offset name="creature_disease_resistance">0x4F0</Offset>
-->
<Offset name="creature_current_job">0x390</Offset> <!-- from chmod -->
<Offset name="creature_mood_skill">0x394</Offset> the skill that will be increased at the end of the mood (or not)
<Offset name="creature_appearance_vector">0x604</Offset> seems to be indexes in the list of possible colors defined in the raws for each group
<Offset name="creature_artifact_name">0x6D4</Offset>
<Offset name="creature_labors">0x774</Offset>
<Offset name="creature_soul_vector">0x0740</Offset>
<Offset name="creature_default_soul">0x0758</Offset>
<Offset name="creature_happiness">0x834</Offset>
Job structure
=============
<Offset name="job_type">0x4</Offset> seems to be just like the old occupations
<Offset name="job_materials_vector">0xa4</Offset>
Job materials
=============
<Offset name="job_material_maintype">0x0</Offset> like mood materials, 0=bars, 4=stone, 5=wood, 57=cloth, 54=leather ...
Materials
=========