From 79b06a69bc82680bc8b12b142fe4386fd5394099 Mon Sep 17 00:00:00 2001
From: sedb-dfh <sedb.dfh@gmail.com>
Date: Thu, 6 Feb 2020 00:45:42 -0800
Subject: [PATCH 1/3] Added new event types for 0.47

---
 df.history.xml | 215 +++++++++++++++++++++++++++++++++++++++++++++++++
 df.world.xml   |   8 ++
 2 files changed, 223 insertions(+)

diff --git a/df.history.xml b/df.history.xml
index 939f67378..8d82c4025 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -791,6 +791,28 @@
         <enum-item name='SQUAD_VS_SQUAD'/>
         <enum-item name='SITE_SURRENDERED'/>
         <enum-item name='ENTITY_EXPELS_HF'/>
+
+        <enum-item name='HF_TRADED'/>
+        <enum-item name='ENTITY_HOLY_CITY'/>
+        <enum-item name='HF_GAMBLED'/>
+        <enum-item name='HF_GAINED_TITLE'/>
+        <enum-item name='ENTITY_DISSOLVED'/>
+        <enum-item name='ENTITY_PURCHASED_EQUIPMENT'/>
+        <enum-item name='HOUSE_EXTENDED'/>
+        <enum-item name='HOUSE_ACQUIRED'/>
+        <enum-item name='HF_PREACHED'/>
+        <enum-item name='RELIGIOUS_PERSECUTION'/>
+        <enum-item name='UNDERWORLD_BREACHED'/>
+        <enum-item name='ENTITY_ALLIANCE'/>
+        <enum-item name='HF_RANSOMED'/>
+        <enum-item name='HF_SOLD'/>
+        <enum-item name='UNKNOWN_127'/>
+        <enum-item name='HF_LED_COUP'/>
+        <enum-item name='HF_SUCCESSFUL_CORRUPTION'/>
+        <enum-item name='HF_FAILED_CORRUPTION'/>
+        <enum-item name='HF_CONVICTED'/>
+        <enum-item name='HF_FRAMED'/>
+        <enum-item name='HF_INTERROGATED'/>
     </enum-type>
 
     <enum-type type-name='history_event_reason'>
@@ -2200,6 +2222,199 @@
         <int32_t name='feature_layer' ref-target='world_underground_region'/>
     </class-type>
 
