Skip to content

Commit

Permalink
Check historical_entity, world constructions, language raws, manager.
Browse files Browse the repository at this point in the history
  • Loading branch information
@angavrilov
angavrilov committed Jul 15, 2014
1 parent 6b62fbf commit 5cfd2a2
Show file tree
Hide file tree
Showing 10 changed files with 220 additions and 117 deletions.
3 changes: 2 additions & 1 deletion df.descriptors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<stl-vector name="word_unk"/>
<stl-vector name="words" type-name='int32_t' ref-target='language_word'/>
<stl-string name="name"/>
<int16_t name="unk_58"/>
<int8_t name="color"/>
<int8_t name="bold"/>
<s-float name="red"/>
<s-float name="green"/>
<s-float name="blue"/>
Expand Down
32 changes: 17 additions & 15 deletions df.entities.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@
<stl-vector name='unk34b' type-name='int16_t'/>
<stl-vector name='unk34c' type-name='int32_t'/>
<stl-vector name='unk34d' type-name='int32_t' comment='empty'/>
<stl-vector name='unk34e' type-name='int32_t' comment='empty'/>
<stl-vector name='unk34e' type-name='int32_t' ref-target='historical_figure' comment='empty'/>
</compound>

<compound name='positions'>
Expand All @@ -439,13 +439,13 @@
<stl-vector name='assignments' pointer-type='entity_position_assignment'/>

<int32_t name='next_assignment_id'/>
</compound>

<stl-vector type-name='int32_t' comment='v0.40.01'/>
<stl-vector type-name='int32_t' comment='v0.40.01'/>
<stl-vector type-name='int32_t' comment='v0.40.01'/>
<stl-vector type-name='int32_t' comment='v0.40.01'/>
<stl-vector type-name='int32_t' comment='v0.40.01'/>
<stl-vector name='unk_v40_1' pointer-type='entity_position_assignment' comment='v0.40.01'/>
<stl-vector name='unk_v40_2' pointer-type='entity_position_assignment' comment='v0.40.01'/>
<stl-vector name='unk_v40_3' pointer-type='entity_position_assignment' comment='v0.40.01'/>
<stl-vector name='unk_v40_4' type-name='int32_t' comment='v0.40.01'/>
<stl-vector name='unk_v40_5' type-name='int32_t' comment='v0.40.01'/>
</compound>

<compound name='tissue_styles'>
<stl-vector name='all' pointer-type='entity_tissue_style'/>
Expand Down Expand Up @@ -473,6 +473,12 @@

<stl-vector comment='v0.40.01' pointer-type='conversation_unk'/>

<int32_t name='unk_v40_1a' comment='v0.40.01'/>
<int32_t name='unk_v40_1b' comment='v0.40.01'/>
<int32_t name='unk_v40_1c' comment='v0.40.01'/>
<int32_t name='unk_v40_1d' comment='v0.40.01'/>
<int32_t name='unk_v40_1e' comment='v0.40.01'/>

<stl-vector name='meeting_events' pointer-type='meeting_event'/>
<pointer name='activity_stats' type-name='entity_activity_statistics'/>

Expand All @@ -487,14 +493,10 @@
<int32_t name='unk49e'/>
<int32_t name='unk49f'/>
<int32_t comment='v0.40.01'/>

<stl-vector name='unk50' type-name='pointer' comment='empty'/>
</compound>

<stl-vector comment='v0.40.01'/> position uncertain
<stl-vector comment='v0.40.01'/>
<stl-vector comment='v0.40.01'/>

<stl-vector name='armies' pointer-type='army' comment='v0.40.01'/>
<stl-vector name='army_controllers' pointer-type='army_controller' comment='v0.40.01'/>
<stl-vector name='hist_figures' pointer-type='historical_figure'/>
<stl-vector name='nemesis' pointer-type='nemesis_record'/>

Expand Down Expand Up @@ -615,7 +617,7 @@
comment='best IMPACT_FRACTURE/10000 + MAX_EDGE/1000 for weapon mats plus best IMPACT_FRACTURE/10000 for armor mats'/>
<stl-vector name='unk10' type-name='int16_t'/>

