From ba7ff872867d161d6fcad08851f6cf88cd215503 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Fri, 14 Feb 2020 17:44:37 +0100
Subject: [PATCH] corrected caption attributes

---
 df.history.xml | 391 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 290 insertions(+), 101 deletions(-)

diff --git a/df.history.xml b/df.history.xml
index 5fdf920b0..d5dcd9905 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -825,111 +825,300 @@
     </enum-type>
 
     <enum-type type-name='history_event_reason' comment="Some of these require at least one parameter of varying type. The text is what DF provides without parameter">
+        <enum-attr name='caption'/>
         <enum-item name='none' value='-1'/>
 
-        <enum-item name='insurrection' caption='for an insurrection'/>
-        <enum-item name='adventure' caption='to adventure'/>
-        <enum-item name='guide' caption='as a guide'/>
-        <enum-item name='rescued' caption='in order to be rescued'/>
-        <enum-item name='sphere_alignment' caption='due to their cosmic similarity'/>
-        <enum-item name='maintain_balance_in_universe' caption='in order to maintain balance in the universe'/>
-        <enum-item name='highlight_boundaries_between_worlds' caption='to create a monument to the boundaries between realities'/>
-        <enum-item name='sow_the_seeds_of_chaos_in_the_world' caption='to sow the seeds of chaos within'/>
-        <enum-item name='provide_opportunities_for_courage' caption='to provide opportunities for courage to rise'/>
-        <enum-item name='bring_death_to_the_world' caption='that more might die'/>
-
-        <enum-item name='liked_appearance' caption='that all should gaze upon a truly gruesome visage'/>
-        <enum-item name='because_it_was_destined' caption='because it was destined'/>
-        <enum-item name='great_fortresses_built_and_tested' caption='that great fortresses might be raised and tested in siege'/>
-        <enum-item name='whim' caption='on a whim'/>
-        <enum-item name='bring_misery_to_the_world' caption='that it might bathe in misery forever'/>
-        <enum-item name='bring_murder_to_the_world' caption='that more might be murdered'/>
-        <enum-item name='bring_nightmares_into_reality' caption='in order to make nightmares reality'/>
-        <enum-item name='bring_thralldom_to_the_world' caption='in order to make thralls of everyone'/>
-        <enum-item name='bring_torture_to_the_world' caption='in order that acts of torture be perpetrated'/>
-        <enum-item name='provide_opportunities_for_acts_of_valor' caption='to provide opportunities for acts of valor to be performed'/>
-
-        <enum-item name='bring_war_to_the_world' caption='that war might rage forever'/>
-        <enum-item name='find_relative' caption='in order to find a relative'/>
-        <enum-item name='offer_condolences' caption='to offer condolences'/>
-        <enum-item name='be_brought_to_safety' caption='in order to be brought to safety'/>
-        <enum-item name='help_with_rescue' caption='to help with a rescue'/>
-        <enum-item name='insufficient_work' caption='due to insufficient work'/>
-        <enum-item name='work_request' caption='to request work'/>
-        <enum-item name='make_weapon' caption='that weapons be made'/>
-        <enum-item name='vent_at_boss' caption='to vent at somebody in charge'/>
-        <enum-item name='cry_on_boss' caption='to cry on somebody in charge'/>
-
-        <enum-item name='should_have_reached_goal' caption='as the goal was not reached'/>
-        <enum-item name='insufficient_progress_toward_goal' caption='as insufficient progress was made toward the goal'/>
-        <enum-item name='going_wrong_direction' caption='after going the wrong direction'/>
-        <enum-item name='arrived_at_location' caption='after arriving at the location'/>
-        <enum-item name='entity_no_longer_rules' caption='as the relevant government was no longer in control'/>
-        <enum-item name='left_site' caption='after leaving the site'/>
-        <enum-item name='reunited_with_loved_one' caption='after being reunited with a loved one'/>
-        <enum-item name='violent_disagreement' caption='after a violent disagreement'/>
-        <enum-item name='adopted' caption='after adoption'/>
-        <enum-item name='true_name_invocation' caption='after invocation of the true name'/>
-
-        <enum-item name='arrived_at_person' caption='after finding an unknown creature'/>
-        <enum-item name='eradicate_beasts' caption='in order to eradicate beasts'/>
-        <enum-item name='entertain_people' caption='in order to entertain people'/>
-        <enum-item name='make_a_living_as_a_warrior' caption='in order to make a living as a warrior'/>
-        <enum-item name='study' caption='in order to study'/>
-        <enum-item name='flight' caption='in order to flee'/>
-        <enum-item name='scholarship' caption='in order to pursue scholarship'/>
-        <enum-item name='be_with_master' caption='in order to be with the master'/>
-        <enum-item name='become_citizen' caption='in order to become a citizen'/>
-        <enum-item name='prefers_working_alone' caption='in order to continue working alone'/>
-
-        <enum-item name='jealousy' caption='due to jealousy'/>
-        <enum-item name='glorify_hf' caption='in order to glorify an unknown creature'/>
-        <enum-item name='have_not_performed' caption='due to a lack of performances'/>
-        <enum-item name='prevented_from_leaving' caption='after being prevented from leaving'/>
-        <enum-item name='curiosity' caption='out of curiosity'/>
-        <enum-item name='hire_on_as_mercenary' caption='to fill a role as a mercenary'/>
-        <enum-item name='hire_on_as_performer' caption='to fill a role as a performer'/>
-        <enum-item name='hire_on_as_scholar' caption='to fill a role as a scholar'/>
-        <enum-item name='drink' caption='in order to drink'/>
-        <enum-item name='admire_architecture' caption='in order to admire achitecture'/>
-
-        <enum-item name='pray' caption='in order to pray'/>
-        <enum-item name='relax' caption='in order to relax'/>
-        <enum-item name='danger' caption='to experience danger'/>
-        <enum-item name='cannot_find_artifact' caption='after being unable to find an artifact'/>
-        <enum-item name='failed_mood' caption='after failing to create an artifact'/>
-        <enum-item name='lack_of_sleep' caption='due to a lack of sleep'/>
-        <enum-item name='trapped_in_cage' caption='after being trapped in a cage'/>
-        <enum-item name='great_deal_of_stress' caption='after a great deal of stress'/>
-        <enum-item name='unable_to_leave_location' caption='after being unable to leave a location'/>
-        <enum-item name='sanctify_hf' caption='in order to sanctify an unknown creature'/>
-
-        <enum-item name='artifact_is_heirloom_of_family_hfid' caption='as an heirloom of the an unknown creature family'/>
-        <enum-item name='cement_bonds_of_friendship' caption='in order to cement the bonds of friendship'/>
-        <enum-item name='as_a_symbol_of_everlasting_peace' caption='as a symbol of everlasting peace'/>
-        <enum-item name='on_a_pilgrimage' caption='on a pilgrimage'/>
-        <enum-item name='gather_information' caption='to gather information'/>
-        <enum-item name='seek_sanctuary' caption='in order to find sactuary'/>
-        <enum-item name='part_of_trade_negotiation' caption='as part of a trade negotiation'/>
-        <enum-item name='artifact_is_symbol_of_entity_position' caption='as a symbol of authority within an unknown civilization'/>
-        <enum-item name='fear_of_persecution' since='0.47.01' comment='The ones below were introduced as well' caption='due to fear of persecution'/>
-        <enum-item name='smooth_operation' caption='to smooth the operation of an unknown civilization'/>
+        <enum-item name='insurrection'>
+            <item-attr name='caption' value='for an insurrection'/>
+        </enum-item>
+        <enum-item name='adventure'>
+            <item-attr name='caption' value='to adventure'/>
+        </enum-item>
+        <enum-item name='guide'>
+            <item-attr name='caption' value='as a guide'/>
+        </enum-item>
+        <enum-item name='rescued'>
+            <item-attr name='caption' value='in order to be rescued'/>
+        </enum-item>
+        <enum-item name='sphere_alignment'>
+            <item-attr name='caption' value='due to their cosmic similarity'/>
+        </enum-item>
+        <enum-item name='maintain_balance_in_universe'>
+            <item-attr name='caption' value='in order to maintain balance in the universe'/>
+        </enum-item>
+        <enum-item name='highlight_boundaries_between_worlds'>
+            <item-attr name='caption' value='to create a monument to the boundaries between realities'/>
+        </enum-item>
+        <enum-item name='sow_the_seeds_of_chaos_in_the_world'>
+            <item-attr name='caption' value='to sow the seeds of chaos within'/>
+        </enum-item>
+        <enum-item name='provide_opportunities_for_courage'>
+            <item-attr name='caption' value='to provide opportunities for courage to rise'/>
+        </enum-item>
+        <enum-item name='bring_death_to_the_world'>
+            <item-attr name='caption' value='that more might die'/>
+        </enum-item>
         