+    <class-type type-name='history_event_hf_tradedst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='entity' ref-target='historical_entity' comment='the guild to which the figure belongs?'/>
+      <int32_t name='source_site' ref-target='world_site'/>
+      <int32_t name='dest_site' ref-target='world_site'/>
+      <int32_t/>
+      <int32_t/>
+      <int32_t/>
+      <int32_t comment='value of the trade?'/>
+    </class-type>
+
+    <class-type type-name='history_event_entity_holy_sitest' inherits-from='history_event'>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_gained_titlest' inherits-from='history_event'>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t comment='index or identifier for the title?'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_gambledst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='site' ref-target='world_site'/>
+      <int32_t name='structure'/>
+      <int32_t name='money_before'/>
+      <int32_t name='money_after'/>
+    </class-type>
+
+    <class-type type-name='history_event_entity_dissolvedst' inherits-from='history_event'>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t/>
+      <int32_t/>
+      <int32_t name='reason' comment='89: due to lack of funds, 90: after taking heavy losses in battle'/> probably new values for history_event_reason
+      <int32_t/>
+    </class-type>
+
+    <class-type type-name='history_event_entity_purchased_equipmentst' inherits-from='history_event'>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t name='quality' comment='1 = well-crafted, 2 = finely-crafted, 3 = superior, 4 = exceptional, 5 = masterwork'/>
+      <stl-vector name='hfs' type-name='int32_t' ref-target='historical_figure'/>
+    </class-type>
+
+    <class-type type-name='history_event_house_extendedst' inherits-from='history_event'>
+      <int32_t name='site' ref-target='world_site'/>
+      <int32_t name='structure'/>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t/> always 12? maybe a reason? history_event_reason::great_fortresses_built_and_tested
+      <bitfield name='extension_type' base-type='uint32_t'>
+        <flag-bit name='dungeon'/>
+        <flag-bit name='fortifications'/>
+        <flag-bit name='courtyard'/>
+        <flag-bit name='feast_hall'/>
+      </bitfield>
+    </class-type>
+
+    <class-type type-name='history_event_house_acquiredst' inherits-from='history_event'>
+      <int32_t name='site' ref-target='world_site'/>
+      <int32_t name='structure'/>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t name='inherited' comment='0: purchased, 1: inherited'/>
+      <int32_t name='previous_owner_hf' ref-target='historical_figure'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_preachedst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='site' ref-target='world_site'/>
+      <int16_t name='content' comment='11 = inveighing against, 12 = urging love be shown'/>
+      <int32_t name='preached_to_entity' ref-target='historical_entity'/>
+      <int32_t name='against_entity' ref-target='historical_entity'/>
+    </class-type>
+
+    <class-type type-name='history_event_religious_persecutionst' inherits-from='history_event'>
+      <int32_t name='persecuting_hf' ref-target='historical_figure'/>
+      <int32_t name='persecuting_entity' ref-target='historical_entity'/>
+      <int32_t name='target_entity' ref-target='historical_entity'/>
+      <int32_t name='site' ref-target='world_site'/>
+      <stl-vector type-name='int32_t' ref-target='historical_figure' comment='subset of expelled_hfs. expelled priests?'/>
+      <stl-vector type-name='int32_t'/>
+      <int32_t/>
+      <stl-vector name='expelled_hfs' type-name='int32_t' ref-target='historical_figure'/>
+      <stl-vector type-name='int32_t'/>
+      <stl-vector name='expelled_races' type-name='int32_t'/>
+      <stl-vector name='expelled_counts' type-name='int32_t'/>
+    </class-type>
+
+    <class-type type-name='history_event_underworld_breachedst' inherits-from='history_event'>
+      <int32_t name='site' ref-target='world_site'/>
+      <int32_t name='governing_entity' ref-target='historical_entity'/>
+      <int32_t name='civ_entity' ref-target='historical_entity'/>
+      <int32_t name='underworld_region' ref-target='world_underground_region'/>
+    </class-type>
+
+    <class-type type-name='history_event_entity_alliancest' inherits-from='history_event'>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t/>
+      <stl-vector name='allied_entities' type-name='int32_t' ref-target='historical_entity'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_ransomedst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='ransomer_hf' ref-target='historical_figure'/>
+      <int32_t name='paying_hf' ref-target='historical_figure'/>
+      <int32_t name='paying_entity' ref-target='historical_entity'/>
+      <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_soldst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='selling_hf' ref-target='historical_figure'/>
+      <int32_t name='buying_entity' ref-target='historical_entity'/>
+      <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_led_coupst' inherits-from='history_event'>
+      <int32_t name='toppled_hf' ref-target='historical_figure'/>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='master_villain_hf' ref-target='historical_figure'/>
+      <int32_t name='governing_entity' ref-target='historical_entity'/>
+      <int32_t/> 0 or 1?
+      <int32_t/>
+      <stl-vector name='supporters' type-name='int32_t' ref-target='historical_figure'/>
+      <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_successful_corruptionst' inherits-from='history_event'>
+      <int32_t name='villain_hf' ref-target='historical_figure'/>
+      <int32_t name='villain_identity'/>
+      <int32_t name='target_hf' ref-target='historical_figure'/>
+      <int32_t name='target_identity'/>
+      <int32_t/> ? 6 = plots and schemes, 11 = agent
+      <int32_t/> ? 4 = plots and schemes, 21 = agent
+      <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_failed_corruptionst' inherits-from='history_event'>
+      <int32_t name='villain_hf' ref-target='historical_figure'/>
+      <int32_t name='villain_identity'/>
+      <int32_t name='target_hf' ref-target='historical_figure'/>
+      <int32_t name='target_identity'/>
+      <int32_t name='site' ref-target='world_site'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_convictedst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='entity' ref-target='historical_entity'/>
+      <int32_t name='recognized_by_entity' ref-target='historical_entity'/>
+      <int32_t name='recognized_by_hf' ref-target='historical_figure'/>
+      <stl-vector name='implicated' type-name='int32_t' ref-target='historical_figure'/>
+      <int32_t name='corrupt_hf' ref-target='historical_figure'/>
+      <int32_t name='behest_of_hf' ref-target='historical_figure'/>
+      <int32_t name='fooled_hf' ref-target='historical_figure'/>
+      <int32_t name='fooling_hf' ref-target='historical_figure'/>
+      <int32_t name='surveillance_hf' ref-target='historical_figure'/>
+      <int32_t name='co_conspirator_hf' ref-target='historical_figure'/>
+      <int32_t name='target_hf' ref-target='historical_figure'/>
+      <int32_t name="crime" comment='references crime::T_mode'/>
+      <int32_t/>
+      <int32_t name='months_sentence'/>
+      <bitfield name='punishment_flags' base-type='uint32_t'>
+        <flag-bit name='beaten'/>
+        <flag-bit name='exiled'/>
+        <flag-bit name='death_sentence' comment='sentenced to death'/>
+        <flag-bit name='no_prison_available' comment='would have been imprisoned but for lack of accommodations'/>
+      </bitfield>
+      <bitfield name='plot_flags' base-type='uint32_t'>
+        <flag-bit name='wrongful' comment='wrongful conviction'/>
+        <flag-bit name='plot_surveillance' comment='due to ongoing surveillance as the plot unfolded'/>
+        <flag-bit name='target_surveillance' comment='due to ongoing surveillance on the target'/>
+        <flag-bit name='implicated_others' comment='implicated others during interrogation'/>
+        <flag-bit name='co_conspirator_surveillance' comment='due to ongoing surveillance on a coconspirator'/>
+        <flag-bit name='go_between' comment='convicted as go-between'/>
+        <flag-bit name='revealed_nothing' comment='revealed nothing during interrogation'/>
+      </bitfield>
+    </class-type>
+
+    <class-type type-name='history_event_hf_framedst' inherits-from='history_event'>
+      <int32_t name='target_hf' ref-target='historical_figure'/>
+      <int32_t name='fooled_entity' ref-target='historical_entity'/>
+      <int32_t name='master_villain_hf' ref-target='historical_figure'/>
+      <int32_t name='fooled_hf' ref-target='historical_figure'/>
+      <int32_t name='villain_hf' ref-target='historical_figure'/>
+      <int32_t name='crime' comment='references crime::T_mode'/>
+    </class-type>
+
+    <class-type type-name='history_event_hf_interrogatedst' inherits-from='history_event'>
+      <int32_t name='hf' ref-target='historical_figure'/>
+      <int32_t name='arresting_entity' ref-target='historical_entity'/>
+      <int32_t name='interrogator_hf' ref-target='historical_figure'/>
+    </class-type>
+
     <enum-type type-name='history_event_collection_type'>
         <enum-item name='WAR'/>
         <enum-item name='BATTLE'/>
