From 96f1474f5e68737fb4719513c85adac33f436c54 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Tue, 28 Nov 2017 22:28:30 -0600
Subject: [PATCH] Align a bunch of structures, and add new history
 events/collections

---
 df.art.xml        |   7 +-
 df.entities.xml   |  26 +--
 df.history.xml    | 420 +++++++++++++++++++++++++++++++++-------------
 df.item-raws.xml  |   1 +
 df.military.xml   | 241 +++++++++++++++++++++++++-
 df.units.xml      |   1 +
 df.world-site.xml |  81 ++++++++-
 7 files changed, 626 insertions(+), 151 deletions(-)

diff --git a/df.art.xml b/df.art.xml
index 6a2062ed0..7eb9d5815 100644
--- a/df.art.xml
+++ b/df.art.xml
@@ -489,12 +489,11 @@
         <int32_t name='unit_id' ref-target='unit'/>
         <int32_t name='location_id' ref-target='abstract_building' aux-value='$$.site_id'/>
         <int32_t name='site_id' ref-target='world_site'/>
-        <int32_t comment='appears to be an entity_id?'/>
+        <int32_t name='group_id' ref-target='historical_entity'/>
         <stl-vector pointer-type='occupation_sub1'/>
         <int32_t/>
-        TODO: uninitialized on x64?
-        <int32_t/>
-        <int32_t/>
+        <pointer/>
+        <pointer/>
     </struct-type>
 
     <struct-type type-name='occupation_sub1'>
diff --git a/df.entities.xml b/df.entities.xml
index d5fb5d7d2..bfa8d40f8 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -2,16 +2,7 @@
     <struct-type type-name='entity_occasion_info'>
         <stl-vector name="occasions" pointer-type='entity_occasion' since='v0.42.01'/>
         <int32_t name="next_occasion_id"/>
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
+        <static-array type-name='int32_t' count='10'/>
         <int32_t />
     </struct-type>
     <struct-type type-name='entity_occasion'>
@@ -27,10 +18,6 @@
         <int32_t />
         <stl-vector name='schedule' pointer-type='entity_occasion_schedule' />
         <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
     </struct-type>
     <enum-type type-name='occasion_schedule_type' base-type='int32_t'>
         <enum-item name='DANCE_PERFORMANCE'/>
@@ -59,7 +46,6 @@
         <stl-vector name='features' pointer-type='entity_occasion_schedule_feature' />
         <int32_t />
         <int32_t />
-        <int32_t />
     </struct-type>
     <enum-type type-name='occasion_schedule_feature' base-type='int32_t'>
         <enum-item />
@@ -88,9 +74,6 @@
         <int32_t />
         <int32_t />
         <int32_t />
-        <int32_t />
-        <int32_t />
-        <int32_t />
     </struct-type>
     <struct-type type-name='entity_activity_statistics'>
         <compound name='food'>
@@ -504,9 +487,7 @@
         <int32_t name='next_uniform_id'/>
 
         <compound name='unknown1b'>
-<!-- one of these 4 vectors was removed, not sure which one is worship
             <stl-vector name='unk32a' type-name='int32_t' comment='empty'/>
--->
             <stl-vector name='unk32b' type-name='int32_t'/>
             <stl-vector name='worship' type-name='int32_t' ref-target='historical_figure'/>
             <stl-vector name='unk32d' type-name='int32_t'/>
@@ -532,7 +513,6 @@
                     <int32_t/>
                 </pointer>
             </stl-vector>
-            <stl-vector since='v0.44.01'/>
 
             <int16_t name='unk33'/>
             <stl-vector name='unk34a' type-name='int16_t'/>
@@ -600,8 +580,8 @@
         <stl-vector type-name='int32_t' since='v0.42.01'/>
         <pointer name='occasion_info' type-name='entity_occasion_info'/>
 
-        <stl-vector name='meeting_events' pointer-type='meeting_event'/>
         <stl-vector since='v0.44.01'/>
+        <stl-vector name='meeting_events' pointer-type='meeting_event'/>
         <pointer name='activity_stats' type-name='entity_activity_statistics'/>
 
         <compound name='unknown1e'>
