Skip to content

Commit

Permalink
Add info from Urist Da Vinci, plus a curse-related struct used by wound.
Browse files Browse the repository at this point in the history 
http://www.bay12forums.com/smf/index.php?topic=91166.msg4435715#msg4435715
  • Loading branch information
@angavrilov
angavrilov committed Aug 16, 2013
1 parent 6a95d62 commit f51c7d9
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 38 deletions.
4 changes: 2 additions & 2 deletions df.creature-raws.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@

<int32_t name='layer_depth' comment='-1 for skin and internal organs'/>
<int32_t name='unk13'/>
<int32_t name='unk14'/>
<int32_t name='nonsolid_id'/>
<int32_t name='styleable_id'/>
</struct-type>

Expand Down Expand Up @@ -599,7 +599,7 @@
<stl-vector name='nonsolid_layers'>
For blood, magma, iron men etc, lists BLOOD/MAGMA/GAS layers.
For other titans and FBs, lists all layers. For ordinary, empty.
<int32_t refers-to='$$._global.layer_part[$].refers-to'/>
<int32_t refers-to='$$._global.layer_idx[$].refers-to'/>
</stl-vector>

<int32_t comment='v0.34.01'/>
Expand Down
44 changes: 30 additions & 14 deletions df.items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,17 +720,25 @@
<flag-bit name='skin_damage' comment='brown'/>
<flag-bit name='motor_nerve_severed'/>
<flag-bit name='sensory_nerve_severed'/>
<flag-bit/>
<flag-bit name='spilled_guts'/>

<flag-bit name='has_splint'/>
<flag-bit name='has_bandage'/>
<flag-bit name='has_plaster_cast'/>
<flag-bit/>
<flag-bit comment='related to soap and grime'/>

<flag-bit/>
<flag-bit/>
<flag-bit comment='seen e.g. on ribs smashed by blunt attack, but quickly disappeared'/>
<flag-bit/>
<flag-bit comment='related to soap and grime'/>
<flag-bit comment='related to soap and grime'/>
<flag-bit name='severed_or_jammed'
comment='seen e.g. on ribs smashed by blunt attack, but quickly disappeared'/>
<flag-bit name='under_shell'/>

<flag-bit name='is_shell'/>
</bitfield-type>

<bitfield-type type-name='body_layer_status'>
<flag-bit name='gone'/>
<flag-bit name='leaking'/>
</bitfield-type>

<struct-type type-name='body_component_info'>
Expand All @@ -739,14 +747,22 @@

<stl-vector name='numbered_masks' type-name='uint32_t'
comment='1 bit per instance of a numbered body part'/>

<stl-vector name='body_layer_328' type-name='uint32_t'/>
<stl-vector name='body_layer_338' type-name='uint32_t'
comment='if 1, gone'/> // 238*0
<stl-vector name='body_layer_348' type-name='uint32_t'/> // 238*0
<stl-vector name='body_layer_358' type-name='uint32_t'/> // 238*0
<stl-vector name='body_layer_368' type-name='uint32_t'/> // 238*0
<stl-vector name='body_layer_378' type-name='uint32_t'/> // 238*0
<stl-vector name='nonsolid_remaining' type-name='uint32_t' comment='0-100%'
index-refers-to='$$._global._upglobal.caste.ref-target.body_info.nonsolid_layers[$].refers-to'/>

<stl-vector name='layer_status' type-name='body_layer_status'
index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
<stl-vector name='layer_wound_area' type-name='uint32_t'
index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>

Surface percentages for cuts/fractures, dents and effects (such as
bruises, burns, frostbite, melting, freezing, necrosis, and blistering)
<stl-vector name='layer_cut_fraction' type-name='uint32_t' comment='0-10000'
index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
<stl-vector name='layer_dent_fraction' type-name='uint32_t' comment='0-10000'
index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
<stl-vector name='layer_effect_fraction' type-name='uint32_t' comment='0-10000'
index-refers-to='$$._global._upglobal.caste.ref-target.body_info.layer_idx[$].refers-to'/>
</struct-type>

<struct-type type-name='body_size_info'>
Expand Down
76 changes: 54 additions & 22 deletions df.units.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,17 +647,8 @@
<uint32_t name='speed_add' comment='v0.34.01'/>
<uint32_t name='speed_mul_percent' comment='v0.34.01' init-value='100'/>

<pointer name='attr_change' comment='v0.34.01'>
<static-array name='phys_att_perc' type-name='int32_t'
count='6' index-enum='physical_attribute_type'/>
<static-array name='phys_att_add' type-name='int32_t'
count='6' index-enum='physical_attribute_type'/>
<static-array name='ment_att_perc' type-name='int32_t'
count='13' index-enum='mental_attribute_type'/>
<static-array name='ment_att_add' type-name='int32_t'
count='13' index-enum='mental_attribute_type'/>
</pointer>
<uint32_t comment='v0.34.01' init-value='100'/>
<pointer name='attr_change' type-name='curse_attr_change' comment='v0.34.01'/>
<uint32_t name='luck_mul_percent' comment='v0.34.01' init-value='100'/>