diff --git a/df.world.xml b/df.world.xml
index 5c1f17f1d..6d201a81b 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -203,6 +203,14 @@
             <enum-item name='Theft'/>
             <enum-item name='Robbery'/>
             <enum-item name='BloodDrinking'/>
+            <enum-item name='Embezzlement'/>
+            <enum-item name='AttemptedMurder'/>
+            <enum-item name='Kidnapping'/>
+            <enum-item name='AttemptedKidnapping'/>
+            <enum-item name='AttemptedTheft'/>
+            <enum-item name='Treason'/>
+            <enum-item name='Espionage'/>
+            <enum-item name='Bribery'/>
         </enum>
 
         <compound name='punishment'>

From e3a632386275269804f11a5856db7243b9c3a219 Mon Sep 17 00:00:00 2001
From: sedb-dfh <sedb.dfh@gmail.com>
Date: Thu, 6 Feb 2020 17:18:42 -0800
Subject: [PATCH 2/3] Renamed events and classes based on the values from
 symbols.xml

---
 df.history.xml | 90 ++++++++++++++++++++++++++------------------------
 df.world.xml   | 16 ++++-----
 2 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/df.history.xml b/df.history.xml
index 8d82c4025..e389c08b3 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -792,27 +792,27 @@
         <enum-item name='SITE_SURRENDERED'/>
         <enum-item name='ENTITY_EXPELS_HF'/>
 
