Assorted structure fixes for 53.11

changelog.txt

@@ -19,6 +19,81 @@ Template for new versions:
 # Future
 
 ## Structures
+- filled in missing ``original-name`` attributes
+- fixed assorted typos in ``original-name`` attributes
+- ensured that ``original-name`` always appears after ``name`` or ``type-name``, never before
+- fixed several structure field type errors
+- specific changes: fixed ``building_constructionst.type`` to be 32-bit, along with the ``construction_type`` enum
+- specific changes: fixed ``contextst.interrogator_relationships`` to be a pointer to ``evidence_repositoryst``
+- specific changes: fixed ``actor_entryst.associated_org`` to contain pointers to ``organization_entryst``
+- specific changes: fixed ``justice_interfacest.interrogation_report`` to contain pointers to ``interrogation_report``
+- specific changes: fixed ``main_interface_settings.member`` to contain shared pointers to ``world_gen_param_valuest``
+- specific changes: fixed ``squad_equipment_interfacest.am_cand_subtype`` to contain ``int16_t``
+- specific changes: fixed ``startup_charactersheet_petst.race`` to be ``int32_t``
+- specific changes: fixed ``lookinfo_verminst.caste`` to be ``int16_t``
+- specific changes: fixed ``intrigue_corruption.facet_rating`` to be ``int16_t``
+- specific changes: fixed ``historical_entity.current_wgwg`` to be a direct pointer
+- specific changes: fixed ``historical_figure.worldgen_relationships`` to be a direct pointer
+- specific changes: fixed ``pmd_tree_texture_infost.texpos_tree_wood_tile`` to use correct array length (sized against the correct enum)
+- fixed several enums
+- specific changes: fixed ``build_square_type`` enum to add missing element ``OUTSIDE``
+- specific changes: swapped ``main_hover_instruction`` elements ``ADVENTURE_MOVE_DOWN_RAMP_E`` and ``ADVENTURE_MOVE_DOWN_RAMP_W``
+- added some missing enums and bitfields
+- specific changes: ``viewscreen_titlest.mode`` now uses new enum ``title_mode_type``
+- specific changes: ``viewscreen_worldst.squad_flag`` now uses new bitfield ``civlist_squad_flag``
+- specific changes: ``viewscreen_worldst.messenger_flag`` now uses new bitfield ``civlist_messenger_flag``
+- specific changes: fixed ``historical_entity.resources.art_image_types`` to use new ``entity_art_image_type`` enum
+- changed various fields to make use of existing enums and bitfields
+- specific changes: ``adventure_movement_movest.aim_attack_flag`` now uses ``aim_attack_flag`` bitfield
+- specific changes: ``adventure_movement_mountst.riderposition`` now uses ``rider_positions_type`` enum
+- specific changes: ``adventure_constructionst.building_jobitemflag`` now uses ``job_material_category`` bitfield
+- specific changes: ``adventure_constructionst.mat_jobitemflag`` now uses ``job_material_category`` bitfield
+- specific changes: ``adventure_constructionst.mat_jobitemflag_master`` now uses ``job_material_category`` bitfield
+- specific changes: ``building_defst.build_key`` now uses ``interface_key`` enum
+- specific changes: ``body_detail_plan.bp_layers_tissue`` now uses ``creature_interaction_effect_target_mode`` enum
+- specific changes: ``body_detail_plan.bp_position_value`` now uses ``body_part_position_type`` enum
+- specific changes: ``body_detail_plan.bp_relation_value_1`` now uses ``body_part_relation_type`` enum
+- specific changes: ``custom_stockpile_interfacest.cur_main_mode_flag`` now uses ``stockpile_group_set`` bitfield
+- specific changes: ``custom_stockpile_interfacest.main_mode_flag`` now uses ``stockpile_group_set`` bitfield
+- specific changes: ``name_creator_interfacest.cur_name_place`` now uses ``language_name_component`` enum
+- specific changes: ``name_creator_interfacest.cur_word_place`` now uses ``language_word_table_index`` enum
+- specific changes: ``dance_form_section.dance_flag`` now uses ``dance_flag`` bitfield
+- specific changes: ``evidence_hf_filest.evidence`` now uses ``evidence_type`` enum
+- specific changes: ``historical_entity.resources.scholar_flag`` now uses ``entity_scholar_flag`` bitfield
+- specific changes: ``interaction_effect_summon_unitst`` fields ``required_creature_flags`` and ``forbidden_creature_flags`` now use ``creature_raw_flags`` enum
+- specific changes: ``interaction_effect_summon_unitst`` fields ``required_caste_flags`` and ``forbidden_caste_flags`` now use ``caste_raw_flags`` enum
+- specific changes: ``interaction_effect_change_weatherst`` fields ``add_weather_flag`` and ``remove_weather_flag`` now use ``region_weather_bits`` bitfield
+- specific changes: ``creature_interaction_effect_body_transformationst`` fields ``required_creature_flags`` and ``forbidden_creature_flags`` now use ``creature_raw_flags`` enum
+- specific changes: ``creature_interaction_effect_body_transformationst`` fields ``required_caste_flags`` and ``forbidden_caste_flags`` now use ``caste_raw_flags`` enum
+- specific changes: ``unit_personality.habit`` now uses ``habit_type`` enum
+- specific changes: ``world_region_feature.vertical_connection`` now uses ``layer_connection_type`` enum
+- specific changes: ``site_construction_blueprintst`` fields ``construction_type`` and ``building_type`` now use ``building_type`` enum
+- specific changes: ``site_construction_blueprintst`` fields ``construction_jobitemflag`` and ``building_jobitemflag`` now use ``job_material_category`` bitfield
+- fixed various fields to use correct signedness
+- specific changes: ``building_weaponrackst.rack_flags`` is now unsigned
+- specific changes: ``temperaturest.fraction`` is now unsigned
+- specific changes: ``historical_entity`` fields ``did_wg_variable_position`` and ``did_wg_variable_market_position`` are now unsigned
+- specific changes: ``item_body_component`` fields ``nonsolid_remaining``, ``layer_wound_area``, ``layer_cut_fraction``, ``layer_dent_fraction``, and ``layer_effect_fraction`` are now signed
+- specific changes: ``unit_personality.traits`` is now signed
+- specific changes: ``rpd_indicator_datast`` fields ``marker_char``, ``marker_f``, ``marker_b``, and ``marker_br`` are now unsigned
+- specific changes: ``embark_note.tile`` is now unsigned
+- specific changes: ``world_population`` fields ``count_min``, ``count_max``, and ``temp_num`` are now unsigned
+- specific changes: ``world_site_realization.mini_colors`` is now unsigned
+- specific changes: ``unit.body.components`` fields ``nonsolid_remaining``, ``layer_wound_area``, ``layer_cut_fraction``, ``layer_dent_fraction``, and ``layer_effect_fraction`` are now signed
+- specific changes: ``unit.body`` fields ``blood_max`` and ``blood_count`` are now signed
+- specific changes: ``unit.counters`` fields ``pain``, ``nausea``, and ``dizziness`` are now signed
+- specific changes: ``unit`` fields ``uwss_alt_period``, ``uwss_alt_on_period``, ``uwss_speed_add``, ``uwss_speed_perc``, and ``uwss_skill_role_adjust`` are now signed
+- specific changes: ``unit.counters`` fields ``paralysis``, ``numbness``, ``fever``, ``exhaustion``, ``hunger_timer``, ``thirst_timer``, ``sleepiness_timer``, ``stomach_content``, ``stomach_food``, ``vomit_timeout``, and ``stored_fat`` are now signed
+- specific changes: ``unit.status2.liquid_depth`` are now signed
+- fixed various fields to use ``int8_t`` or ``bool`` as appropriate
+- specific changes: ``viewscreen_dwarfmodest.sideSubmenu`` is now ``bool``
+- specific changes: ``entity_raw`` fields ``likes_site``, ``tolerates_site``, ``start_biome``, ``settlement_biome``, and ``active_season`` are now ``bool``
+- specific changes: ``entity_raw.jobs.permitted_labor`` is now ``int8_t``
+- specific changes: ``graphicst`` fields ``do_clean_tile_cache`` and ``do_post_init_texture_clear`` are now ``bool``
+- specific changes: ``world_generatorst`` fields ``have_logged_parameters`` and ``last_used_valid`` are now ``bool``
+- other changes: added name to field ``cgl_itemst.item_type``
+- other changes: ``inclusion_type`` now has 16-bit base type (though nothing relies on it)
+- other changes: renamed ``adventure_interface_attackst.scrselected_item_idoll_position_wrestle`` to ``selected_item_id``
 
 # 53.11-r2
 

