From 06cb8699406fa0f29c37382ddac42083e94b7230 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 21 Apr 2010 11:00:10 +0200 Subject: [PATCH 1/3] an appearance vector location --- output/Memory.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/output/Memory.xml b/output/Memory.xml index 8be57eb89..ec325ff06 100644 --- a/output/Memory.xml +++ b/output/Memory.xml @@ -1408,6 +1408,7 @@ map_data_1b60_offset 0x1B9c 0x4F0 --> 0x390 + 0x604 the first one seems to be the index in the raw list of skin colors 0x6D4 0x774 0x0740 From 494cc49b519f9fca2501d9fd16a2f1ca2bce2d0c Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 21 Apr 2010 16:12:14 +0200 Subject: [PATCH 2/3] new offsets and data related to mood --- output/Memory.xml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/output/Memory.xml b/output/Memory.xml index ec325ff06..5aff6abb2 100644 --- a/output/Memory.xml +++ b/output/Memory.xml @@ -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,13 +1408,22 @@ map_data_1b60_offset 0x1B9c 0x4F0 --> 0x390 - 0x604 the first one seems to be the index in the raw list of skin colors + 0x394 the skill that will be increased at the end of the mood (or not) + 0x604 seems to be indexes in the list of possible colors defined in the raws for each group 0x6D4 0x774 0x0740 0x0758 0x834 - + + Job structure + ============= + 0x4 seems to be just like the old occupations + 0xa4 + + Job materials + ============= + 0x0 like mood materials, 0=bars, 4=stone, 5=wood, 57=cloth, 54=leather ... Materials ========= From a6c42c64682a834f9f2fabc8b0471c409d3a02d2 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 22 Apr 2010 10:38:26 +0200 Subject: [PATCH 3/3] the Materials::ReadDescriptorColors function does return a value now ... --- dfhack/modules/Materials.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dfhack/modules/Materials.cpp b/dfhack/modules/Materials.cpp index e0e8da8a7..8f00b96c6 100644 --- a/dfhack/modules/Materials.cpp +++ b/dfhack/modules/Materials.cpp @@ -230,6 +230,8 @@ bool Materials::ReadDescriptorColors (vector & 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 & color) col.b = p->readFloat( p_colors[i] + p->getDescriptor()->getOffset ("descriptor_color_b") ); color.push_back(col); } + return true; } bool Materials::ReadCreatureTypesEx (vector & creatures)