diff --git a/df.announcement.xml b/df.announcement.xml
index c84913ffb..26da612b9 100644
--- a/df.announcement.xml
+++ b/df.announcement.xml
@@ -33,6 +33,7 @@
                   comment='When split into multiple lines, set on all but the first'/>
         <flag-bit name='unconscious' original-name='KO' comment='units.active[0]'/>
         <flag-bit name='announcement' original-name='DISPLAYED'/>
+        <flag-bit name='high_prio_removal' original-name='HIGH_PRIO_REMOVAL'/>
     </bitfield-type>
 
     <struct-type type-name='report' original-name='announcementst'
@@ -64,6 +65,8 @@
         <int32_t name='activity_id' ref-target='activity_entry' since='v0.40.01'/>
         <int32_t name='activity_event_id' ref-target='activity_event' since='v0.40.01'/>
         <int32_t name='speaker_id' original-name='speaker_unid' ref-target='unit' since='v0.40.01' comment='unit speaking the conversation'/>
+
+        <size_t name='pool_id'/>
     </struct-type>
 
     <struct-type type-name='popup_message' original-name='mega_announcementst'>
diff --git a/df.army_controller.xml b/df.army_controller.xml
index eb0d71b18..5d11ddbfc 100644
--- a/df.army_controller.xml
+++ b/df.army_controller.xml
@@ -83,6 +83,7 @@
         <enum-item name='ABDUCT_HF'/>
         <enum-item name='SABOTAGE_ENTITY'/>
         <enum-item name='INFILTRATE_SOCIETY'/>
+        <enum-item name='DIPLOMACY'/>
     </enum-type>
 
     <enum-type type-name='invasion_intent_type' base-type='int32_t'> bay12: InvasionIntentType
@@ -218,6 +219,39 @@
         <int32_t name='source_abs_smm_y' init-value='-1'/>
     </struct-type>
 
+    <enum-type type-name='meeting_topic' original-name='diplomacy_topic_type' base-type='int16_t'> bay12: DiplomacyTopicType
+        <enum-item name="DiscussCurrent" original-name='AGREEMENT'/>
+        <enum-item name="RequestPeace" original-name='PEACETREATY'/>
+        <enum-item name="TreeQuota" original-name='TREECOUNT'/>
+        <enum-item name="BecomeLandHolder" original-name='ESTABLISH_LAND_HOLDER'/>
+        <enum-item name="PromoteLandHolder" original-name='ELEVATE_LAND_HOLDER'/>
+        <enum-item name="ExportAgreement" original-name='MAKE_REQUESTS'/>
+        <enum-item name="ImportAgreement" original-name='TAKE_REQUESTS'/>
+        <enum-item name="PleasantPlace" original-name='PLEASANTRIES'/>
+        <enum-item name="WorldStatus" original-name='DISCUSS_WORLD'/>
+        <enum-item name="TributeAgreement" original-name='TRIBUTE'/>
+        <enum-item name="DemandSurrender" original-name='DEMAND_UNCONDITIONAL_SURRENDER'/>
+        <enum-item name="InduceWar" original-name='SET_ENTITY_1_AGAINST_ENTITY_2'/>
+        <enum-item name="InducePeace" original-name='ENTITY_1_SHOULD_LOVE_ENTITY_2'/>
+        <enum-item name="DeclareWar" original-name='DECLARE_WAR'/>
+        <enum-item name="SeekAlliance" original-name='SEEK_ALLIANCE'/>
+        <enum-item name="OpenTrade" original-name='OPEN_TRADE'/>
+        <enum-item name="ImproveTrade" original-name='IMPROVE_TRADE'/>
+    </enum-type>
+
+    <bitfield-type type-name='ac_goal_diplomacy_flag' base-type='uint32_t'> bay12: AC_GOAL_DIPLOMACY_FLAG_*
+        <flag-bit name='RETURNING_HOME'/>
+    </bitfield-type>
+
+    <struct-type type-name='ac_goal_diplomacyst'>
+        <stl-vector type-name='meeting_topic' name='topic'/>
+        <stl-vector type-name='int32_t' name='topic_id1'/>
+        <stl-vector type-name='int32_t' name='topic_id2'/>
+        <bitfield base-type='uint32_t' type-name='ac_goal_diplomacy_flag' name='flag'/>
+        <int32_t name='source_abs_smm_x'/>
+        <int32_t name='source_abs_smm_y'/>
+    </struct-type>
+
     <bitfield-type type-name='ac_goal_hunting_flag' base-type='uint32_t'> bay12: AC_GOAL_HUNTING_FLAG_*
         <flag-bit name='RETURNING_HOME'/>
         <flag-bit name='DAWN_PERMITTED'/>
