Fix lengths of enum-linked arrays

to automatically infer the length based on the values in the enum, so
that when Toady adds new enum entries we don't end up missing them.

Author: quietust

df.abstract_building.xml

@@ -115,7 +115,7 @@
     </struct-type>
 
     <struct-type type-name='ab_reputation_infost'>
-        <static-array name='reputation' type-name='int32_t' count='8' index-enum='abstract_building_reputation_type'/>
+        <static-array name='reputation' type-name='int32_t' index-enum='abstract_building_reputation_type'/>
     </struct-type>
 
     <class-type type-name='abstract_building' original-name='abstract_buildingst' key-field='id'>

df.adventure.xml

@@ -752,7 +752,7 @@
 
     <struct-type type-name='adventure_rumor_infost'>
         <stl-vector name='base_data' pointer-type='adventure_rumor_datast' since='v0.44.10'/>
-        <static-array name='data' count='34' index-enum='entity_event_type'>
+        <static-array name='data' index-enum='entity_event_type'>
             <stl-vector pointer-type='adventure_rumor_datast'/>
         </static-array>
     </struct-type>

df.announcement.xml

@@ -136,9 +136,9 @@
 
     <struct-type type-name='combat_event_listst'>
         <static-array name='slotdata' count='100' type-name='combat_eventst'/>
-        <static-array name='slot_id_used' type-name='int16_t' count='38' index-enum='combat_report_event_type'/>
-        <static-array name='slot_id_idx1' type-name='int16_t' count='38' index-enum='combat_report_event_type'/>
-        <static-array name='slot_id_idx2' type-name='int16_t' count='38' index-enum='combat_report_event_type'/>
+        <static-array name='slot_id_used' type-name='int16_t' index-enum='combat_report_event_type'/>
+        <static-array name='slot_id_idx1' type-name='int16_t' index-enum='combat_report_event_type'/>
+        <static-array name='slot_id_idx2' type-name='int16_t' index-enum='combat_report_event_type'/>
         <int16_t name='slots_used'/>
     </struct-type>
 

df.belief_system.xml

@@ -21,7 +21,7 @@
         <stl-vector name='story' pointer-type='storyst'/>
         <stl-vector name='deities' type-name='int32_t' ref-target="historical_figure" comment="historical figure ID of gods the belief system is concerned with"/>
         <stl-vector name='worship_levels' type-name='int32_t' comment="worship level for each god referenced in the deities field"/>
-        <static-array name='value' type-name='int32_t' count='64' index-enum='value_type'/>
+        <static-array name='value' type-name='int32_t' count='64' index-enum='value_type'/> SAVE_VALUENUM
     </struct-type>
 
     <struct-type type-name='belief_system_handlerst'>

df.building.xml

@@ -300,7 +300,7 @@
         <compound name='links' type-name='stockpile_links'/>
         <int32_t name='max_general_orders'/>
         <bitfield name='flags' base-type='uint32_t' type-name='workshop_profile_flag'/>
-        <static-array name='blocked_labors' type-name='bool' count='94' index-enum='unit_labor'/>
+        <static-array name='blocked_labors' type-name='bool' index-enum='unit_labor'/>
     </struct-type>
 
     <class-type type-name='building' original-name='buildingst'
@@ -1521,7 +1521,7 @@
     </bitfield-type>
 
     <class-type type-name='building_farmplotst' inherits-from='building_actual'>
-        <static-array name='plant_id' count='4'>
+        <static-array name='plant_id' index-enum='season'>
             <int16_t ref-target='plant_raw'/>
         </static-array>
         <int32_t name='material_amount'/>
@@ -1780,7 +1780,7 @@
             <!-- <item-attr name='civzone' value='ActivityZone'/> -->
         </enum-item>
 
-        -- 98 different civzone subtypes
+        -- 98 different civzone subtypes: array of length BUILDING_CIVZONENUM
         <enum-item name='ZONE_HOME'>
             <item-attr name='building' value='Civzone'/>
             <item-attr name='civzone' value='Home'/>

df.civagreement.xml

@@ -23,7 +23,7 @@
     </enum-type>
 
     <struct-type type-name='entity_sell_requests' original-name='civgoods_demandst'>
-        <static-array count='107' index-enum='entity_sell_category' name='priority'>
+        <static-array index-enum='entity_sell_category' name='priority'>
             <stl-vector type-name='int8_t'/>
         </static-array>
     </struct-type>
