From f20bf5d7c2f4d31c11c43d66d1c04d6399d79627 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Mon, 26 Dec 2022 15:10:28 -0600
Subject: [PATCH] Updates

* Add new fields to map_viewport
* There's now a map_viewport inside world
* Fix building_flags
* Add new tree tile types
* Fix alignment of material[_template]
* Remove plotinfo.unk_v50_1, update and realign plotinfo.main
* Realign map_renderer
* Realign entity_raw and entity_position_raw
* Realign manager_order_template and identify where they get stored
* Identify some Steam/Classic differences, which are going to be a pain
* Add layouts for some new map event types, currently unknown
* Identify new vectors in matgloss_list
---
 df.buildings.xml   |   5 +-
 df.entity-raws.xml |  19 +-
 df.jobs.xml        |   3 +
 df.materials.xml   |  36 +++-
 df.refs.xml        |   4 +-
 df.tile-types.xml  | 443 ++++++++++++++++++++++++++++++++++++++-------
 df.ui-menus.xml    |  45 +++--
 df.ui.xml          |  95 +++-------
 df.viewscreen.xml  |  18 +-
 df.world.xml       |  42 +++--
 10 files changed, 511 insertions(+), 199 deletions(-)

diff --git a/df.buildings.xml b/df.buildings.xml
index fd3450b6d..8740c3bb0 100644
--- a/df.buildings.xml
+++ b/df.buildings.xml
@@ -207,10 +207,9 @@
         <flag-bit name='site_blocked' comment='items on ground on site'/>
         <flag-bit name='room_collision' comment='major intersection with another room?'/>
         <flag-bit/>
-        <flag-bit name='justice'/>
         <flag-bit name='almost_deleted' comment='when requesting delete while in_update'/>
-        <flag-bit name='in_update'/>
-        <flag-bit name='from_worldgen'/>
+        <flag-bit name='in_update'/> moved?
+        <flag-bit name='from_worldgen'/> moved?
     </bitfield-type>
 
     <bitfield-type type-name='door_flags' base-type='uint16_t'>
diff --git a/df.entity-raws.xml b/df.entity-raws.xml
index 56f965cab..5eb17343b 100644
--- a/df.entity-raws.xml
+++ b/df.entity-raws.xml
@@ -221,15 +221,15 @@
         <stl-string name='translation'/>
 
         <compound name='symbols'>
-            <static-array name='symbols1' type-name='language_word_table' index-enum='entity_name_type' count='18'/>
-            <static-array name='symbols2' type-name='language_word_table' index-enum='entity_name_type' count='18'/>
-            <static-array name='select_symbol' index-enum='entity_name_type' count='18'>
+            <static-array name='symbols1' type-name='language_word_table' index-enum='entity_name_type' count='19'/>
+            <static-array name='symbols2' type-name='language_word_table' index-enum='entity_name_type' count='19'/>
+            <static-array name='select_symbol' index-enum='entity_name_type' count='19'>
                 <stl-vector pointer-type='stl-string'/>
             </static-array>
-            <static-array name='subselect_symbol' index-enum='entity_name_type' count='18'>
+            <static-array name='subselect_symbol' index-enum='entity_name_type' count='19'>
                 <stl-vector pointer-type='stl-string'/>
             </static-array>
-            <static-array name='cull_symbol' index-enum='entity_name_type' count='18'>
+            <static-array name='cull_symbol' index-enum='entity_name_type' count='19'>
                 <stl-vector pointer-type='stl-string'/>
             </static-array>
         </compound>
@@ -326,12 +326,6 @@
             <stl-vector name='permitted_reaction_id' type-name='int32_t' ref-target='reaction'/>
         </compound>
 
-        <compound name='land_holder_trigger'>
-            <static-array name='num' type-name='int32_t' count='10'/>
-            <static-array name='population' type-name='int32_t' count='10'/>
-            <static-array name='wealth' type-name='int32_t' count='10'/>
-        </compound>
-
         <int32_t name='banditry'/>
 
         <stl-vector pointer-type='stl-string' name='gem_shapes_str'/>