@@ -1159,7 +1139,7 @@
                         <int32_t/>
                     </pointer>
                     <pointer name='data1'>
-                        <enum name='reason' base-type='int32_t' type-name='agreement_conclusion_reason'/>
+                        <enum name='reason' base-type='int32_t' type-name='history_event_reason'/>
                         <int32_t/>
                         <int32_t/>
                         <int32_t name='site' ref-target='world_site'/>
diff --git a/df.history.xml b/df.history.xml
index 8d6331422..2cefc69ae 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -36,6 +36,38 @@
         <int32_t name='shooter_matindex'/>
     </struct-type>
 
+    <enum-type type-name='reputation_type' base-type='int32_t'>
+        <enum-item name='Hero'/>
+        <enum-item name='Buddy'/>
+        <enum-item name='Grudge'/>
+        <enum-item name='Bonded'/>
+        <enum-item name='Violent'/>
+        <enum-item name='Psychopath'/>
+        <enum-item name='TradePartner'/>
+        <enum-item name='Friendly'/>
+        <enum-item name='Killer'/>
+        <enum-item name='Murderer'/>
+
+        <enum-item name='Comrade'/>
+        <enum-item name='RespectedGroup'/>
+        <enum-item name='HatedGroup'/>
+        <enum-item name='EnemyFighter'/>
+        <enum-item name='FriendlyFighter'/>
+        <enum-item name='Bully'/>
+        <enum-item name='Brigand'/>
+        <enum-item name='LoyalSoldier'/>
+        <enum-item name='Monster'/>
+        <enum-item name='Storyteller'/>
+
+        <enum-item name='Poet'/>
+        <enum-item name='Bard'/>
+        <enum-item name='Dancer'/>
+        <enum-item name='Quarreler'/>
+        <enum-item name='Flatterer'/>
+        <enum-item name='Hunter'/>
+        <enum-item name='ProtectorOfWeak'/>
+    </enum-type>
+
     <struct-type type-name='historical_figure_info'>
         <pointer name="spheres">
             <stl-vector>
@@ -218,42 +250,7 @@
             <stl-vector name="wanted">
                 <pointer>
                     <int32_t name='entity_id' ref-target='historical_entity'/>
-                    <stl-vector name='types'>
-                        <enum base-type='int32_t'>
-                            0
-                            <enum-item name='Hero'/>
-                            <enum-item name='Buddy'/>
-                            <enum-item name='Grudge'/>
-                            <enum-item name='Bonded'/>
-                            <enum-item name='Violent'/>
-                            <enum-item name='Psychopath'/>
-                            <enum-item name='TradePartner'/>
-                            <enum-item name='Friendly'/>
-                            <enum-item name='Killer'/>
-                            <enum-item name='Murderer'/>
-
-                            10
-                            <enum-item name='Comrade'/>
-                            <enum-item name='RespectedGroup'/>
-                            <enum-item name='HatedGroup'/>
-                            <enum-item name='EnemyFighter'/>
-                            <enum-item name='FriendlyFighter'/>
-                            <enum-item name='Bully'/>
-                            <enum-item name='Brigand'/>
-                            <enum-item name='LoyalSoldier'/>
-                            <enum-item name='Monster'/>
-                            <enum-item name='Storyteller'/>
-
-                            20
-                            <enum-item name='Poet'/>
-                            <enum-item name='Bard'/>
-                            <enum-item name='Dancer'/>
-                            <enum-item name='Quarreler'/>
-                            <enum-item name='Flatterer'/>
-                            <enum-item name='Hunter'/>
-                            <enum-item name='ProtectorOfWeak'/>
-                        </enum>
-                    </stl-vector>
+                    <stl-vector name='types'><enum base-type='int32_t' type-name='reputation_type'/></stl-vector>
                     <stl-vector name='levels' type-name='int32_t' comment='1 to 100: rumored to legendary'/>
                     <int32_t name="discovered_year"/>
                     <int32_t name="discovered_time"/>
@@ -514,6 +511,22 @@
 
         <int32_t name='birth_year' comment='the fake one, that is'/>
         <int32_t name='birth_second'/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int16_t/>