<pointer name='unk11'/>
<pointer name='resource_allotment' type-name='resource_allotment_data'/>
<int16_t name='unk12a' init-value='-1'/>
<int16_t name='unk12b' comment='uninitialized'/>
<bool name='unk13' comment='0'/>
Expand Down Expand Up @@ -767,10 +769,10 @@
</code-helper>

<int32_t name='histfig' ref-target='historical_figure'/>
<int32_t name='histfig2' ref-target='historical_figure' comment='v0.40.01'/>
<int32_t name='position_id'
refers-to='(find-by-id $$._global._parent._global.positions.own $id $)'
comment='position within relevant entity'/>
<int32_t comment='v0.40.01'/>

<df-flagarray name='flags'/>
<int32_t name='squad_id' ref-target='squad'/>
Expand Down
46 changes: 27 additions & 19 deletions df.language.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<data-definition>
<enum-type type-name='language_word_flags'>
<enum-item name='FRONT_COMPOUND_NOUN_SING'/>
<enum-item name='FRONT_COMPOUND_NOUN_PLUR'/>
<enum-item name='FRONT_COMPOUND_ADJ'/>
<enum-item name='FRONT_COMPOUND_PREFIX'/>
<enum-item name='REAR_COMPOUND_NOUN_SING'/>
<enum-item name='REAR_COMPOUND_NOUN_PLUR'/>
<enum-item name='REAR_COMPOUND_ADJ'/>
<enum-item name='THE_NOUN_SING'/>
<enum-item name='THE_NOUN_PLUR'/>
<enum-item name='THE_COMPOUND_NOUN_SING'/>
<enum-item name='THE_COMPOUND_NOUN_PLUR'/>
<enum-item name='THE_COMPOUND_ADJ'/>
<enum-item name='THE_COMPOUND_PREFIX'/>
<enum-item name='OF_NOUN_SING'/>
<enum-item name='OF_NOUN_PLUR'/>
<enum-item name='STANDARD_VERB'/>
</enum-type>
<bitfield-type type-name='language_word_flags'>
<flag-bit name='front_compound_noun_sing'/>
<flag-bit name='front_compound_noun_plur'/>
<flag-bit name='front_compound_adj'/>
<flag-bit name='front_compound_prefix'/>
<flag-bit name='rear_compound_noun_sing'/>
<flag-bit name='rear_compound_noun_plur'/>
<flag-bit name='rear_compound_adj'/>
<flag-bit name='the_noun_sing'/>
<flag-bit name='the_noun_plur'/>
<flag-bit name='the_compound_noun_sing'/>
<flag-bit name='the_compound_noun_plur'/>
<flag-bit name='the_compound_adj'/>
<flag-bit name='the_compound_prefix'/>
<flag-bit name='of_noun_sing'/>
<flag-bit name='of_noun_plur'/>
<flag-bit name='standard_verb'/>
</bitfield-type>

<enum-type type-name='part_of_speech'>
<enum-item name='Noun'/>
Expand Down Expand Up @@ -175,7 +175,9 @@

<padding size='7' comment='looks like garbage'/>

<df-flagarray name='flags' index-enum='language_word_flags'/>
<compound name='flags' type-name='language_word_flags'/>

<stl-vector pointer-type='stl-string' name='str' comment='v0.40.01'/>
</struct-type>

<struct-type type-name='language_translation'
Expand All @@ -188,6 +190,9 @@
<stl-vector name='unknown2' comment='empty'/>

<stl-vector name='words' index-refers-to='$global.world.raws.language.words[$]' pointer-type='stl-string'/>

<int32_t name='flags' comment='v0.40.01; 1 = generated'/>
<stl-vector pointer-type='stl-string' name='str' comment='v0.40.01'/>
</struct-type>

<struct-type type-name='language_symbol'
Expand All @@ -199,6 +204,9 @@
<stl-vector name='words'>
<int32_t ref-target='language_word'/>
</stl-vector>

<int32_t name='flags' comment='v0.40.01'/>
<stl-vector pointer-type='stl-string' name='str' comment='v0.40.01'/>
</struct-type>

