From 01c86e8be64529a0ccb19b2b40c1d0097ccd9f0d Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sun, 13 Dec 2015 12:50:22 -0600
Subject: [PATCH] Add new announcements for 0.42

---
 df.announcements.xml | 59 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/df.announcements.xml b/df.announcements.xml
index 4f74477e7..06a70fb24 100644
--- a/df.announcements.xml
+++ b/df.announcements.xml
@@ -8,6 +8,7 @@
         <enum-item name='STRUCK_ECONOMIC_MINERAL'/>
         <enum-item name='COMBAT_TWIST_WEAPON'/>
         <enum-item name='COMBAT_LET_ITEM_DROP'/>
+
         <enum-item name='COMBAT_START_CHARGE'/>
         <enum-item name='COMBAT_SURPRISE_CHARGE'/>
         <enum-item name='COMBAT_JUMP_DODGE_PROJ'/>
@@ -16,6 +17,7 @@
         <enum-item name='COMBAT_COUNTERSTRIKE'/>
         <enum-item name='COMBAT_BLOCK'/>
         <enum-item name='COMBAT_PARRY'/>
+
         <enum-item name='COMBAT_CHARGE_COLLISION'/>
         <enum-item name='COMBAT_CHARGE_DEFENDER_TUMBLES'/>
         <enum-item name='COMBAT_CHARGE_DEFENDER_KNOCKED_OVER'/>
@@ -24,6 +26,7 @@
         <enum-item name='COMBAT_CHARGE_TANGLE_TOGETHER'/>
         <enum-item name='COMBAT_CHARGE_TANGLE_TUMBLE'/>
         <enum-item name='COMBAT_CHARGE_RUSH_BY'/>
+
         <enum-item name='COMBAT_CHARGE_MANAGE_STOP'/>
         <enum-item name='COMBAT_CHARGE_OBSTACLE_SLAM'/>
         <enum-item name='COMBAT_WRESTLE_LOCK'/>
@@ -32,6 +35,7 @@
         <enum-item name='COMBAT_WRESTLE_THROW'/>
         <enum-item name='COMBAT_WRESTLE_RELEASE_LOCK'/>
         <enum-item name='COMBAT_WRESTLE_RELEASE_CHOKE'/>
+
         <enum-item name='COMBAT_WRESTLE_RELEASE_GRIP'/>
         <enum-item name='COMBAT_WRESTLE_STRUGGLE'/>
         <enum-item name='COMBAT_WRESTLE_RELEASE_LATCH'/>
@@ -40,6 +44,7 @@
         <enum-item name='COMBAT_GRAB_TEAR'/>
         <enum-item name='COMBAT_STRIKE_DETAILS'/>
         <enum-item name='COMBAT_STRIKE_DETAILS_2'/>
+
         <enum-item name='COMBAT_EVENT_ENRAGED'/>
         <enum-item name='COMBAT_EVENT_STUCKIN'/>
         <enum-item name='COMBAT_EVENT_LATCH_BP'/>
@@ -48,6 +53,7 @@
         <enum-item name='COMBAT_EVENT_KNOCKED_OUT'/>
         <enum-item name='COMBAT_EVENT_STUNNED'/>
         <enum-item name='COMBAT_EVENT_WINDED'/>
+
         <enum-item name='COMBAT_EVENT_NAUSEATED'/>
         <enum-item name='MIGRANT_ARRIVAL_NAMED'/>
         <enum-item name='MIGRANT_ARRIVAL'/>
@@ -56,6 +62,7 @@
         <enum-item name='AMBUSH_DEFENDER'/>
         <enum-item name='AMBUSH_RESIDENT'/>
         <enum-item name='AMBUSH_THIEF'/>
+
         <enum-item name='AMBUSH_THIEF_SUPPORT_SKULKING'/>
         <enum-item name='AMBUSH_THIEF_SUPPORT_NATURE'/>
         <enum-item name='AMBUSH_THIEF_SUPPORT'/>
@@ -64,6 +71,7 @@
         <enum-item name='AMBUSH_SNATCHER_SUPPORT'/>
         <enum-item name='AMBUSH_AMBUSHER_NATURE'/>
         <enum-item name='AMBUSH_AMBUSHER'/>
+
         <enum-item name='AMBUSH_INJURED'/>
         <enum-item name='AMBUSH_OTHER'/>
         <enum-item name='AMBUSH_INCAPACITATED'/>
@@ -72,6 +80,7 @@
         <enum-item name='D_MIGRANTS_ARRIVAL'/>
         <enum-item name='D_MIGRANT_ARRIVAL'/>
         <enum-item name='D_MIGRANT_ARRIVAL_DISCOURAGED'/>