+        <int32_t/>
+        <stl-vector pointer-type='identity_unk_94'/>
+        <stl-vector pointer-type='identity_unk_94'/>
+    </struct-type>
+
+    <struct-type type-name='identity_unk_94'>
+        <stl-vector type-name='int32_t'/>
+        <stl-vector type-name='int32_t'/>
+        <int32_t init-value='-1'/>
+        <int32_t init-value='-1'/>
+        <int32_t/>
+        <int32_t comment='uninitialized'/>
     </struct-type>
 
     <enum-type type-name='history_event_type'>
@@ -632,6 +645,94 @@
         <enum-item name='HIST_FIGURE_SIMPLE_ACTION'/>
     </enum-type>
 
+    <enum-type type-name='history_event_reason'>
+        <enum-item name='insurrection'/>
+        <enum-item name='adventure'/>
+        <enum-item name='guide'/>
+        <enum-item name='rescued'/>
+        <enum-item name='sphere_alignment'/>
+        <enum-item name='maintain_balance_in_universe'/>
+        <enum-item name='highlight_boundaries_between_worlds'/>
+        <enum-item name='sow_the_seeds_of_chaos_in_the_world'/>
+        <enum-item name='provide_opportunities_for_courage'/>
+        <enum-item name='bring_death_to_the_world'/>
+
+        <enum-item name='liked_appearance'/>
+        <enum-item name='because_it_was_destined'/>
+        <enum-item name='great_fortresses_built_and_tested'/>
+        <enum-item name='whim'/>
+        <enum-item name='bring_misery_to_the_world'/>
+        <enum-item name='bring_murder_to_the_world'/>
+        <enum-item name='bring_nightmares_into_reality'/>
+        <enum-item name='bring_thralldom_to_the_world'/>
+        <enum-item name='bring_torture_to_the_world'/>
+        <enum-item name='provide_opportunities_for_acts_of_valor'/>
+
+        <enum-item name='bring_war_to_the_world'/>
+        <enum-item name='find_relative'/>
+        <enum-item name='offer_condolences'/>
+        <enum-item name='be_brought_to_safety'/>
+        <enum-item name='help_with_rescue'/>
+        <enum-item name='insufficient_work'/>
+        <enum-item name='work_request'/>
+        <enum-item name='make_weapon'/>
+        <enum-item name='vent_at_boss'/>
+        <enum-item name='cry_on_boss'/>
+
+        <enum-item name='should_have_reached_goal'/>
+        <enum-item name='insufficient_progress_toward_goal'/>
+        <enum-item name='going_wrong_direction'/>
+        <enum-item name='arrived_at_location'/>
+        <enum-item name='entity_no_longer_rules'/>
+        <enum-item name='left_site'/>
+        <enum-item name='reunited_with_loved_one'/>
+        <enum-item name='violent_disagreement'/>
+        <enum-item name='adopted'/>
+        <enum-item name='true_name_invocation'/>
+
+        <enum-item name='arrived_at_person'/>
+        <enum-item name='eradicate_beasts'/>
+        <enum-item name='entertain_people'/>
+        <enum-item name='make_a_living_as_a_warrior'/>
+        <enum-item name='study'/>
+        <enum-item name='flight'/>
+        <enum-item name='scholarship'/>
+        <enum-item name='be_with_master'/>
+        <enum-item name='become_citizen'/>
+        <enum-item name='prefers_working_alone'/>
+
+        <enum-item name='jealousy'/>
+        <enum-item name='glorify_hf'/>
+        <enum-item name='have_not_performed'/>
+        <enum-item name='prevented_from_leaving'/>
+        <enum-item name='curiosity'/>
+        <enum-item name='hire_on_as_mercenary'/>
+        <enum-item name='hire_on_as_performer'/>
+        <enum-item name='hire_on_as_scholar'/>
+        <enum-item name='drink'/>
+        <enum-item name='admire_architecture'/>
+
+        <enum-item name='pray'/>
+        <enum-item name='relax'/>
+        <enum-item name='danger'/>
+        <enum-item name='cannot_find_artifact'/>
+        <enum-item name='failed_mood'/>
+        <enum-item name='lack_of_sleep'/>
+        <enum-item name='trapped_in_cage'/>
+        <enum-item name='great_deal_of_stress'/>
+        <enum-item name='unable_to_leave_location'/>
+        <enum-item name='sanctify_hf'/>
+
+        <enum-item name='artifact_is_heirloom_of_family_hfid'/>
+        <enum-item name='cement_bonds_of_friendship'/>
+        <enum-item name='as_a_symbol_of_everlasting_peace'/>
+        <enum-item name='on_a_pilgrimage'/>
+        <enum-item name='gather_information'/>
+        <enum-item name='seek_sanctuary'/>
+        <enum-item name='part_of_trade_negotiation'/>
+        <enum-item name='artifact_is_symbol_of_entity_position'/>
+    </enum-type>
+
     <struct-type type-name='history_event_context'>
         <int32_t/>
         <int32_t/>