@@ -50,7 +50,7 @@
 
     <struct-type type-name='entity_sell_prices' original-name='civ_tradeagreementst'>
         <pointer type-name='entity_sell_requests' name='items'/>
-        <static-array count='107' index-enum='entity_sell_category' name='price'>
+        <static-array index-enum='entity_sell_category' name='price'>
             <stl-vector type-name='int32_t'/>
         </static-array>
     </struct-type>

df.creature.xml

@@ -426,6 +426,7 @@
     </struct-type>
 
     <enum-type type-name='gait_type' base-type='int32_t'> bay12: GaitType
+        <enum-item name='NONE' value='-1'/>
         <enum-item name='WALK'/>
         <enum-item name='FLY'/>
         <enum-item name='SWIM'/>
@@ -489,7 +490,7 @@
 
         <bitfield name='flags' base-type='int32_t' type-name='body_flag' since='v0.34.01'/>
 
-        <static-array name='gait_info' count="5" index-enum='gait_type'>
+        <static-array name='gait_info' index-enum='gait_type'>
             <stl-vector pointer-type='gait_info'/>
         </static-array>
 
@@ -501,17 +502,17 @@
         <int32_t name='fraction_fat'/>
         <int32_t name='fraction_muscle'/>
 
-        <static-array name='default_gait_index' count="5" index-enum='gait_type' type-name='int32_t'/>
-        <static-array name='fastest_gait_index' count="5" index-enum='gait_type' type-name='int32_t'/>
-        <static-array name='slowest_gait_index' count="5" index-enum='gait_type' type-name='int32_t'/>
+        <static-array name='default_gait_index' index-enum='gait_type' type-name='int32_t'/>
+        <static-array name='fastest_gait_index' index-enum='gait_type' type-name='int32_t'/>
+        <static-array name='slowest_gait_index' index-enum='gait_type' type-name='int32_t'/>
 
         <pointer name='clothing_items' type-name='clothing_needsst'/>
     </struct-type>
 
     <struct-type type-name='creature_personality_profilest'>
-        <static-array type-name='int16_t' name='min' count='50' index-enum='personality_facet_type'/>
-        <static-array type-name='int16_t' name='med' count='50' index-enum='personality_facet_type'/>
-        <static-array type-name='int16_t' name='max' count='50' index-enum='personality_facet_type'/>
+        <static-array type-name='int16_t' name='min' index-enum='personality_facet_type'/>
+        <static-array type-name='int16_t' name='med' index-enum='personality_facet_type'/>
+        <static-array type-name='int16_t' name='max' index-enum='personality_facet_type'/>
     </struct-type>
 
     <enum-type type-name='secretion_condition'> bay12: SecretionCondition, no base type
@@ -536,13 +537,13 @@
         <stl-string name='token'/>
 
         <static-array name='texpos' count='2'>
-            <static-array count='7' index-enum='creature_graphics_role'>
+            <static-array index-enum='creature_graphics_role'>
                 <static-array count='3'><static-array count='2' type-name='int32_t'/></static-array>
             </static-array>
         </static-array>
-        <static-array name='texpos_add_color' count='7' index-enum='creature_graphics_role' type-name='int8_t'/>
+        <static-array name='texpos_add_color' index-enum='creature_graphics_role' type-name='int8_t'/>
         <static-array name='sheet_icon_texpos' count='2'>
-            <static-array count='7' index-enum='creature_graphics_role' type-name='int32_t'/>
+            <static-array index-enum='creature_graphics_role' type-name='int32_t'/>
         </static-array>
     </struct-type>
 
@@ -706,34 +707,34 @@
     </enum-type>
 
     <struct-type type-name='creature_raw_graphics' original-name='creature_graphicsst'>
-        <static-array name='creature_texture_texpos' count='2'><static-array count='7' index-enum='creature_graphics_role'><static-array count='3'><static-array type-name='int32_t' count='2'/></static-array></static-array></static-array>
-        <static-array name='creature_texture_add_color' type-name='bool' count='7' index-enum='creature_graphics_role'/>
-        <static-array name='creature_texture_sheet_icon_texpos' count='2'><static-array type-name='int32_t' count='7' index-enum='creature_graphics_role'/></static-array>
+        <static-array name='creature_texture_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array count='3'><static-array type-name='int32_t' count='2'/></static-array></static-array></static-array>
+        <static-array name='creature_texture_add_color' type-name='bool' index-enum='creature_graphics_role'/>
+        <static-array name='creature_texture_sheet_icon_texpos' count='2'><static-array type-name='int32_t' index-enum='creature_graphics_role'/></static-array>
 
