Skip to content

Commit

Permalink
Move DF addition version from 'comment' attributes
Browse files Browse the repository at this point in the history
Move comments that have the DF version where they were introduced (i.e. <int32_t name='owner_id' ref-target='unit' comment='v0.40.1'/> )
to its corresponding  'since' attribute
<int32_t name='owner_id' ref-target='unit' since='v0.40.1'/>
  • Loading branch information
ragundo committed Dec 8, 2016
1 parent 2746875 commit 1d42069
Show file tree
Hide file tree
Showing 32 changed files with 524 additions and 524 deletions.
2 changes: 1 addition & 1 deletion df.advmode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
<stl-vector name='unk29'/>
<stl-vector name='unk30'/>
<stl-vector name='actions' pointer-type='adventure_movement_option'/>
<stl-vector name='unk31' comment='v0.34.08'/>
<stl-vector name='unk31' since='v0.34.08'/>

<int32_t/>
<int8_t/>
Expand Down
6 changes: 3 additions & 3 deletions df.announcements.xml
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,9 @@
<int32_t name='year'/>
<int32_t name='time'/>

<int32_t name='unk_v40_1' init-value='-1' comment='v0.40.1'/>
<int32_t name='unk_v40_2' init-value='-1' comment='v0.40.1'/>
<int32_t name='unk_v40_3' init-value='-1' comment='v0.40.1'/>
<int32_t name='unk_v40_1' init-value='-1' since='v0.40.1'/>
<int32_t name='unk_v40_2' init-value='-1' since='v0.40.1'/>
<int32_t name='unk_v40_3' init-value='-1' since='v0.40.1'/>
</struct-type>

<struct-type type-name='popup_message'>
Expand Down
4 changes: 2 additions & 2 deletions df.art.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@
<struct-type type-name='art_image_ref'>
<int32_t name='id' ref-target='art_image_chunk'/>
<int16_t name='subid' ref-target='art_image' aux-value='$$.id'/>
<int32_t name='civ_id' ref-target='historical_entity' comment='v0.34.01'/>
<int32_t name='site_id' ref-target='world_site' comment='v0.34.01'/>
<int32_t name='civ_id' ref-target='historical_entity' since='v0.34.01'/>
<int32_t name='site_id' ref-target='world_site' since='v0.34.01'/>
</struct-type>

<struct-type type-name='poetic_form' instance-vector='$global.world.poetic_forms.all' key-field='id'>
Expand Down
36 changes: 18 additions & 18 deletions df.buildings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
<stl-vector name='children' pointer-type='building' comment='other buildings within this room'/>
<stl-vector name='parents' pointer-type='building' comment='rooms this building belongs to'/>

<int32_t name='owner_id' ref-target='unit' comment='v0.40.1'/>
<int32_t name='owner_id' ref-target='unit' since='v0.40.1'/>
<pointer type-name='unit' name='owner'/>

<stl-vector name='job_claim_suppress' comment='after Remv Cre, prevents unit from taking jobs at building'>
Expand All @@ -272,12 +272,12 @@
</pointer>
</stl-vector>

<int32_t name='world_data_id' ref-target='world_object_data' comment='v0.34.01'/>
<int32_t name='world_data_subid' init-value='-1' comment='v0.34.01'/>
<int32_t name='unk_v40_2' init-value='-1' comment='v0.40.1'/>
<int32_t name='site_id' ref-target='world_site' comment='v0.42.1'/>
<int32_t name='location_id' ref-target='abstract_building' aux-value='$$.site_id' comment='v0.42.1'/>
<int32_t name='unk_v40_3' init-value='-1' comment='v0.40.1'/>
<int32_t name='world_data_id' ref-target='world_object_data' since='v0.34.01'/>
<int32_t name='world_data_subid' init-value='-1' since='v0.34.01'/>
<int32_t name='unk_v40_2' init-value='-1' since='v0.40.1'/>
<int32_t name='site_id' ref-target='world_site' since='v0.42.1'/>
<int32_t name='location_id' ref-target='abstract_building' aux-value='$$.site_id' since='v0.42.1'/>
<int32_t name='unk_v40_3' init-value='-1' since='v0.40.1'/>

<virtual-methods>
<vmethod ret-type='int32_t' name='getCustomType'/>
Expand Down Expand Up @@ -464,7 +464,7 @@
<vmethod name='getSpecificPosition' ret-type='int32_t'/>
<vmethod name='setSpecificSquadPos'><int32_t/><int32_t/></vmethod>
<vmethod name='clearSpecificSquad'/>
<vmethod comment='v0.42.01, related to tavern beds'/>
<vmethod since='v0.42.01, related to tavern beds'/>

