From 3df992e7d89dfa79edf7a7ee6625ac8aa5ad90eb Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Fri, 4 Dec 2015 19:04:33 +0300
Subject: [PATCH] Patch by _Q

---
 df.advmode.xml   |  20 +++++++
 df.d_init.xml    |   3 +
 df.history.xml   |  10 +++-
 df.materials.xml |   6 +-
 df.raws.xml      |   5 +-
 df.stockpile.xml |   3 +
 df.ui-menus.xml  |  19 +++++++
 df.ui.xml        |  10 ++++
 df.units.xml     |  26 +++++++++
 df.world.xml     |  47 +++++++++++++---
 symbols.xml      | 142 ++++++++++++++++++++++++-----------------------
 11 files changed, 207 insertions(+), 84 deletions(-)

diff --git a/df.advmode.xml b/df.advmode.xml
index e1cfaae9b..06714ddf1 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -322,6 +322,9 @@
         <int16_t name='unk6'/>
         <bool name='sleeping'/>
         <int8_t/>
+
+        <padding size="24" comment="0.42.01"/> not sure where this is, just that it's before bogeymen_timer
+
         <int32_t name='bogeymen_timer' comment='initialized to 4-7 when the cackling starts'/>
         <int32_t name='bogeymen_killed'/>
         <int32_t name='unk9' comment='initialized to 60 when the cackling starts'/>
@@ -510,6 +513,23 @@
             <stl-vector/>
             <stl-vector/>
         </compound>
+
+        <compound name='unk_v42_1'>
+            <int32_t/> ?
+            <stl-vector/>
+            <stl-vector/>
+            <stl-string/>
+            <int32_t/> ?
+            <int32_t/> ?
+            <int32_t/> ?
+            <int32_t/> ?
+            <stl-vector/>
+            <int32_t/> ?
+            <int32_t/> ?
+            <int32_t/> ?
+            <int32_t/> ?
+            <stl-string/>
+        </compound>
     </struct-type>
 
     <class-type type-name='adventure_movement_option'
diff --git a/df.d_init.xml b/df.d_init.xml
index 32976e486..715cba991 100644
--- a/df.d_init.xml
+++ b/df.d_init.xml
@@ -116,10 +116,13 @@
         <int32_t name="strict_population_cap"/>
         <int32_t name="baby_cap_absolute"/>
         <int32_t name="baby_cap_percent"/>
+        <int32_t name="visitor_cap"/>
 
         <int32_t name="specific_seed_cap"/>
         <int32_t name="fortress_seed_cap"/>
 
+        <static-array name='invasion_soldier_cap' type-name='int32_t' count='3'/>
+        <static-array name='invasion_monster_cap' type-name='int32_t' count='3'/>
         <static-array name='path_cost' type-name='int32_t' count='4'/>
         <static-array name='embark_rect' type-name='int16_t' count='2'/>
 
diff --git a/df.history.xml b/df.history.xml
index 79509e1f5..69b1c3c16 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -1673,7 +1673,7 @@
 
         <compound name='event_collections'>
             <stl-vector name='all' pointer-type='history_event_collection'/>
-            <static-array name='other' count='9'>
+            <static-array name='other' count='14'>
                 <stl-vector pointer-type='history_event_collection'/>
             </static-array>
         </compound>
@@ -1687,14 +1687,20 @@
         <int32_t name='total_megabeasts'/>
         <int32_t name='total_semimegabeasts'/>
         <stl-vector/>
+        <padding size="56" comment='v0.42.01'/>
         <stl-vector/>
         <stl-vector/>
         <stl-vector/>
         <stl-vector/>
         <stl-vector/>
-        <static-array name='unk_v40_1' comment='v0.40.01' count='12'>
+        <static-array name='unk_v40_1' comment='v0.40.01' count='13'>
             <stl-vector/>
         </static-array>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
         <stl-vector comment='v0.40.01'/>
         <bool/>
         <stl-vector comment='v0.40.01'/>
diff --git a/df.materials.xml b/df.materials.xml
index 6a7c10e89..264afc935 100644
--- a/df.materials.xml
+++ b/df.materials.xml
@@ -481,13 +481,13 @@
     </enum-type>
 
     <struct-type type-name='special_mat_table'>
-        <static-array name='organic_types' count='37' index-enum='organic_mat_category'>
+        <static-array name='organic_types' count='39' index-enum='organic_mat_category'>
             <stl-vector type-name='int16_t' index-refers-to='(food-mat-by-idx $$._key $)'/>
         </static-array>