-        <static-array name='entity_link_texpos' count='2'><static-array count='18' index-enum='histfig_entity_link_type'><static-array count='7' index-enum='creature_graphics_role'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array></static-array></static-array>
-        <static-array name='entity_link_add_color' count='18' index-enum='histfig_entity_link_type'><static-array type-name='bool' count='7' index-enum='creature_graphics_role'/></static-array>
-        <static-array name='entity_link_sheet_icon_texpos' count='2'><static-array count='18' index-enum='histfig_entity_link_type'><static-array type-name='int32_t' count='7' index-enum='creature_graphics_role'/></static-array></static-array>
+        <static-array name='entity_link_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array index-enum='histfig_entity_link_type'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array></static-array></static-array>
+        <static-array name='entity_link_add_color' index-enum='creature_graphics_role'><static-array type-name='bool' index-enum='histfig_entity_link_type'/></static-array>
+        <static-array name='entity_link_sheet_icon_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array type-name='int32_t' index-enum='histfig_entity_link_type'/></static-array></static-array>
 
-        <static-array name='site_link_texpos' count='2'><static-array count='10' index-enum='histfig_site_link_type'><static-array count='7' index-enum='creature_graphics_role'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array></static-array></static-array>
-        <static-array name='site_link_add_color' count='10' index-enum='histfig_site_link_type'><static-array type-name='bool' count='7' index-enum='creature_graphics_role'/></static-array>
-        <static-array name='site_link_sheet_icon_texpos' count='2'><static-array count='10' index-enum='histfig_site_link_type'><static-array type-name='int32_t' count='7' index-enum='creature_graphics_role'/></static-array></static-array>
+        <static-array name='site_link_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array index-enum='histfig_site_link_type'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array></static-array></static-array>
+        <static-array name='site_link_add_color' index-enum='creature_graphics_role'><static-array type-name='bool' index-enum='histfig_site_link_type'/></static-array>
+        <static-array name='site_link_sheet_icon_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array type-name='int32_t' index-enum='histfig_site_link_type'/></static-array></static-array>
 
-        <static-array name='profession_texpos' count='2'><static-array count='135' index-enum='profession'><static-array count='7' index-enum='creature_graphics_role'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array></static-array></static-array>
-        <static-array name='profession_add_color' count='135' index-enum='profession'><static-array type-name='bool' count='7' index-enum='creature_graphics_role'/></static-array>
-        <static-array name='profession_sheet_icon_texpos' count='2'><static-array count='135' index-enum='profession'><static-array type-name='int32_t' count='7' index-enum='creature_graphics_role'/></static-array></static-array>
+        <static-array name='profession_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array index-enum='profession'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array></static-array></static-array>
+        <static-array name='profession_add_color' index-enum='creature_graphics_role'><static-array type-name='bool' index-enum='profession'/></static-array>
+        <static-array name='profession_sheet_icon_texpos' count='2'><static-array index-enum='creature_graphics_role'><static-array type-name='int32_t' index-enum='profession'/></static-array></static-array>
 
         <stl-vector name='position_graphics' pointer-type='creature_position_graphicst'/>
         <stl-vector name='graphics_layer_set' pointer-type='creature_graphics_layer_setst'/>
 
-        <static-array name='creature_small_texpos' type-name='int32_t' count='12' index-enum='creature_small_texture_type'/>
+        <static-array name='creature_small_texpos' type-name='int32_t' index-enum='creature_small_texture_type'/>
 
         <int32_t name='egg_texpos'/>
         <int32_t name='list_icon_texpos'/>
         <int32_t name='skeleton_with_skull_texpos'/>
         <int32_t name='skeleton_texpos'/>
 
-        <static-array name='layer_unitless_texpos' count='135' index-enum='profession'><static-array count='3'><static-array count='2'><stl-vector type-name='int32_t'/></static-array></static-array></static-array>
-        <static-array name='layer_unitless_sheet_icon_texpos' count='135' index-enum='profession'><stl-vector type-name='int32_t'/></static-array>
+        <static-array name='layer_unitless_texpos' index-enum='profession'><static-array count='3'><static-array count='2'><stl-vector type-name='int32_t'/></static-array></static-array></static-array>
+        <static-array name='layer_unitless_sheet_icon_texpos' index-enum='profession'><stl-vector type-name='int32_t'/></static-array>
 
         <int32_t name='texpos_glow'/>
         <int32_t name='texpos_glow_left_gone'/>