+
         <enum-item name='D_NO_MIGRANT_ARRIVAL'/>
         <enum-item name='ANIMAL_TRAP_CATCH'/>
         <enum-item name='ANIMAL_TRAP_ROBBED'/>
@@ -80,6 +89,7 @@
         <enum-item name='MISCHIEF_CAGE'/>
         <enum-item name='MISCHIEF_CHAIN'/>
         <enum-item name='DIPLOMAT_ARRIVAL'/>
+
         <enum-item name='LIAISON_ARRIVAL'/>
         <enum-item name='TRADE_DIPLOMAT_ARRIVAL'/>
         <enum-item name='CAVE_COLLAPSE'/>
@@ -88,6 +98,7 @@
         <enum-item name='STRANGE_MOOD'/>
         <enum-item name='MADE_ARTIFACT'/>
         <enum-item name='NAMED_ARTIFACT'/>
+
         <enum-item name='ITEM_ATTACHMENT'/>
         <enum-item name='VERMIN_CAGE_ESCAPE'/>
         <enum-item name='TRIGGER_WEB'/>
@@ -96,6 +107,7 @@
         <enum-item name='MEGABEAST_ARRIVAL'/>
         <enum-item name='BERSERK_CITIZEN'/>
         <enum-item name='MAGMA_DEFACES_ENGRAVING'/>
+
         <enum-item name='ENGRAVING_MELTS'/>
         <enum-item name='MASTERPIECE_ARCHITECTURE'/>
         <enum-item name='MASTERPIECE_CONSTRUCTION'/>
@@ -104,6 +116,7 @@
         <enum-item name='ADV_AWAKEN'/>
         <enum-item name='ADV_SLEEP_INTERRUPTED'/>
         <enum-item name='CANCEL_JOB'/>
+
         <enum-item name='ADV_CREATURE_DEATH'/>
         <enum-item name='CITIZEN_DEATH'/>
         <enum-item name='PET_DEATH'/>
@@ -112,6 +125,7 @@
         <enum-item name='FALL_OVER'/>
         <enum-item name='CAUGHT_IN_FLAMES'/>
         <enum-item name='CAUGHT_IN_WEB'/>
+
         <enum-item name='UNIT_PROJECTILE_SLAM_BLOW_APART'/>
         <enum-item name='UNIT_PROJECTILE_SLAM'/>
         <enum-item name='UNIT_PROJECTILE_SLAM_INTO_UNIT'/>
@@ -120,6 +134,7 @@
         <enum-item name='REGAIN_CONSCIOUSNESS'/>
         <enum-item name='FREE_FROM_WEB'/>
         <enum-item name='PARALYZED'/>
+
         <enum-item name='OVERCOME_PARALYSIS'/>
         <enum-item name='NOT_STUNNED'/>
         <enum-item name='EXHAUSTION'/>
@@ -128,6 +143,7 @@
         <enum-item name='NO_BREAK_GRIP'/>
         <enum-item name='BLOCK_FIRE'/>
         <enum-item name='BREATHE_FIRE'/>
+
         <enum-item name='SHOOT_WEB'/>
         <enum-item name='PULL_OUT_DROP'/>
         <enum-item name='STAND_UP'/>
@@ -136,6 +152,7 @@
         <enum-item name='ADV_REACTION_PRODUCTS'/>
         <enum-item name='NIGHT_ATTACK_STARTS'/>
         <enum-item name='NIGHT_ATTACK_ENDS'/>
+
         <enum-item name='NIGHT_ATTACK_TRAVEL'/>
         <enum-item name='GHOST_ATTACK'/>
         <enum-item name='FLAME_HIT'/>
@@ -144,6 +161,7 @@
         <enum-item name='ADVENTURE_INTRO'/>
         <enum-item name='CREATURE_SOUND'/>
         <enum-item name='CREATURE_STEALS_OBJECT'/>
+
         <enum-item name='FOUND_TRAP'/>
         <enum-item name='BODY_TRANSFORMATION'/>
         <enum-item name='INTERACTION_ACTOR'/>
@@ -152,6 +170,7 @@
         <enum-item name='CITIZEN_MISSING'/>
         <enum-item name='PET_MISSING'/>
         <enum-item name='EMBRACE'/>
+
         <enum-item name='STRANGE_RAIN_SNOW'/>
         <enum-item name='STRANGE_CLOUD'/>
         <enum-item name='SIMPLE_ANIMAL_ACTION'/>
@@ -160,6 +179,7 @@
         <enum-item name='TRAINING_FULL_REVERSION'/>
         <enum-item name='ANIMAL_TRAINING_KNOWLEDGE'/>
         <enum-item name='SKIP_ON_LIQUID'/>