@@ -446,6 +480,7 @@
             <pointer type-name='army_controller_goal_abduct_hfst' name='goal_abduct_hf'/>
             <pointer type-name='army_controller_goal_sabotage_entityst' name='goal_sabotage_entity'/>
             <pointer type-name='army_controller_goal_infiltrate_societyst' name='goal_infiltrate_society'/>
+            <pointer type-name='ac_goal_diplomacyst' name='goal_diplomacy'/>
         </compound>
         <enum type-name='army_controller_goal_type' name='goal'/>
 
diff --git a/df.d_interface.xml b/df.d_interface.xml
index 1f6706486..755939945 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -6934,6 +6934,11 @@
 
     -- Unused: viewscreen_workquota_detailsst
 
+    -- Unused: CivlistModeType
+    -- Unused: CIVLIST_SQUAD_FLAG_*
+    -- Unused: CIVLIST_MESSENGER_FLAG_*
+    -- Unused: viewscreen_civlistst
+
     <enum-type type-name='world_view_mode_type' base-type='int32_t'> bay12: WorldViewModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='NORMAL'/>
@@ -6944,13 +6949,9 @@
         <enum-item name='REPORTS'/>
         <enum-item name='CITIZENS'/>
         <enum-item name='ARTIFACTS'/>
+        <enum-item name='NEW_MISSION'/>
     </enum-type>
 
-    -- Unused: CivlistModeType
-    -- Unused: CIVLIST_SQUAD_FLAG_*
-    -- Unused: CIVLIST_MESSENGER_FLAG_*
-    -- Unused: viewscreen_civlistst
-
     <bitfield-type type-name='civlist_squad_flag' base-type='uint32_t'> bay12: CIVLIST_SQUAD_FLAG_*
         <flag-bit name='LOCKED_IN'/>
     </bitfield-type>
@@ -6959,6 +6960,31 @@
         <flag-bit name='LOCKED_IN'/>
     </bitfield-type>
 
+    <enum-type type-name='world_new_mission_type' base-type='int32_t'> bay12: WorldNewMissionType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='OKAY'/>
+        <enum-item name='NOT_DISPLAYED'/>
+        <enum-item name='OWN_SITE'/>
+        <enum-item name='OWN_CIV'/>
+        <enum-item name='NOT_UNDER_YOUR_CONTROL'/>
+        <enum-item name='NO_CIV'/>
+        <enum-item name='NO_REQUESTABLE_WORKERS'/>
+        <enum-item name='INACCESSIBLE'/>
+        <enum-item name='NO_MILITARY_GOALS_HF'/>
+        <enum-item name='NO_MEET_WORKERS_HF'/>
+        <enum-item name='NOT_IN_CONTACT'/>
+        <enum-item name='ALREADY_IN_CONTACT'/>
+        <enum-item name='ALREADY_AT_WAR'/>
+        <enum-item name='ALREADY_HAVE_PEACE'/>
+        <enum-item name='ALREADY_HAVE_ALLIANCE'/>
+        <enum-item name='AT_WAR'/>
+        <enum-item name='CANNOT_COMMUNICATE'/>
+        <enum-item name='HOSTILE_ENTITY'/>
+        <enum-item name='NOT_TRADING'/>
+        <enum-item name='ALREADY_TRADING'/>
+        <enum-item name='NO_CIVILIZATION_MILITARY_GOALS_HF'/>
+    </enum-type>
+
     <class-type type-name='viewscreen_worldst' inherits-from='viewscreen'>
         <int32_t name='region_cent_x'/>
         <int32_t name='region_cent_y'/>
@@ -6970,6 +6996,7 @@
 
         <enum type-name='world_view_mode_type' name='view_mode'/>
 
+        <pointer type-name='historical_figure' name='civ_level_military_goals_hf'/>
         <pointer type-name='historical_figure' name='military_goals_hf'/>
         <pointer type-name='historical_figure' name='meet_workers_hf'/>
 