-- 95

Expand Down Expand Up @@ -632,13 +632,13 @@
</bitfield>
<int16_t name='fill_timer'/>
<compound type-name='hospital_supplies' name='hospital'/>
<bitfield name='gather_flags' base-type='uint32_t' comment='v0.40.14'>
<bitfield name='gather_flags' base-type='uint32_t' since='v0.40.14'>
<flag-bit name='pick_trees'/>
<flag-bit name='pick_shrubs'/>
<flag-bit name='gather_fallen'/>
</bitfield>
<int32_t name='unk_v4014_1' comment='v0.40.14'/>
<stl-vector name='unk_v43_1' comment='v0.43.01'/>
<int32_t name='unk_v4014_1' since='v0.40.14'/>
<stl-vector name='unk_v43_1' since='v0.43.01'/>
</class-type>

-- actual --
Expand Down Expand Up @@ -1075,8 +1075,8 @@
<int8_t name='water_max' init-value='7'/>
<int8_t name='magma_min' init-value='1'/>
<int8_t name='magma_max' init-value='7'/>
<int32_t name='track_min' init-value='1' comment='v0.34.08'/>
<int32_t name='track_max' init-value='2000' comment='v0.34.08'/>
<int32_t name='track_min' init-value='1' since='v0.34.08'/>
<int32_t name='track_max' init-value='2000' since='v0.34.08'/>

<bitfield name='flags' init-value='0x10'>
<flag-bit name='units'/>
Expand Down Expand Up @@ -1105,11 +1105,11 @@

<compound name='plate_info' type-name='pressure_plate_info'/>

<int32_t name='friction' init-value='50000' comment='v0.34.08'/>
<int32_t name='use_dump' comment='v0.34.08'/>
<int32_t name='dump_x_shift' comment='v0.34.08'/>
<int32_t name='dump_y_shift' comment='v0.34.08'/>
<int8_t name='stop_trigger_timer' comment='v0.34.08'/>
<int32_t name='friction' init-value='50000' since='v0.34.08'/>
<int32_t name='use_dump' since='v0.34.08'/>
<int32_t name='dump_x_shift' since='v0.34.08'/>
<int32_t name='dump_y_shift' since='v0.34.08'/>
<int8_t name='stop_trigger_timer' since='v0.34.08'/>
</class-type>

<class-type type-name='building_wagonst' inherits-from='building_actual'/>
Expand Down
54 changes: 27 additions & 27 deletions df.creature-raws.xml
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@
<int16_t name='insulation_muscle'/>
<int16_t name='insulation_base'/>

<int32_t name='clothing_item_id' init-value='-1' comment='v0.34.06'/>
<int32_t name='clothing_item_id' init-value='-1' since='v0.34.06'/>
</struct-type>

<struct-type type-name='color_modifier_raw' key-field='id'>
Expand Down Expand Up @@ -598,16 +598,16 @@
<stl-vector type-name='int32_t' name='specialattack_max'/>
<int32_t name='contact_perc'/>
<int32_t name='penetration_perc'/>
<int16_t name='unk_v40_1' comment='v0.40.1'/>
<int16_t name='unk_v40_2' comment='v0.40.1'/>
<int16_t name='unk_v40_1' since='v0.40.1'/>
<int16_t name='unk_v40_2' since='v0.40.1'/>
<stl-vector type-name='int16_t' name='body_part_idx'/>
<stl-vector type-name='int16_t' name='tissue_layer_idx'/>
<enum base-type="int16_t" type-name="job_skill" name="skill"/>
<int32_t name='velocity_modifier'/>
<stl-vector pointer-type='stl-string' name='specialattack_interaction_tmp_name' comment='parsed during second pass'/>
<stl-vector type-name='int32_t' name='specialattack_interaction_id'/>
<int32_t name='unk_v40_3' comment='v0.40.1'/>
<int32_t name='unk_v40_4' comment='v0.40.1'/>
<int32_t name='unk_v40_3' since='v0.40.1'/>
<int32_t name='unk_v40_4' since='v0.40.1'/>
</struct-type>

<enum-type type-name='gait_type'>
Expand Down Expand Up @@ -716,7 +716,7 @@
<int32_t refers-to='$$._global.layer_idx[$].refers-to'/>
</stl-vector>