@@ -503,6 +497,9 @@
         <int32_t name='required_tomb'/>
         <int32_t name='mandate_max'/>
         <int32_t name='demand_max'/>
+
+        <int32_t/>
+        <stl-string/>
     </struct-type>
 </data-definition>
 
diff --git a/df.jobs.xml b/df.jobs.xml
index 658f00a1b..52b91db4c 100644
--- a/df.jobs.xml
+++ b/df.jobs.xml
@@ -467,6 +467,9 @@
         <int32_t name="hist_figure_id" ref-target='historical_figure'/>
         <bitfield name="material_category" type-name='job_material_category'/>
         <int32_t name='unk_1' init-value='1'/>
+        <stl-string/>
+        <stl-string/>
+        <int32_t/>
     </struct-type>
 
     <enum-type type-name='guild_id' base-type='int16_t'>
diff --git a/df.materials.xml b/df.materials.xml
index 5e6f0451e..b016f5ca8 100644
--- a/df.materials.xml
+++ b/df.materials.xml
@@ -291,6 +291,11 @@
         </compound>
 
         <stl-vector name='reaction_class' pointer-type='stl-string'/>
+    </struct-type>
+
+    <struct-type type-name='material' inherits-from='material_common' custom-methods='true'>
+        <code-helper name='find-instance'>(material-by-id $ $$)</code-helper>
+        <code-helper name='describe'> (describe-material $) </code-helper>
 
         <uint8_t name='tile'/>
 
@@ -300,24 +305,17 @@
 
         <uint8_t name='item_symbol'/>
 
+        <int32_t/><int32_t/><int32_t/> 0.50.01
+
         <int16_t name='powder_dye'/> // color token index
         <int16_t name='temp_diet_info'/>
 
-        <int32_t/><int32_t/><int32_t/><int32_t/> 0.50.01
-
         <stl-vector name='syndrome' pointer-type='syndrome'/>
 
         <int32_t name='soap_level'/>
 
         <stl-vector name='unk_41c' type-name='int16_t' since='v0.40.01'/>
 
-        <int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/> 0.50.01
-    </struct-type>
-
-    <struct-type type-name='material' inherits-from='material_common' custom-methods='true'>
-        <code-helper name='find-instance'>(material-by-id $ $$)</code-helper>
-        <code-helper name='describe'> (describe-material $) </code-helper>
-
         <stl-string name='prefix'/>
 
         <static-array name='food_mat_index' count='39' index-enum='organic_mat_category'>
@@ -327,6 +325,9 @@
 
         <stl-string name='powder_dye_str' comment='temporary'/>
         <static-array name='state_color_str' type-name='stl-string' count='6' index-enum='matter_state'/>
+
+        <int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/><int32_t/> 0.50.01
+
         <custom-methods>
             <cmethod name='isGem'/>
             <cmethod name='isStone'/>
@@ -343,6 +344,23 @@
     <struct-type type-name='material_template' inherits-from='material_common'>
         <code-helper name='describe'> (describe-material $) </code-helper>
 
+        <uint8_t name='tile'/>
+
+        <static-array name='basic_color' type-name='int16_t' count='2'/>
+        <static-array name='build_color' type-name='int16_t' count='3'/>
+        <static-array name='tile_color' type-name='int16_t' count='3'/>
+
+        <uint8_t name='item_symbol'/>
+
+        <int16_t name='powder_dye'/> // color token index
+        <int16_t name='temp_diet_info'/>
+
+        <stl-vector name='syndrome' pointer-type='syndrome'/>
+
+        <int32_t name='soap_level'/>
+
+        <stl-vector name='unk_41c' type-name='int16_t' since='v0.40.01'/>
+
         <stl-string name='powder_dye_str' comment='temporary'/>
         <static-array name='state_color_str' type-name='stl-string' count='6' index-enum='matter_state'/>
     </struct-type>