@@ -6996,6 +7023,8 @@
         <bool name='scrolling_ac'/>
         <int32_t name='scroll_position_ac'/>
 
+        <static-array type-name='world_new_mission_type' name='new_mission' index-enum='army_controller_goal_type'/>
+
         <stl-vector pointer-type='squad' name='squad'/>
         <stl-vector type-name='civlist_squad_flag' name='squad_flag'/>
         <stl-vector pointer-type='entity_position_assignment' name='messenger_epp'/>
@@ -7010,6 +7039,8 @@
         <int32_t name='scroll_position_request_nem'/>
         <bool name='scrolling_request_nem'/>
 
+        <static-array type-name='world_new_mission_type' name='diplomacy_topic' index-enum='meeting_topic'/>
+
         <stl-vector pointer-type='entity_event' name='rumor_master'/>
         <compound type-name='region_print_datast' name='rumor_rpd'/>
         <compound type-name='rpd_indicator_datast' name='rumor_rpd_indicator_data'/>
diff --git a/df.diplomacy.xml b/df.diplomacy.xml
index b23416bae..897363c01 100644
--- a/df.diplomacy.xml
+++ b/df.diplomacy.xml
@@ -1,20 +1,4 @@
 <data-definition>
-    <enum-type type-name='meeting_topic' original-name='diplomacy_topic_type' base-type='int16_t'> bay12: DiplomacyTopicType
-        <enum-item name="DiscussCurrent" original-name='AGREEMENT'/>
-        <enum-item name="RequestPeace" original-name='PEACETREATY'/>
-        <enum-item name="TreeQuota" original-name='TREECOUNT'/>
-        <enum-item name="BecomeLandHolder" original-name='ESTABLISH_LAND_HOLDER'/>
-        <enum-item name="PromoteLandHolder" original-name='ELEVATE_LAND_HOLDER'/>
-        <enum-item name="ExportAgreement" original-name='MAKE_REQUESTS'/>
-        <enum-item name="ImportAgreement" original-name='TAKE_REQUESTS'/>
-        <enum-item name="PleasantPlace" original-name='PLEASANTRIES'/>
-        <enum-item name="WorldStatus" original-name='DISCUSS_WORLD'/>
-        <enum-item name="TributeAgreement" original-name='TRIBUTE'/>
-        <enum-item name="DemandSurrender" original-name='DEMAND_UNCONDITIONAL_SURRENDER'/>
-        <enum-item name="InduceWar" original-name='SET_ENTITY_1_AGAINST_ENTITY_2'/>
-        <enum-item name="InducePeace" original-name='ENTITY_1_SHOULD_LOVE_ENTITY_2'/>
-    </enum-type>
-
     <bitfield-type type-name='diplomacy_flag' base-type='uint32_t'> bay12: DIPLOMACYFLAG_*
         <flag-bit name='dynamic_load' original-name='DELETESCRIPT' comment='destroy dipscript_info in destructor'/>
         <flag-bit name='failure' original-name='FAILURE'/>
diff --git a/df.entity.xml b/df.entity.xml
index de3cce3ab..d51a0b836 100644
--- a/df.entity.xml
+++ b/df.entity.xml
@@ -1385,6 +1385,7 @@
         <flag-bit name='calculated_best_appointment_precedence' original-name='CALCULATED_BEST_APPOINTMENT_PRECEDENCE'/>
         <flag-bit name='religious_devotion' original-name='RELIGIOUS_DEVOTION'/>
         <flag-bit name='might_have_interaction_region_pops' original-name='MIGHT_HAVE_INTERACTION_REGION_POPS'/>
+        <flag-bit name='ignore_progress_triggers' original-name='IGNORE_PROGRESS_TRIGGERS'/>
     </bitfield-type>
 
     <enum-type type-name='historical_entity_type' original-name='entity_type' base-type='int16_t'> bay12: EntityType; no base type, but usually int16
diff --git a/df.g_src.basics.xml b/df.g_src.basics.xml
index 3839f1c15..5d92d969c 100644
--- a/df.g_src.basics.xml
+++ b/df.g_src.basics.xml
@@ -1122,10 +1122,10 @@
         <enum-item name='DEITY_PRONOUNCEMENT' since='v0.51.01'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