@@ -846,6 +947,8 @@
         <enum-item name='SLAUGHTER'/>
         <enum-item name='VEHICLE'/>
         <enum-item name='FALLING_OBJECT'/>
+        <enum-item name='LEAPT_FROM_HEIGHT'/>
+        <enum-item name='DROWN_ALT2'/>
     </enum-type>
 
     <class-type type-name='history_event_hist_figure_diedst' inherits-from='history_event'>
@@ -958,10 +1061,10 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t/>
         <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
     </class-type>
 
     <class-type type-name='history_event_artifact_createdst' inherits-from='history_event'>
@@ -1203,11 +1306,11 @@
             <enum-item name='Wandering'/>
             <enum-item name='Settled'/>
             <enum-item name='Refugee'/>
+            <enum-item/>
+            <enum-item/>
+            <enum-item name='Visiting'/>
         </enum>
-        <enum base-type='int32_t' name='substate' comment='for state == Wandering'>
-            <enum-item name='Wandered' value='-1'/>
-            <enum-item name='Fled' value='45'/>
-        </enum>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -1329,10 +1432,10 @@
         <compound name='region_pos' type-name='coord2d'/>
 
         <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
         <int32_t/>
     </class-type>
 
@@ -1508,6 +1611,7 @@
         <enum name='action' base-type='int32_t'>
             <enum-item name='Profane'/>
             <enum-item name='Disturb'/>
+            <enum-item name='PrayedInside'/>
         </enum>
         <int32_t name='histfig' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
@@ -1575,55 +1679,10 @@
         <int32_t name='site_2' ref-target='world_site'/>
     </class-type>
 
-    <enum-type type-name='agreement_conclusion_reason'>
-        <enum-item name='None'/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item name='PonderMisery'/>
-        <enum-item name='MaintainBalance'/>
-        <enum-item name='CreateMonumentToBoundaries'/>
-        <enum-item name='SowChaos'/>
-        <enum-item name='ProvideOpportunityForCourage'/>
-        <enum-item name='MoreDeath'/>
-        <enum-item name='AllGazeUponGruesomeVisage'/>
-        <enum-item name='TestFortressesInSiege'/>
-        <enum-item name='Whim'/>
-        <enum-item name='BatheInMisery'/>
-        <enum-item name='MoreMurder'/>
-        <enum-item name='MakeNightmaresReal'/>
-        <enum-item name='MakeEveryoneThralls'/>
-        <enum-item name='PerpetrateTorture'/>
-        <enum-item name='ProvideOpportunityForValor'/>
-        <enum-item name='EternalWar'/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item name='ShouldHaveReachedGoal'/>
-        <enum-item name='InsufficientProgressTowardGoal'/>
-        <enum-item name='GoingWrongDirection'/>
-        <enum-item name='ArrivedAtLocation'/>
-        <enum-item name='EntityNoLongerRules'/>
-        <enum-item name='LeftSite'/>
-        <enum-item name='ReunitedWithLovedOne'/>
-        <enum-item name='ViolentDisagreement'/>
-        <enum-item name='Adopted'/>
-        <enum-item/>
-        <enum-item name='ArrivedAtPerson'/>
-    </enum-type>
-
     <class-type type-name='history_event_agreement_concludedst' inherits-from='history_event'>
         <int32_t name='agreement_id'/>
         <int32_t name='subject_id'/>