<bitfield name='flags' comment='v0.34.01'>
<bitfield name='flags' since='v0.34.01'>
<flag-bit name='unk0'/>
</bitfield>

Expand All @@ -732,10 +732,10 @@
<int32_t name='fraction_fat'/>
<int32_t name='fraction_muscle'/>

<!--<pointer name='clothing_items' comment='v0.34.06'>
<!--<pointer name='clothing_items' since='v0.34.06'>
<stl-vector pointer-type='caste_clothing_item'/>
</pointer>-->
<static-array name='unk_v40_2' count='11' type-name='int32_t' comment='v0.40.1'/>
<static-array name='unk_v40_2' count='11' type-name='int32_t' since='v0.40.1'/>
</struct-type>

<struct-type type-name='caste_raw'>
Expand Down Expand Up @@ -856,8 +856,8 @@

<int8_t name='gender'/>

<static-array name='orientation_male' count='3' type-name='int32_t' comment='v0.40.1'/>
<static-array name='orientation_female' count='3' type-name='int32_t' comment='v0.40.1'/>
<static-array name='orientation_male' count='3' type-name='int32_t' since='v0.40.1'/>
<static-array name='orientation_female' count='3' type-name='int32_t' since='v0.40.1'/>

<stl-vector type-name='int32_t' name='body_size_1'/>
<stl-vector type-name='int32_t' name='body_size_2'/>
Expand Down Expand Up @@ -1004,26 +1004,26 @@
<stl-string name="unk_44"/>
<stl-vector name="body_part_id" type-name="int16_t" refers-to='$$._upglobal.body_info.body_parts[$]'/>
<stl-vector name="layer_id" type-name="int16_t" refers-to='$$._parent._parent.body_part_id[$$._key].refers-to.layers[$]'/>
<int32_t name='cause' comment='v0.40.01; 2 EXERTION, 1 EXTREME_EMOTION, 0 always?'/>
<int32_t name='cause' since='v0.40.01; 2 EXERTION, 1 EXTREME_EMOTION, 0 always?'/>
</pointer>
</stl-vector>

<stl-vector name='creature_class' pointer-type='stl-string'/>

<compound name='unknown2'>
<stl-vector name='unk_v4201_1' comment='v0.42.01'/>
<stl-vector name='unk_v4201_2' comment='v0.42.01'/>
<stl-vector name='unk_v4201_1' since='v0.42.01'/>
<stl-vector name='unk_v4201_2' since='v0.42.01'/>

<stl-vector name='gobble_vermin_class' pointer-type='stl-string'/>
<stl-vector name='gobble_vermin_creature_1' pointer-type='stl-string'/>
<stl-vector name='gobble_vermin_creature_2' pointer-type='stl-string'/>

<stl-vector name='infect_all' type-name='int32_t' ref-target='syndrome'
comment='v0.34.01; for spatter applied to all bp'/>
since='v0.34.01; for spatter applied to all bp'/>
<stl-vector name='infect_local' type-name='int32_t' ref-target='syndrome'
comment='v0.34.01; for spatter applied to one bp'/>
<stl-vector name='unk23f' type-name='int32_t' comment='v0.34.01'/>
<stl-vector name='unk23g' type-name='int32_t' comment='v0.34.01'/>
since='v0.34.01; for spatter applied to one bp'/>
<stl-vector name='unk23f' type-name='int32_t' since='v0.34.01'/>
<stl-vector name='unk23g' type-name='int32_t' since='v0.34.01'/>

<df-flagarray name='unk24_flags'/>
<df-flagarray name='unk25_flags'/>
Expand All @@ -1041,7 +1041,7 @@
<stl-vector name='unk_2f20' type-name='int16_t'/>
<stl-vector name='unk_2f30' type-name='int8_t'/>
<stl-vector name='unk_2f40' type-name='int32_t'/>
<stl-vector name='unk_2f50' type-name='int16_t' comment='v0.34.01'/>
<stl-vector name='unk_2f50' type-name='int16_t' since='v0.34.01'/>

muscle:
<int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
Expand All @@ -1064,7 +1064,7 @@
<stl-vector type-name='int32_t' name='sound_peaceful_intermittent'
refers-to='$$._global.sound[$]'/>

<stl-vector type-name='pointer' comment='v0.34.01'/>
<stl-vector type-name='pointer' since='v0.34.01'/>