df.activity.xml

@@ -68,7 +68,7 @@
         <enum-item name='TrainingSession' original-name='TRAINING_SESSION'/>
         <enum-item name='CombatTraining' original-name='COMBAT_TRAINING'/>
         <enum-item name='SkillDemonstration' original-name='SKILL_DEMONSTRATION'/>
-        <enum-item name='IndividualSkillDrill' original-name='ORIGINAL_SKILL_DRILL'/>
+        <enum-item name='IndividualSkillDrill' original-name='INDIVIDUAL_SKILL_DRILL'/>
         <enum-item name='Sparring' original-name='SPARRING'/>
         <enum-item name='RangedPractice' original-name='RANGED_PRACTICE'/>
         <enum-item name='Harassment' original-name='HARASSMENT'/>
@@ -670,7 +670,7 @@
     <class-type type-name='activity_event_prayerst' inherits-from='activity_event'>
         <compound type-name='activity_event_participants' name='participants' original-name='list'/>
         <int32_t name='histfig_id' original-name='prayer_target_hfid' ref-target='historical_figure' comment='praying to deity'/>
-        <enum type-name='sphere_type' original-name='sphere_target' name='topic' comment='praying to sphere'/>
+        <enum type-name='sphere_type' name='topic' original-name='sphere_target' comment='praying to sphere'/>
         <int32_t name='site_id' original-name='location_stid' ref-target='world_site'/>
         <int32_t name='location_id' original-name='location_abid' ref-target='abstract_building' aux-value='$$.site_id'/>
         <int32_t name='building_id' original-name='location_zone_bldid' ref-target='building'/>