-        <enum-item name='HF_TRADED'/>
-        <enum-item name='ENTITY_HOLY_CITY'/>
-        <enum-item name='HF_GAMBLED'/>
-        <enum-item name='HF_GAINED_TITLE'/>
-        <enum-item name='ENTITY_DISSOLVED'/>
-        <enum-item name='ENTITY_PURCHASED_EQUIPMENT'/>
-        <enum-item name='HOUSE_EXTENDED'/>
-        <enum-item name='HOUSE_ACQUIRED'/>
-        <enum-item name='HF_PREACHED'/>
-        <enum-item name='RELIGIOUS_PERSECUTION'/>
-        <enum-item name='UNDERWORLD_BREACHED'/>
-        <enum-item name='ENTITY_ALLIANCE'/>
-        <enum-item name='HF_RANSOMED'/>
-        <enum-item name='HF_SOLD'/>
-        <enum-item name='UNKNOWN_127'/>
-        <enum-item name='HF_LED_COUP'/>
-        <enum-item name='HF_SUCCESSFUL_CORRUPTION'/>
-        <enum-item name='HF_FAILED_CORRUPTION'/>
-        <enum-item name='HF_CONVICTED'/>
-        <enum-item name='HF_FRAMED'/>
-        <enum-item name='HF_INTERROGATED'/>
+        <enum-item name='TRADE' since='v0.47.01'/>
+        <enum-item name='ADD_ENTITY_SITE_PROFILE_FLAG' since='v0.47.01'/>
+        <enum-item name='GAMBLE' since='v0.47.01'/>
+        <enum-item name='ADD_HF_ENTITY_HONOR' since='v0.47.01'/>
+        <enum-item name='ENTITY_DISSOLVED' since='v0.47.01'/>
+        <enum-item name='ENTITY_EQUIPMENT_PURCHASE' since='v0.47.01'/>
+        <enum-item name='MODIFIED_BUILDING' since='v0.47.01'/>
+        <enum-item name='BUILDING_PROFILE_ACQUIRED' since='v0.47.01'/>
+        <enum-item name='HF_PREACH' since='v0.47.01'/>
+        <enum-item name='ENTITY_PERSECUTED' since='v0.47.01'/>
+        <enum-item name='ENTITY_BREACH_FEATURE_LAYER' since='v0.47.01'/>
+        <enum-item name='ENTITY_ALLIANCE_FORMED' since='v0.47.01'/>
+        <enum-item name='HF_RANSOMED' since='v0.47.01'/>
+        <enum-item name='HF_ENSLAVED' since='v0.47.01'/>
+        <enum-item name='SABOTAGE' since='v0.47.01'/>
+        <enum-item name='ENTITY_OVERTHROWN' since='v0.47.01'/>
+        <enum-item name='HFS_FORMED_INTRIGUE_RELATIONSHIP' since='v0.47.01'/>
+        <enum-item name='FAILED_INTRIGUE_CORRUPTION' since='v0.47.01'/>
+        <enum-item name='HF_CONVICTED' since='v0.47.01'/>
+        <enum-item name='FAILED_FRAME_ATTEMPT' since='v0.47.01'/>
+        <enum-item name='HF_INTERROGATED' since='v0.47.01'/>
     </enum-type>
 
     <enum-type type-name='history_event_reason'>
