Fix embark_profile, viewscreen_barterst

Author: quietust

df.viewscreen.xml

@@ -439,32 +439,31 @@
     </class-type>
 
     <class-type type-name='viewscreen_barterst' inherits-from='viewscreen'>
-        <pointer name='unk_1'/>
-        <pointer name='unk_2'/>
-        <pointer name='unk_3'/>
+        <static-array name='units' count='2'><pointer type-name='unit'/></static-array>
+        <pointer name='building' type-name='building_civzonest'/>
         <pointer name='unk_4'/>
         <int8_t name='unk_5'/>
-        <int8_t name='unk_6'/>
+        <int8_t name='making_demands'/>
         <int8_t name='unk_7'/>
-        <static-array name='unk_8' count='2'><stl-vector/></static-array>
-        <static-array name='unk_9' count='2'><stl-vector/></static-array>
-        <static-array name='unk_10' count='2'><stl-vector/></static-array>
+        <static-array name='items' count='2'><stl-vector pointer-type='item'/></static-array>
+        <static-array name='selected' count='2'><stl-vector type-name='int8_t'/></static-array>
+        <static-array name='count' count='2'><stl-vector type-name='int32_t'/></static-array>
         <stl-vector name='unk_11'/>
         <stl-vector name='unk_12'/>
-        <static-array name='unk_13' count='2' type-name='int32_t'/>
+        <static-array name='cursor' count='2' type-name='int32_t'/>
         <int8_t name='unk_14'/>
-        <int16_t name='unk_15'/>
+        <int16_t name='trade_reply'/>
         <int8_t name='unk_16'/>
         <int32_t name='max_ask'/>
         <int32_t name='max_offer'/>
         <int32_t name='cur_ask'/>
         <int32_t name='cur_offer'/>
-        <int8_t name='unk_17'/>
-        <int8_t name='unk_18'/>
-        <int8_t name='unk_19'/>
-        <stl-string name='unk_20'/>
-        <stl-vector name='unk_21'/>
-        <int32_t name='unk_22'/>
+        <int8_t name='do_trade'/>
+        <int8_t name='do_settle_debt'/>
+        <int8_t name='do_offer'/>
+        <stl-string name='quantity_prompt'/>
+        <stl-vector name='responses' pointer-type='stl-string'/>
+        <int32_t name='response_cursor'/>
     </class-type>
 
     <class-type type-name='viewscreen_buildingst' inherits-from='viewscreen'>
@@ -2983,19 +2982,20 @@
         <stl-vector name='skill_dwarf_idx' type-name='int16_t'/>
         <stl-vector name='skill_level' type-name='int16_t'/>
 
-        <stl-vector name='unk_1' type-name='int32_t'/>
-        <stl-vector name='unk_2' type-name='int32_t'/>
-        <stl-vector name='unk_3' type-name='int16_t'/>
+        <stl-vector name='reclaim_dwarf_idx' type-name='int16_t'/>
+        <stl-vector name='reclaim_prof1' type-name='profession'/>
+        <stl-vector name='reclaim_prof2' type-name='profession'/>
 
         <stl-vector name='item_type' type-name='int16_t'/>
         <stl-vector name='item_subtype' type-name='int16_t'/>
         <stl-vector name='mat_type' type-name='int16_t'/>
-        <stl-vector name='mat_info' type-name='int32_t'/>
+        <stl-vector name='mat_index' type-name='int32_t'/>
         <stl-vector name='item_count' type-name='int32_t'/>
 
-        <stl-vector name='race' type-name='int32_t' ref-target='creature_raw'/>
-        <stl-vector name='caste' type-name='int16_t' ref-target='caste_raw'/>
-        <stl-vector name='profession' type-name='profession'/>
+        <stl-vector name='pet_race' type-name='int32_t' ref-target='creature_raw'/>
+        <stl-vector name='pet_caste' type-name='int16_t' ref-target='caste_raw'/>
+        <stl-vector name='pet_profession' type-name='profession'/>
+        <stl-vector name='pet_count' type-name='int32_t'/>
     </struct-type>
 
     <struct-type type-name='embark_symbol'>
@@ -3267,8 +3267,8 @@
           <enum-item name='EmptyTrade'/>
           <enum-item name='HalfEmptyBroker'/>
           <enum-item name='HalfEmptyTrader'/>
+          <enum-item name='OffendedBoth'/>
           <enum-item name='OffendedAnimal'/>
-          <enum-item name='OffendedAnimalAlt'/>
           <enum-item name='OffendedPlant'/>
           <enum-item name='Result15'/>
           <enum-item name='Result16'/>