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 df.creature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,8 @@
<int32_t name="max_qual"/>
<int32_t name="min_dam_level"/>
<int32_t name="max_dam_level"/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</struct-type>

<struct-type type-name='creature_graphics_layer_materialst'>
Expand Down
12 changes: 12 additions & 0 deletions df.d_interface.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,9 @@
<vmethod name='get_info_string'>
<ret-type><pointer type-name='stl-string'/></ret-type>
</vmethod>
<vmethod name='set_info_string_color'/>
<vmethod ret-type='int32_t' name='get_swatch_color'/>
<vmethod ret-type='int32_t' name='get_list_priority'/>
<vmethod is-destructor='true'/>
</virtual-methods>
</class-type>
Expand Down Expand Up @@ -340,6 +342,8 @@

<stl-string name='objection'/>
<stl-string name='info'/>

<int32_t name='list_priority'/>
</class-type>

<class-type type-name='interface_button_building_custom_category_selectorst'
Expand Down Expand Up @@ -2942,6 +2946,13 @@

<int32_t name='entering_index'/>
<bool name='entering_name'/>

<int32_t name='confirming_slot'/>
<bool name='confirming_recenter_overwrite'/>
<int16_t name='confirming_recenter_overwrite_mx'/>
<int16_t name='confirming_recenter_overwrite_my'/>
<int16_t name='confirming_recenter_overwrite_mz'/>
<bool name='confirming_deletion'/>
</struct-type>

<enum-type type-name='main_bottom_mode_type' base-type='int32_t'> bay12: MainBottomModeType
Expand Down Expand Up @@ -6331,6 +6342,7 @@
<enum-type type-name='save_game_sort_type' base-type='uint8_t'> bay12: SaveGameSort
<enum-item name='Name'/>
<enum-item name='Folder'/>
<enum-item name='Recency'/>
</enum-type>

<class-type type-name='viewscreen_titlest' inherits-from='viewscreen'>
Expand Down
1 change: 1 addition & 0 deletions df.datafile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<stl-string name='filename_noext'/>
<stl-fs-path name='full_path'/>
<bool name='is_portable'/>
<stl-fs-filetime name='timestamp'/>
</struct-type>
</data-definition>

Expand Down
2 changes: 1 addition & 1 deletion df.g_src.basics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@
<enum-item name='CITIZEN_STUCK'>
<item-attr name='alert_type' value='GENERAL'/>
</enum-item>
<enum-item name='UNUSED_49'>
<enum-item name='BARTENDER_SLACKING'>
<item-attr name='alert_type' value='GENERAL'/>
</enum-item>
<enum-item name='UNUSED_50'>
Expand Down
5 changes: 4 additions & 1 deletion df.g_src.graphics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<static-array name='color' type-name='uint8_t' count='54'/>
</struct-type>

-- Unused: ProceduralItemTextureType
-- Unused: TextureBodypartSkinSurfaceType

<enum-type type-name='sphere_type' base-type='int16_t'> bay12: SphereType
<enum-item name='NONE' value='-1'/>
<enum-item name='AGRICULTURE'/>
Expand Down Expand Up @@ -793,7 +796,7 @@
<static-array type-name='long' count='1' name='black_background_texpos'/>
<static-array type-name='int32_t' count='136' name='texture_indices1'/>
<stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
<static-array type-name='int32_t' count='11174' name='texture_indices2'/>
<static-array type-name='int32_t' count='11346' name='texture_indices2'/>

<compound type-name='interface_setst' name='graphical_interface'/>
<compound type-name='interface_setst' name='classic_interface'/>
Expand Down
3 changes: 3 additions & 0 deletions df.item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,9 @@

<vmethod ret-type='bool' name='isStrappable' original-name='is_strappable' since='v0.40.01'/>
<vmethod ret-type='bool' name='hasWriting' original-name='has_any_written_content'/>
<vmethod ret-type='bool' name='has_procedural_item_graphics'>
<enum type-name='procedural_item_graphics_type' name='pig'/>
</vmethod>
<vmethod is-destructor='true'/>
</virtual-methods>
</class-type>
Expand Down
68 changes: 68 additions & 0 deletions df.itemdef.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,56 @@
<data-definition>
<enum-type type-name='procedural_item_graphics_type' base-type='int32_t'> bay12: ProceduralItemGraphicsType
<enum-item name='NONE' value='1'/>
<enum-item name='ARMOR_BREASTPLATE'/>
<enum-item name='ARMOR_COAT'/>
<enum-item name='ARMOR_SHIRT'/>
<enum-item name='ARMOR_CLOAK'/>
<enum-item name='ARMOR_TUNIC'/>
<enum-item name='ARMOR_TOGA'/>
<enum-item name='ARMOR_CAPE'/>
<enum-item name='ARMOR_VEST'/>
<enum-item name='ARMOR_DRESS'/>
<enum-item name='ARMOR_ROBE'/>
<enum-item name='PANTS_GREAVES'/>
<enum-item name='PANTS_SKIRT'/>
<enum-item name='HELM_HELM'/>
<enum-item name='HELM_CAP'/>
<enum-item name='HELM_HOOD'/>
<enum-item name='HELM_TURBAN'/>
<enum-item name='HELM_MASK'/>
<enum-item name='HELM_VEIL_HEAD'/>
<enum-item name='HELM_VEIL_FACE'/>
<enum-item name='HELM_HEADSCARF'/>
<enum-item name='GLOVES_GAUNTLET'/>
<enum-item name='GLOVES_GLOVE'/>
<enum-item name='GLOVES_MITTEN'/>
<enum-item name='SHOES_BOOT_HIGH'/>
<enum-item name='SHOES_BOOT_LOW'/>
<enum-item name='SHOES_SHOE'/>
<enum-item name='SHOES_SANDAL'/>
<enum-item name='SHOES_CHAUSSE'/>
<enum-item name='SHOES_SOCK'/>
<enum-item name='WEAPON_SWORD'/>
<enum-item name='WEAPON_PIKE'/>
<enum-item name='WEAPON_WHIP'/>
<enum-item name='WEAPON_SCOURGE'/>
<enum-item name='WEAPON_BOW'/>
<enum-item name='WEAPON_CROSSBOW'/>
<enum-item name='WEAPON_BLOWGUN'/>
<enum-item name='WEAPON_BATTLE_AXE'/>
<enum-item name='WEAPON_HALBERD'/>
<enum-item name='WEAPON_GREAT_AXE'/>
<enum-item name='WEAPON_DAGGER'/>
<enum-item name='WEAPON_MACE'/>
<enum-item name='WEAPON_WAR_HAMMER'/>
<enum-item name='WEAPON_MAUL'/>
<enum-item name='WEAPON_SPEAR'/>
<enum-item name='AMMO_ARROW'/>
<enum-item name='AMMO_BOLT'/>
<enum-item name='AMMO_BLOWDART'/>
<enum-item name='SHIELD_SHIELD'/>
</enum-type>