@@ -2222,7 +2222,7 @@
         <int32_t name='feature_layer' ref-target='world_underground_region'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_tradedst' inherits-from='history_event'>
+    <class-type type-name='history_event_tradest' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='entity' ref-target='historical_entity' comment='the guild to which the figure belongs?'/>
       <int32_t name='source_site' ref-target='world_site'/>
@@ -2233,18 +2233,18 @@
       <int32_t comment='value of the trade?'/>
     </class-type>
 
-    <class-type type-name='history_event_entity_holy_sitest' inherits-from='history_event'>
+    <class-type type-name='history_event_add_entity_site_profile_flagst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_gained_titlest' inherits-from='history_event'>
+    <class-type type-name='history_event_add_hf_entity_honorst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t name='hf' ref-target='historical_figure'/>
-      <int32_t comment='index or identifier for the title?'/>
+      <int32_t comment='index or identifier for the honor?'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_gambledst' inherits-from='history_event'>
+    <class-type type-name='history_event_gamblest' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='site' ref-target='world_site'/>
       <int32_t name='structure'/>
@@ -2252,7 +2252,7 @@
       <int32_t name='money_after'/>
     </class-type>
 
-    <class-type type-name='history_event_entity_dissolvedst' inherits-from='history_event'>
+    <class-type type-name='history_event_entity_dissolvedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t/>
       <int32_t/>
@@ -2260,13 +2260,13 @@
       <int32_t/>
     </class-type>
 
-    <class-type type-name='history_event_entity_purchased_equipmentst' inherits-from='history_event'>
+    <class-type type-name='history_event_entity_equipment_purchasest' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t name='quality' comment='1 = well-crafted, 2 = finely-crafted, 3 = superior, 4 = exceptional, 5 = masterwork'/>
       <stl-vector name='hfs' type-name='int32_t' ref-target='historical_figure'/>
     </class-type>
 
-    <class-type type-name='history_event_house_extendedst' inherits-from='history_event'>
+    <class-type type-name='history_event_modified_buildingst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='site' ref-target='world_site'/>
       <int32_t name='structure'/>
       <int32_t name='hf' ref-target='historical_figure'/>
@@ -2279,7 +2279,7 @@
       </bitfield>
     </class-type>
 
-    <class-type type-name='history_event_house_acquiredst' inherits-from='history_event'>
+    <class-type type-name='history_event_building_profile_acquiredst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='site' ref-target='world_site'/>
       <int32_t name='structure'/>
       <int32_t name='hf' ref-target='historical_figure'/>
@@ -2288,7 +2288,7 @@
       <int32_t name='previous_owner_hf' ref-target='historical_figure'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_preachedst' inherits-from='history_event'>
+    <class-type type-name='history_event_hf_preachst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='site' ref-target='world_site'/>
       <int16_t name='content' comment='11 = inveighing against, 12 = urging love be shown'/>
@@ -2296,7 +2296,7 @@
       <int32_t name='against_entity' ref-target='historical_entity'/>
     </class-type>
 
-    <class-type type-name='history_event_religious_persecutionst' inherits-from='history_event'>
+    <class-type type-name='history_event_entity_persecutedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='persecuting_hf' ref-target='historical_figure'/>
       <int32_t name='persecuting_entity' ref-target='historical_entity'/>
       <int32_t name='target_entity' ref-target='historical_entity'/>
@@ -2310,20 +2310,20 @@
       <stl-vector name='expelled_counts' type-name='int32_t'/>
     </class-type>
 
-    <class-type type-name='history_event_underworld_breachedst' inherits-from='history_event'>
+    <class-type type-name='history_event_entity_breach_feature_layerst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='site' ref-target='world_site'/>
       <int32_t name='governing_entity' ref-target='historical_entity'/>
       <int32_t name='civ_entity' ref-target='historical_entity'/>