-        <enum-item name='UNUSED_47'>
+        <enum-item name='CREATURE_STUCK'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
-        <enum-item name='UNUSED_48'>
+        <enum-item name='CITIZEN_STUCK'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
         <enum-item name='UNUSED_49'>
diff --git a/df.g_src.init.xml b/df.g_src.init.xml
index fdfd8e6ba..658e9c3c2 100644
--- a/df.g_src.init.xml
+++ b/df.g_src.init.xml
@@ -81,6 +81,7 @@
         <enum-item name='SOUND_OFF'/>
         <enum-item name='PORTABLE_MODE'/>
         <enum-item name='COMPRESS_SAVES'/>
+        <enum-item name='DISPLAY_ALL_ERRORLOGS'/>
     </enum-type>
 
     <struct-type type-name='init_media' original-name='init_mediast'>
diff --git a/df.history.xml b/df.history.xml
index de6e3b10d..641c72f04 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -1,4 +1,41 @@
 <data-definition>
+    <enum-type type-name='negotiation_result_difficulty_modifier_type' base-type='int32_t'> bay12: NegotiationResultDifficultyModifierType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='INVASION_DEATHS'/>
+        <enum-item name='TARGET_LARGER_CIV'/>
+        <enum-item name='TARGET_SMALLER_CIV'/>
+    </enum-type>
+
+    <enum-type type-name='negotiation_result_type' base-type='int32_t'> bay12: NegotiationResultType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='SUCCESS'/>
+        <enum-item name='FAILURE'/>
+        <enum-item name='MUST_LIFT_CURRENT_SIEGE'/>
+    </enum-type>
+
+    <struct-type type-name='negotiation_resultst'>
+        <int32_t name='initiator_hfid' ref-target='historical_figure'/>
+        <int32_t name='initiator_enid' ref-target='historical_entity'/>
+        <int32_t name='target_hfid' ref-target='historical_figure'/>
+        <int32_t name='target_enid' ref-target='historical_entity'/>
+        <int32_t name='target_ep_id'/>
+        <int32_t name='target_ep_enid'/>
+        <enum type-name='meeting_topic' name='topic'/>
+        <enum type-name='negotiation_result_type' name='result'/>
+        <int32_t name='result_id'/>
+        <int32_t name='result_magnitude'/>
+        <int32_t name='initiator_negotiation_roll'/>
+        <int32_t name='initiator_persuasion_roll'/>
+        <int32_t name='initiator_extra_skill'/>
+        <int32_t name='initiator_extra_skill_roll'/>
+        <int32_t name='target_negotiation_roll'/>
+        <int32_t name='target_judgment_roll'/>
+        <int32_t name='target_extra_skill'/>
+        <int32_t name='target_extra_skill_roll'/>
+        <stl-vector type-name='negotiation_result_difficulty_modifier_type' name='difficulty_modifier'/>
+        <stl-vector type-name='int32_t' name='difficulty_modifier_value'/>
+    </struct-type>
+
     <bitfield-type type-name='intrigue_corruption_result_flag' base-type='uint32_t'> bay12: INTRIGUE_CORRUPTION_RESULT_FLAG_*
         <flag-bit name='succeeded' original-name='SUCCESSFUL'/>
         <flag-bit name='misread_target' original-name='FAILED_JUDGMENT_TEST'/>
@@ -138,6 +175,8 @@
 
     <struct-type type-name='intrigue' instance-vector='$global.world.history.intrigues' key-field='event_id' original-name='history_support_eventst'>
         <int32_t name='event_id' original-name='global_id' ref-target='history_event' comment="NOTE: can be culled. Seen: failed_intrigue_corruption, event_agreement_formed, hfs_formed_intrigue_relationship"/>
+
+        <pointer type-name='negotiation_resultst' name='negotiation_result'/>
         <pointer type-name='intrigue_corruption' name='corruption' original-name='intcr' comment="Mutually exclusive with circumstance. Exactly one is present. Presumably 'bring into network' action doesn't provide membership"/>
         <compound name='reason'> not a compound
             <enum base-type='int32_t' type-name='history_event_reason' name='type' original-name='reason'/>