diff --git a/df.refs.xml b/df.refs.xml
index c2e93d4e2..2c321439a 100644
--- a/df.refs.xml
+++ b/df.refs.xml
@@ -546,7 +546,7 @@
                 <pointer name='file' type-name='file_compressorst'/>
                 <enum name='loadversion' type-name='save_version'/>
             </vmethod>
-            <vmethod comment='generate_xml'>
+            <vmethod name='generate_xml'>
                 <pointer type-name='stl-fstream'/>
                 <int32_t name='indent'/>
             </vmethod>
@@ -598,7 +598,7 @@
                 <pointer name='file' type-name='file_compressorst'/>
                 <enum name='loadversion' type-name='save_version'/>
             </vmethod>
-            <vmethod comment='generate_xml'>
+            <vmethod name='generate_xml'>
                 <pointer type-name='stl-fstream'/>
                 <int32_t name='indent'/>
             </vmethod>
diff --git a/df.tile-types.xml b/df.tile-types.xml
index e7cf1d42c..87e4d308f 100644
--- a/df.tile-types.xml
+++ b/df.tile-types.xml
@@ -331,31 +331,111 @@
             <item-attr name='shape' value='STAIR_UPDOWN'/>
             <item-attr name='material' value='UNDERWORLD_GATE'/>
         </enum-item>
-        <enum-item/>
+        <enum-item name='TreeCapPillar_unk07'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
 
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeCapPillar_unk08'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk09'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk0A'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk0B'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk0C'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk0D'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk0E'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk0F'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
 
         -- 0x010
 
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeCapPillar_unk10'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk11'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk12'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
         <enum-item name='Driftwood'>
             <item-attr name='caption' value='driftwood'/>
             <item-attr name='shape' value='FLOOR'/>
             <item-attr name='material' value='DRIFTWOOD'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeCapPillar_unk14'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk15'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk16'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
+        <enum-item name='TreeCapPillar_unk17'>
+            <item-attr name='caption' value='cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH'/>
+        </enum-item>
 
         <enum-item/>
         <enum-item name='FrozenStairUD'>
@@ -376,7 +456,12 @@
         <enum-item/>
         <enum-item/>
         <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk1F'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
 
         -- 0x020
 
@@ -385,7 +470,12 @@
             <item-attr name='shape' value='EMPTY'/>
             <item-attr name='material' value='AIR'/>
         </enum-item>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk21'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='Shrub'>
             <item-attr name='caption' value='shrub'/>
             <item-attr name='shape' value='SHRUB'/>
@@ -466,7 +556,12 @@
 
         -- 0x030
 
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk30'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='Grass1StairUD'>
             <item-attr name='caption' value='light grass stair up/down'/>
             <item-attr name='shape' value='STAIR_UPDOWN'/>
@@ -546,20 +641,40 @@
 
         -- 0x040
 
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk40'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='StoneFortification'>
             <item-attr name='caption' value='stone fortification'/>
             <item-attr name='shape' value='FORTIFICATION'/>
             <item-attr name='material' value='STONE'/>
         </enum-item>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk42'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='Campfire'>
             <item-attr name='caption' value='campfire'/>
             <item-attr name='shape' value='FLOOR'/>
             <item-attr name='material' value='CAMPFIRE'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk44'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
+        <enum-item name='TreeDeadCapPillar_unk45'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='Fire'>
             <item-attr name='caption' value='fire'/>
             <item-attr name='shape' value='FLOOR'/>
@@ -596,8 +711,18 @@
             <item-attr name='shape' value='FLOOR'/>
             <item-attr name='material' value='FIRE'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk4D'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
+        <enum-item name='TreeDeadCapPillar_unk4E'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='StonePillar'>
             <item-attr name='caption' value='stone pillar'/>
             <item-attr name='shape' value='WALL'/>
@@ -631,12 +756,37 @@
             <item-attr name='material' value='FROZEN_LIQUID'/>
             <item-attr name='special' value='SMOOTH'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk54'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