-        <enum-item name='nuance_belief' caption='due to a belief in nuances of'/>
-        <enum-item name='shared_interest' caption='due to a shared interest in'/>
-        <enum-item name='envy_living' caption='due to envy of those that live on'/>
-        <enum-item name='death_panic' caption='due to panic about what happens after death'/>
-        <enum-item name='death_fear' caption='due to fear of death'/>
-        <enum-item name='avoid_judgement' caption='unable to face any possible judgment and the afterlife'/>
-        <enum-item name='death_pride' caption='being too proud to give in to death'/>
-        <enum-item name='death_vain' caption='being too vain to give in to death'/>
-        <enum-item name='death_ambition' caption='having ambitions for which death was only a small obstacle'/>
-        <enum-item name='lack_of_funds' caption='due to lack of funds'/>
+        <enum-item name='liked_appearance'>
+            <item-attr name='caption' value='that all should gaze upon a truly gruesome visage'/>
+        </enum-item>
+        <enum-item name='because_it_was_destined'>
+            <item-attr name='caption' value='because it was destined'/>
+        </enum-item>
+        <enum-item name='great_fortresses_built_and_tested'>
+            <item-attr name='caption' value='that great fortresses might be raised and tested in siege'/>
+        </enum-item>
+        <enum-item name='whim'>
+            <item-attr name='caption' value='on a whim'/>
+        </enum-item>
+        <enum-item name='bring_misery_to_the_world'>
+            <item-attr name='caption' value='that it might bathe in misery forever'/>
+        </enum-item>
+        <enum-item name='bring_murder_to_the_world'>
+            <item-attr name='caption' value='that more might be murdered'/>
+        </enum-item>
+        <enum-item name='bring_nightmares_into_reality'>
+            <item-attr name='caption' value='in order to make nightmares reality'/>
+        </enum-item>
+        <enum-item name='bring_thralldom_to_the_world'>
+            <item-attr name='caption' value='in order to make thralls of everyone'/>
+        </enum-item>
+        <enum-item name='bring_torture_to_the_world'>
+            <item-attr name='caption' value='in order that acts of torture be perpetrated'/>
+        </enum-item>
+        <enum-item name='provide_opportunities_for_acts_of_valor'>
+            <item-attr name='caption' value='to provide opportunities for acts of valor to be performed'/>
+        </enum-item>
+
+        <enum-item name='bring_war_to_the_world'>
+            <item-attr name='caption' value='that war might rage forever'/>
+        </enum-item>
+        <enum-item name='find_relative'>
+            <item-attr name='caption' value='in order to find a relative'/>
+        </enum-item>
+        <enum-item name='offer_condolences'>
+            <item-attr name='caption' value='to offer condolences'/>
+        </enum-item>
+        <enum-item name='be_brought_to_safety'>
+            <item-attr name='caption' value='in order to be brought to safety'/>
+        </enum-item>
+        <enum-item name='help_with_rescue'>
+            <item-attr name='caption' value='to help with a rescue'/>
+        </enum-item>
+        <enum-item name='insufficient_work'>
+            <item-attr name='caption' value='due to insufficient work'/>
+        </enum-item>
+        <enum-item name='work_request'>
+            <item-attr name='caption' value='to request work'/>
+        </enum-item>
+        <enum-item name='make_weapon'>
+            <item-attr name='caption' value='that weapons be made'/>
+        </enum-item>
+        <enum-item name='vent_at_boss'>
+            <item-attr name='caption' value='to vent at somebody in charge'/>
+        </enum-item>
+        <enum-item name='cry_on_boss'>
+            <item-attr name='caption' value='to cry on somebody in charge'/>
+        </enum-item>
+
+        <enum-item name='should_have_reached_goal'>
+            <item-attr name='caption' value='as the goal was not reached'/>
+        </enum-item>
+        <enum-item name='insufficient_progress_toward_goal'>
+            <item-attr name='caption' value='as insufficient progress was made toward the goal'/>
+        </enum-item>
+        <enum-item name='going_wrong_direction'>
+            <item-attr name='caption' value='after going the wrong direction'/>
+        </enum-item>
+        <enum-item name='arrived_at_location'>
+            <item-attr name='caption' value='after arriving at the location'/>
+        </enum-item>
+        <enum-item name='entity_no_longer_rules'>
+            <item-attr name='caption' value='as the relevant government was no longer in control'/>
+        </enum-item>
+        <enum-item name='left_site'>
+            <item-attr name='caption' value='after leaving the site'/>
+        </enum-item>
+        <enum-item name='reunited_with_loved_one'>
+            <item-attr name='caption' value='after being reunited with a loved one'/>
+        </enum-item>
+        <enum-item name='violent_disagreement'>
+            <item-attr name='caption' value='after a violent disagreement'/>
+        </enum-item>
+        <enum-item name='adopted'>
+            <item-attr name='caption' value='after adoption'/>
+        </enum-item>
+        <enum-item name='true_name_invocation'>
+            <item-attr name='caption' value='after invocation of the true name'/>
+        </enum-item>
+
+        <enum-item name='arrived_at_person'>
+            <item-attr name='caption' value='after finding an unknown creature'/>
+        </enum-item>
+        <enum-item name='eradicate_beasts'>
+            <item-attr name='caption' value='in order to eradicate beasts'/>
+        </enum-item>
+        <enum-item name='entertain_people'>
+            <item-attr name='caption' value='in order to entertain people'/>
+        </enum-item>
+        <enum-item name='make_a_living_as_a_warrior'>
+            <item-attr name='caption' value='in order to make a living as a warrior'/>
+        </enum-item>
+        <enum-item name='study'>
+            <item-attr name='caption' value='in order to study'/>
+        </enum-item>
+        <enum-item name='flight'>
+            <item-attr name='caption' value='in order to flee'/>
+        </enum-item>
+        <enum-item name='scholarship'>
+            <item-attr name='caption' value='in order to pursue scholarship'/>
+        </enum-item>
+        <enum-item name='be_with_master'>
+            <item-attr name='caption' value='in order to be with the master'/>
+        </enum-item>
+        <enum-item name='become_citizen'>
+            <item-attr name='caption' value='in order to become a citizen'/>
+        </enum-item>
+        <enum-item name='prefers_working_alone'>
+            <item-attr name='caption' value='in order to continue working alone'/>
+        </enum-item>
+
+        <enum-item name='jealousy'>
+            <item-attr name='caption' value='due to jealousy'/>
+        </enum-item>
+        <enum-item name='glorify_hf'>
+            <item-attr name='caption' value='in order to glorify an unknown creature'/>
+        </enum-item>
+        <enum-item name='have_not_performed'>
+            <item-attr name='caption' value='due to a lack of performances'/>
+        </enum-item>
+        <enum-item name='prevented_from_leaving'>
+            <item-attr name='caption' value='after being prevented from leaving'/>
+        </enum-item>
+        <enum-item name='curiosity'>
+            <item-attr name='caption' value='out of curiosity'/>
+        </enum-item>
+        <enum-item name='hire_on_as_mercenary'>
+            <item-attr name='caption' value='to fill a role as a mercenary'/>
+        </enum-item>
+        <enum-item name='hire_on_as_performer'>
+            <item-attr name='caption' value='to fill a role as a performer'/>
+        </enum-item>
+        <enum-item name='hire_on_as_scholar'>
+            <item-attr name='caption' value='to fill a role as a scholar'/>
+        </enum-item>
+        <enum-item name='drink'>
+            <item-attr name='caption' value='in order to drink'/>
+        </enum-item>
+        <enum-item name='admire_architecture'>
+            <item-attr name='caption' value='in order to admire achitecture'/>
+        </enum-item>
+
+        <enum-item name='pray'>
+            <item-attr name='caption' value='in order to pray'/>
+        </enum-item>
+        <enum-item name='relax'>
+            <item-attr name='caption' value='in order to relax'/>
+        </enum-item>
+        <enum-item name='danger'>
+            <item-attr name='caption' value='to experience danger'/>
+        </enum-item>
+        <enum-item name='cannot_find_artifact'>
+            <item-attr name='caption' value='after being unable to find an artifact'/>
+        </enum-item>
+        <enum-item name='failed_mood'>
+            <item-attr name='caption' value='after failing to create an artifact'/>
+        </enum-item>
+        <enum-item name='lack_of_sleep'>
+            <item-attr name='caption' value='due to a lack of sleep'/>
+        </enum-item>
+        <enum-item name='trapped_in_cage'>
+            <item-attr name='caption' value='after being trapped in a cage'/>
+        </enum-item>
+        <enum-item name='great_deal_of_stress'>
+            <item-attr name='caption' value='after a great deal of stress'/>
+        </enum-item>
+        <enum-item name='unable_to_leave_location'>
+            <item-attr name='caption' value='after being unable to leave a location'/>
+        </enum-item>
+        <enum-item name='sanctify_hf'>
+            <item-attr name='caption' value='in order to sanctify an unknown creature'/>
+        </enum-item>
+
+        <enum-item name='artifact_is_heirloom_of_family_hfid'>
+            <item-attr name='caption' value='as an heirloom of the an unknown creature family'/>
+        </enum-item>
+        <enum-item name='cement_bonds_of_friendship'>
+            <item-attr name='caption' value='in order to cement the bonds of friendship'/>
+        </enum-item>
+        <enum-item name='as_a_symbol_of_everlasting_peace'>
+            <item-attr name='caption' value='as a symbol of everlasting peace'/>
+        </enum-item>
+        <enum-item name='on_a_pilgrimage'>
+            <item-attr name='caption' value='on a pilgrimage'/>
+        </enum-item>
+        <enum-item name='gather_information'>
+            <item-attr name='caption' value='to gather information'/>
+        </enum-item>
+        <enum-item name='seek_sanctuary'>
+            <item-attr name='caption' value='in order to find sactuary'/>
+        </enum-item>
+        <enum-item name='part_of_trade_negotiation'>
+            <item-attr name='caption' value='as part of a trade negotiation'/>
+        </enum-item>
+        <enum-item name='artifact_is_symbol_of_entity_position'>
+            <item-attr name='caption' value='as a symbol of authority within an unknown civilization'/>
+        </enum-item>
+        <enum-item name='fear_of_persecution' since='0.47.01' comment='The ones below were introduced in 0.47.01 as well'>
+            <item-attr name='caption' value='due to fear of persecution'/>
+        </enum-item>
+        <enum-item name='smooth_operation'>
+            <item-attr name='caption' value='to smooth the operation of an unknown civilization'/>
+        </enum-item>
         