-      <int32_t name='underworld_region' ref-target='world_underground_region'/>
+      <int32_t name='layer' ref-target='world_underground_region'/>
     </class-type>
 
-    <class-type type-name='history_event_entity_alliancest' inherits-from='history_event'>
+    <class-type type-name='history_event_entity_alliance_formedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t/>
       <stl-vector name='allied_entities' type-name='int32_t' ref-target='historical_entity'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_ransomedst' inherits-from='history_event'>
+    <class-type type-name='history_event_hf_ransomedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='ransomer_hf' ref-target='historical_figure'/>
       <int32_t name='paying_hf' ref-target='historical_figure'/>
@@ -2331,14 +2331,18 @@
       <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_soldst' inherits-from='history_event'>
+    <class-type type-name='history_event_hf_enslavedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='selling_hf' ref-target='historical_figure'/>
       <int32_t name='buying_entity' ref-target='historical_entity'/>
       <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_led_coupst' inherits-from='history_event'>
+    <class-type type-name='history_event_sabotagest' inherits-from='history_event' since='v0.47.01'>
+       Have not yet found this event in-game
+    </class-type>
+
+    <class-type type-name='history_event_entity_overthrownst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='toppled_hf' ref-target='historical_figure'/>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='master_villain_hf' ref-target='historical_figure'/>
@@ -2349,7 +2353,7 @@
       <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_successful_corruptionst' inherits-from='history_event'>
+    <class-type type-name='history_event_hfs_formed_intrigue_relationshipst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='villain_hf' ref-target='historical_figure'/>
       <int32_t name='villain_identity'/>
       <int32_t name='target_hf' ref-target='historical_figure'/>
@@ -2359,7 +2363,7 @@
       <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_failed_corruptionst' inherits-from='history_event'>
+    <class-type type-name='history_event_failed_intrigue_corruptionst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='villain_hf' ref-target='historical_figure'/>
       <int32_t name='villain_identity'/>
       <int32_t name='target_hf' ref-target='historical_figure'/>
@@ -2367,7 +2371,7 @@
       <int32_t name='site' ref-target='world_site'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_convictedst' inherits-from='history_event'>
+    <class-type type-name='history_event_hf_convictedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t name='recognized_by_entity' ref-target='historical_entity'/>
@@ -2400,7 +2404,7 @@
       </bitfield>
     </class-type>
 
-    <class-type type-name='history_event_hf_framedst' inherits-from='history_event'>
+    <class-type type-name='history_event_failed_frame_attemptst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='target_hf' ref-target='historical_figure'/>
       <int32_t name='fooled_entity' ref-target='historical_entity'/>
       <int32_t name='master_villain_hf' ref-target='historical_figure'/>
@@ -2409,7 +2413,7 @@
       <int32_t name='crime' comment='references crime::T_mode'/>
     </class-type>
 
-    <class-type type-name='history_event_hf_interrogatedst' inherits-from='history_event'>
+    <class-type type-name='history_event_hf_interrogatedst' inherits-from='history_event' since='v0.47.01'>
       <int32_t name='hf' ref-target='historical_figure'/>
       <int32_t name='arresting_entity' ref-target='historical_entity'/>
       <int32_t name='interrogator_hf' ref-target='historical_figure'/>
diff --git a/df.world.xml b/df.world.xml
index 6d201a81b..4e586164f 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -203,14 +203,14 @@
             <enum-item name='Theft'/>
             <enum-item name='Robbery'/>
             <enum-item name='BloodDrinking'/>