+        <enum-item name='TreeDeadCapPillar_unk55'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
+        <enum-item name='TreeDeadCapPillar_unk56'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
+        <enum-item name='TreeDeadCapPillar_unk57'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
 
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unk58'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='Waterfall'>
             <item-attr name='caption' value='waterfall'/>
             <item-attr name='shape' value='FLOOR'/>
@@ -1020,8 +1170,19 @@
             <item-attr name='special' value='DEAD'/>
             <item-attr name='direction' value='EW'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeBranchNSEW_unk95'>
+            <item-attr name='caption' value='branches (NSEW)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='NSEW'/>
+        </enum-item>
+        <enum-item name='TreeDeadBranchNSEW_unk96'>
+            <item-attr name='caption' value='dead branches (NSEW)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='NSEW'/>
+        </enum-item>
         <enum-item name='TreeDeadBranchNW'>
             <item-attr name='caption' value='dead branch (NW)'/>
             <item-attr name='shape' value='BRANCH'/>
@@ -1163,7 +1324,12 @@
             <item-attr name='special' value='DEAD'/>
             <item-attr name='variant' value='VAR_4'/>
         </enum-item>
-        <enum-item/>
+        <enum-item name='TreeDeadCapPillar_unkAB'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='StoneWallWorn1'>
             <item-attr name='caption' value='worn 1 stone wall'/>
             <item-attr name='shape' value='WALL'/>
@@ -1357,23 +1523,99 @@
             <item-attr name='material' value='TREE'/>
             <item-attr name='special' value='DEAD'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeTrunkNW_unkC9'>
+            <item-attr name='caption' value='trunk (NW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='NW'/>
+        </enum-item>
+        <enum-item name='TreeTrunkNE_unkCA'>
+            <item-attr name='caption' value='trunk (NE)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='NE'/>
+        </enum-item>
+        <enum-item name='TreeTrunkSW_unkCB'>
+            <item-attr name='caption' value='trunk (SW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='SW'/>
+        </enum-item>
+        <enum-item name='TreeTrunkSE_unkCC'>
+            <item-attr name='caption' value='trunk (SE)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='SE'/>
+        </enum-item>
+        <enum-item name='TreeDeadTrunkNW_unkCD'>
+            <item-attr name='caption' value='dead trunk (NW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='NW'/>
+        </enum-item>
+        <enum-item name='TreeDeadTrunkNE_unkCE'>
+            <item-attr name='caption' value='dead trunk (NE)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='NE'/>
+        </enum-item>
+        <enum-item name='TreeDeadTrunkSW_unkCF'>
+            <item-attr name='caption' value='dead trunk (SW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='SW'/>
+        </enum-item>
 
         -- 0x0D0
 
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadTrunkSE_unkD0'>
+            <item-attr name='caption' value='dead trunk (SE)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='SE'/>
+        </enum-item>
+        <enum-item name='TreeTrunkNS_unkD1'>
+            <item-attr name='caption' value='trunk (NS)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='NS'/>
+        </enum-item>
+        <enum-item name='TreeTrunkNS_unkD2'>
+            <item-attr name='caption' value='trunk (NS)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='NS'/>
+        </enum-item>
+        <enum-item name='TreeTrunkEW_unkD3'>
+            <item-attr name='caption' value='trunk (EW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='EW'/>
+        </enum-item>
+        <enum-item name='TreeTrunkEW_unkD4'>
+            <item-attr name='caption' value='trunk (EW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='EW'/>
+        </enum-item>
+        <enum-item name='TreeDeadTrunkNS_unkD5'>
+            <item-attr name='caption' value='dead trunk (NS)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='S'/>
+        </enum-item>
+        <enum-item name='TreeDeadTrunkNS_unkD6'>
+            <item-attr name='caption' value='dead trunk (NS)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='N'/>
+        </enum-item>
         <enum-item name='StoneWall'>
             <item-attr name='caption' value='stone wall'/>
             <item-attr name='shape' value='WALL'/>
