Some abstract building research

DFHack · Dec 26, 2015 · cc74796 · cc74796
1 parent 11dfc8f
commit cc74796
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 28 deletions.
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
@@ -1262,26 +1262,12 @@
     </class-type>
 
     <class-type type-name='viewscreen_locationsst' inherits-from='viewscreen'>
-        <stl-vector name='locations'/>
+        <stl-vector name='locations' pointer-type='abstract_building'/>
         <stl-vector name='dance_floor_x' type-name='int32_t'/>
         <stl-vector name='dance_floor_y' type-name='int32_t'/>
         <stl-vector type-name='int32_t'/>
         <int32_t name='location_idx'/>
-        <stl-vector name='occupations'>
-            <pointer>
-                <int32_t/>
-                <enum name='type' base-type='int32_t'>
-                    <enum-item name='TavernKeeper'/>
-                    <enum-item name='Performer'/>
-                    <enum-item name='Scholar'/>
-                    <enum-item name='Mercenary'/>
-                    <enum-item name='MonsterSlayer'/>
-                    <enum-item name='Scribe'/>
-                </enum>
-                <int32_t/>
-                <int32_t name='unit_id'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='occupations' pointer-type='occupation'/>
         <int32_t name='occupation_idx'/>
         <stl-vector name='units' pointer-type='unit'/>
         <int32_t name='unit_idx' comment='uninitialized'/>

diff --git a/df.world-site.xml b/df.world-site.xml
@@ -28,19 +28,25 @@
         <stl-vector name='histfigs' ref-target='historical_figure' type-name='int32_t'/>
     </struct-type>
 
-    <struct-type type-name='abstract_building_unk2'> used within Temple, Library, and Inn/Tavern
-        <int32_t name="unk_e4"/>
-        <int32_t name="unk_e8"/>
-        <int32_t name="unk_ec"/>
-        <int32_t name="unk_f0"/>
-        <int32_t name="unk_f4"/>
+    <struct-type type-name='abstract_building_contents'> used within Temple, Library, and Inn/Tavern
+        <enum name="type" base-type='int32_t'>
+            <enum-item/>
+            <enum-item/>
+            <enum-item name='Temple'/>
+            <enum-item name='Tavern'/>
+            <enum-item name='Library'/>
+        </enum>
+        <int32_t name="desired_goblets"/>
+        <int32_t name="desired_instruments"/>
+        <int32_t name="desired_paper"/>
+        <int32_t name="desired_bookcases"/>
 
         the following is not saved:
         <int32_t name="unk_f8"/>
         <int32_t name="unk_fc"/>
         <int32_t name="unk_100"/>
         <int32_t name="unk_104"/>
-        <stl-vector name="unk_108"/>
+        <stl-vector name="unk_108" type-name='int32_t'/>
     </struct-type>
 
     <class-type type-name='abstract_building' original-name='abstract_buildingst' key-field='id'>
@@ -75,7 +81,7 @@
         <int32_t name='site_id' ref-target='world_site'
                  comment='not initialized/saved/loaded, assumed member of base class'/>
         <compound name='pos' type-name='coord2d' comment='v0.42.01'/>
-        <stl-vector name='unk_v42_5' comment='v0.42.01'/>
+        <stl-vector name='occupations' pointer-type='occupation' comment='v0.42.01'/>
 
         <virtual-methods>
             <vmethod ret-type='abstract_building_type' name='getType'/>
@@ -87,7 +93,7 @@
                 <pointer type-name='uint16_t' name='bright'/>
             </vmethod>
             <vmethod name='getName'><ret-type><pointer type-name='language_name'/></ret-type></vmethod>
-            <vmethod><ret-type><pointer type-name='abstract_building_unk2'/></ret-type></vmethod>
+            <vmethod name='getContents'><ret-type><pointer type-name='abstract_building_contents'/></ret-type></vmethod>
             <vmethod name='write_file'> <pointer name='file' type-name='file_compressorst'/> </vmethod>
 
             <vmethod name='read_file'>
@@ -119,7 +125,7 @@
         <int32_t name='religion' ref-target='historical_entity'
                  comment='returned by the vmethod after the destructor'/>
         <compound name='name' type-name='language_name'/>
-        <compound name='unk_v42' type-name='abstract_building_unk2'/>
+        <compound name='contents' type-name='abstract_building_contents'/>
     </class-type>
 
     <class-type type-name='abstract_building_dark_towerst' inherits-from='abstract_building'>
@@ -172,7 +178,7 @@
 
     <class-type type-name='abstract_building_inn_tavernst' inherits-from='abstract_building'>
         <compound name='name' type-name='language_name'/>
-        <compound name='unk_v42' type-name='abstract_building_unk2'/>
+        <compound name='contents' type-name='abstract_building_contents'/>
         <stl-vector>
             <pointer>
                 <int32_t/>
@@ -188,7 +194,7 @@
     <class-type type-name='abstract_building_libraryst' inherits-from='abstract_building'>
         <compound name='name' type-name='language_name'/>
         <stl-vector type-name='int32_t'/>
-        <compound name='unk_v42' type-name='abstract_building_unk2'/>
+        <compound name='contents' type-name='abstract_building_contents'/>
     </class-type>
 
     <enum-type type-name='world_site_type' base-type='int16_t'>