-            <enum-item name='Embezzlement'/>
-            <enum-item name='AttemptedMurder'/>
-            <enum-item name='Kidnapping'/>
-            <enum-item name='AttemptedKidnapping'/>
-            <enum-item name='AttemptedTheft'/>
-            <enum-item name='Treason'/>
-            <enum-item name='Espionage'/>
-            <enum-item name='Bribery'/>
+            <enum-item name='Embezzlement' since='v0.47.01'/>
+            <enum-item name='AttemptedMurder' since='v0.47.01'/>
+            <enum-item name='Kidnapping' since='v0.47.01'/>
+            <enum-item name='AttemptedKidnapping' since='v0.47.01'/>
+            <enum-item name='AttemptedTheft' since='v0.47.01'/>
+            <enum-item name='Treason' since='v0.47.01'/>
+            <enum-item name='Espionage' since='v0.47.01'/>
+            <enum-item name='Bribery' since='v0.47.01'/>
         </enum>
 
         <compound name='punishment'>

From 68e2806e34f228109a9a31e59570d6cb6c8e9efa Mon Sep 17 00:00:00 2001
From: unknown <sedb.dfh@gmail.com>
Date: Fri, 7 Feb 2020 21:14:33 -0800
Subject: [PATCH 3/3] Verified struct sizes.  Added new event collections.

---
 df.history.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/df.history.xml b/df.history.xml
index e389c08b3..3dd490f96 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -2264,6 +2264,8 @@
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t name='quality' comment='1 = well-crafted, 2 = finely-crafted, 3 = superior, 4 = exceptional, 5 = masterwork'/>
       <stl-vector name='hfs' type-name='int32_t' ref-target='historical_figure'/>
+      <int32_t/>
+      <int32_t/>
     </class-type>
 
     <class-type type-name='history_event_modified_buildingst' inherits-from='history_event' since='v0.47.01'>
@@ -2294,6 +2296,7 @@
       <int16_t name='content' comment='11 = inveighing against, 12 = urging love be shown'/>
       <int32_t name='preached_to_entity' ref-target='historical_entity'/>
       <int32_t name='against_entity' ref-target='historical_entity'/>
+      <int32_t/>
     </class-type>
 
     <class-type type-name='history_event_entity_persecutedst' inherits-from='history_event' since='v0.47.01'>
@@ -2321,6 +2324,8 @@
       <int32_t name='entity' ref-target='historical_entity'/>
       <int32_t/>
       <stl-vector name='allied_entities' type-name='int32_t' ref-target='historical_entity'/>
+      <int32_t/>
+      <int32_t/>
     </class-type>
 
     <class-type type-name='history_event_hf_ransomedst' inherits-from='history_event' since='v0.47.01'>
@@ -2339,7 +2344,7 @@
     </class-type>
 
     <class-type type-name='history_event_sabotagest' inherits-from='history_event' since='v0.47.01'>
-       Have not yet found this event in-game
+      Have not yet found this event in-game.  Possibly not used yet?
     </class-type>
 
     <class-type type-name='history_event_entity_overthrownst' inherits-from='history_event' since='v0.47.01'>
@@ -2436,6 +2441,8 @@
         <enum-item name='CEREMONY'/>
         <enum-item name='PURGE'/>
         <enum-item name='RAID'/>
+        <enum-item name='PERSECUTION'/>
+        <enum-item name='ENTITY_OVERTHROWN'/>
     </enum-type>
 
     <class-type type-name='history_event_collection' original-name='history_event_collectionst'
@@ -2673,6 +2680,18 @@
         <int32_t name='ordinal'/>
     </class-type>
 
+    <class-type type-name='history_event_collection_persecutionst' inherits-from='history_event_collection' since='v0.47.01'>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='entity' ref-target='historical_entity'/>
+        <int32_t name='ordinal'/>
+    </class-type>
+
+    <class-type type-name='history_event_collection_entity_overthrownst' inherits-from='history_event_collection' since='v0.47.01'>
+        <int32_t name='site' ref-target='world_site'/>
+        <int32_t name='entity' ref-target='historical_entity'/>
+        <int32_t name='ordinal'/>
+    </class-type>
+
     <enum-type type-name='era_type' base-type='int16_t'>
         <enum-item name='ThreePowers'/>
         <enum-item name='TwoPowers'/>