From e2c1490d122ef4d3f71e6afd7abb8c751f74fe1b Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Wed, 20 Jul 2022 12:14:15 -0600
Subject: [PATCH] Identify feature irritation, and a bunch more

---
 changelog.txt     |  7 ++++++-
 df.entities.xml   |  6 +++---
 df.legends.xml    |  4 ++--
 df.map.xml        |  4 ++--
 df.military.xml   | 24 +++++-------------------
 df.ui.xml         |  2 +-
 df.world-site.xml |  8 ++++----
 7 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 9c191fa51..4770f5c40 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -16,19 +16,24 @@ that repo.
 
 ## Structures
 - Eliminate all "anon_X" names from structure fields
+- ``army``: change ``squads`` vector type to ``world_site_inhabitant``, identify ``min_smell_trigger``+``max_odor_level``+``max_low_light_vision``+``sense_creature_classes``
 - ``cave_column``: identify Z coordinates
 - ``cave_column_rectangle``: identify coordinates
 - ``embark_profile``: identify reclaim fields, add missing pet_count vector
-- ``feature``: identify "shiftCoords" vmethod
+- ``entity_population``: identify ``layer_id``
+- ``feature``: identify "shiftCoords" vmethod, ``irritation_level`` and ``irritation_attacks`` fields
 - ``flow_guide``: identify "shiftCoords" vmethod
 - ``general_refst``: name parameters on ``getLocation`` and ``setLocation`` vmethods
 - ``general_ref_locationst``: name member fields
+- ``historical_entity``: confirm ``hostility_level`` and ``siege_tier``
 - ``language_name_type``: identify ``ElfTree`` and ``SymbolArtifice`` thru ``SymbolFood``
+- ``timed_event``: identify ``layer_id``
 - ``ui``: identify actual contents of ``unk5b88`` field
 - ``ui_advmode``: identify several fields as containing coordinates
 - ``unitst``: identify ``histeventcol_id`` field inside status2
 - ``viewscreen_tradegoodsst``: rename trade_reply ``OffendedAnimal``+``OffendedAnimalAlt`` to ``OffendedBoth``+``OffendedAnimal``
 - ``viewscreen_barterst``: name member fields
+- ``world_site_inhabitant``: rename ``outcast_id`` and ``founder_outcast_entity_id``, identify ``interaction_id`` and ``interaction_effect_idx``
 
 # 0.47.05-r6
 
diff --git a/df.entities.xml b/df.entities.xml
index 2ee9f1f69..0fd5784e4 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -710,9 +710,9 @@
             <int32_t name='offerings_from'/>
             <int32_t name='offerings_recent' comment='since the last migrant wave or diplomat visit'/>
             <static-array name='offerings_history' count='10' type-name='int32_t' comment='rotated yearly at 15th of Timber'/>
-            <int32_t name='unk49e' comment='in 0.23, hostility level - determined siege size, had a chance to reset to 1'/>
-            <int32_t name='unk49f' comment='in 0.23, determined siege size'/>
-            <int32_t name='unk_1' since='v0.40.01'/>
+            <int32_t name='hostility_level'/>
+            <int32_t name='siege_tier'/>
+            <int32_t name='unk_1' since='v0.40.01' comment='siege cooldown?'/>
             <int32_t name='unk_2' since='v0.47.01'/>
             <int32_t name='unk_3' since='v0.47.01'/>
         </compound>
diff --git a/df.legends.xml b/df.legends.xml
index c476c3e1b..0e42268c9 100644
--- a/df.legends.xml
+++ b/df.legends.xml
@@ -62,9 +62,9 @@
             <pointer type-name='entity_population_unk4'/>
         </stl-vector>
         <int32_t name='unk5'/>
-        <int32_t name='unk6'/>
+        <int32_t name='layer_id' ref-target='world_underground_region'/>
         <int32_t name='id'/>
-        <int32_t name='flags' comment='?; unk6 == -1'/>
+        <int32_t name='flags' comment='?; layer_id == -1'/>
         <int32_t name='civ_id' ref-target='historical_entity'/>
     </struct-type>
 
diff --git a/df.map.xml b/df.map.xml
index fe32110b5..72e9a8e4b 100644
--- a/df.map.xml
+++ b/df.map.xml
@@ -581,8 +581,8 @@
     <class-type type-name='feature' original-name='featurest'>
         <stl-vector name='population' pointer-type='world_population'/>
 
-        <int32_t name='unk_1'/>
-        <int16_t name='unk_2'/>
+        <int32_t name='irritation_level' comment='divide by 10k for attack chance, max 100k'/>
+        <int16_t name='irritation_attacks' comment='maxes at 10?'/>
 
         <compound name='embark_pos' type-name='coord2d_path'/>
         <stl-vector name='min_map_z' type-name='int16_t'/>
