From 16abcad25ea059469cb0465cdde4575f7f87e4f2 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Mon, 11 Aug 2025 18:05:16 -0600
Subject: [PATCH] Add missing original-name attributes

and split rhythm_flag out into a global bitfield like everything else
---
 df.d_init.xml         |  2 +-
 df.event.xml          |  2 +-
 df.history_figure.xml |  2 +-
 df.rhythm.xml         | 12 +++++++-----
 df.scale.xml          |  2 +-
 df.unit.xml           |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/df.d_init.xml b/df.d_init.xml
index a51fe3ae0..f2382fd04 100644
--- a/df.d_init.xml
+++ b/df.d_init.xml
@@ -180,7 +180,7 @@
                       count='356' index-enum='announcement_type'/>
     </struct-type>
 
-    <struct-type type-name='d_init'>
+    <struct-type type-name='d_init' original-name='d_initst'>
         <compound name='display' type-name='d_init_displayst'/>
         <compound name='adventure' type-name='d_init_adventurest'/>
         <compound name='dwarf' type-name='d_init_dwarfst'/>
diff --git a/df.event.xml b/df.event.xml
index 0807430f6..e2cd6d7c5 100644
--- a/df.event.xml
+++ b/df.event.xml
@@ -111,7 +111,7 @@
         <enum-item name='FromColony'/>
     </enum-type>
 
-    <struct-type type-name='vermin' instance-vector='$global.world.event.vermin'>
+    <struct-type type-name='vermin' original-name='event_verminst' instance-vector='$global.world.event.vermin'>
         <int16_t name='race' ref-target='creature_raw'/>
         <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
         <compound name='pos' type-name='coord'/>
diff --git a/df.history_figure.xml b/df.history_figure.xml
index a6201b217..961f1c6aa 100644
--- a/df.history_figure.xml
+++ b/df.history_figure.xml
@@ -103,7 +103,7 @@
         <flag-bit name='gelded'/>
     </bitfield-type>
 
-    <struct-type type-name="body_profilest"> bay12: body_profilest
+    <struct-type type-name="body_profilest">
         <stl-vector name="events" type-name='int32_t' ref-target='history_event'/>
         <stl-bit-vector name="status" comment='missing body parts'>
             <code-helper name='index-refers-to'>
diff --git a/df.rhythm.xml b/df.rhythm.xml
index 1cd4e4828..b1c79448d 100644
--- a/df.rhythm.xml
+++ b/df.rhythm.xml
@@ -35,14 +35,16 @@
         <bitfield name='flags' base-type='uint32_t' type-name='rhythm_construction_flag'/>
     </struct-type>
 
-    <struct-type type-name='rhythm' instance-vector='$global.world.rhythms.all' key-field='id'>
+    <bitfield-type type-name='rhythm_flag' base-type='uint32_t'> bay12: RHYTHM_FLAG_*
+        <flag-bit name='fundamental_polyrhythm'/>
+        <flag-bit name='fundamental_polymeter'/>
+    </bitfield-type>
+
+    <struct-type type-name='rhythm' original-name='rhythmst' instance-vector='$global.world.rhythms.all' key-field='id'>
         <int32_t name='id'/>
         <stl-vector name='patterns' pointer-type='rhythm_pattern'/>
         <stl-vector name='sub_rhythms' pointer-type='sub_rhythm'/>
-        <bitfield name='flags' base-type='uint32_t'> bay12: RHYTHM_FLAG_*
-            <flag-bit name='fundamental_polyrhythm'/>
-            <flag-bit name='fundamental_polymeter'/>
-        </bitfield>
+        <bitfield name='flags' base-type='uint32_t' type-name='rhythm_flag'/>
     </struct-type>
 
     <struct-type type-name='rhythm_handlerst'>
diff --git a/df.scale.xml b/df.scale.xml
index c89acadde..44316f4da 100644
--- a/df.scale.xml
+++ b/df.scale.xml
@@ -51,7 +51,7 @@
         <flag-bit name='tonic_note_fixed_at_performance' comment='moveable_tonic'/>
     </bitfield-type>
 
-    <struct-type type-name='scale' instance-vector='$global.world.scales.all' key-field='id'>
+    <struct-type type-name='scale' original-name='scalest' instance-vector='$global.world.scales.all' key-field='id'>
         <int32_t name='id'/>
         <bitfield name='flags' base-type='uint32_t' type-name='scale_flag'/>
         <enum name='type' type-name='scale_type' base-type='int32_t'/>
diff --git a/df.unit.xml b/df.unit.xml
index 2fcceae6a..391d3d8c5 100644
--- a/df.unit.xml
+++ b/df.unit.xml
@@ -2412,7 +2412,7 @@
         <stl-vector name='own_interaction_delay' type-name='int32_t' since='v0.34.01'/>
     </struct-type>
 
-    <struct-type type-name='unit_appearance' comment='physical_formst'>
+    <struct-type type-name='unit_appearance' original-name='physical_formst'>
         <int32_t name='local_id'/>
         <int32_t name='caste_index' refers-to='$global.world.raws.creatures.list_creature[$]' comment='also refers to $global.world.raws.creatures.list_caste[$]'/>
         <int16_t name='favoredgrasp_bp'/>