+
         <enum-item name='DODGE_FLYING_OBJECT'/>
         <enum-item name='REGULAR_CONVERSATION'/>
         <enum-item name='BANDIT_EMPTY_CONTAINER'/>
@@ -168,6 +188,7 @@
         <enum-item name='COMBAT_WRESTLE_CATCH_ATTACK'/>
         <enum-item name='FAIL_TO_GRAB_SURFACE'/>
         <enum-item name='LOSE_HOLD_OF_SURFACE'/>
+
         <enum-item name='TRAVEL_COMPLAINT'/>
         <enum-item name='LOSE_EMOTION'/>
         <enum-item name='REORGANIZE_POSSESSIONS'/>
@@ -176,6 +197,7 @@
         <enum-item name='STRAP_ITEM'/>
         <enum-item name='GAIN_SITE_CONTROL'/>
         <enum-item name='CONFLICT_CONVERSATION'/>
+
         <enum-item name='FORT_POSITION_SUCCESSION'/>
         <enum-item name='MECHANISM_SOUND'/>
         <enum-item name='BIRTH_WILD_ANIMAL'/>
@@ -184,6 +206,7 @@
         <enum-item name='CITIZEN_TANTRUM'/>
         <enum-item name='MOVED_OUT_OF_RANGE'/>
         <enum-item name='CANNOT_JUMP'/>
+
         <enum-item name='NO_TRACKS'/>
         <enum-item name='ALREADY_SEARCHED_AREA'/>
         <enum-item name='SEARCH_FOUND_SOMETHING'/>
@@ -192,6 +215,7 @@
         <enum-item name='NOTHING_TO_EXAMINE'/>
         <enum-item name='YOU_YIELDED'/>
         <enum-item name='YOU_UNYIELDED'/>
+
         <enum-item name='YOU_STRAP_ITEM'/>
         <enum-item name='YOU_DRAW_ITEM'/>
         <enum-item name='NO_GRASP_TO_DRAW_ITEM'/>
@@ -200,6 +224,7 @@
         <enum-item name='NO_INV_TO_WEAR'/>
         <enum-item name='NO_INV_TO_EAT'/>
         <enum-item name='NO_INV_TO_CONTAIN'/>
+
         <enum-item name='NO_INV_TO_DROP'/>
         <enum-item name='NOTHING_TO_PICK_UP'/>
         <enum-item name='NO_INV_TO_THROW'/>
@@ -208,6 +233,7 @@
         <enum-item name='CURRENT_WEATHER'/>
         <enum-item name='CURRENT_TEMPERATURE'/>
         <enum-item name='CURRENT_DATE'/>
+
         <enum-item name='NO_GRASP_FOR_PICKUP'/>
         <enum-item name='TRAVEL_ADVISORY'/>
         <enum-item name='CANNOT_CLIMB'/>
@@ -216,6 +242,7 @@
         <enum-item name='CANNOT_REST'/>
         <enum-item name='CANNOT_MAKE_CAMPFIRE'/>
         <enum-item name='MADE_CAMPFIRE'/>
+
         <enum-item name='CANNOT_SET_FIRE'/>
         <enum-item name='SET_FIRE'/>
         <enum-item name='DAWN_BREAKS'/>
@@ -224,6 +251,7 @@
         <enum-item name='NO_INV_INTERACTION'/>
         <enum-item name='EMPTY_CONTAINER'/>
         <enum-item name='TAKE_OUT_OF_CONTAINER'/>
+
         <enum-item name='NO_CONTAINER_FOR_ITEM'/>
         <enum-item name='PUT_INTO_CONTAINER'/>
         <enum-item name='EAT_ITEM'/>
@@ -232,6 +260,7 @@
         <enum-item name='DROP_ITEM'/>
         <enum-item name='PICK_UP_ITEM'/>
         <enum-item name='YOU_BUILDING_INTERACTION'/>
+
         <enum-item name='YOU_ITEM_INTERACTION'/>
         <enum-item name='YOU_TEMPERATURE_EFFECTS'/>
         <enum-item name='PROFESSION_CHANGES'/>
@@ -240,6 +269,7 @@
         <enum-item name='RESOLVE_SHARED_ITEMS'/>
         <enum-item name='COUGH_BLOOD'/>
         <enum-item name='VOMIT_BLOOD'/>
+
         <enum-item name='MERCHANTS_UNLOADING'/>
         <enum-item name='MERCHANTS_NEED_DEPOT'/>
         <enum-item name='MERCHANT_WAGONS_BYPASSED'/>