@@ -1381,20 +1623,81 @@
             <item-attr name='special' value='NORMAL'/>
         </enum-item>
 
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadTrunkEW_unkD8'>
+            <item-attr name='caption' value='dead trunk (EW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='EW'/>
+        </enum-item>
+        <enum-item name='TreeDeadTrunkEW_unkD9'>
+            <item-attr name='caption' value='dead trunk (EW)'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='EW'/>
+        </enum-item>
+        <enum-item name='TreeBranchS'>
+            <item-attr name='caption' value='branch (S)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='S'/>
+        </enum-item>
+        <enum-item name='TreeBranchN'>
+            <item-attr name='caption' value='branch (N)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='N'/>
+        </enum-item>
+        <enum-item name='TreeBranchW'>
+            <item-attr name='caption' value='branch (W)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='W'/>
+        </enum-item>
+        <enum-item name='TreeBranchE'>
+            <item-attr name='caption' value='branch (E)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='direction' value='E'/>
+        </enum-item>
+        <enum-item name='TreeDeadBranchS'>
+            <item-attr name='caption' value='branch (S)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='S'/>
+        </enum-item>
+        <enum-item name='TreeDeadBranchN'>
+            <item-attr name='caption' value='branch (N)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='N'/>
+        </enum-item>
 
         -- 0x0E0
 
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='TreeDeadBranchW'>
+            <item-attr name='caption' value='branch (W)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='W'/>
+        </enum-item>
+        <enum-item name='TreeDeadBranchE'>
+            <item-attr name='caption' value='branch (E)'/>
+            <item-attr name='shape' value='BRANCH'/>
+            <item-attr name='material' value='TREE'/>
+            <item-attr name='special' value='DEAD'/>
+            <item-attr name='direction' value='E'/>
+        </enum-item>
+        <enum-item name='TreeDeadCapPillar_unkE2'>
+            <item-attr name='caption' value='dead cap pillar'/>
+            <item-attr name='shape' value='WALL'/>
+            <item-attr name='material' value='MUSHROOM'/>
+            <item-attr name='special' value='SMOOTH_DEAD'/>
+        </enum-item>
         <enum-item name='Sapling'>
             <item-attr name='caption' value='sapling'/>
             <item-attr name='shape' value='SAPLING'/>
@@ -2333,14 +2636,30 @@
             <item-attr name='material' value='BROOK'/>
             <item-attr name='direction' value='SE'/>
         </enum-item>
-        <enum-item name='BrookTop'>
+        <enum-item name='BrookTop1'>
             <item-attr name='caption' value='brook top'/>
             <item-attr name='shape' value='BROOK_TOP'/>
             <item-attr name='material' value='BROOK'/>
+            <item-attr name='variant' value='VAR_1'/>
+        </enum-item>
+        <enum-item name='BrookTop2'>
+            <item-attr name='caption' value='brook top'/>
+            <item-attr name='shape' value='BROOK_TOP'/>
+            <item-attr name='material' value='BROOK'/>
+            <item-attr name='variant' value='VAR_2'/>
+        </enum-item>
+        <enum-item name='BrookTop3'>
+            <item-attr name='caption' value='brook top'/>
+            <item-attr name='shape' value='BROOK_TOP'/>
+            <item-attr name='material' value='BROOK'/>
+            <item-attr name='variant' value='VAR_3'/>
+        </enum-item>
+        <enum-item name='BrookTop4'>
+            <item-attr name='caption' value='brook top'/>
+            <item-attr name='shape' value='BROOK_TOP'/>
+            <item-attr name='material' value='BROOK'/>
+            <item-attr name='variant' value='VAR_4'/>
         </enum-item>
-        <enum-item/>
-        <enum-item/>
-        <enum-item/>
         <enum-item/>
         <enum-item/>
         <enum-item name='GrassDryFloor1'>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index b599aeb92..407d81f74 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -1441,16 +1441,18 @@
             <int32_t/>
             <int8_t/>
             <stl-vector/>
