Skip to content

Commit 341b6bc

Browse files
committed
Update structures for 53.04
1 parent 07bd0e8 commit 341b6bc

File tree

5 files changed

+23
-5
lines changed

5 files changed

+23
-5
lines changed

df.creature.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,11 @@
654654
<stl-vector name='required_caste' type-name='int32_t'/>
655655
<stl-vector name='required_profession' type-name='int32_t'/>
656656

657-
<int32_t name='haul_min_count'/>
657+
<int32_t name='haul_min_count'/>
658658
<int32_t name='haul_max_count'/>
659659

660+
<int32_t name='body_size_min'/>
661+
660662
<stl-vector name='required_item' pointer-type='cgl_itemst'/>
661663
<stl-vector name='forbidden_item' pointer-type='cgl_itemst'/>
662664
<stl-vector name='dye_color_index' type-name='int32_t'/>

df.d_interface.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1955,6 +1955,7 @@
19551955
<enum-item name='STOCKPILES'/>
19561956
<enum-item name='WORKSHOPS'/>
19571957
<enum-item name='FARMPLOTS'/>
1958+
<enum-item name='SIEGE_ENGINES'/>
19581959
</enum-type>
19591960

19601961
<struct-type type-name='buildings_interfacest'>
@@ -2330,7 +2331,6 @@
23302331
<bool name='sorting_guard_nameprof_doing_name'/>
23312332
<bool name='sorting_guard_nameprof_doing_prof'/>
23322333

2333-
<stl-set pointer-type='unit' name='convicts'/>
23342334
<pointer type-name='unit' name='selected_convict'/>
23352335

23362336
<stl-vector pointer-type='crime' name='convict_crime'/>

df.g_src.graphics.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,11 +801,11 @@
801801
<stl-vector type-name='int32_t' name='texpos_boulder'/>
802802
<static-array type-name='int32_t' count='4508' name='texture_indices4'/>
803803
<static-array name='texpos_item_door_debris' count='4'><stl-vector type-name='int32_t'/></static-array>
804-
<static-array type-name='int32_t' count='57' name='texture_indices5'/>
804+
<static-array type-name='int32_t' count='60' name='texture_indices5'/>
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='437' name='texture_indices7'/>
808+
<static-array type-name='int32_t' count='454' name='texture_indices7'/>
809809
<stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
810810
<static-array type-name='int32_t' count='8321' name='texture_indices8'/>
811811
<static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>

df.itemdef.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
<stl-string name="name_plural"/>
656656
<stl-string name="ammo_class"/>
657657

658-
<static-array name='texpos' type-name='int32_t' count='16'/>
658+
<static-array name='texpos' type-name='int32_t' count='24'/>
659659
<stl-vector name='graphics_info' pointer-type='itemdef_siegeammo_graphics_infost'/>
660660
</class-type>
661661

@@ -834,6 +834,7 @@
834834
<bitfield-type type-name='item_craft_graphics_flag' base-type='int32_t'> bay12: ITEM_CRAFT_GRAPHICS_FLAG_*
835835
<flag-bit name='size' count='2' type-name='item_craft_graphics_flag_material'/>
836836
<flag-bit name='color_index' count='8'/>
837+
<flag-bit name='gem_color_index' count='8'/>
837838
</bitfield-type>
838839

839840
<enum-type type-name='item_craft_graphics_flag_material' base-type='int32_t'> bay12: ITEM_CRAFT_GRAPHICS_FLAG_MATERIAL_*
@@ -1369,6 +1370,8 @@
13691370
<bitfield-type type-name='item_book_graphics_flag' base-type='int32_t'> bay12: ITEM_BOOK_GRAPHICS_FLAG_*
13701371
<flag-bit name='color_index' count='8'/>
13711372
<flag-bit name='material_wood'/>
1373+
<flag-bit name='material_stone'/>
1374+
<flag-bit name='material_glass'/>
13721375
</bitfield-type>
13731376

13741377
<struct-type type-name='item_book_graphics_infost'>
@@ -1454,6 +1457,7 @@
14541457
<bitfield-type type-name='item_goblet_graphics_flag' base-type='int32_t'> bay12: ITEM_GOBLET_GRAPHICS_FLAG_*
14551458
<flag-bit name='material' count='2' type-name='item_goblet_graphics_flag_material'/>
14561459
<flag-bit name='color_index' count='8'/>
1460+
<flag-bit name='gem_color_index' count='8'/>
14571461
</bitfield-type>
14581462

14591463
<enum-type type-name='item_goblet_graphics_flag_material' base-type='int32_t'> bay12: ITEM_GOBLET_GRAPHICS_FLAG_MATERIAL_*
@@ -1467,6 +1471,15 @@
14671471
<int32_t name='texpos'/>
14681472
</struct-type>
14691473

1474+
<bitfield-type type-name='item_totem_graphics_flag' base-type='int32_t'> bay12: ITEM_TOTEM_GRAPHICS_FLAG_*
1475+
<flag-bit name='color_index' count='8'/>
1476+
</bitfield-type>
1477+
1478+
<struct-type type-name='item_totem_graphics_infost'>
1479+
<bitfield name='flags' type-name='item_totem_graphics_flag' base-type='int32_t'/>
1480+
<int32_t name='texpos'/>
1481+
</struct-type>
1482+
14701483
<bitfield-type type-name='item_bar_graphics_flag' base-type='int32_t'> bay12: ITEM_BAR_GRAPHICS_FLAG_*
14711484
<flag-bit name='color_index' count='8'/>
14721485
<flag-bit name='soap'/>
@@ -1601,6 +1614,7 @@
16011614
<stl-vector name='powder_graphics_info' pointer-type='item_powder_graphics_infost'/>
16021615
<stl-vector name='pipe_section_graphics_info' pointer-type='item_pipe_section_graphics_infost'/>
16031616
<stl-vector name='rock_graphics_info' pointer-type='item_rock_graphics_infost'/>
1617+
<stl-vector name='totem_graphics_info' pointer-type='item_totem_graphics_infost'/>
16041618
<static-array name='statue_texpos_top' index-enum='item_type' type-name='int32_t'/>
16051619
<static-array name='statue_texpos_bottom' index-enum='item_type' type-name='int32_t'/>
16061620
</struct-type>

df.plotinfo.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
<enum-item name='WildlifeFlier'/>
222222
<enum-item name='NightCreature'/>
223223
<enum-item name='TributeCaravan'/>
224+
<enum-item name='EvaluateAttackAndSendImmediateArmy'/>
224225
</enum-type>
225226

226227
<struct-type type-name='timed_event' original-name='plot_eventst'>
@@ -307,6 +308,7 @@
307308
<flag-bit name='death_caged_scrap_all_plans'/>
308309
<flag-bit name='can_copy_heat_map'/>
309310
<flag-bit name='planless'/>
311+
<flag-bit name='scrap_non_vehicle_plans'/>
310312
</bitfield-type>
311313

312314
<enum-type type-name='mission_type' base-type='int16_t'> bay12: MissionType

0 commit comments

Comments
 (0)