v0.47.01 - creature_raw, entities, unit_personality, and 2 viewscreens

PatrikLundell · Feb 1, 2020 · c12ffb0 · c12ffb0
1 parent cc978b7
commit c12ffb0
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 65 deletions.
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -852,7 +852,7 @@
         <stl-vector name='caste_speech_2'/>
 
         <static-array name='skill_rates' count='4'>
-            <static-array type-name='int32_t' count='135' index-enum='job_skill'/>
+            <static-array type-name='int32_t' count='147' index-enum='job_skill'/>
         </static-array>
 
         <compound name='attributes'>
@@ -1201,11 +1201,11 @@
 
             <static-array name='site_link_texpos'
                           count='6' index-enum='creature_graphics_role'>
-                <static-array count='8' type-name='int32_t' index-enum='histfig_site_link_type'/>
+                <static-array count='10' type-name='int32_t' index-enum='histfig_site_link_type'/>
             </static-array>
             <static-array name='site_link_texpos_gs'
                           count='6' index-enum='creature_graphics_role'>
-                <static-array count='8' type-name='int32_t' index-enum='histfig_site_link_type'/>
+                <static-array count='10' type-name='int32_t' index-enum='histfig_site_link_type'/>
             </static-array>
 
             <static-array name='profession_texpos'
@@ -1227,7 +1227,7 @@
 
             <static-array name='site_link_add_color'
                           count='6' index-enum='creature_graphics_role'>
-                <static-array count='8' type-name='bool' index-enum='histfig_site_link_type'/>
+                <static-array count='10' type-name='bool' index-enum='histfig_site_link_type'/>
             </static-array>
 
             <static-array name='profession_add_color'

diff --git a/df.entities.xml b/df.entities.xml
@@ -171,7 +171,7 @@
         <pointer type-name='entity_buy_prices' name='buy_prices'/>
         <stl-vector name='goods' type-name='int32_t' ref-target='item'/>
         <int32_t/>
-        <pointer/>
+        <int32_t/>
     </struct-type>
 
     <struct-type type-name='entity_buy_prices'>
@@ -329,6 +329,7 @@
             <flag-bit name='worshipping'/>
         </bitfield>
 
+        <stl-vector since='v0.47.01' comment='contains int32_t pairs'/>
         <stl-vector name='entity_links' pointer-type='entity_entity_link'/>
         <stl-vector name='site_links' pointer-type='entity_site_link'/>
 
@@ -471,7 +472,7 @@
             <static-array name='values' type-name='int32_t' count='64' index-enum='value_type'/>
 
             <int32_t since='v0.42.01'/>
-            <static-array name='permitted_skill' type-name='bool' index-enum='job_skill' count='135'/>
+            <static-array name='permitted_skill' type-name='bool' index-enum='job_skill' count='147'/>
 
             <stl-vector type-name='int16_t' name='art_image_types' comment='0 = civilization symbol'/>
             <stl-vector type-name='int32_t' name='art_image_ids'/>
@@ -582,6 +583,20 @@
         <pointer name='occasion_info' type-name='entity_occasion_info'/>
 
         <stl-vector since='v0.44.01'/>
+
+        <stl-vector since='v0.47.01'/>
+        <int32_t since='v0.47.01' comment='probably a next_id'/>
+
+        <int32_t since='v0.47.01'/>
+        <int32_t since='v0.47.01'/>
+        <int32_t since='v0.47.01'/>
+
+        <pointer since='v0.47.01'/>
+
+        <stl-vector type-name='int32_t' since='v0.47.01'/>
+
+        <int32_t since='v0.47.01'/>
+
         <stl-vector name='meeting_events' pointer-type='meeting_event'/>
         <pointer name='activity_stats' type-name='entity_activity_statistics'/>
 
@@ -596,6 +611,8 @@
             <int32_t name='unk49e' comment='in 0.23, hostility level - determined siege size, had a chance to reset to 1'/>
             <int32_t name='unk49f' comment='in 0.23, determined siege size'/>
             <int32_t since='v0.40.01'/>
+            <int32_t since='v0.47.01'/>
+            <int32_t since='v0.47.01'/>
         </compound>
 
         <stl-vector name='armies' pointer-type='army' since='v0.40.01'/>
@@ -638,7 +655,7 @@
             <stl-vector name='gloves_over' type-name='int16_t' ref-target='itemdef_glovesst'/>
             <stl-vector name='gloves_cover' type-name='int16_t' ref-target='itemdef_glovesst'/>
         </compound>