df.activity_meeting.xml

@@ -8,7 +8,7 @@
     </bitfield-type>
 
     <struct-type type-name='activity_info' original-name='activity_meetingst'>
-        <int32_t name='id' original-name='save-index' init-value='-1' comment='assigned during Save'/>
+        <int32_t name='id' original-name='save_index' init-value='-1' comment='assigned during Save'/>
         <int32_t name='unit_actor' original-name='actor_unid' ref-target='unit' init-value='-1' comment='diplomat or worker'/>
         <int32_t name='unit_noble' original-name='target_unid' ref-target='unit' init-value='-1' comment='meeting recipient'/>
         <int32_t name='place' original-name='civzone_id' ref-target='building' init-value='-1'/>

df.adventure.xml

@@ -32,7 +32,7 @@
     </struct-type>
 
     <enum-type type-name='ui_advmode_menu' original-name='adventure_view_mode'> bay12: AdventureViewModes
-        <enum-item name='None' value='-1'/>
+        <enum-item name='None' original-name='NONE' value='-1'/>
         <enum-item name='Default' original-name='MAIN'/>
         <enum-item name='Look' original-name='LOOK'/>
         <enum-item name='ConversationAddress' original-name='CONVERSATION_START_NEW'/>
@@ -519,7 +519,7 @@
 
     <class-type type-name='adventure_movement_movest' inherits-from='adventure_movement_optionst'>
         <bitfield type-name='pathfinding_flags' name='override_permit'/>
-        <uint32_t name='aim_attack_flag' comment='which flags?'/>
+        <bitfield type-name='aim_attack_flag' name='aim_attack_flag'/>
     </class-type>
 
     <class-type type-name='adventure_movement_hold_tilest' inherits-from='adventure_movement_optionst'>
@@ -554,7 +554,7 @@
 
     <class-type type-name='adventure_movement_mountst' inherits-from='adventure_movement_optionst'>
         <pointer type-name='unit' name='animal' original-name='mount'/>
-        <int16_t name='riderposition'/>
+        <enum base-type='int16_t' type-name='rider_positions_type' name='riderposition'/>
     </class-type>
 
     <class-type type-name='adventure_movement_dismountst' inherits-from='adventure_movement_optionst'/>
@@ -616,7 +616,7 @@
         <int32_t name='abs_x'/>
         <int32_t name='abs_y'/>
         <int32_t name='abs_z'/>