-        <enum name='reason' type-name='agreement_conclusion_reason' base-type='int32_t'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
         <int32_t name='concluder_hf' ref-target='historical_figure'/>
     </class-type>
 
@@ -1736,10 +1795,10 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
-        <int32_t name='circumstance'/>
-        <int32_t name='circumstance_id'/>
-        <int32_t name='reason'/>
-        <int32_t name='reason_id'/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
     </class-type>
 
     <class-type type-name='history_event_musical_form_createdst' inherits-from='history_event'>
@@ -1748,10 +1807,10 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
-        <int32_t name='circumstance'/>
-        <int32_t name='circumstance_id'/>
-        <int32_t name='reason'/>
-        <int32_t name='reason_id'/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
     </class-type>
 
     <class-type type-name='history_event_dance_form_createdst' inherits-from='history_event'>
@@ -1760,10 +1819,10 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
-        <int32_t name='circumstance'/>
-        <int32_t name='circumstance_id'/>
-        <int32_t name='reason'/>
-        <int32_t name='reason_id'/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
     </class-type>
 
     <class-type type-name='history_event_written_content_composedst' inherits-from='history_event'>
@@ -1772,10 +1831,133 @@
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
-        <int32_t name='circumstance'/>
-        <int32_t name='circumstance_id'/>
-        <int32_t name='reason'/>
-        <int32_t name='reason_id'/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
+    </class-type>
+
+    <class-type type-name='history_event_change_hf_moodst' inherits-from='history_event'>
+        <int32_t name='histfig' ref-target='historical_figure'/>
+        <enum base-type='int16_t' name='mood' type-name='mood_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='region' ref-target='world_region'/>
+        <int32_t name='layer' ref-target='world_underground_region'/>
+        <int32_t/>
+        <compound name='region_pos' type-name='coord2d'/>
+    </class-type>
+
+    <class-type type-name='history_event_artifact_claim_formedst' inherits-from='history_event'>
+        <int32_t name='artifact' ref-target='artifact_record'/>
+        <int32_t name='histfig' ref-target='historical_figure'/>
+        <int32_t name='entity' ref-target='historical_entity'/>
+        <int32_t name='position_profile'/>
+        <enum name='claim_type' base-type='int32_t'>
+            <enum-item name='Symbol'/>
+            <enum-item name='Heirloom'/>
+            <enum-item name='Treasure'/>
+            <enum-item name='HolyRelic'/>
+        </enum>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
+    </class-type>
+
+    <class-type type-name='history_event_artifact_givenst' inherits-from='history_event'> ?????????????
+        <int32_t name='artifact' ref-target='artifact_record'/>
+        <int32_t name='giver_hf' ref-target='historical_figure'/>
+        <int32_t name='giver_entity' ref-target='historical_entity'/>
+        <int32_t name='receiver_hf' ref-target='historical_figure'/>
+        <int32_t name='receiver_entity' ref-target='historical_entity'/>
+        <enum base-type='int32_t' name='circumstance' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='circumstance_id' type-name='unit_thought_type'/>
+        <enum base-type='int32_t' name='reason' type-name='history_event_reason'/>
+        <enum base-type='int32_t' name='reason_id' type-name='history_event_reason'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_act_on_artifactst' inherits-from='history_event'>
+        <enum name='action' base-type='int32_t'>
+            <enum-item name='View'/>
+            <enum-item name='AskAbout'/>
+        </enum>
+        <int32_t name='artifact' ref-target='artifact_record'/>
+        <int32_t name='histfig' ref-target='historical_figure'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='structure' ref-target='abstract_building'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_recruited_unit_type_for_entityst' inherits-from='history_event'>
+        <int32_t name='entity' ref-target='historical_entity'/>
+        <int32_t name='histfig' ref-target='historical_figure'/>
+        <enum base-type='int16_t' name='profession' type-name='profession'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='region' ref-target='world_region'/>
+        <int32_t name='layer' ref-target='world_underground_region'/>
+    </class-type>
+
+    <class-type type-name='history_event_hfs_formed_reputation_relationshipst' inherits-from='history_event'>
+        <int32_t name='histfig1' ref-target='historical_figure'/>
+        <int32_t name='identity1' ref-target='identity'/>
+        <int32_t name='histfig2' ref-target='historical_figure'/>
+        <int32_t name='identity2' ref-target='identity'/>
+        <enum base-type='int32_t' name='rep1' type-name='reputation_type'/>
+        <enum base-type='int32_t' name='rep2' type-name='reputation_type'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='region' ref-target='world_region'/>
+        <int32_t name='layer' ref-target='world_underground_region'/>
+    </class-type>
+
+    <class-type type-name='history_event_artifact_copiedst' inherits-from='history_event'>
+        <int32_t name='artifact' ref-target='artifact_record'/>
+        <int32_t name='entity_dest' ref-target='historical_entity'/>
+        <int32_t name='entity_src' ref-target='historical_entity'/>
+        <int32_t name='site_dest' ref-target='world_site'/>
+        <int32_t name='site_src' ref-target='world_site'/>
+        <int32_t name='structure_dest' ref-target='abstract_building'/>
+        <int32_t name='structure_src' ref-target='abstract_building'/>
+        <bitfield name='flags' base-type='uint32_t'>
+            <flag-bit name='from_original'/>
+        </bitfield>
+    </class-type>
+
+    <class-type type-name='history_event_sneak_into_sitest' inherits-from='history_event'>
+        <int32_t name='attacker_civ' ref-target='historical_entity'/>
+        <int32_t name='defender_civ' ref-target='historical_entity'/>
+        <int32_t name='site_civ' ref-target='historical_entity'/>
+        <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_spotted_leaving_sitest' inherits-from='history_event'>
+        <int32_t name='spotter_hf' ref-target='historical_figure'/>
+        <int32_t name='leaver_civ' ref-target='historical_entity'/>
+        <int32_t name='site_civ' ref-target='historical_entity'/>
+        <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_entity_searched_sitest' inherits-from='history_event'>
+        <int32_t name='searcher_civ' ref-target='historical_entity'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='result' comment='0 = found nothing'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_freedst' inherits-from='history_event'>
+        <int32_t name='freeing_civ' ref-target='historical_entity'/>
+        <int32_t name='freeing_hf' ref-target='historical_figure'/>
+        <int32_t name='holding_civ' ref-target='historical_entity'/>
+        <int32_t name='site_civ' ref-target='historical_entity'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <stl-vector name='rescued_hfs' type-name='int32_t' ref-target='historical_figure'/>
+    </class-type>
+
+    <class-type type-name='history_event_hist_figure_simple_actionst' inherits-from='history_event'>
+        <stl-vector name='group_hfs' type-name='int32_t' ref-target='historical_figure'/>
+        <int32_t name='type' comment='0 = hf carouse'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='structure' ref-target='abstract_building'/>
+        <int32_t name='region' ref-target='world_region'/>
+        <int32_t name='layer' ref-target='world_underground_region'/>
     </class-type>
 
     <enum-type type-name='history_event_collection_type'>
