Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Template for new versions:
# Future

## Structures
- added missing field in history_event_artifact_createdst
- fixed incorrect base class on widget_anchored_tile

# 53.04-r1

Expand Down
1 change: 1 addition & 0 deletions df.d_basics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4145,6 +4145,7 @@
<enum-item name='AdventureAutomoveAcrobatic'/>
<enum-item name='ArcherReposition'/>
<enum-item name='BatteringRamPosition'/>
<enum-item name='BuildSiegeConstruction'/>
</enum-type>

-- Unused: BuildPathResult
Expand Down
2 changes: 1 addition & 1 deletion df.g_src.ViewBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

<class-type type-name='widget_nineslice_horizontal' original-name='widgets::nineslize_horizontal' inherits-from='widget_nineslice'/>

<class-type type-name='widget_anchored_tile' original-name='widgets::anchored_tile' inherits-from='widget_nineslice'>
<class-type type-name='widget_anchored_tile' original-name='widgets::anchored_tile' inherits-from='widget'>
<long name='texp'/>
<long name='offset_x'/>
<long name='offset_y'/>
Expand Down
4 changes: 2 additions & 2 deletions df.g_src.graphics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -805,9 +805,9 @@
<static-array name='texpos_item_barrel_top' count='7'><stl-vector type-name='int32_t'/></static-array>
<static-array type-name='int32_t' count='128' name='texture_indices6'/>
<static-array name='texpos_item_bin_top' count='21'><stl-vector type-name='int32_t'/></static-array>
<static-array type-name='int32_t' count='454' name='texture_indices7'/>
<static-array type-name='int32_t' count='458' name='texture_indices7'/>
<stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
<static-array type-name='int32_t' count='8321' name='texture_indices8'/>
<static-array type-name='int32_t' count='8340' name='texture_indices8'/>
<static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
<static-array type-name='int32_t' count='101' name='texture_indices9'/>
<static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
Expand Down
1 change: 1 addition & 0 deletions df.history_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,7 @@
<int32_t name='artifact_id' ref-target='artifact_record'/>
<int32_t name='creator_unit_id' ref-target='unit' comment='the unit who created the artifact'/>
<int32_t name='creator_hfid' ref-target='historical_figure' comment='the figure who created the artifact'/>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
<bitfield name='flags2' base-type='uint32_t' type-name='history_event_artifact_created_flag'/>
<compound name='circumstance'> not a compound
Expand Down
48 changes: 48 additions & 0 deletions df.itemdef.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1536,6 +1536,52 @@
<int32_t name='texpos'/>
</struct-type>

<bitfield-type type-name='item_skin_tanned_graphics_flag' base-type='int32_t'> bay12: ITEM_SKIN_TANNED_GRAPHICS_FLAG_*
<flag-bit name='color_index' count='8'/>
<flag-bit name='over_color_index' count='8'/>
<flag-bit name='pattern' count='3' type-name='item_skin_tanned_graphics_flag_pattern'/>
</bitfield-type>

<enum-type type-name='item_skin_tanned_graphics_flag_pattern' base-type='int32_t'> bay12: ITEM_SKIN_TANNED_GRAPHICS_FLAG_PATTERN_*
<enum-item name='MONOTONE'/>
<enum-item name='BICOLOR'/>
<enum-item name='STRIPES'/>
<enum-item name='MOTTLED'/>
<enum-item name='SPOTS'/>
</enum-type>

<struct-type type-name='item_skin_tanned_graphics_infost'>
<bitfield name='flags' type-name='item_skin_tanned_graphics_flag' base-type='int32_t'/>
<int32_t name='texpos'/>
</struct-type>

<bitfield-type type-name='item_bodypart_skin_graphics_flag' base-type='int32_t'> bay12: ITEM_BODYPART_SKIN_GRAPHICS_FLAG_*
<flag-bit name='color_index' count='8'/>
<flag-bit name='over_color_index' count='8'/>
<flag-bit name='pattern' count='3' type-name='item_bodypart_skin_graphics_flag_pattern'/>
<flag-bit name='surface' count='2' type-name='item_bodypart_skin_graphics_flag_surface'/>
</bitfield-type>

<enum-type type-name='item_bodypart_skin_graphics_flag_pattern' base-type='int32_t'> bay12: ITEM_BODYPART_SKIN_GRAPHICS_FLAG_PATTERN_*
<enum-item name='MONOTONE'/>
<enum-item name='BICOLOR'/>
<enum-item name='STRIPES'/>
<enum-item name='MOTTLED'/>
<enum-item name='SPOTS'/>
</enum-type>

<enum-type type-name='item_bodypart_skin_graphics_flag_surface' base-type='int32_t'> bay12: ITEM_BODYPART_SKIN_GRAPHICS_FLAG_SURFACE_*
<enum-item name='HAIR'/>
<enum-item name='SKIN'/>
<enum-item name='SCALES'/>
<enum-item name='FEATHERS'/>
</enum-type>

<struct-type type-name='item_bodypart_skin_graphics_infost'>
<bitfield name='flags' type-name='item_bodypart_skin_graphics_flag' base-type='int32_t'/>
<int32_t name='texpos'/>
</struct-type>

-- Unused: itemdef_handling_informationst

<struct-type type-name='itemdef_handlerst'>
Expand Down Expand Up @@ -1615,6 +1661,8 @@
<stl-vector name='pipe_section_graphics_info' pointer-type='item_pipe_section_graphics_infost'/>
<stl-vector name='rock_graphics_info' pointer-type='item_rock_graphics_infost'/>
<stl-vector name='totem_graphics_info' pointer-type='item_totem_graphics_infost'/>
<stl-vector name='skin_tanned_graphics_info' pointer-type='item_skin_tanned_graphics_infost'/>
<stl-vector name='bodypart_skin_graphics_info' pointer-type='item_bodypart_skin_graphics_infost'/>
<static-array name='statue_texpos_top' index-enum='item_type' type-name='int32_t'/>
<static-array name='statue_texpos_bottom' index-enum='item_type' type-name='int32_t'/>
</struct-type>
Expand Down
5 changes: 5 additions & 0 deletions df.plotinfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,11 @@

<int32_t name='entered_planless_year'/>
<int32_t name='entered_planless_season_count'/>

<int32_t name='last_death_caged_scrap_year'/>
<int32_t name='last_death_caged_scrap_season_count'/>
<int32_t name='last_non_vehicle_scrap_year'/>
<int32_t name='last_non_vehicle_scrap_season_count'/>
</struct-type>

<struct-type type-name='plot_invasion_infost'>
Expand Down
1 change: 1 addition & 0 deletions df.unit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1452,6 +1452,7 @@
<flag-bit name='portrait_must_be_refreshed'/>
<flag-bit name='may_have_magical_inventory_item'/>
<flag-bit name='may_have_mythical_substance'/>
<flag-bit name='did_dungeon_move_unit'/>
</bitfield-type>

-- Unused: UNITFLAG_CIV_OFFERED
Expand Down
Loading