Skip to content

Commit 6838c7b

Browse files
authored
Merge pull request #867 from quietust/53.06
Update structures for 53.06
2 parents 2b631c0 + 66bdbe0 commit 6838c7b

File tree

8 files changed

+61
-3
lines changed

8 files changed

+61
-3
lines changed

changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Template for new versions:
1919
# Future
2020

2121
## Structures
22+
- added missing field in history_event_artifact_createdst
23+
- fixed incorrect base class on widget_anchored_tile
2224

2325
# 53.04-r1
2426

df.d_basics.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4145,6 +4145,7 @@
41454145
<enum-item name='AdventureAutomoveAcrobatic'/>
41464146
<enum-item name='ArcherReposition'/>
41474147
<enum-item name='BatteringRamPosition'/>
4148+
<enum-item name='BuildSiegeConstruction'/>
41484149
</enum-type>
41494150

41504151
-- Unused: BuildPathResult

df.g_src.ViewBase.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

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

125-
<class-type type-name='widget_anchored_tile' original-name='widgets::anchored_tile' inherits-from='widget_nineslice'>
125+
<class-type type-name='widget_anchored_tile' original-name='widgets::anchored_tile' inherits-from='widget'>
126126
<long name='texp'/>
127127
<long name='offset_x'/>
128128
<long name='offset_y'/>

df.g_src.graphics.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,9 +805,9 @@
805805
<static-array name='texpos_item_barrel_top' count='7'><stl-vector type-name='int32_t'/></static-array>
806806
<static-array type-name='int32_t' count='128' name='texture_indices6'/>
807807
<static-array name='texpos_item_bin_top' count='21'><stl-vector type-name='int32_t'/></static-array>
808-
<static-array type-name='int32_t' count='454' name='texture_indices7'/>
808+
<static-array type-name='int32_t' count='458' name='texture_indices7'/>
809809
<stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
810-
<static-array type-name='int32_t' count='8321' name='texture_indices8'/>
810+
<static-array type-name='int32_t' count='8340' name='texture_indices8'/>
811811
<static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
812812
<static-array type-name='int32_t' count='101' name='texture_indices9'/>
813813
<static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>

df.history_event.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,7 @@
11261126
<int32_t name='artifact_id' ref-target='artifact_record'/>
11271127
<int32_t name='creator_unit_id' ref-target='unit' comment='the unit who created the artifact'/>
11281128
<int32_t name='creator_hfid' ref-target='historical_figure' comment='the figure who created the artifact'/>
1129+
<int32_t name='entity' ref-target='historical_entity'/>
11291130
<int32_t name='site' ref-target='world_site'/>
11301131
<bitfield name='flags2' base-type='uint32_t' type-name='history_event_artifact_created_flag'/>
11311132
<compound name='circumstance'> not a compound

df.itemdef.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,6 +1536,52 @@
15361536
<int32_t name='texpos'/>
15371537
</struct-type>
15381538

