From 50e51f80f475fd0c2ff7617d3d1560887c64328e Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 13:39:29 -0800
Subject: [PATCH 01/12] Update df.ui.xml

---
 df.ui.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/df.ui.xml b/df.ui.xml
index 37622b32b..d6d88c45d 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -354,6 +354,11 @@
             <flag-bit name='first_year'/>
             <flag-bit name='recheck_aid_requests'/>
             <flag-bit name='force_elections'/>
+            <flag-bit/>
+            <flag-bit/>
+            <flag-bit/>
+            <flag-bit/>
+            <flag-bit name='caverns_opened'/>
         </bitfield>
         <int16_t name='mood_cooldown'/>
 

From 38033b5cf9a5a7c0d1be9dac46eac61fb6c04a9e Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 13:43:06 -0800
Subject: [PATCH 02/12] Update df.raws.xml

---
 df.raws.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/df.raws.xml b/df.raws.xml
index d67c61698..546ed2a9c 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -204,11 +204,11 @@
             <static-array count='63' type-name='int32_t'/>
         </compound>
 
-        <compound name='unk_v50_2'>
+        <compound name='music'>
             <stl-vector/>
         </compound>
 
-        <compound name='unk_v50_3'>
+        <compound name='sound'>
             <stl-vector/>
         </compound>
 

From 71bd56f954314161e33e10a75c9acaab8bb9214a Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 13:48:42 -0800
Subject: [PATCH 03/12] Update df.raws.xml

---
 df.raws.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/df.raws.xml b/df.raws.xml
index 546ed2a9c..63338dc71 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -208,7 +208,7 @@
             <stl-vector/>
         </compound>
 
-        <compound name='sound'>
+        <compound name='sounds'>
             <stl-vector/>
         </compound>
 

From 3863411287fc906753b88c0836b549bfccc7dc5b Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 19:47:48 -0800
Subject: [PATCH 04/12] Update plotinfost flags; rename raw handlers

Update df.ui.xml
Update df.raws.xml
---
 df.raws.xml |  4 ++--
 df.ui.xml   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/df.raws.xml b/df.raws.xml
index 63338dc71..07fde19af 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -199,7 +199,7 @@
 
         -- Unknown new stuff
 
-        <compound name='unk_v50_1'>
+        <compound name='text_set'>
             <stl-vector/>
             <static-array count='63' type-name='int32_t'/>
         </compound>
@@ -208,7 +208,7 @@
             <stl-vector/>
         </compound>
 
-        <compound name='sounds'>
+        <compound name='sound'>
             <stl-vector/>
         </compound>
 
diff --git a/df.ui.xml b/df.ui.xml
index d6d88c45d..59f7b6e3d 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -350,15 +350,15 @@
         <stl-vector name='economic_stone' type-name='bool'
                     index-refers-to='(material-by-id 0 $)'/>
 
-        <bitfield name='unk23c8_flags'>
-            <flag-bit name='first_year'/>
-            <flag-bit name='recheck_aid_requests'/>
-            <flag-bit name='force_elections'/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit name='caverns_opened'/>
+        <bitfield name='flags'>
+            <flag-bit name='first_year' comment='(FIRSTYEAR)'/>
+            <flag-bit name='recheck_aid_requests' comment='(EVAL_REQUESTERCANCHECK)'/>
+            <flag-bit name='force_elections' comment='(RUN_SPECIAL_ELECTIONS)'/>
+            <flag-bit name='need_to_do_tutorial' comment='(NEED_TO_DO_TUTORIAL)'/>
+            <flag-bit name='minor_victory' comment='(MINOR_VICTORY)'/>
+            <flag-bit name='major_victory' comment='(MAJOR_VICTORY)'/>
+            <flag-bit name='did_first_caravan_announcement' comment='(DID_FIRST_CARAVAN_ANNOUNCEMENT)'/>
+            <flag-bit name='did_first_cavern_announcement' comment='(DID_FIRST_CAVERN_ANNOUNCEMENT)'/>
         </bitfield>
         <int16_t name='mood_cooldown'/>
 

From ca1f880775a4277f5f9e6333812c4eb2d0a031ad Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 20:22:27 -0800
Subject: [PATCH 05/12] Update df.raws.xml

---
 df.raws.xml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/df.raws.xml b/df.raws.xml