-        <static-array name='assignments_by_type' count='25'
+        <static-array name='assignments_by_type' count='42'
                       index-enum='entity_position_responsibility'>
             <stl-vector pointer-type='entity_position_assignment'/>
         </static-array>
@@ -693,14 +710,23 @@
             <int32_t name='unk_B8'/>
             <int32_t name='unk_BC'/>
             <int32_t name='unk_C0'/>
+
+            <int32_t since='v0.47.01'/>?
+            <int32_t since='v0.47.01'/>?
+            <int32_t since='v0.47.01'/>?
+
             <static-array name='unk26a' count='38' type-name='int32_t'/>
             <static-array name='unk26b' count='38' type-name='int32_t'/>
             <static-array name='unk26c' count='38' type-name='int32_t'/>
             <static-array name='unk26d' count='38' type-name='int32_t'/>
             <static-array name='unk26e' count='15' type-name='int32_t'/>
 
             <stl-vector name='unk28' type-name='pointer' comment='empty'/>
+            <int32_t since='v0.47.01'/>?
             <stl-vector name='unk29' type-name='pointer' since='v0.34.01'/>
+            <int32_t since='v0.47.01'/>
+            <int32_t since='v0.47.01'/>
+            <int32_t since='v0.47.01'/>
         </compound>
     </struct-type>
 
@@ -807,7 +833,7 @@
         <stl-vector name='appointed_by_civ' type-name='int32_t' ref-target='historical_entity'/>
         <stl-vector name='succession_by_position' type-name='int32_t'/>
 
-        <static-array type-name='bool' name='responsibilities' count='25' index-enum='entity_position_responsibility'/>
+        <static-array type-name='bool' name='responsibilities' count='42' index-enum='entity_position_responsibility'/>
         <static-array type-name='int16_t' name='color' count='3'/>
 
         <int32_t name='required_boxes'/>
@@ -820,6 +846,7 @@
         <int32_t name='required_tomb'/>
         <int32_t name='mandate_max'/>
         <int32_t name='demand_max'/>
+        <int32_t init-value='30001' since='v0.47.01'/>
     </struct-type>
 
     <struct-type type-name='entity_position_assignment' key-field='id'>
@@ -844,6 +871,7 @@
         <int32_t init-value='-1' since='v0.40.01'/>
         <int32_t init-value='-1' since='v0.40.01'/>
         <stl-vector since='v0.40.01' comment='not saved'/>
+        <int32_t since='v0.47.01' comment='unknown size, not initialized or saved'/>
     </struct-type>
 
     <enum-type type-name='entity_material_category' base-type='int16_t'>

diff --git a/df.entity-raws.xml b/df.entity-raws.xml
@@ -302,10 +302,10 @@
         <stl-vector name='positions' pointer-type='entity_position_raw'/>
 
         <static-array name='variable_positions' type-name='int8_t'
-                      index-enum='entity_position_responsibility' count='25'/>
+                      index-enum='entity_position_responsibility' count='42'/>
 
         <static-array name='site_variable_positions' type-name='int8_t'
-                      index-enum='entity_position_responsibility' count='25'/>
+                      index-enum='entity_position_responsibility' count='42'/>
 
         <stl-vector name='tissue_styles'>
             <pointer>
@@ -421,6 +421,23 @@
         <enum-item name='SORT_AMMUNITION'/>
         <enum-item name='BUILD_MORALE'/>
         <enum-item name='HEALTH_MANAGEMENT'/>
+        <enum-item name='ESPIONAGE'/>
+        <enum-item name='ADVISE_LEADERS'/>
+        <enum-item name='OVERSEE_LEADER_HOUSEHOLD'/>
+        <enum-item name='MANAGE_ANIMALS'/>
+        <enum-item name='MANAGE_LEADER_HOUSEHOLD_FOOD'/>
+        <enum-item name='MANAGE_LEADER_HOUSEHOLD_DRINKS'/>
+        <enum-item name='PREPARE_LEADER_MEALS'/>
+        <enum-item name='MANAGE_LEADER_HOUSEHOLD_CLEANLINESS'/>
+        <enum-item name='MAINTAIN_SEWERS'/>
+        <enum-item name='FOOD_SUPPLY'/>
+        <enum-item name='FIRE_SAFETY'/>
+        <enum-item name='JUDGE'/>
+        <enum-item name='BUILDING_SAFETY'/>
+        <enum-item name='CONSTRUCTION_PERMITS'/>
+        <enum-item name='MAINTAIN_ROADS'/>
+        <enum-item name='MAINTAIN_BRIDGES'/>
+        <enum-item name='MAINTAIN_TUNNELS'/>
     </enum-type>
 
     <struct-type type-name='entity_position_raw'>