<enum-type type-name='item_statue_graphics_type_overall' base-type='int64_t'> bay12: ITEM_STATUE_GRAPHICS_TYPE_OVERALL_*
<enum-item name='SHAPE'/>
<enum-item name='ITEM'/>
Expand Down Expand Up @@ -212,6 +264,8 @@
<int32_t name='texpos_weapon_trap'/>
<static-array name='texpos_upright' count='10'><static-array type-name='int32_t' count='2'/></static-array>
<stl-vector pointer-type='itemdef_weapon_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_trapcomp_graphics_flag' base-type='int32_t'> bay12: ITEM_TRAPCOMP_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -637,6 +691,8 @@

<int32_t name='texpos_item'/>
<stl-vector pointer-type='item_armor_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_ammo_graphics_flag' base-type='int32_t'> bay12: ITEM_AMMO_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -696,6 +752,8 @@
<int32_t name='texpos_wood_sw'/>
<int32_t name='texpos_wood_se'/>
<stl-vector pointer-type='itemdef_ammo_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_siegeammo_graphics_flag' base-type='int32_t'> bay12: ITEM_SIEGEAMMO_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -780,6 +838,8 @@

<int32_t name='texpos_item'/>
<stl-vector pointer-type='item_gloves_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_shoes_graphics_flag' base-type='int32_t'> bay12: ITEM_SHOES_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -812,6 +872,8 @@
<int32_t name='texpos_item'/>
<int32_t name='texpos_item_metal'/>
<stl-vector pointer-type='item_shoes_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_shield_graphics_flag' base-type='int32_t'> bay12: ITEM_SHIELD_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -839,6 +901,8 @@
<int32_t name='texpos_item'/>
<int32_t name='texpos_item_wooden'/>
<stl-vector pointer-type='item_shield_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_helm_graphics_flag' base-type='int32_t'> bay12: ITEM_HELM_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -867,6 +931,8 @@

<int32_t name='texpos_item'/>
<stl-vector pointer-type='item_helm_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<bitfield-type type-name='item_pants_graphics_flag' base-type='int32_t'> bay12: ITEM_PANTS_GRAPHICS_FLAG_*
Expand Down Expand Up @@ -900,6 +966,8 @@

<int32_t name='texpos_item'/>
<stl-vector pointer-type='item_pants_graphics_infost' name='graphics_info'/>

<enum type-name='procedural_item_graphics_type' name='procedural_item_graphics'/>
</class-type>

<class-type type-name='itemdef_foodst' inherits-from='itemdef'
Expand Down
1 change: 1 addition & 0 deletions df.material.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
<int16_t name='tl'/>
<pointer pointer-type='unit_wound' name='uw'/>
</vmethod>
<vmethod ret-type='bool' name='expected_to_be_bad'/>
<vmethod ret-type='bool' name='isUntargeted' original-name='body_part_independent'/>

<vmethod name='getTargetModes' original-name='get_bp_group_list'>
Expand Down
1 change: 1 addition & 0 deletions df.region.xml
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@
<stl-string name='filename_noext'/>
<stl-fs-path name='full_path'/>
<bool name='is_portable'/>
<stl-fs-filetime name='timestamp'/>
</struct-type>

-- Unused: map_generatorst
Expand Down
1 change: 1 addition & 0 deletions df.squad.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<enum-item name='no_item' original-name='NO_ITEM'/>
<enum-item name='cannot_leave_site' original-name='CANNOT_LEAVE_SITE'/>
<enum-item name='location_no_longer_in_zone' original-name='LOCATION_NO_LONGER_IN_ZONE'/>
<enum-item name='wrong_worker' original-name='WRONG_WORKER'/>
</enum-type>

-- Unused: squad_duty_order_specifierst
Expand Down
Loading