<stl-vector comment='v0.34.01'/>
<stl-vector comment='v0.34.01'/>
Expand All @@ -682,7 +673,7 @@
<uint32_t name='vomit_timeout' comment='blocks nausea causing vomit'/>

<uint32_t name='stored_fat' comment='hunger leads to death only when 0'/>
<uint32_t name='unk_59c'/>
<uint32_t name='undead_hitpoints' comment='collapses once >= area_cur'/>
</compound>

<compound name='status'>
Expand Down Expand Up @@ -938,7 +929,7 @@
<enum-item name='Flask' comment='attached to clothing'/>
<enum-item name='WrappedAround' comment='e.g. bandage'/>
<enum-item name='StuckIn'/>
<enum-item name='Unk7' comment='string descr like Worn'/>
<enum-item name='InMouth' comment='string descr like Worn'/>
<enum-item name='Shouldered'/>
<enum-item name='SewnInto'/>
</enum>
Expand Down Expand Up @@ -1044,20 +1035,20 @@
<flag-bit name='major_artery'/>
<flag-bit name='guts_spilled'/>

<flag-bit/>
<flag-bit name='edged_shake1'/>
<flag-bit name='jagged_scar'/>
<flag-bit/>
<flag-bit name='edged_shake2'/>
<flag-bit name='broken'/>

<flag-bit name='huge_dent2'/>
<flag-bit/>
<flag-bit/>
<flag-bit name='gouged'/>
<flag-bit name='blunt_shake1'/>
<flag-bit name='jagged_scar2'/>

<flag-bit/>
<flag-bit/>
<flag-bit name='blunt_shake2'/>
<flag-bit name='joint_bend1'/>
<flag-bit name='jagged_scar3'/>
<flag-bit/>
<flag-bit name='joint_bend2'/>

<flag-bit name='compound_fracture'/>
<flag-bit name='diagnosed'/>
Expand All @@ -1067,7 +1058,7 @@

<bitfield-type type-name='wound_damage_flags2'>
<flag-bit name='needs_setting'/>
<flag-bit name='unk1'/>
<flag-bit name='entire_surface'/>
</bitfield-type>

<struct-type type-name='unit_wound' key-field='id'>
Expand Down Expand Up @@ -1150,7 +1141,48 @@
<int32_t name="unk_34"/>
<int32_t name="unk_38"/>
<int32_t name="unk_3c"/>
<pointer name="unk_40"/>
<pointer name="curse" type-name='wound_curse_info'/>
</struct-type>

<struct-type type-name='curse_attr_change'>
<static-array name='phys_att_perc' type-name='int32_t'
count='6' index-enum='physical_attribute_type'/>
<static-array name='phys_att_add' type-name='int32_t'
count='6' index-enum='physical_attribute_type'/>
<static-array name='ment_att_perc' type-name='int32_t'
count='13' index-enum='mental_attribute_type'/>
<static-array name='ment_att_add' type-name='int32_t'
count='13' index-enum='mental_attribute_type'/>
</struct-type>

<struct-type type-name='wound_curse_info'>
<compound name='add_tags1' type-name='cie_add_tag_mask1'/>
<compound name='rem_tags1' type-name='cie_add_tag_mask1'/>
<compound name='add_tags2' type-name='cie_add_tag_mask2'/>
<compound name='rem_tags2' type-name='cie_add_tag_mask2'/>

<bool name='name_visible'/>
<stl-string name='name'/>
<stl-string name='name_plural'/>
<stl-string name='name_adjective'/>

<uint32_t name='sym_and_color1' init-value='0x400'/>
<uint32_t name='sym_and_color2' init-value='0x400'/>
<uint32_t name='flash_period'/>
<uint32_t name='flash_time2'/>
<uint32_t name='speed_add'/>
<uint32_t name='speed_mul_percent' init-value='100'/>

<pointer name='attr_change' type-name='curse_attr_change'/>
<uint32_t name='luck_mul_percent' init-value='100'/>

<stl-vector/>
<stl-vector/>
<int32_t name='unk1'/>
<int32_t name='unk2' init-value='-1'/>
<int32_t name='unk3' init-value='-1'/>
<stl-vector/>
<stl-vector/>
</struct-type>

<enum-type base-type='int16_t' type-name='misc_trait_type'>
Expand Down

0 comments on commit f51c7d9

Please sign in to comment.