-        <static-array name='organic_indexes' count='37' index-enum='organic_mat_category'>
+        <static-array name='organic_indexes' count='39' index-enum='organic_mat_category'>
             <stl-vector type-name='int32_t'/>
         </static-array>
-        <static-array name='organic_unknown' count='37' comment='everything 0'
+        <static-array name='organic_unknown' count='39' comment='everything 0'
                       index-enum='organic_mat_category'>
             <stl-vector type-name='int32_t'/>
         </static-array>
diff --git a/df.raws.xml b/df.raws.xml
index 1773017d5..0b8ff8be5 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -79,7 +79,7 @@
             <stl-vector name='trapcomps' pointer-type='itemdef_trapcompst'/>
             <stl-vector name='toys' pointer-type='itemdef_toyst'/>
             <stl-vector name='tools' pointer-type='itemdef_toolst'/>
-            <static-array name='tools_by_type' count='18' index-enum='tool_uses'>
+            <static-array name='tools_by_type' count='22' index-enum='tool_uses'>
                 <stl-vector pointer-type='itemdef_toolst'/>
             </static-array>
             <stl-vector name='instruments' pointer-type='itemdef_instrumentst'/>
@@ -108,7 +108,7 @@
             <stl-vector name='translations' pointer-type='language_translation'/>
 
             <static-array name='word_table' count='2'>
-                <static-array type-name='language_word_table' count='60'/>
+                <static-array type-name='language_word_table' count='62'/>
             </static-array>
 
             -- Descriptors
@@ -128,6 +128,7 @@
             <stl-vector name='all' pointer-type='building_def'/>
             <stl-vector name='workshops' pointer-type='building_def_workshopst'/>
             <stl-vector name='furnaces' pointer-type='building_def_furnacest'/>
+            <stl-vector comment='v0.42.01'/>
 
             <int32_t name='next_id'/>
         </compound>
diff --git a/df.stockpile.xml b/df.stockpile.xml
index 39fb5355f..e344fde2c 100644
--- a/df.stockpile.xml
+++ b/df.stockpile.xml
@@ -298,6 +298,9 @@
             <bool name='unusable'/>
         </compound>
 
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+
         <bool name='allow_organic' init-value='true'/>
         <bool name='allow_inorganic' init-value='true'/>
     </struct-type>
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index 16308f5a8..c99cea213 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -225,6 +225,8 @@
             <compound name='material_category' type-name='job_material_category'/>
         </compound>
 
+        <stl-string comment='v0.42.01'/>
+
         <compound name='building'>
             <stl-vector name='choices_all' pointer-type='interface_button_constructionst'/>
             <stl-vector name='choices_visible' pointer-type='interface_button_constructionst'/>
@@ -248,6 +250,7 @@
         <compound name='unit'>
             <stl-vector name='inv_items' pointer-type='unit_inventory_item'/>
             <stl-vector name='inv_spatters' pointer-type='spatter'/>
+            <stl-vector comment='v0.42.01'/>
 
             <bool name="in_new_squad" comment='v0.34.08'/>
             <int32_t name="cursor_uniform" comment='v0.34.08'/>
@@ -276,6 +279,8 @@
 
             judging from the destructor, these two sections should probably be in different compounds
 
+            <padding size="16" comment="v0.42.01"/>
+
             <stl-vector name='list' type-name='int32_t' refers-to='$global.world.units.active[$]'/>
 
             <int8_t name='unk_a0'/>
@@ -288,6 +293,18 @@
             <bool name="show_misc"/>
         </compound>
 
+        <compound name='unk_v42_1'>
+            <int32_t/>
+            <stl-vector/>
+            <bool/>
+            <stl-vector/>
+            <stl-vector/>
+            <stl-vector/>
+            <bool/>
+            <bool/>
+            <bool/>
+        </compound>
+
         <compound name='barracks'>
             <int32_t name="squad_cursor"/>
 
@@ -306,6 +323,8 @@
             <int32_t name="position_squad_cursor"/>
         </compound>
 
+        <stl-vector comment='v0.42.01'/>
+
         <compound name='minimap'>
             -- Abstract representation of contents; updated by need_scan
             <static-array name='data' count='23'>
diff --git a/df.ui.xml b/df.ui.xml
index d2f7f1a01..d7476abef 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -329,6 +329,12 @@
             </compound>
         </compound>
 
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+        <stl-vector comment='v0.42.01'/>
+
         <compound name='stockpile'>
             <int32_t name='reserved_bins'/>
             <int32_t name='reserved_barrels'/>
@@ -514,6 +520,8 @@
             <stl-string name='old_name'/>
         </compound>
 