<struct-type type-name='language_name'>
Expand Down
26 changes: 13 additions & 13 deletions df.map.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -717,27 +717,27 @@
</class-type>

<class-type type-name='world_construction_square_roadst' inherits-from='world_construction_square'>
<int16_t/>
<int16_t/>
<int16_t/>
<int32_t/>
<enum type-name='item_type' base-type='int16_t' name='item_type'/>
<int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
<int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
<int32_t name='mat_index'/>
</class-type>

<class-type type-name='world_construction_square_tunnelst' inherits-from='world_construction_square'/>

<class-type type-name='world_construction_square_bridgest' inherits-from='world_construction_square'>
<int32_t/>
<int16_t/>
<int16_t/>
<int16_t/>
<int32_t/>
<int32_t name='road_id' ref-target='world_construction' comment='guess'/>
<enum type-name='item_type' base-type='int16_t' name='item_type'/>
<int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
<int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
<int32_t name='mat_index'/>
</class-type>

<class-type type-name='world_construction_square_wallst' inherits-from='world_construction_square'>
<int16_t/>
<int16_t/>
<int16_t/>
<int32_t/>
<enum type-name='item_type' base-type='int16_t' name='item_type'/>
<int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
<int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
<int32_t name='mat_index'/>
</class-type>

<class-type type-name='world_construction' original-name='world_constructionst'
Expand Down
86 changes: 86 additions & 0 deletions df.military.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,92 @@
</stl-vector>
<stl-string name='title'/>
</class-type>

<struct-type type-name='army_controller' key-field='id'
instance-vector='$global.world.army_controllers.all'>
<int32_t name="id"/>
<int32_t name="entity_id" ref-target='historical_entity'/>
<int32_t name="unk_8"/>
<int32_t name="pos_x"/>
<int32_t name="pos_y"/>
<int32_t name="unk_14"/>
<int32_t name="unk_18"/>
<stl-vector name="unk_1c"/>
<int32_t name="year"/>
<int32_t name="year_tick"/>
<int32_t name="unk_34"/>
<int32_t name="unk_38"/>
<int32_t name="unk_3c"/>
<int32_t name="unk_40"/>
<stl-vector name="unk_44"/>
<int32_t name="unk_54"/>
<pointer name="unk_58" comment='target structure varies'/>
<int32_t name="unk_5c"/>
</struct-type>

<struct-type type-name='army' key-field='id'
instance-vector='$global.world.armies.all'>
<int32_t name="id"/>
<compound type-name='coord' name="unk_pos1"/>
<compound type-name='coord' name="unk_pos2"/>
<int16_t name="unk_10"/>
<int32_t name="unk_14"/>
<int32_t name="unk_18"/>
<stl-vector name="unk_1c">
<pointer>
<int32_t name="unk_0"/>
<int32_t name="unk_4"/>
<int32_t name="unk_8"/>
<int32_t name="unk_c"/>
<int32_t name="unk_10"/>
<int32_t name="unk_14"/>
<int32_t name="unk_18"/>
<int32_t name="unk_1c" init-value='-1000000'/>
<int32_t name="unk_20" init-value='-1000000'/>
<int32_t name="unk_24" init-value='-1000000'/>
<int32_t name="unk_28"/>
<int32_t name="unk_2c"/>
<int32_t name="unk_30"/>
<int32_t name="unk_34"/>
<stl-vector name="unk_38"/>
</pointer>
</stl-vector>
<stl-vector name="unk_2c">
<pointer>
<int32_t name="unk_0"/>
<int32_t name="unk_4"/>
<int32_t name="unk_8"/>
<int32_t name="unk_c"/>
<int32_t name="unk_10"/>
<int32_t name="unk_14"/>
<int32_t name="unk_18"/>
<int32_t name="unk_1c"/>
<int32_t name="unk_20"/>
<int32_t name="unk_24"/>
<int32_t name="unk_28"/>
</pointer>
</stl-vector>
<int32_t name="unk_3c"/>
<int32_t name="controller_id" ref-target='army_controller'/>
<pointer name="controller" type-name="army_controller"/>
<df-flagarray name="unk_48"/>
<stl-vector name="unk_pos_x" type-name="int32_t"/>
<stl-vector name="unk_pos_y" type-name="int32_t"/>
<stl-vector name="unk_70" type-name="int32_t"/>
<stl-vector name="unk_80" type-name="int32_t"/>
<int32_t name="unk_90"/>
<int32_t name="unk_94"/>
<int32_t name="unk_98"/>
<int32_t name="unk_9c"/>
<int32_t name="unk_a0"/>
<int32_t name="unk_a4"/>
<stl-vector name="unk_a8"/>
<stl-vector name='creature_class' pointer-type='stl-string'/>
<enum type-name='item_type' base-type='int16_t' name='item_type'/>
<int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
<int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
<int32_t name='mat_index'/>
</struct-type>
</data-definition>