index 07fde19af..72f1d54c6 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -25,6 +25,20 @@
         </virtual-methods>
     </class-type>
 
+    <class-type type-name='soundst'>
+        <stl-string name='token'/>
+        <int32_t name='index'/>
+        <stl-vector name='current_definition'>
+            <stl-string/>
+        </stl-vector>
+        <int32_t name='source_hfid'/>
+        <int32_t name='source_enid'/>
+        <int32_t name='sound' comment='index of sound to be played'/>
+        <stl-vector name='announcement' comment='sound can be selected for these announcement types'>
+            <enum type-name='announcement_type'/>
+        </stl-vector>
+    </class-type>
+
     <struct-type type-name='world_raws'>
         !! in bay12 each of these is its own compound and some of them are classes with their own methods !!
 
@@ -197,19 +211,21 @@
 
         <stl-vector name='interactions' since='v0.34.01' pointer-type='interaction'/>
 
-        -- Unknown new stuff
+        -- Text set
 
-        <compound name='text_set'>
+        <compound name='text_set' comment='type text_set_handlerst'>
             <stl-vector/>
             <static-array count='63' type-name='int32_t'/>
         </compound>
 
-        <compound name='music'>
-            <stl-vector/>
+        -- Audio
+        
+        <compound name='music' comment='type music_handlerst'>
+            <stl-vector name='music'/>
         </compound>
 
-        <compound name='sound'>
-            <stl-vector/>
+        <compound name='sound' comment='type sound_handlerst'>
+            <stl-vector name='sound' pointer-type='soundst'/>
         </compound>
 
         -- Material index

From 15cfd20b9b35f5dff0cd4f7c95b7138030c8673c Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 20:26:02 -0800
Subject: [PATCH 06/12] Fix whitespace

---
 df.raws.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/df.raws.xml b/df.raws.xml
index 72f1d54c6..dbaa435f9 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -219,7 +219,7 @@
         </compound>
 
         -- Audio
-        
+
         <compound name='music' comment='type music_handlerst'>
             <stl-vector name='music'/>
         </compound>

From b9a8ada6e9ddccf24313d198f111e7bea09565be Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sat, 16 Dec 2023 20:36:46 -0800
Subject: [PATCH 07/12] Comments

* Update df.raws.xml

* Update df.ui.xml
---
 df.raws.xml | 6 +++---
 df.ui.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/df.raws.xml b/df.raws.xml
index dbaa435f9..8f17f923c 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -213,18 +213,18 @@
 
         -- Text set
 
-        <compound name='text_set' comment='type text_set_handlerst'>
+        <compound name='text_set'>
             <stl-vector/>
             <static-array count='63' type-name='int32_t'/>
         </compound>
 
         -- Audio
 
-        <compound name='music' comment='type music_handlerst'>
+        <compound name='music'>
             <stl-vector name='music'/>
         </compound>
 
-        <compound name='sound' comment='type sound_handlerst'>
+        <compound name='sound'>
             <stl-vector name='sound' pointer-type='soundst'/>
         </compound>
 
diff --git a/df.ui.xml b/df.ui.xml
index 59f7b6e3d..2b37f46e9 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -358,7 +358,7 @@
             <flag-bit name='minor_victory' comment='(MINOR_VICTORY)'/>
             <flag-bit name='major_victory' comment='(MAJOR_VICTORY)'/>
             <flag-bit name='did_first_caravan_announcement' comment='(DID_FIRST_CARAVAN_ANNOUNCEMENT)'/>
-            <flag-bit name='did_first_cavern_announcement' comment='(DID_FIRST_CAVERN_ANNOUNCEMENT)'/>
+            <flag-bit name='did_first_cavern_announcement' comment='(DID_FIRST_CAVERN_ANNOUNCEMENT) required for CAVERNS_OPENED music context'/>
         </bitfield>
         <int16_t name='mood_cooldown'/>
 

From bb5fdec34a73496de3db1841e01bf38cb778c278 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Sun, 17 Dec 2023 15:02:02 -0800
Subject: [PATCH 08/12] Update df.raws.xml

---
 df.raws.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/df.raws.xml b/df.raws.xml
index 8f17f923c..1f6fa7a21 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -28,9 +28,8 @@
     <class-type type-name='soundst'>
         <stl-string name='token'/>
         <int32_t name='index'/>