1539+
<bitfield-type type-name='item_skin_tanned_graphics_flag' base-type='int32_t'> bay12: ITEM_SKIN_TANNED_GRAPHICS_FLAG_*
1540+
<flag-bit name='color_index' count='8'/>
1541+
<flag-bit name='over_color_index' count='8'/>
1542+
<flag-bit name='pattern' count='3' type-name='item_skin_tanned_graphics_flag_pattern'/>
1543+
</bitfield-type>
1544+
1545+
<enum-type type-name='item_skin_tanned_graphics_flag_pattern' base-type='int32_t'> bay12: ITEM_SKIN_TANNED_GRAPHICS_FLAG_PATTERN_*
1546+
<enum-item name='MONOTONE'/>
1547+
<enum-item name='BICOLOR'/>
1548+
<enum-item name='STRIPES'/>
1549+
<enum-item name='MOTTLED'/>
1550+
<enum-item name='SPOTS'/>
1551+
</enum-type>
1552+
1553+
<struct-type type-name='item_skin_tanned_graphics_infost'>
1554+
<bitfield name='flags' type-name='item_skin_tanned_graphics_flag' base-type='int32_t'/>
1555+
<int32_t name='texpos'/>
1556+
</struct-type>
1557+
1558+
<bitfield-type type-name='item_bodypart_skin_graphics_flag' base-type='int32_t'> bay12: ITEM_BODYPART_SKIN_GRAPHICS_FLAG_*
1559+
<flag-bit name='color_index' count='8'/>
1560+
<flag-bit name='over_color_index' count='8'/>
1561+
<flag-bit name='pattern' count='3' type-name='item_bodypart_skin_graphics_flag_pattern'/>
1562+
<flag-bit name='surface' count='2' type-name='item_bodypart_skin_graphics_flag_surface'/>
1563+
</bitfield-type>
1564+
1565+
<enum-type type-name='item_bodypart_skin_graphics_flag_pattern' base-type='int32_t'> bay12: ITEM_BODYPART_SKIN_GRAPHICS_FLAG_PATTERN_*
1566+
<enum-item name='MONOTONE'/>
1567+
<enum-item name='BICOLOR'/>
1568+
<enum-item name='STRIPES'/>
1569+
<enum-item name='MOTTLED'/>
1570+
<enum-item name='SPOTS'/>
1571+
</enum-type>
1572+
1573+
<enum-type type-name='item_bodypart_skin_graphics_flag_surface' base-type='int32_t'> bay12: ITEM_BODYPART_SKIN_GRAPHICS_FLAG_SURFACE_*
1574+
<enum-item name='HAIR'/>
1575+
<enum-item name='SKIN'/>
1576+
<enum-item name='SCALES'/>
1577+
<enum-item name='FEATHERS'/>
1578+
</enum-type>
1579+
1580+
<struct-type type-name='item_bodypart_skin_graphics_infost'>
1581+
<bitfield name='flags' type-name='item_bodypart_skin_graphics_flag' base-type='int32_t'/>
1582+
<int32_t name='texpos'/>
1583+
</struct-type>
1584+
15391585
-- Unused: itemdef_handling_informationst
15401586

15411587
<struct-type type-name='itemdef_handlerst'>
@@ -1615,6 +1661,8 @@
16151661
<stl-vector name='pipe_section_graphics_info' pointer-type='item_pipe_section_graphics_infost'/>
16161662
<stl-vector name='rock_graphics_info' pointer-type='item_rock_graphics_infost'/>
16171663
<stl-vector name='totem_graphics_info' pointer-type='item_totem_graphics_infost'/>
1664+
<stl-vector name='skin_tanned_graphics_info' pointer-type='item_skin_tanned_graphics_infost'/>
1665+
<stl-vector name='bodypart_skin_graphics_info' pointer-type='item_bodypart_skin_graphics_infost'/>
16181666
<static-array name='statue_texpos_top' index-enum='item_type' type-name='int32_t'/>
16191667
<static-array name='statue_texpos_bottom' index-enum='item_type' type-name='int32_t'/>
16201668
</struct-type>

df.plotinfo.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,11 @@
371371

372372
<int32_t name='entered_planless_year'/>
373373
<int32_t name='entered_planless_season_count'/>
374+
375+
<int32_t name='last_death_caged_scrap_year'/>
376+
<int32_t name='last_death_caged_scrap_season_count'/>
377+
<int32_t name='last_non_vehicle_scrap_year'/>
378+
<int32_t name='last_non_vehicle_scrap_season_count'/>
374379
</struct-type>
375380

376381
<struct-type type-name='plot_invasion_infost'>

df.unit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,6 +1452,7 @@
14521452
<flag-bit name='portrait_must_be_refreshed'/>
14531453
<flag-bit name='may_have_magical_inventory_item'/>
14541454
<flag-bit name='may_have_mythical_substance'/>
1455+
<flag-bit name='did_dungeon_move_unit'/>
14551456
</bitfield-type>
14561457

14571458
-- Unused: UNITFLAG_CIV_OFFERED

0 commit comments

Comments
 (0)