<!--
Expand Down
2 changes: 2 additions & 0 deletions df.projectile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
-- Parabolic projectile info:
<int32_t name="unk_item_id" ref-target='item'/>
<int32_t name="unk_unit_id" ref-target='unit'/>
<padding size='4' comment='v0.40.01'/>

<int32_t name="pos_x"/>
<int32_t name="pos_y"/>
<int32_t name="pos_z"/>
Expand Down
20 changes: 20 additions & 0 deletions df.resource.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,26 @@
<int32_t name='mat_index'/>
<int32_t/>
</class-type>

<struct-type type-name='resource_allotment_data'
instance-vector='$global.world.world_data.resource_allotments'>
<int32_t name='index'/>
<static-array name='resource_allotments' count='100'>
<stl-vector pointer-type='resource_allotment_specifier'/>
</static-array>
<int32_t name='unk1'/>
<int32_t name='unk2'/>
<int32_t name='unk3'/>
<int32_t name="unk_650"/>
<stl-vector name="unk_654">
<pointer>
<int32_t name="unk_0"/>
<stl-vector name="unk_4" type-name="int32_t"/>
<stl-vector name="unk_14" type-name="int32_t"/>
<stl-vector name="unk_24" type-name="int32_t"/>
</pointer>
</stl-vector>
</struct-type>
</data-definition>

<!--
Expand Down
21 changes: 1 addition & 20 deletions df.world-data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,26 +675,7 @@

<stl-vector name="site_unk130" pointer-type='world_site_unk130'/>

<stl-vector name="unk_140">
<pointer>
<int32_t name='index'/>
<static-array name='resource_allotments' count='100'>
<stl-vector pointer-type='resource_allotment_specifier'/>
</static-array>
<int32_t name='unk1'/>
<int32_t name='unk2'/>
<int32_t name='unk3'/>
<int32_t name="unk_650"/>
<stl-vector name="unk_654">
<pointer>
<int32_t name="unk_0"/>
<stl-vector name="unk_4" type-name="int32_t"/>
<stl-vector name="unk_14" type-name="int32_t"/>
<stl-vector name="unk_24" type-name="int32_t"/>
</pointer>
</stl-vector>
</pointer>
</stl-vector>
<stl-vector name="resource_allotments" pointer-type='resource_allotment_data'/>

<stl-vector name="unk_150">
<pointer>
Expand Down
8 changes: 4 additions & 4 deletions df.world.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,13 +706,13 @@
</compound>

<compound name='armies' comment='v0.40.01'>
<stl-vector name='all'/>
<stl-vector name='bad' has-bad-pointers='true'/>
<stl-vector name='all' pointer-type='army'/>
<stl-vector name='bad' pointer-type='army' has-bad-pointers='true'/>
</compound>

<compound name='army_controllers' comment='v0.40.01'>
<stl-vector name='all'/>
<stl-vector name='bad' has-bad-pointers='true'/>
<stl-vector name='all' pointer-type='army_controller'/>
<stl-vector name='bad' pointer-type='army_controller' has-bad-pointers='true'/>
</compound>

<compound name='army_tracking_info' comment='v0.40.01'>
Expand Down
Loading

0 comments on commit 5cfd2a2

Please sign in to comment.