+        <stl-vector comment='v0.42.01'/>
+
         <compound name='main'>
             <static-array name='hotkeys' type-name='ui_hotkey' count='16'/>
 
@@ -552,6 +560,8 @@
             <bool name='in_rename_hotkey'/>
         </compound>
 
+        <int32_t comment='v0.42.01'/>
+
         <compound name='squads'>
             <stl-vector name='list' has-bad-pointers='true'
                         comment='valid only when ui is displayed' pointer-type='squad'/>
diff --git a/df.units.xml b/df.units.xml
index e3512812b..ee9b34d91 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -482,6 +482,7 @@
         <compound name='flags1' type-name='unit_flags1'/>
         <compound name='flags2' type-name='unit_flags2'/>
         <compound name='flags3' type-name='unit_flags3'/>
+        <int32_t comment='v0.42.01'/>
 
         <compound name='meeting'>
             <enum name='state' base-type='int8_t'>
@@ -767,6 +768,7 @@
 
             <pointer name='attr_change' type-name='curse_attr_change' comment='v0.34.01'/>
             <uint32_t name='luck_mul_percent' comment='v0.34.01' init-value='100'/>
+            <int32_t comment='v0.42.01'/>
 
             <stl-vector name='interaction_id' type-name='int32_t' comment='v0.34.01'
                         ref-target='creature_interaction_effect'/>
@@ -965,6 +967,30 @@
                 <stl-vector name="unk_10" type-name="int32_t"/>
             </pointer>
 
+            <stl-vector comment='v0.42.01'>
+                <pointer>
+                    <stl-vector>
+                        <pointer>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                            <int32_t/>
+                        </pointer>
+                    </stl-vector>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                    <int32_t/>
+                </pointer>
+            </stl-vector>
             <int32_t name='enemy_status_slot' init-value='-1'/>
             <int32_t name='unk_874_cntr'/> // age ? incremented every tick
 
diff --git a/df.world.xml b/df.world.xml
index dd99b21c5..4bbfae361 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -451,7 +451,7 @@
 
             <stl-vector name='all' pointer-type='item'/>
 
-            <static-array name='other' count='129' index-enum='items_other_id'>
+            <static-array name='other' count='131' index-enum='items_other_id'>
                 <stl-vector pointer-type='item'/>
             </static-array>
 
@@ -498,7 +498,7 @@
 
             <stl-vector name='all' pointer-type='building'/>
 
-            <static-array name='other' count='87' index-enum='buildings_other_id'>
+            <static-array name='other' count='90' index-enum='buildings_other_id'>
                 <stl-vector pointer-type='building'/>
             </static-array>
 
@@ -750,6 +750,36 @@
             <stl-vector name='bad' pointer-type='agreement' has-bad-pointers='true'/>
         </compound>
 
+        <compound name='poetic_forms' comment='v0.42.01'>
+            <stl-vector name='all'/>
+            <stl-vector name='bad' has-bad-pointers='true'/>
+        </compound>
+
+        <compound name='musical_forms' comment='v0.42.01'>
+            <stl-vector name='all'/>
+            <stl-vector name='bad' has-bad-pointers='true'/>
+        </compound>
+
+        <compound name='dance_forms' comment='v0.42.01'>
+            <stl-vector name='all'/>
+            <stl-vector name='bad' has-bad-pointers='true'/>
+        </compound>
+
+        <compound name='scales' comment='v0.42.01'>
+            <stl-vector name='all'/>
+            <stl-vector name='bad' has-bad-pointers='true'/>
+        </compound>
+
+        <compound name='rhythms' comment='v0.42.01'>
+            <stl-vector name='all'/>
+            <stl-vector name='bad' has-bad-pointers='true'/>
+        </compound>
+
+        <compound name='occupations' comment='v0.42.01'>
+            <stl-vector name='all'/>
+            <stl-vector name='bad' has-bad-pointers='true'/>
+        </compound>
+
         <pointer name='selected_building' type-name='building'/>
         <enum base-type='int16_t' name='selected_stockpile_type' type-name='stockpile_category'/>
         <bool name='update_selected_building'/>
@@ -793,10 +823,10 @@
                               comment='Appears to be precomputed rounded integer distances'/>
             </static-array>
 
-            <static-array name='unk_v40_1a' count='112' index-enum='profession' comment='v0.40.1'>
+            <static-array name='unk_v40_1a' count='129' index-enum='profession' comment='v0.40.1'>
                 <stl-vector type-name='int16_t'/>
             </static-array>
-            <static-array name='unk_v40_1b' count='112' index-enum='profession' comment='v0.40.1'>
+            <static-array name='unk_v40_1b' count='129' index-enum='profession' comment='v0.40.1'>
                 <stl-vector type-name='int16_t'/>
             </static-array>
 