@@ -2015,9 +2197,21 @@
     </class-type>
 
     <class-type type-name='history_event_collection_purgest' inherits-from='history_event_collection' comment='0.42.04'>
-        <int32_t/>
-        <stl-string/>
-        <int32_t/>
+        <int32_t name='site' ref-target='world_site'/>
+        <stl-string name='adjective'/>
+        <int32_t name='ordinal'/>
+    </class-type>
+
+    <class-type type-name='history_event_collection_raidst' inherits-from='history_event_collection' comment='0.42.04'>
+        <int32_t name='parent_collection' ref-target='history_event_collection'/>
+        <int32_t name='region' ref-target='world_region'/>
+        <int32_t name='layer' ref-target='world_underground_region'/>
+        <int32_t name='site' ref-target='world_site'/>
+        <compound name='region_pos' type-name='coord2d'/>
+        <int32_t name='attacker_civ' ref-target='historical_entity'/>
+        <int32_t name='defender_civ' ref-target='historical_entity'/>
+        <stl-vector type-name='int32_t'/>
+        <int32_t name='ordinal'/>
     </class-type>
 
     <enum-type type-name='era_type' base-type='int16_t'>
diff --git a/df.item-raws.xml b/df.item-raws.xml
index 6ef6da145..421afe8e5 100644
--- a/df.item-raws.xml
+++ b/df.item-raws.xml
@@ -848,6 +848,7 @@
         <enum-item name='PROTECT_FOLDED_SHEETS'/>
         <enum-item name='CONTAIN_WRITING'/>
         <enum-item name='BOOKCASE'/>
