Minor fixes to 53.11

* Fix base types of creature_sound_type, creature_sound_method_type,
  and art_image_property_verb
* Use correct bitfield type on
  agreement_details_data_plot_infiltration_coup.flags
* Fix a few original-name attributes
* Merge item_statue_graphics_type bitfield into item_statue_graphics_flag

Author: quietust

changelog.txt

@@ -19,6 +19,10 @@ Template for new versions:
 # Future
 
 ## Structures
+- fixed base types of ``creature_sound_type``, ``creature_sound_method_type``, and ``art_image_property_verb``
+- assigned proper bitfield data type on ``agreement_details_data_plot_infiltration_coup.flags``
+- merged ``item_statue_graphics_type`` bitfield into ``item_statue_graphics_flag``
+- fixed several typos in ``original-name`` attributes
 
 # 53.11-r2
 

df.agreement.xml

@@ -115,7 +115,7 @@
         <int32_t name='actor_index' original-name='infiltrator_party_id' ref-target='agreement_party'/>
         <int32_t name='influencer_index' original-name='client_party_id' ref-target='agreement_party'/>
         <int32_t name='target' original-name='target_enid' ref-target='historical_entity'/>
-        <uint32_t name='flags' original-name='infiltrate_flag'/> bay12: INTRIGUE_PLOT_INFILTRATE_SOCIETY_FLAG_* ?
+        <bitfield base-type='uint32_t' type-name='intrigue_plot_infiltrate_society_flag' name='flags' original-name='infiltrate_flag'/>
     </struct-type>
 
     <struct-type type-name='agreement_details_data_plot_frame_treason' original-name='agreement_subject_frame_for_crimest'>

df.art_image.xml

@@ -35,7 +35,7 @@
             </vmethod>
             <vmethod name='markDiscovered' original-name='reveal_art'/>
 
-            <vmethod name='getColorAndShape' original-name='get_shape_Color'>
+            <vmethod name='getColorAndShape' original-name='get_shape_color'>
                 <pointer name='i_color'><stl-vector type-name='int16_t'/></pointer>
                 <pointer name='i_shape'><stl-vector type-name='int16_t'/></pointer>
             </vmethod>

df.d_basics.xml

@@ -2383,13 +2383,13 @@
         <enum-item name='PILLAGE'/>
     </enum-type>
 
-    <enum-type type-name='creature_sound_type' base-type='int16_t'> bay12: CreatureSoundType
+    <enum-type type-name='creature_sound_type' base-type='int32_t'> bay12: CreatureSoundType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ALERT'/>
         <enum-item name='PEACEFUL_INTERMITTENT'/>
     </enum-type>
 
-    <enum-type type-name='creature_sound_method_type' base-type='int16_t'> bay12: CreatureSoundMethodType
+    <enum-type type-name='creature_sound_method_type' base-type='int32_t'> bay12: CreatureSoundMethodType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='VOCALIZATION'/>
     </enum-type>
@@ -3805,7 +3805,7 @@
         <enum-item name="EVIL"/>
     </enum-type>
 
-    <enum-type type-name='art_image_property_verb' original-name='art_image_action_type' base-type='int16_t'> bay12: ArtImageActionType
+    <enum-type type-name='art_image_property_verb' original-name='art_image_action_type' base-type='int32_t'> bay12: ArtImageActionType
         <enum-item name="NONE" value='-1'/>
         <enum-item name='Withering' original-name='WITHER'/>
         <enum-item name='SurroundedBy' original-name='SURROUNDED_BY'/>

df.interaction.xml

@@ -161,7 +161,7 @@
             </vmethod>
             <vmethod name='finalize'><int32_t name='interaction_index'/></vmethod>
             <vmethod ret-type='bool' name='affects_body_component'><pointer type-name='item_body_component' name='ic'/><pointer type-name='interaction' name='it'/></vmethod>
-            <vmethod ret-type='bool' name='affects_unit'><pointer type-name='unit' name='un'/><pointer type-name='interaction' name='iut'/></vmethod>
+            <vmethod ret-type='bool' name='affects_unit'><pointer type-name='unit' name='un'/><pointer type-name='interaction' name='it'/></vmethod>
             <vmethod ret-type='bool' name='affects_histfig' original-name='affects_hf'>
                 <pointer type-name='historical_figure' name='hf'/>
                 <pointer type-name='interaction' name='it'/>

df.itemdef.xml

@@ -1,11 +1,5 @@
 <data-definition>
-    <bitfield-type type-name='item_statue_graphics_type' base-type='int32_t'> bay12: ITEM_STATUE_GRAPHICS_TYPE_*
-        <flag-bit name='overall' original-name='OVERALL' count='4' type-name='item_statue_graphics_type_overall'/>
-        <flag-bit name='index_1' original-name='INDEX_1' count='13'/>
-        <flag-bit name='index_2' original-name='INDEX_2' count='14'/>
-    </bitfield-type>
-
-    <enum-type type-name='item_statue_graphics_type_overall' base-type='int32_t'> bay12: ITEM_STATUE_GRAPHICS_TYPE_OVERALL_*
+    <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'/>
         <enum-item name='CREATURE'/>
@@ -27,7 +21,11 @@
         <enum-item name='SITE'/>
     </enum-type>
 
-    <bitfield-type type-name='item_statue_graphics_flag' base-type='int64_t'> bay12: ITEM_STATUE_GRAPHICS_FLAG_*
+    <bitfield-type type-name='item_statue_graphics_flag' base-type='int64_t'> bay12: ITEM_STATUE_GRAPHICS_TYPE_* + ITEM_STATUE_GRAPHICS_FLAG_*
+        <flag-bit name='overall' original-name='OVERALL' count='4' type-name='item_statue_graphics_type_overall'/>
+        <flag-bit name='index_1' original-name='INDEX_1' count='13'/>
+        <flag-bit name='index_2' original-name='INDEX_2' count='14'/>
+        <flag-bit comment='unused'/>
         <flag-bit name='material' original-name='MATERIAL' count='2' type-name='item_statue_graphics_flag_material'/>
         <flag-bit name='material_color_index' original-name='MATERIAL_COLOR_INDEX' count='8'/>
         <flag-bit name='planned' original-name='PLANNED'/>