diff --git a/df.military.xml b/df.military.xml
index 78a8401d3..1342d27df 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -676,21 +676,7 @@
                 <int32_t name='unk_3' since='v0.47.01'/>
             </pointer>
         </stl-vector>
-        <stl-vector name='squads'>
-            <pointer>
-                <int32_t name='count'/> next five checks out in created units
-                <int32_t name='race'/>
-                <int32_t name='population_id'/>
-                <int32_t name='entity_id' ref-target='historical_entity'/>
-                <int32_t name='unk_10' init-value='-1'/> same as unk_c0 in unit
-                <int32_t name='cultural_identity'/>
-                <int32_t name='unk_18' init-value='-1' comment="in range for nemesis id, but probably something else"/> made creatures undead, so not sure maybe affliction?
-                <int32_t name='unk_1c' init-value='-1' comment="also seen 0"/> crashed df...
-                <int32_t name='subordinate_entity_id' ref-target='historical_entity' comment="usually None, sometimes same as entity_id, sometimes subordinate of entity_id (like site government to civ)"/>
-                <int32_t name='unk_24' init-value='-1' comment="0/1 seen"/>
-                <int32_t name='unk_28' init-value='-1'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='squads' pointer-type='world_site_inhabitant'/>
         <int32_t name='unk_3c'/>
         <int32_t name='unk_1' since='v0.44.01'/>
         <int32_t name='unk_2' since='v0.47.03' comment="16 only value seen"/>
@@ -704,10 +690,10 @@
         <int32_t name='unk_90' init-value='-1'/>
         <int32_t name='unk_94' init-value='-1' comment="Number counting down. In examined save starts at 80 for id 38 counting down to 0 at 113, obviously with missing numbers somewhere"/>
         <int32_t name='unk_98' init-value='-1'/>
-        <int32_t name='unk_9c' comment="10, 50, 90, 100 seen"/>
-        <int32_t name='unk_a0' comment='0, 50, 90, 1000 seen'/>
-        <int32_t name='unk_a4' comment="0, 100, 10000 seen"/>
-        <stl-vector name='unk_a8' pointer-type='stl-string' comment='also creature class?'/>
+        <int32_t name='min_smell_trigger'/>
+        <int32_t name='max_odor_level' comment='1000 if undead are present'/>
+        <int32_t name='max_low_light_vision'/>
+        <stl-vector name='sense_creature_classes' pointer-type='stl-string'/>
         <stl-vector name='creature_class' pointer-type='stl-string' comment="Usually 'GENERAL_POISON' and 'MAMMAL'. Seen something else for undead"/>
         <enum type-name='item_type' base-type='int16_t' name='item_type'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
diff --git a/df.ui.xml b/df.ui.xml
index f5b243f85..63809cbb6 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -702,7 +702,7 @@
         <int16_t name='season_ticks' comment='1 tick = 10 frames'/>
         <pointer name='entity' type-name='historical_entity'/>
         <int16_t name='unk_1'/>
-        <int32_t name='unk_2'/>
+        <int32_t name='layer_id' ref-target='world_underground_region'/>
         <int16_t name='unk_3'/>
         <int16_t name='unk_4'/>
     </struct-type>
diff --git a/df.world-site.xml b/df.world-site.xml
index 28a4ac2b3..9dd9d7f84 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -681,12 +681,12 @@
         <int32_t name="count"/>
         <int32_t name="race" ref-target='creature_raw'/>
         <int32_t name='population_id' ref-target='entity_population'/>
-        <int32_t name="outcast_id" ref-target='historical_entity' comment="can be Religion, Civilization, and SiteGovernment as well as Outcast"/>
+        <int32_t name="entity_id" ref-target='historical_entity' comment="can be Religion, Civilization, and SiteGovernment as well as Outcast"/>
         <int32_t name="unk_10" init-value='-1' since='v0.40.01'/>
         <int32_t name='cultural_identity_id' ref-target='cultural_identity' since='v0.40.01'/>
-        <int32_t name="unk_18" init-value='-1' since='v0.40.01'/>
-        <int32_t name="unk_1c" init-value='-1' since='v0.40.01' comment="0 only other value seen"/>
-        <int32_t name='founder_outcast_entity_id' ref-target='historical_entity' since='v0.40.01' comment="Founder if outcast_id=-1, else Outcast and equal to outcast_id"/>
+        <int32_t name="interaction_id" ref-target='interaction' since='v0.40.01'/>
+        <int32_t name="interaction_effect_idx" init-value='-1' since='v0.40.01' comment="index into the above interaction, usually refers to an ANIMATE effect"/>
+        <int32_t name='related_entity_id' ref-target='historical_entity' since='v0.40.01' comment="Founder if outcast_id=-1, else Outcast and equal to outcast_id"/>
         <int32_t name="unk_24" init-value='-1' since='v0.40.01' comment="0 and 1 seen"/>
         <int32_t name="unk_28" init-value='-1' since='v0.40.01'/>
     </struct-type>