diff --git a/df.history_event.xml b/df.history_event.xml
index a52af1bb6..753ef517d 100644
--- a/df.history_event.xml
+++ b/df.history_event.xml
@@ -665,11 +665,14 @@
         <enum-item name='purchase_exceptional_equipment' original-name='BOUGHT_BETTER_EQUIPMENT_4'/>
         <enum-item name='purchase_masterwork_equipment' original-name='BOUGHT_BETTER_EQUIPMENT_5'/>
         <enum-item name='performed_horrible_experiments' original-name='PERFORMED_HORRIBLE_EXPERIMENTS'/>
+        <enum-item name='diplomacy_failed_entity_not_at_location' original-name='DIPLOMACY_FAILED_ENTITY_NOT_AT_LOCATION'/>
+        <enum-item name='diplomacy_failed_entity_no_hf_at_location' original-name='DIPLOMACY_FAILED_ENTITY_NO_HF_AT_LOCATION'/>
     </enum-type>
 
     <class-type type-name='history_event_hist_figure_simple_actionst' inherits-from='history_event'>
         <stl-vector type-name='int32_t' name='group_hfs' original-name='group_hfid' ref-target='historical_figure' comment='binary'/>
         <enum type-name='simple_action_type' name='type' original-name='action'/>
+        <int32_t name='entity' original-name='entity_id' ref-target='historical_entity'/>
         <int32_t name='site' original-name='site_id' ref-target='world_site'/>
         <int32_t name='structure' original-name='ab_id' ref-target='abstract_building'/>
         <int32_t name='region' original-name='subregion_id' ref-target='world_region'/>
@@ -1065,7 +1068,7 @@
         <enum-item name='hardship' original-name='HARDSHIP'/>
         <enum-item name='seized' original-name='SEIZURE'/>
         <enum-item name='offended' original-name='OFFENDED'/>
-        <enum-item name='missing_goods' original-name='LOSTVALUE'/>
+        <enum-item name='unused_01_05' original-name='UNUSED_01_05' comment='formerly LOSTVALUE'/>
         <enum-item name='tribute' original-name='IS_TRIBUTE'/>
     </enum-type>
 
@@ -1074,6 +1077,8 @@
         <int32_t name='destination' original-name='depot_civid' ref-target='historical_entity' comment='site government'/>
         <int32_t name='site' original-name='site_id' ref-target='world_site'/>
         <df-flagarray name='flags2' original-name='merchant_flag' index-enum='history_event_merchant_flags'/>
+        <int32_t name='goods_value_initial'/>
+        <int32_t name='goods_value_end'/>
     </class-type>
 
     <class-type type-name='history_event_tradest' inherits-from='history_event' since='v0.47.01'>
diff --git a/df.unit.xml b/df.unit.xml
index 25e04b232..b5c9d0298 100644
--- a/df.unit.xml
+++ b/df.unit.xml
@@ -1478,6 +1478,7 @@
         <flag-bit name='may_have_mythical_substance' original-name='MAY_HAVE_MYTHICAL_SUBSTANCE'/>
         <flag-bit name='did_dungeon_move_unit' original-name='DID_DUNGEON_MOVE_UNIT'/>
         <flag-bit name='carrying_somebody' original-name='CARRYING_SOMEBODY'/>
+        <flag-bit name='has_announced_stuck' original-name='HAS_ANNOUNCED_STUCK'/>
     </bitfield-type>
 
     <enum-type type-name='unitpref_type'> bay12: UnitPrefs, no base type
@@ -2374,6 +2375,7 @@
         <stl-string name='undead_name' original-name='animated_name' comment='display name of reanimated creatures'/>
         <int32_t name='initial_good_head_count' since='v0.43.01'/>
         <int32_t name='initial_good_grasp_count' since='v0.43.01'/>
+        <int16_t name='disturbed_timer'/>
     </struct-type>
 
     <struct-type type-name='entity_pop_specifierst'>
@@ -2592,6 +2594,8 @@
 
     <struct-type type-name='unit_cache_vars'>
         <enum type-name='glowtile_type' name='cached_glowtile_type' original-name='glow_tile'/>
+        <int32_t name='path_cooldown'/>
+        <int32_t name='next_path_cooldown'/>
     </struct-type>
 
     <enum-type type-name='dungeon_control_state' base-type='int8_t'> bay12: DungeonControlState