-        <pointer type-name='world_site' name='target_site' original-name='target+st'/>
+        <pointer type-name='world_site' name='target_site' original-name='target_st'/>
     </struct-type>
 
     <enum-type type-name='adventure_construction_mode_type' base-type='int32_t'> bay12: AdventureConstructionModeType
@@ -649,7 +649,7 @@
         <int32_t name='building_subtype'/>
         <int32_t name='building_subcat1'/>
         <int32_t name='building_subcat2'/>
-        <uint32_t name='building_jobitemflag'/>
+        <bitfield type-name='job_material_category' name='building_jobitemflag'/>
 
         <int32_t name='selected_build_phase'/>
 
@@ -687,11 +687,11 @@
 
         <stl-vector type-name='int16_t' name='material'/>
         <stl-vector type-name='int32_t' name='matgloss'/>
-        <stl-vector type-name='uint32_t' name='mat_jobitemflag'/>
+        <stl-vector type-name='job_material_category' name='mat_jobitemflag'/>
         <stl-vector type-name='int32_t' name='material_count'/>
         <stl-vector type-name='int16_t' name='material_master'/>
         <stl-vector type-name='int32_t' name='matgloss_master'/>
-        <stl-vector type-name='uint32_t' name='mat_jobitemflag_master'/>
+        <stl-vector type-name='job_material_category' name='mat_jobitemflag_master'/>
         <stl-vector type-name='int32_t' name='material_count_master'/>
         <int32_t name='material_select'/>
         <stl-string name='material_filter'/>
@@ -710,7 +710,7 @@
         <stl-vector type-name='int32_t' name='start_menu_used_mat_item_tool_use'/>
         <stl-vector type-name='int16_t' name='start_menu_used_material'/>
         <stl-vector type-name='int32_t' name='start_menu_used_matgloss'/>
-        <stl-vector type-name='uint32_t' name='start_menu_used_mat_job_item_flag'/>
+        <stl-vector type-name='job_material_category' name='start_menu_used_mat_job_item_flag'/>
         <stl-vector type-name='matter_state' name='start_menu_used_mat_state'/>
         <stl-vector type-name='int32_t' name='start_menu_used_mat_count'/>
         <stl-vector type-name='int32_t' name='start_menu_have_mat_count'/>
@@ -1003,7 +1003,7 @@
         <int16_t name='move_direction_z' original-name='move_sz' comment='z-axis direction for the last attempted player unit movement: -1 = down, 0 = none, 1 = up'/>
         <bool name='move_do_mid_move'/>
         <bool name='move_carefully' original-name='move_do_care' comment='Is set when the player prepares to move carefully (via the Alt + movement key combo)'/>
-        <int16_t name='careful_direction_x' original-name='move_care_sz' comment='x-axis direction for the last attempted careful player unit movement: -1 = west, 0 = none, 1 = east'/>
+        <int16_t name='careful_direction_x' original-name='move_care_sx' comment='x-axis direction for the last attempted careful player unit movement: -1 = west, 0 = none, 1 = east'/>
         <int16_t name='careful_direction_y' original-name='move_care_sy' comment='y-axis direction for the last attempted careful player unit movement: -1 = north, 0 = none, 1 = south'/>
         <stl-string name='interrupt_performance_warning' original-name='move_confirm_str' comment='the message displayed when the player attempts to move while their unit is performing'/>
 

df.adventure_log.xml

@@ -29,7 +29,7 @@
 
         <pointer type-name='squad' name='sq'/>
         <pointer type-name='squad_order' name='so'/>
-        <bool name='squad_order_repeatable'/>
+        <bool name='squad_order_repeatable' original-name='squad_order_reportable'/>
 
         <stl-string name='list_name'/>
         <stl-string name='simple_list_name'/>

df.agreement.xml

@@ -214,7 +214,7 @@
             <pointer type-name='agreement_details_data_retrieve_artifact' name='RetrieveArtifact' original-name='retrieve_artifact'/>
         </compound>
 
-        <enum base-type='int32_t' type-name='agreement_details_type' name='type'/>
+        <enum base-type='int32_t' type-name='agreement_details_type' name='type' original-name='subject'/>
     </struct-type>
 
     <bitfield-type type-name='agreement_flag' base-type='uint32_t' since='v0.42.01'> bay12: AGREEMENT_FLAG_*