@@ -891,11 +921,12 @@
             <stl-vector/>
             <int32_t/>
             <int32_t/>
+           <stl-vector name='unk_10d298' comment='v0.40.01'/>
+           <stl-vector name='unk_10d2a4' comment='v0.40.01'/>
+           <stl-vector comment='v0.42.01'/>
+           <int32_t comment='v0.42.01'/>
         </compound>
 
-        <stl-vector name='unk_10d298' comment='v0.40.01'/>
-        <stl-vector name='unk_10d2a4' comment='v0.40.01'/>
-
         <compound name='orphaned_flow_pool' type-name='flow_reuse_pool'/>
 
         -- RAWs
@@ -1075,6 +1106,7 @@
         <static-array name='unk_v40_6f' comment='v0.40.1' count='336'>
             <stl-vector type-name='int32_t'/>
         </static-array>
+        <stl-vector comment='v0.42.01'/>
         <stl-vector name='unk_v40_7' comment='v0.40.1'/>
 
         <bool name="reindex_pathfinding" comment='forces map_block.passable to be recomputed'/>
@@ -1155,6 +1187,7 @@
 
         <bool/>
         <bool/>
+        <bool comment='v0.42.01'/>
 
         <compound name='arena_spawn'>
             <stl-vector name='race' type-name='int16_t' ref-target='creature_raw'/>
diff --git a/symbols.xml b/symbols.xml
index 5bba759c7..87568b566 100644
--- a/symbols.xml
+++ b/symbols.xml
@@ -127,88 +127,90 @@
 
         .data
 
-        <global-address name='cursor'/>
-        <global-address name='selection_rect'/>
+        <global-address name='cursor' value='0xFB71D0'/>
+        <global-address name='selection_rect' value='0xFB71DC'/>
 
-        <global-address name='gamemode'/>
-        <global-address name='gametype'/>
+        <global-address name='gamemode' value='0xFB71F4'/>
+        <global-address name='gametype' value='0xFB71F8'/>
 
-        <global-address name='ui_menu_width'/>
-        <global-address name='ui_area_map_width'/>
+        <global-address name='ui_menu_width' value='0xFB72A8'/>
+        <global-address name='ui_area_map_width' value='0xFB72A9'/>
 
         .bss compound - THAT IS, NOT SIMPLE INTEGER VARIABLES!
 
-        <global-address name='created_item_type'/>
-        <global-address name='created_item_subtype'/>
-        <global-address name='created_item_mattype'/>
-        <global-address name='created_item_matindex'/>
-        <global-address name='created_item_count'/>
-        <global-address name='map_renderer'/>
-        <global-address name='d_init'/>
-        <global-address name='enabler'/>
-        <global-address name='flows'/>
-        <global-address name='gps'/>
-        <global-address name='gview'/>
-        <global-address name='init'/>
-        <global-address name='texture'/>
-        <global-address name='timed_events'/>
-        <global-address name='ui'/>
-        <global-address name='ui_advmode'/>
-        <global-address name='ui_build_selector'/>
-        <global-address name='ui_building_assign_type'/>
-        <global-address name='ui_building_assign_is_marked'/>
-        <global-address name='ui_building_assign_units'/>
-        <global-address name='ui_building_assign_items'/>
-        <global-address name='ui_look_list'/>
-        <global-address name='ui_sidebar_menus'/>
-        <global-address name='world'/>
+        <global-address name='created_item_type' value='0x1B34FF0'/>
+        <global-address name='created_item_subtype' value='0x1DAE1EC'/>
+        <global-address name='created_item_mattype' value='0x1D94710'/>
+        <global-address name='created_item_matindex' value='0x1972C2C'/>
+        <global-address name='created_item_count' value='0x1972BFC'/>
+        <global-address name='map_renderer' value='0x1D980F0'/>
+        <global-address name='d_init' value='0x1D94048'/>
+        <global-address name='enabler' value='0x1972958'/>
+        <global-address name='flows' value='0x1D980E0'/>
+        <global-address name='gps' value='0xFB7728'/>
+        <global-address name='gview' value='0x197A638'/>
+        <global-address name='init' value='0x1D97058'/>
+        <global-address name='texture' value='0x1D97024'/>
+        <global-address name='timed_events' value='0x1972C0C'/>
+        <global-address name='ui' value='0x1972C60'/>
+        <global-address name='ui_advmode' value='0x1DAA270'/>
+        <global-address name='ui_build_selector' value='0x1D96068'/>
+        <global-address name='ui_building_assign_type' value='0x1DAE1FC'/>
+        <global-address name='ui_building_assign_is_marked' value='0x1972C4C'/>
+        <global-address name='ui_building_assign_units' value='0x1B35020'/>
+        <global-address name='ui_building_assign_items' value='0x1972C3C'/>
+        <global-address name='ui_look_list' value='0x1DAE1DC'/>
+        <global-address name='ui_sidebar_menus' value='0x1D94720'/>
+        <global-address name='world' value='0x1B35030'/>
 
         generated cglobals
 
         generated keydisplay
 