@@ -1046,24 +1047,24 @@
         <stl-vector name='caste_speech_token' pointer-type='stl-string'/>
 
         <static-array name='skill_rates' count='4'> learn_ip_perc, last_used, rust, demote
-            <static-array type-name='int32_t' count='149' index-enum='job_skill'/>
+            <static-array type-name='int32_t' index-enum='job_skill'/>
         </static-array>
 
         <compound name='attributes'> not a compound
-            <static-array name='phys_att_range' count='6' index-enum='physical_attribute_type'>
+            <static-array name='phys_att_range' index-enum='physical_attribute_type'>
                 <static-array type-name='int32_t' count='7'/>
             </static-array>
-            <static-array name='ment_att_range' count='13' index-enum='mental_attribute_type'>
+            <static-array name='ment_att_range' index-enum='mental_attribute_type'>
                 <static-array type-name='int32_t' count='7'/>
             </static-array>
-            <static-array name='phys_att_rates' count='6' index-enum='physical_attribute_type'>
+            <static-array name='phys_att_rates' index-enum='physical_attribute_type'>
                 <static-array type-name='int32_t' count='4'/>
             </static-array>
-            <static-array name='ment_att_rates' count='13' index-enum='mental_attribute_type'>
+            <static-array name='ment_att_rates' index-enum='mental_attribute_type'>
                 <static-array type-name='int32_t' count='4'/>
             </static-array>
-            <static-array type-name='int32_t' name='phys_att_cap_perc' count='6' index-enum='physical_attribute_type'/>
-            <static-array type-name='int32_t' name='ment_att_cap_perc' count='13' index-enum='mental_attribute_type'/>
+            <static-array type-name='int32_t' name='phys_att_cap_perc' index-enum='physical_attribute_type'/>
+            <static-array type-name='int32_t' name='ment_att_cap_perc' index-enum='mental_attribute_type'/>
         </compound>
 
         <enum name='sex' type-name='pronoun_type'/>
@@ -1103,10 +1104,10 @@
         <stl-vector name='tissue_styles' pointer-type='tissue_style_raw'/>
         <stl-vector name='shearable_tissue_layer' pointer-type='shearable_tissue_layerst'/>
 
-        <static-array name='body_app_mode_rate_index' count='4'>
-            <stl-vector/>
+        <static-array name='body_app_mode_rate_index' index-enum='appearance_modifier_growth_interval'>
+            <stl-vector type-name='int32_t'/>
         </static-array>
-        <static-array name='bp_app_mode_rate_index' count='4'>
+        <static-array name='bp_app_mode_rate_index' index-enum='appearance_modifier_growth_interval'>
             <stl-vector type-name='int32_t'/>
         </static-array>
 
@@ -1255,9 +1256,9 @@
         </compound>
 
         <stl-vector name='sound' pointer-type='creature_soundst'/>
-        <stl-vector type-name='int32_t' name='sound_alert'/> bay12: vector[CreatureSoundType]
-        <stl-vector type-name='int32_t' name='sound_peaceful_intermittent'
-                    refers-to='$$._global.sound[$]'/>
+        <static-array name='sound_index' index-enum='creature_sound_type'>
+            <stl-vector type-name='int32_t' refers-to='$$._global.sound[$]'/>
+        </static-array>
 
         <stl-vector name='material_force_adjust' since='v0.34.01' pointer-type='material_force_adjustst'/>
 

df.cultural_identity.xml

@@ -39,8 +39,8 @@
         <int32_t name="site_id" ref-target='world_site'/>
         <int32_t name="civ_id" ref-target='historical_entity'/>
         <stl-vector name='group_log' pointer-type='cultural_identity_entityst' comment='the circumstances of groups joining or leaving this culture'/>
-        <static-array name='ethic' count='22' type-name='ethic_response' index-enum='ethic_type'/>
-        <static-array name='values' type-name='int32_t' count='64' index-enum='value_type'/>
+        <static-array name='ethic' type-name='ethic_response' index-enum='ethic_type'/>
+        <static-array name='values' type-name='int32_t' count='64' index-enum='value_type'/> SAVE_VALUENUM
         <stl-vector name='events' pointer-type='entity_event'/>
         <int32_t name='world_general_knowledge_year' init-value='-1'/>
         <stl-vector name="known_heid" type-name='int32_t' ref-target='history_event'/>