-            <int8_t/>
-            <int32_t/>
-            <stl-vector/>
-            <stl-vector/>
-            <int32_t/>
-            <int8_t/>
-            <int32_t/>
-            <int32_t/>
-            <int8_t/>
-            <stl-string/>
+            <compound name='orders'>
+                <int8_t/>
+                <int32_t/>
+                <stl-vector pointer-type='manager_order_template' name='orders'/>
+                <stl-vector/>
+                <int32_t/>
+                <int8_t/>
+                <int32_t/>
+                <int32_t/>
+                <int8_t/>
+                <stl-string/>
+            </compound>
             <int8_t/>
             <int32_t/>?
             <int8_t/>
@@ -1669,12 +1671,13 @@
 
         <compound name='steam'>
             <stl-vector pointer-type='unk_steam'/>
-            <pointer/>
-            <int8_t/>
-            <stl-vector pointer-type='unk_steam'/>
-            <int8_t/>
-            <int32_t/>
-            <compound name='CreateItemResult'>
+
+            <pointer/> -- Not present in Classic
+            <int8_t/> -- Not present in Classic
+            <stl-vector pointer-type='unk_steam'/> -- Not present in Classic
+            <int8_t/> -- Not present in Classic
+            <int32_t/> -- Not present in Classic
+            <compound name='CreateItemResult'> -- Not present in Classic
                 <pointer name='vftable'/>
                 <uint8_t name='m_nCallbackFlags'/>
                 <int32_t name='m_iCallback'/>
@@ -1682,7 +1685,7 @@
                 <pointer name='m_pObj' comment='mod_managerst'/>
                 <pointer name='m_Func'/>
             </compound>
-            <compound name='SubmitItemUpdateResult'>
+            <compound name='SubmitItemUpdateResult'> -- Not present in Classic
                 <pointer name='vftable'/>
                 <uint8_t name='m_nCallbackFlags'/>
                 <int32_t name='m_iCallback'/>
@@ -1690,6 +1693,7 @@
                 <pointer name='m_pObj' comment='mod_managerst'/>
                 <pointer name='m_Func'/>
             </compound>
+
             <pointer/>
             <pointer/>?
             <pointer/>?
@@ -1702,6 +1706,7 @@
             <static-array count='11'><static-array count='6' type-name='int32_t'/></static-array>
             <static-array count='7'><static-array count='6' type-name='int32_t'/></static-array>
             <static-array count='4'><static-array count='6' type-name='int32_t'/></static-array>
+            <int32_t name='external_flag'/>
         </compound>
     </struct-type>
 
@@ -1802,9 +1807,9 @@
         <stl-vector pointer-type='stl-string'/>
         <stl-string/>
         <stl-string/>
-        <stl-string/>
-        <pointer/>?
-        <pointer/>?
+        <stl-string/> -- Not present in Classic
+        <pointer/>? -- Not present in Classic
+        <pointer/>? -- Not present in Classic
     </struct-type>
 
     <struct-type type-name='ui_look_list'>
diff --git a/df.ui.xml b/df.ui.xml
index ed7da6a6e..6446ca6c0 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -604,9 +604,10 @@
         <stl-vector name='infiltrator_years' type-name='int32_t' since='v0.47.01'/>
         <stl-vector name='infiltrator_year_ticks' type-name='int32_t' since='v0.47.01'/>
 
-        <stl-vector/> 0.50.01
-        <stl-vector/> 0.50.01
-        <int32_t/> 0.50.01
+        <stl-vector type-name='int32_t'/> 0.50.01
+        <stl-vector type-name='int32_t'/> 0.50.01
+        <int32_t name='food_warn_year'/>
+        <int32_t name='food_warn_year_tick'/>
 
         <compound name='main'>
             <static-array name='hotkeys' type-name='ui_hotkey' count='16'/>
@@ -627,10 +628,11 @@
                     <enum base-type='int16_t' name='ghost_type' type-name='ghost_type'/>
                 </pointer>
             </stl-vector>