+        <enum-item name='DISPLAY_OBJECT'/>
     </enum-type>
 
     <class-type type-name='itemdef_toolst' inherits-from='itemdef'
diff --git a/df.military.xml b/df.military.xml
index 2699654b7..64e27de45 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -200,6 +200,7 @@
                  refers-to='(find-by-id $$._global.entity_id.ref-target.positions.own $id $)'/>
         <int32_t name="leader_assignment" since='v0.40.01'
                  refers-to='(find-by-id $$._global.entity_id.ref-target.positions.assignments $id $)'/>
+        <int32_t since='v0.44.01'/>
     </struct-type>
 
     <enum-type type-name='squad_order_type'>
@@ -336,19 +337,245 @@
         <int32_t name="pos_y"/>
         <int32_t name="unk_14"/>
         <int32_t name="unk_18"/>
-        <stl-vector name="unk_1c"/>
+        <int32_t name="unk_1c"/>
+        <stl-vector name='unk_20' type-name='int32_t'/>
         <int32_t name="year"/>
         <int32_t name="year_tick"/>
         <int32_t name="unk_34"/>
         <int32_t name="unk_38"/>
         <int32_t name="unk_3c"/>
         <int32_t name="unk_40"/>
-        <stl-vector name="unk_44"/>
-        <int32_t name="unk_54"/>
-        <pointer name="unk_58" comment='target structure varies'/>
+        <stl-vector name="unk_44" type-name='int32_t'/>
+        <int32_t name="unk_50"/>
+        <stl-vector name="unk_54" type-name='int32_t'/>
+        <pointer name='unk_60' type-name='army_controller_unk60'/>
+        <compound name='unk_64' is-union='true'>
+            <pointer type-name='army_controller_sub1' name='t1'/>
+            <pointer type-name='army_controller_sub2' name='t2'/>
+            <pointer type-name='army_controller_sub4' name='t4'/>
+            <pointer type-name='army_controller_sub5' name='t5'/>
+            <pointer type-name='army_controller_sub6' name='t6'/>
+            <pointer type-name='army_controller_sub7' name='t7'/>
+            <pointer type-name='army_controller_sub11' name='t11'/>
+            <pointer type-name='army_controller_sub12' name='t12'/>
+            <pointer type-name='army_controller_sub13' name='t13'/>
+            <pointer type-name='army_controller_sub14' name='t14'/>
+            <pointer type-name='army_controller_sub15' name='t15'/>
+            <pointer type-name='army_controller_sub16' name='t16'/>
+            <pointer type-name='army_controller_sub17' name='t17'/>
+            <pointer type-name='army_controller_sub18' name='t18'/>
+        </compound>
         <int32_t name="type"/>
     </struct-type>
 
+    <struct-type type-name='army_controller_unk60'>
+        <stl-vector>
+            <pointer>
+                <static-array type-name='int32_t' count='64'/>
+                <static-array type-name='int32_t' count='64'/>
+                <static-array type-name='int32_t' count='64'/>
+                <static-array type-name='int32_t' count='64'/>
+                <int32_t/>
+                <static-array type-name='int32_t' count='64'/>
+                <static-array type-name='int32_t' count='64'/>
+                <static-array type-name='int32_t' count='64'/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <stl-string/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector type-name='int32_t'/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub1'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub2'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <stl-vector type-name='int32_t'/>
+        <stl-vector type-name='int32_t'/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub4'>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub5'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub6'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub7'>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub11'>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub12'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub13'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub14'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub15'>
+        <int32_t/>
+        <int32_t/>
+        <stl-vector>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub16'>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub17'>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
+    <struct-type type-name='army_controller_sub18'>
+        <int32_t/>
+        <int32_t/>
+    </struct-type>
+
     <enum-type type-name='army_flags'>
         <enum-item name='player'/>
     </enum-type>