-        <stl-vector name='current_definition'>
-            <stl-string/>
-        </stl-vector>
+        <stl-vector name='current_definition' pointer-type='stl-string'/>
+        <df-flagarray name='flag'/>
         <int32_t name='source_hfid'/>
         <int32_t name='source_enid'/>
         <int32_t name='sound' comment='index of sound to be played'/>

From 5d171922b911da9e71c03a91586ff6aa8ad0b852 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Tue, 19 Dec 2023 12:52:05 -0800
Subject: [PATCH 09/12] Update changelog.txt

---
 changelog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 4adb1a69a..55d393f6e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -21,6 +21,9 @@ Template for new versions:
 ## Structures
 - ``markup_text_boxst``: updated based on information from bay12
 - ``markup_text_linkst``, ``markup_text_wordst``, ``script_environmentst``: defined
+- ``plotinfost``: `unk23c8_flags` renamed to `flags`, updated based on information from bay12
+- ``world_raws``: `unk_v50_1`, `unk_v50_2`, `unk_v50_3` renamed to `text_set`, `music`, `sound`
+- ``soundst``: defined
 
 # 50.11-r4
 

From 9e80fb373097d7154b7ea2f2b6d6849f914f2c12 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Tue, 19 Dec 2023 21:08:55 -0800
Subject: [PATCH 10/12] Update changelog.txt

---
 changelog.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 55d393f6e..a068d993f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -21,8 +21,8 @@ Template for new versions:
 ## Structures
 - ``markup_text_boxst``: updated based on information from bay12
 - ``markup_text_linkst``, ``markup_text_wordst``, ``script_environmentst``: defined
-- ``plotinfost``: `unk23c8_flags` renamed to `flags`, updated based on information from bay12
-- ``world_raws``: `unk_v50_1`, `unk_v50_2`, `unk_v50_3` renamed to `text_set`, `music`, `sound`
+- ``plotinfost``: ``unk23c8_flags`` renamed to ``flags``, updated based on information from bay12
+- ``world_raws``: ``unk_v50_1``, ``unk_v50_2``, ``unk_v50_3`` renamed to ``text_set``, ``music``, ``sound``
 - ``soundst``: defined
 
 # 50.11-r4

From 35e8fafb6e1b6cefbba221bbbeb0f5331d248565 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Wed, 27 Dec 2023 15:16:32 -0800
Subject: [PATCH 11/12] Update df.announcements.xml

---
 df.announcements.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/df.announcements.xml b/df.announcements.xml
index 5f92622db..f3c62be86 100644
--- a/df.announcements.xml
+++ b/df.announcements.xml
@@ -1221,7 +1221,7 @@
         <enum base-type='int32_t' type-name='announcement_alert_type' name='type'/>
         <stl-vector name='announcement_id' type-name='int32_t'/>
         <stl-vector name='report_unid' type-name='int32_t' comment='unit id'/>
-        <stl-vector name='report_unit_announcement_category'>
+        <stl-vector name='report_unit_announcement_category' comment='vector must be same length as report_unid'>
             <enum type-name='unit_report_type'/>
         </stl-vector>
     </struct-type>

From 40369b9a54280e75fd09d419fc2a83c4859e39c3 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams.1990@gmail.com>
Date: Wed, 27 Dec 2023 15:26:09 -0800
Subject: [PATCH 12/12] Add missing changelog entries

---
 changelog.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index a068d993f..fd7631c45 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -19,11 +19,15 @@ Template for new versions:
 # Future
 
 ## Structures
-- ``markup_text_boxst``: updated based on information from bay12
+- ``markup_text_boxst``: updated based on information from Bay12
 - ``markup_text_linkst``, ``markup_text_wordst``, ``script_environmentst``: defined
-- ``plotinfost``: ``unk23c8_flags`` renamed to ``flags``, updated based on information from bay12
+- ``plotinfost``: ``unk23c8_flags`` renamed to ``flags``, updated based on information from Bay12
 - ``world_raws``: ``unk_v50_1``, ``unk_v50_2``, ``unk_v50_3`` renamed to ``text_set``, ``music``, ``sound``
 - ``soundst``: defined
+- ``announcement_alertst``: defined
+- ``announcement_alert_type``: enum defined
+- ``announcement_type``: added ``alert_type`` enum attribute
+- ``alert_button_announcement_id``: now int32_t vector (contains report ids)
 
 # 50.11-r4