-
+            <compound type-name='custom_difficulty' name='custom_difficulty'/>
             <pointer name='fortress_entity' type-name='historical_entity' comment='entity pointed to by group_id'/>
             <pointer name='fortress_site' type-name='world_site'/>
 
+<!--        Some of these might be in here somewhere
             <enum base-type='int16_t' name='mode' type-name='ui_sidebar_mode'/>
 
             <int16_t name='unk1'/>
@@ -638,14 +640,21 @@
             <int16_t name='selected_traffic_cost'
                      comment='For changing the above costs.'/>
 
-            <bool name='autosave_request'/>
-            <bool name='autosave_unk' comment='set to 0 when a_rq set to 1'/>
-
+            <int16_t/>
             <int32_t name='unk6df4'/>
 
             <bool name='unk_44_12a'/>
-            <padding name='pad_1' size='3' comment='workaround for strange IDA 7.0 bug'/>
 
+-->
+            <int16_t name='unk_v50_2'/>
+            <int16_t name='unk_v50_3'/>
+            <int16_t name='unk_v50_4'/>
+            <bool name='autosave_request'/>
+            <int32_t name='autosave_unk'/>
+            <compound type-name='file_compressorst' name='file'/>
+            <int32_t name='unk_v50_5'/>
+            <compound type-name='nemesis_offload' name='unk_v50_6'/>
+            <int8_t name='unk_v50_7'/>
             <compound name='unk_44_12b' type-name='nemesis_offload'/>
             <bool name='unk_44_12c' since='v0.44.12'/>
             <int32_t name='unk_44_12d' comment='padding?'/>
@@ -654,68 +663,6 @@
             <bool name='in_rename_hotkey'/>
         </compound>
 
-        <compound name='unk_v50_1'>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <uint32_t name='flags'/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <static-array count='3'><static-array count='10' type-name='int32_t'/></static-array>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <pointer/>
-            <pointer/>
-            <int16_t/>
-            <int16_t/>
-            <int16_t/>
-            <int8_t/>
-            <int32_t/>
-            <compound type-name='file_compressorst' name='file'/>
-            <int32_t/>
-            <stl-vector/>
-            <stl-vector/>
-            <stl-vector/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int8_t/>
-            <stl-vector/>
-            <stl-vector/>
-            <stl-vector/>
-            <pointer/>
-            <int32_t/>
-            <int32_t/>
-            <int8_t/>
-            <int32_t/>?
-            <int32_t/>?
-            <int32_t/>?
-        </compound>
-
         <compound name='squads'>
             <stl-vector name='list' has-bad-pointers='true'
                         comment='valid only when ui is displayed' pointer-type='squad'/>
@@ -795,12 +742,20 @@
         <int16_t name='window_x'/>
         <int16_t name='window_y'/>
         <int16_t name='window_z'/>
+        <pointer type-name='graphic_viewportst' name='main_viewport'/>
+        <static-array name='lower_viewport' pointer-type='graphic_viewportst' count='8'/>
+        <int32_t/>
+        <pointer type-name='int32_t'/>
+        <int32_t/>
     </struct-type>
 
     <struct-type type-name='map_renderer'>
         <static-array name='entity' count='256'>
             <static-array count='256' type-name='uint8_t' comment='|=1 building, |=2 ramp/stair'/>
         </static-array>
+        <static-array name='unk_v50_1' count='256'>
+            <static-array count='256' type-name='int16_t'/>
+        </static-array>
         <stl-vector name='cursor_units' pointer-type='unit'/>
         <pointer name='cursor_guts' type-name='unit'/>
         <bool name='multiple_guts'/>
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index 13f6d13d4..192a0e808 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -955,15 +955,15 @@
         <stl-vector name='body_detail_plans' pointer-type='stl-string'/>
         <stl-vector name='creature_variations' pointer-type='stl-string'/>
         <stl-vector name='interactions' pointer-type='stl-string'/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