-- v0.40.01
<int32_t name="smell_trigger"/>
Expand Down Expand Up @@ -1136,7 +1136,7 @@
<static-array type-name='stl-string' name='name' count='3'/>
<static-array type-name='stl-string' name='general_baby_name' count='2'/>
<static-array type-name='stl-string' name='general_child_name' count='2'/>
<stl-string name='unk_v43_1' comment='v0.43.01'/>
<stl-string name='unk_v43_1' since='v0.43.01'/>

<uint8_t name='creature_tile'/>
<uint8_t name='creature_soldier_tile'/>
Expand Down Expand Up @@ -1270,7 +1270,7 @@
</compound>

<int32_t name='source_hfid' ref-target='historical_figure'/>
<int32_t name='unk_v4201_1' init-value='-1' comment='v0.42.01'/>
<int32_t name='unk_v4201_1' init-value='-1' since='v0.42.01'/>

<int32_t name='next_modifier_id'/>

Expand All @@ -1281,19 +1281,19 @@
<stl-string name='cvct_master'/>
<stl-string name='cvct_target'/>
<stl-string name='cvct_replacement'/>
<int32_t name='unk_v40_1' init-value='-1' comment='v0.40.1'/>
<stl-string name='unk_v40_2' comment='v0.40.1'/>
<int32_t name='unk_v40_1' init-value='-1' since='v0.40.1'/>
<stl-string name='unk_v40_2' since='v0.40.1'/>
</struct-type>

<struct-type type-name='creature_variation' instance-vector='$global.world.raws.creature_variations'>
<stl-string name='id'/>
<stl-vector name='cv_convert_tag' pointer-type='creature_variation_convert_tag'/>
<stl-vector name='cv_new_tag' pointer-type='stl-string'/>
<stl-vector name='cv_new_unk_v40_1' type-name='int32_t' comment='v0.40.1'/>
<stl-vector name='cv_new_unk_v40_2' pointer-type='stl-string' comment='v0.40.1'/>
<stl-vector name='cv_new_unk_v40_1' type-name='int32_t' since='v0.40.1'/>
<stl-vector name='cv_new_unk_v40_2' pointer-type='stl-string' since='v0.40.1'/>
<stl-vector name='cv_remove_tag' pointer-type='stl-string'/>
<stl-vector name='cv_remove_unk_v40_1' type-name='int32_t' comment='v0.40.1'/>
<stl-vector name='cv_remove_unk_v40_2' pointer-type='stl-string' comment='v0.40.1'/>
<stl-vector name='cv_remove_unk_v40_1' type-name='int32_t' since='v0.40.1'/>
<stl-vector name='cv_remove_unk_v40_2' pointer-type='stl-string' since='v0.40.1'/>
</struct-type>

<enum-type type-name='body_part_template_flags'>
Expand Down
12 changes: 6 additions & 6 deletions df.d_init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@
<uint8_t name='pillar_tile'/>

N S E W NS NE NW SE SW EW NSE NSW NEW SEW NSEW
<static-array name='track_tiles' type-name='uint8_t' count='15' comment='v0.34.08'/>
<static-array name='track_tile_invert' type-name='uint8_t' count='15' comment='v0.34.08'/>
<static-array name='track_ramp_tiles' type-name='uint8_t' count='15' comment='v0.34.08'/>
<static-array name='track_ramp_invert' type-name='uint8_t' count='15' comment='v0.34.08'/>
<static-array name='track_tiles' type-name='uint8_t' count='15' since='v0.34.08'/>
<static-array name='track_tile_invert' type-name='uint8_t' count='15' since='v0.34.08'/>
<static-array name='track_ramp_tiles' type-name='uint8_t' count='15' since='v0.34.08'/>
<static-array name='track_ramp_invert' type-name='uint8_t' count='15' since='v0.34.08'/>

<static-array name='tree_tiles' type-name='uint8_t' count='104' comment='v0.40.01'/>
<static-array name='tree_tiles' type-name='uint8_t' count='104' since='v0.40.01'/>

<static-array name='chasm_color' type-name='int16_t' count='3'/>

Expand Down Expand Up @@ -136,7 +136,7 @@

<static-array name='set_labor_lists' type-name='int16_t' count='2'/>

<int32_t name='graze_coefficient' comment='v0.40.13'/>
<int32_t name='graze_coefficient' since='v0.40.13'/>
<df-flagarray name='flags4' index-enum='d_init_flags4'/>
<enum name="post_prepare_embark_confirmation" type-name='d_init_embark_confirm'/>
</struct-type>
Expand Down
Loading

0 comments on commit 1d42069

Please sign in to comment.