-        <enum-item name='battle_losses' caption='after taking heavy losses in battle'/>
-        <enum-item name='conviction_exile' caption='after being exiled following a criminal conviction'/>
-        <enum-item name='priest_vent' caption='to vent at a priest'/>
-        <enum-item name='priest_cry' caption='to cry on a priest'/>
+        <enum-item name='nuance_belief'>
+            <item-attr name='caption' value='due to a belief in nuances of'/>
+        </enum-item>
+        <enum-item name='shared_interest'>
+            <item-attr name='caption' value='due to a shared interest in'/>
+        </enum-item>
+        <enum-item name='envy_living'>
+            <item-attr name='caption' value='due to envy of those that live on'/>
+        </enum-item>
+        <enum-item name='death_panic'>
+            <item-attr name='caption' value='due to panic about what happens after death'/>
+        </enum-item>
+        <enum-item name='death_fear'>
+            <item-attr name='caption' value='due to fear of death'/>
+        </enum-item>
+        <enum-item name='avoid_judgement'>
+            <item-attr name='caption' value='unable to face any possible judgment and the afterlife'/>
+        </enum-item>
+        <enum-item name='death_pride'>
+            <item-attr name='caption' value='being too proud to give in to death'/>
+        </enum-item>
+        <enum-item name='death_vain'>
+            <item-attr name='caption' value='being too vain to give in to death'/>
+        </enum-item>
+        <enum-item name='death_ambition'>
+            <item-attr name='caption' value='having ambitions for which death was only a small obstacle'/>
+        </enum-item>
+        <enum-item name='lack_of_funds'>
+            <item-attr name='caption' value='due to lack of funds'/>
+        </enum-item>
+        
+        <enum-item name='battle_losses'>
+            <item-attr name='caption' value='after taking heavy losses in battle'/>
+        </enum-item>
+        <enum-item name='conviction_exile'>
+            <item-attr name='caption' value='after being exiled following a criminal conviction'/>
+        </enum-item>
+        <enum-item name='priest_vent'>
+            <item-attr name='caption' value='to vent at a priest'/>
+        </enum-item>
+        <enum-item name='priest_cry'>
+            <item-attr name='caption' value='to cry on a priest'/>
+        </enum-item>
     </enum-type>
 
     <struct-type type-name='history_event_context'>