-        <stl-vector/>
+        <stl-vector name='text_sets' pointer-type='stl-string'/>
+        <stl-vector name='musics' pointer-type='stl-string'/>
+        <stl-vector name='sounds' pointer-type='stl-string'/>
+        <stl-vector name='mod_ids' pointer-type='stl-string'/>
+        <stl-vector name='mod_versions' type-name='int32_t'/>
+        <stl-vector name='mod_compatible_versions' type-name='int32_t'/>
+        <stl-vector name='mod_folder_paths' pointer-type='stl-string'/>
+        <stl-vector name='mod_names' pointer-type='stl-string'/>
+        <stl-vector name='mod_display_versions' pointer-type='stl-string'/>
     </struct-type>
 
     <class-type type-name='viewscreen_loadgamest' inherits-from='viewscreen'>
diff --git a/df.world.xml b/df.world.xml
index f153c342c..2cb46a7f8 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -426,6 +426,28 @@
         <stl-vector name='details' pointer-type='stl-string'/>
     </struct-type>
 
+    <struct-type type-name='mapevent_v50_1'>
+        <int32_t/>
+        <compound type-name='coord' name='pos1'/>
+        <int32_t/>
+        <int8_t/>
+        <compound type-name='coord_path' name='path'/>
+        <compound type-name='coord' name='pos2'/>
+    </struct-type>
+
+    <struct-type type-name='mapevent_v50_2'>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <int32_t/>
+        <compound type-name='coord_path' name='path'/>
+        <compound type-name='coord' name='pos'/>
+    </struct-type>
+
     <struct-type type-name='cursed_tomb'>
         <int8_t name='triggered'/>
         <stl-vector type-name='int32_t' name='coffin_skeletons' ref-target='item'/>
@@ -768,17 +790,13 @@
 
     <struct-type type-name='world'>
         dtor 89fff80
-        <!-- <compound> -->
+        <!-- <compound name='map_events'> -->
         <stl-vector name='glowing_barriers' pointer-type='glowing_barrier'/>
         <stl-vector name='deep_vein_hollows' pointer-type='deep_vein_hollow'/>
-
-        <stl-vector/>
-        <stl-vector/>
-
+        <stl-vector name='mapevent_v50_1' pointer-type='mapevent_v50_1'/>
+        <stl-vector name='mapevent_v50_2' pointer-type='mapevent_v50_2'/>
         <stl-vector name='cursed_tombs' pointer-type='cursed_tomb'/>
-
         <stl-vector name='engravings' pointer-type='engraving'/>
-
         <compound name='vermin'>
             <stl-vector name='all' pointer-type='vermin'/>
             <stl-vector name='colonies' pointer-type='vermin'/>
@@ -795,8 +813,8 @@
 
         <stl-vector name='site_glowing_barriers' pointer-type='glowing_barrier'/>
         <stl-vector name='site_deep_vein_hollows' pointer-type='deep_vein_hollow'/>
-        <stl-vector/>
-        <stl-vector/>
+        <stl-vector name='site_mapevent_v50_1' pointer-type='mapevent_v50_1'/>
+        <stl-vector name='site_mapevent_v50_2' pointer-type='mapevent_v50_2'/>
         <stl-vector name='site_cursed_tombs' pointer-type='cursed_tomb'/>
         <stl-vector name='site_engravings' pointer-type='engraving'/>
         <stl-vector name='site_constructions' pointer-type='construction'/>
@@ -1502,16 +1520,14 @@
             </pointer>
         </stl-vector>
 
+        <compound type-name='map_viewport' name='viewport'/>
+
         <int32_t name='unk_131f08' since='v0.44.01'/>
 
         <bool name="reindex_pathfinding" comment='forces map_block.passable to be recomputed'/>
 
         <int32_t name='frame_counter' comment='increases by 1 every time . is pressed'/>
 
-        <static-array count='22' type-name='int32_t'/> 0.50.01
-        <pointer/> 0.50.01
-        <static-array count='6' type-name='int32_t'/> 0.50.01
-
         <stl-vector name='orphaned_flows' pointer-type='flow_info' comment='flows that are not tied to a map_block'/>
 
         <compound name='pathfinder'>