@@ -470,7 +487,7 @@
         <stl-vector name='succession_by_position_str' pointer-type='stl-string'/>
         <stl-vector name='succession_by_position' type-name='int32_t'/>
 
-        <static-array type-name='bool' name='responsibilities' count='25' index-enum='entity_position_responsibility'/>
+        <static-array type-name='bool' name='responsibilities' count='42' index-enum='entity_position_responsibility'/>
         <static-array type-name='int16_t' name='color' count='3'/>
 
         <int32_t name='required_boxes'/>

diff --git a/df.refs.xml b/df.refs.xml
@@ -507,6 +507,8 @@
         <enum-item name='LAIR'/>
         <enum-item name='HOME_SITE_REALIZATION_SUL'/>
         <enum-item name='HOME_SITE_SAVED_CIVZONE'/>
+        <enum-item name='PRISON_ABSTRACT_BUILDING'/>
+        <enum-item name='PRISON_SITE_BUILDING_PROFILE'/>
     </enum-type>
 
     <class-type type-name='histfig_site_link' original-name='histfig_site_linkst'>
@@ -528,16 +530,18 @@
         </virtual-methods>
     </class-type>
 
+    <class-type type-name='histfig_site_link_occupationst' inherits-from='histfig_site_link'>
+        <int32_t/>
+    </class-type>
     <class-type type-name='histfig_site_link_seat_of_powerst' inherits-from='histfig_site_link'/>
     <class-type type-name='histfig_site_link_hangoutst' inherits-from='histfig_site_link'/>
     <class-type type-name='histfig_site_link_home_site_abstract_buildingst' inherits-from='histfig_site_link'/>
     <class-type type-name='histfig_site_link_home_site_realization_buildingst' inherits-from='histfig_site_link'/>
     <class-type type-name='histfig_site_link_lairst' inherits-from='histfig_site_link'/>
     <class-type type-name='histfig_site_link_home_site_realization_sulst' inherits-from='histfig_site_link'/>
     <class-type type-name='histfig_site_link_home_site_saved_civzonest' inherits-from='histfig_site_link'/>
-    <class-type type-name='histfig_site_link_occupationst' inherits-from='histfig_site_link'>
-        <int32_t/>
-    </class-type>
+    <class-type type-name='histfig_site_link_prison_abstract_buildingst' inherits-from='histfig_site_link'/>
+    <class-type type-name='histfig_site_link_prison_site_building_profilest' inherits-from='histfig_site_link'/>
 
 
     <enum-type type-name='histfig_hf_link_type'>

diff --git a/df.units.xml b/df.units.xml
@@ -889,15 +889,18 @@
 
             <static-array type-name='bool' name='labors' index-enum='unit_labor' count='94'/>
 
-            <static-array type-name='int32_t' count='14'/> somewhere between here and the end of the compound
-
             <stl-vector name='wrestle_items' pointer-type='unit_item_wrestle'/>
             <stl-vector name='observed_traps' type-name='int32_t' ref-target='building'/>
 
             <stl-vector name='complaints' pointer-type='unit_complaint'/>
             <stl-vector name='unk_138' pointer-type='unit_unk_138' since='v0.44.01'/>
             <stl-vector name='requests' pointer-type='unit_request'/>
             <stl-vector name='coin_debts' pointer-type='unit_coin_debt'/>
+            <stl-vector since='v0.47.01'/>
+            <int32_t since='v0.47.01'/>
+            <int32_t since='v0.47.01'/>
+            <static-array type-name='int32_t' count='5' index-enum='gait_type' since='v0.47.01' comment='initialized together with enemy.gait_index'/>
+            <int32_t since='v0.47.01'/>
 
             <int16_t name='adv_sleep_timer'/>
 
@@ -1837,6 +1840,8 @@
         </pointer>
         <int32_t name="current_focus" comment='weighted sum of needs focus_level-s'/>
         <int32_t name="undistracted_focus" comment='usually number of needs multiplied by 4'/>
+        <int32_t since='v0.47.01'/>
+        <int32_t since='v0.47.01'/>
     </struct-type>
 
     <enum-type type-name='unit_action_type'>