@@ -363,7 +590,7 @@
         <int32_t name="unk_18"/>
         <stl-vector name="members">
             <pointer>
-                <int32_t name="nemesis_id"/>
+                <int32_t name="nemesis_id" init-value='-1'/>
                 <int32_t name="unk_4"/>
                 <int32_t name="unk_8"/>
                 <int32_t name="unk_c"/>
@@ -374,7 +601,8 @@
                 <int32_t name="unk_20" init-value='-1000000'/>
                 <int32_t name="unk_24" init-value='-1000000'/>
                 <int32_t name="unk_28"/>
-                <int32_t name="unk_2c"/>
+                <int32_t since='v0.44.01'/>
+                <int32_t name="unk_2c" init-value='100'/>
                 <int32_t name="unk_30"/>
                 <int32_t name="unk_34"/>
                 <stl-vector name="unk_38"/>
@@ -397,6 +625,7 @@
             </pointer>
         </stl-vector>
         <int32_t name="unk_3c"/>
+        <int32_t since='v0.44.01'/>
         <int32_t name="controller_id" ref-target='army_controller'/>
         <pointer name="controller" type-name="army_controller"/>
         <df-flagarray name="flags" index-enum='army_flags'/>
diff --git a/df.units.xml b/df.units.xml
index b041021a8..be1cfa0cd 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -193,6 +193,7 @@
         <enum-item name='FALL_IN_LOVE'/>
         <enum-item name='SEE_THE_GREAT_NATURAL_SITES'/>
         <enum-item name='IMMORTALITY'/>
+        <enum-item name='MAKE_A_GREAT_DISCOVERY'/>
     </enum-type>
 
     <enum-type type-name='personality_facet_type' base-type='uint16_t'>
diff --git a/df.world-site.xml b/df.world-site.xml
index 4dadf1a89..e77e42768 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -237,6 +237,10 @@
     <class-type type-name='abstract_building_libraryst' inherits-from='abstract_building'>
         <compound name='name' type-name='language_name'/>
         <stl-vector type-name='int32_t'/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
         <compound name='contents' type-name='abstract_building_contents'/>
     </class-type>
 
@@ -415,17 +419,84 @@
                 <int32_t name="unk_10"/>
             </pointer>
         </stl-vector>
-        <stl-vector name="unk_v40_4b" since='v0.40.1'/>
-        <stl-vector name="unk_v40_4c" since='v0.40.1'/>
-        <stl-vector name="unk_v40_4d" since='v0.40.1'/>
+        <stl-vector name="unk_v40_4b" since='v0.40.1'>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <stl-vector name="unk_v40_4c" since='v0.40.1'>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <stl-vector type-name='int32_t'/>
+                <int32_t/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
+        <stl-vector name="unk_v40_4d" since='v0.40.1'>
+            <pointer>
+                <int32_t/>
+                <stl-vector>
+                    <pointer>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                    </pointer>
+                </stl-vector>
+                <stl-vector type-name='int32_t'/>
+                <int32_t/>
+            </pointer>
+        </stl-vector>
 
         <int32_t name='unk_v43_1' since='v0.43.1'/>
-        <stl-vector name='unk_v43_2' since='v0.43.1'/>
+        <stl-vector name='unk_v43_2' since='v0.43.1'>
+            <pointer>
+                <int32_t/>
+                <int32_t/>
+                <int32_t/>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array> not initialized OR saved
+                <static-array count='16'><static-array count='16' type-name='int32_t'/></static-array>
+            </pointer>
+        </stl-vector>
         <int32_t name='unk_v43_3' since='v0.43.1'/>
 
         <int32_t name='unk_v40_5' since='v0.40.1'/>
 
-        <pointer name="unk_188" type-name='world_site_unk130'/>
+        <pointer name="unk_188">
+            <stl-vector>
+                <pointer>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <compound name='unk1'>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                        <int32_t/>
+                    </compound>
+                </pointer>
+            </stl-vector>
+        </pointer>
 
         <int32_t since='v0.44.01'/>