-        .bss primitive
+        <global-address name='keydisplay' value='0x1972BD0'/>
 
-        <global-address name='announcements'/>
-
-        <global-address name='cur_year'/>
-        <global-address name='cur_year_tick'/>
-        <global-address name='cur_year_tick_advmode'/>
-        <global-address name='cur_season'/>
-        <global-address name='cur_season_tick'/>
-
-        <global-address name='current_weather'/>
-
-        <global-address name='pause_state'/>
-        <global-address name='process_dig'/>
-        <global-address name='process_jobs'/>
-
-        <global-address name='ui_building_in_assign'/>
-        <global-address name='ui_building_in_resize'/>
-        <global-address name='ui_building_item_cursor'/>
-        <global-address name='ui_look_cursor'/>
-        <global-address name='ui_selected_unit'/>
-        <global-address name='ui_unit_view_mode'/>
-        <global-address name='ui_workshop_in_add'/>
-        <global-address name='ui_workshop_job_cursor'/>
-
-        <global-address name='window_x'/>
-        <global-address name='window_y'/>
-        <global-address name='window_z'/>
-
-        <global-address name='debug_nopause'/>
-        <global-address name='debug_nomoods'/>
-        <global-address name='debug_combat'/>
-        <global-address name='debug_wildlife'/>
-        <global-address name='debug_nodrink'/>
-        <global-address name='debug_noeat'/>
-        <global-address name='debug_nosleep'/>
-        <global-address name='debug_showambush'/>
-        <global-address name='debug_fastmining'/>
-        <global-address name='debug_noberserk'/>
-        <global-address name='debug_turbospeed'/>
+        .bss primitive
 
-        <global-address name='save_on_exit'/>
+        <global-address name='announcements' value='0x1D941D8'/>
+
+        <global-address name='cur_year' value='0x137B374'/>
+        <global-address name='cur_year_tick' value='0x1349218'/>
+        <global-address name='cur_year_tick_advmode' value='0x129C334'/>
+        <global-address name='cur_season' value='0x129C33A'/>
+        <global-address name='cur_season_tick' value='0x129C214'/>
+
+        <global-address name='current_weather' value='0x19708BC'/>
+
+        <global-address name='pause_state' value='0x19708E7'/>
+        <global-address name='process_dig' value='0x19708E0'/>
+        <global-address name='process_jobs' value='0x19708E1'/>
+
+        <global-address name='ui_building_in_assign' value='0x19708E4'/>
+        <global-address name='ui_building_in_resize' value='0x19708E3'/>
+        <global-address name='ui_building_item_cursor' value='0x137B370'/>
+        <global-address name='ui_look_cursor' value='0x1362C50'/>
+        <global-address name='ui_selected_unit' value='0x137653C'/>
+        <global-address name='ui_unit_view_mode' value='0x1349100'/>
+        <global-address name='ui_workshop_in_add' value='0x1334A3A'/>
+        <global-address name='ui_workshop_job_cursor' value='0x19708B8'/>
+
+        <global-address name='window_x' value='0x1334A34'/>
+        <global-address name='window_y' value='0x1362C5C'/>
+        <global-address name='window_z' value='0x1362C28'/>
+
+        <global-address name='debug_nopause' value='0x19708F7'/>
+        <global-address name='debug_nomoods' value='0x19708F8'/>
+        <global-address name='debug_combat' value='0x19708F9'/>
+        <global-address name='debug_wildlife' value='0x19708FA'/>
+        <global-address name='debug_nodrink' value='0x19708FB'/>
+        <global-address name='debug_noeat' value='0x19708FC'/>
+        <global-address name='debug_nosleep' value='0x19708FD'/>
+        <global-address name='debug_showambush' value='0x19708FE'/>
+        <global-address name='debug_fastmining' value='0x19708FF'/>
+        <global-address name='debug_noberserk' value='0x1970900'/>
+        <global-address name='debug_turbospeed' value='0x1970901'/>
+
+        <global-address name='save_on_exit' value='0x19708E2'/>
 
         code