@@ -248,6 +278,7 @@
         <enum-item name='PET_LOSES_DEAD_OWNER'/>
         <enum-item name='PET_ADOPTS_OWNER'/>
         <enum-item name='VERMIN_BITE'/>
+
         <enum-item name='UNABLE_TO_COMPLETE_BUILDING'/>
         <enum-item name='JOBS_REMOVED_FROM_UNPOWERED_BUILDING'/>
         <enum-item name='CITIZEN_SNATCHED'/>
@@ -256,6 +287,7 @@
         <enum-item name='LAND_ELEVATED_STATUS'/>
         <enum-item name='MASTERPIECE_CRAFTED'/>
         <enum-item name='ARTWORK_DEFACED'/>
+
         <enum-item name='POWER_LEARNED'/>
         <enum-item name='YOU_FEED_ON_SUCKEE'/>
         <enum-item name='ANIMAL_TRAINED'/>
@@ -264,6 +296,7 @@
         <enum-item name='MANDATE_ENDS'/>
         <enum-item name='SLOWDOWN_ENDS'/>
         <enum-item name='FAREWELL_HELPER'/>
+
         <enum-item name='ELECTION_RESULTS'/>
         <enum-item name='SITE_PRESENT'/>
         <enum-item name='CONSTRUCTION_SUSPENDED'/>
@@ -272,6 +305,7 @@
         <enum-item name='JOB_OVERWRITTEN'/>
         <enum-item name='NOTHING_TO_CATCH_IN_WATER'/>
         <enum-item name='DEMAND_FORGOTTEN'/>
+
         <enum-item name='NEW_DEMAND'/>
         <enum-item name='NEW_MANDATE'/>
         <enum-item name='PRICES_ALTERED'/>
@@ -280,6 +314,7 @@
         <enum-item name='GUILD_REQUEST_TAKEN'/>
         <enum-item name='GUILD_WAGES_CHANGED'/>
         <enum-item name='NEW_WORK_MANDATE'/>
+
         <enum-item name='CITIZEN_BECOMES_SOLDIER'/>
         <enum-item name='CITIZEN_BECOMES_NONSOLDIER'/>
         <enum-item name='PARTY_ORGANIZED'/>
@@ -288,6 +323,7 @@
         <enum-item name='MASTERFUL_IMPROVEMENT'/>
         <enum-item name='MASTERPIECE_ENGRAVING'/>
         <enum-item name='MARRIAGE'/>
+
         <enum-item name='NO_MARRIAGE_CELEBRATION'/>
         <enum-item name='CURIOUS_GUZZLER'/>
         <enum-item name='WEATHER_BECOMES_CLEAR'/>
@@ -296,9 +332,30 @@
         <enum-item name='SEASON_WET'/>
         <enum-item name='SEASON_DRY'/>
         <enum-item name='SEASON_SPRING'/>
+
         <enum-item name='SEASON_SUMMER'/>
         <enum-item name='SEASON_AUTUMN'/>
         <enum-item name='SEASON_WINTER'/>
+        <enum-item name='GUEST_ARRIVAL'/>
+        <enum-item name='CANNOT_SPEAK'/>
+        <enum-item name='RESEARCH_BREAKTHROUGH'/>
+        <enum-item name='SERVICE_ORDER_DELIVERY'/>
+        <enum-item name='PERFORMANCE_START_FAILURE'/>
+
+        <enum-item name='BEGIN_ACTIVITY'/>
+        <enum-item name='MIDDLE_OF_ACTIVITY'/>
+        <enum-item name='ACTIVITY_SECTION_CHANGE'/>
+        <enum-item name='CONCLUDE_ACTIVITY'/>
+        <enum-item name='LEARNED_WRITTEN_CONTENT'/>
+        <enum-item name='LEARNED_ART_FORM'/>
+        <enum-item name='PERFORMER_UPDATE'/>
+        <enum-item name='BUILDING_DESTROYED_OR_TOPPLED'/>
+
+        <enum-item name='DEITY_CURSE'/>
+        <enum-item name='COMPOSITION_COMPLETE'/>
+        <enum-item name='COMPOSITION_FAILED'/>
+        <enum-item name='NEW_APPRENTICESHIP'/>
+        <enum-item name='PETITION_IGNORED'/>
     </enum-type>
 
     <bitfield-type type-name='announcement_flags'>
@@ -313,7 +370,7 @@
 
     <struct-type type-name='announcements'>
         <static-array name='flags' type-name='announcement_flags'
-                      count='299' index-enum='announcement_type'/>
+                      count='317' index-enum='announcement_type'/>
     </struct-type>
 
     <struct-type type-name='report'