From 0ccce3412e0d3954aa5bc9c9b7f959789f3d6ffa Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 27 Apr 2020 17:08:54 -0500
Subject: [PATCH 01/11] add df-other-vectors-type.

---
 SYNTAX.rst              |  8 ++++++++
 StructType.pm           |  6 ++++++
 data-definition.xsd     | 14 ++++++++++++++
 df.building-vectors.xml |  4 ++++
 df.item-vectors.xml     |  3 +++
 df.world.xml            | 15 ++++++---------
 lower-1.xslt            | 33 +++++++++++++++++++++++++++++++++
 7 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/SYNTAX.rst b/SYNTAX.rst
index 45f670215..1b1a4bde8 100644
--- a/SYNTAX.rst
+++ b/SYNTAX.rst
@@ -541,6 +541,14 @@ These are defined in df-code.lisp:
 
     with some extra code to make it easier to interact with.
 
+``<df-other-vectors-type type-name='foo_other' index-enum='foo_other_id' item-type='foo'/>``
+
+    Defines a tuple of vectors with the same base type. Individual vectors act as if they were defined as::
+
+        <stl-vector name='FOO_KEY' pointer-type='foo'/>
+
+    where ``FOO_KEY`` is a key in the ``foo_other_id`` enum.
+
 Class type definition
 =====================
 
diff --git a/StructType.pm b/StructType.pm
index 1c2e1486f..a32adc2d1 100644
--- a/StructType.pm
+++ b/StructType.pm
@@ -195,6 +195,8 @@ sub render_struct_type {
     my $item_type = $tag->getAttribute('item-type');
     my $list_link_type = $tag->getAttribute('df-list-link-type');
     my $list_link_field = $tag->getAttribute('df-list-link-field');
+    my $is_other_vectors = (($tag->getAttribute('ld:subtype') or '') eq 'df-other-vectors-type');
+    my $index_enum = $tag->getAttribute('index-enum');
     my $custom_methods = is_attr_true($tag, 'custom-methods') || $tag->findnodes('custom-methods/cmethod');
     my $has_methods = $is_class || is_attr_true($tag, 'has-methods');
     my $inherits = $tag->getAttribute('inherits-from');
@@ -218,6 +220,10 @@ sub render_struct_type {
     } elsif ($is_linked_list) {
         register_ref $item_type, 1;
         $ispec = ' : DfLinkedList<'.$typename.', '.$item_type.'>';
+    } elsif ($is_other_vectors) {
+        register_ref $item_type, 1;
+        register_ref $index_enum, 1;
+        $ispec = ' : DfOtherVectors<'.$typename.', '.$index_enum.', '.$item_type.'>';
     }
 
     if ($list_link_type) {
diff --git a/data-definition.xsd b/data-definition.xsd
index b66c33873..7ee85475c 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -39,6 +39,7 @@
             <xs:element name="struct-type" type="StructTypeDef" />
             <xs:element name="class-type" type="ClassTypeDef" />
             <xs:element name="df-linked-list-type" type="DFLinkedListTypeDef" />
+            <xs:element name="df-other-vectors-type" type="DFOtherVectorsTypeDef" />
             <xs:element name="global-object" type="GlobalObjectDef" />
         </xs:choice>
     </xs:group>
@@ -155,6 +156,19 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+    <xs:complexType name="DFOtherVectorsTypeDef" mixed="true">
+        <xs:complexContent>
+            <xs:extension base="TypeDef">
+                <xs:attribute name="index-enum" use="required">
+                </xs:attribute>
+                <xs:attribute name="item-type" use="required">
+                </xs:attribute>
+                <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:element name="stl-vector" type="StlVectorField" />
+                </xs:choice>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
     <xs:complexType name="GlobalObjectDef" mixed="true">
         <xs:complexContent>
             <xs:extension base="CompoundFieldType">
diff --git a/df.building-vectors.xml b/df.building-vectors.xml
index 3bd21eaa9..a4ac604f2 100644
--- a/df.building-vectors.xml
+++ b/df.building-vectors.xml
@@ -379,6 +379,10 @@
             <item-attr name='building' value='Instrument'/>
         </enum-item>
     </enum-type>
+
+    <df-other-vectors-type type-name='buildings_other' index-enum='buildings_other_id' item-type='building'>
+        <stl-vector name='BED' pointer-type='building_bedst'/>
+    </df-other-vectors-type>
 </data-definition>
 
 <!--
diff --git a/df.item-vectors.xml b/df.item-vectors.xml
index dc6c9f19d..a4f259af4 100644
--- a/df.item-vectors.xml
+++ b/df.item-vectors.xml
@@ -790,6 +790,9 @@
 
     </enum-type>
 
+    <df-other-vectors-type type-name='items_other' index-enum='items_other_id' item-type='item'>
+    </df-other-vectors-type>
+
 </data-definition>
 
 <!--
diff --git a/df.world.xml b/df.world.xml
index fcea5eb01..e0d96ecd6 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -44,6 +44,9 @@
         <enum-item name='ANY_BABY2'/>
     </enum-type>
 
+    <df-other-vectors-type type-name='units_other' index-enum='units_other_id' item-type='unit'>
+    </df-other-vectors-type>
+
     <enum-type type-name='conflict_level'>
         <enum-item name='None' value='-1'/>
         <enum-item name='Encounter'/>
@@ -637,9 +640,7 @@
 
         <stl-vector name='all' pointer-type='building'/>
 
-        <static-array name='other' count='92' index-enum='buildings_other_id'>
-            <stl-vector pointer-type='building'/>
-        </static-array>
+        <compound name='other' type-name='buildings_other'/>
 
         <stl-vector name='bad' has-bad-pointers='true' pointer-type='building'/>
 
@@ -860,9 +861,7 @@
 
             <stl-vector name='active' pointer-type='unit' comment='not sorted, entry 0 is adventurer'/>
 
-            <static-array name='other' count='2' index-enum='units_other_id'>
-                <stl-vector pointer-type='unit'/>
-            </static-array>
+            <compound name='other' type-name='units_other'/>
 
             <stl-vector name='bad' has-bad-pointers='true' pointer-type='unit'/>
             <stl-vector name='unknown' since='v0.44.06'/>
@@ -891,9 +890,7 @@
 
             <stl-vector name='all' pointer-type='item'/>
 
-            <static-array name='other' count='132' index-enum='items_other_id'>
-                <stl-vector pointer-type='item'/>
-            </static-array>
+            <compound name='other' type-name='items_other'/>
 
             <stl-vector name='bad' has-bad-pointers='true' pointer-type='item'/>
 
diff --git a/lower-1.xslt b/lower-1.xslt
index 1bada0651..b657c5d5a 100644
--- a/lower-1.xslt
+++ b/lower-1.xslt
@@ -76,6 +76,39 @@
         </ld:global-type>
     </xsl:template>
 
+    <xsl:template match='df-other-vectors-type'>
+        <xsl:variable name='vectors' select='./stl-vector'/>
+        <xsl:variable name='enum-name' select='@index-enum'/>
+        <xsl:variable name='item-type' select='@item-type'/>
+
+        <ld:global-type ld:meta='struct-type' ld:subtype='df-other-vectors-type' ld:level='0' type-name='{@type-name}' index-enum='{$enum-name}' item-type='{$item-type}'>
+            <xsl:for-each select='/data-definition/enum-type[@type-name=($enum-name)]/enum-item'>
+                <xsl:variable name='enum-key' select='@name'/>
+                <xsl:variable name='defined' select='$vectors[@name=($enum-key)]'/>
+
+                <xsl:choose>
+                    <xsl:when test='count($defined)'>
+                        <xsl:apply-templates select='$defined'>
+                            <xsl:with-param name='level' select='1'/>
+                        </xsl:apply-templates>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <ld:field ld:meta='container' ld:level='1' ld:subtype='stl-vector' name='{$enum-key}'>
+                            <ld:field ld:meta='pointer' ld:is-container='true' ld:level='2' type-name='{$item-type}'>
+                                <ld:field>
+                                    <xsl:call-template name='lookup-type-ref'>
+                                        <xsl:with-param name='name' select='$item-type'/>
+                                        <xsl:with-param name='level' select='3'/>
+                                    </xsl:call-template>
+                                </ld:field>
+                            </ld:field>
+                        </ld:field>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:for-each>
+        </ld:global-type>
+    </xsl:template>
+
     <!-- Code to properly annotate references to types by name -->
 
     <xsl:key name="primitive-type-lookup" match="prim-type" use="@ld:subtype"/>

From 7fb6d10877279ca3fc1f85c53d128d255ca8515f Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 27 Apr 2020 18:30:17 -0500
Subject: [PATCH 02/11] forgot that attributes go last in XSD

---
 data-definition.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data-definition.xsd b/data-definition.xsd
index 7ee85475c..d90fef6be 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -159,13 +159,13 @@
     <xs:complexType name="DFOtherVectorsTypeDef" mixed="true">
         <xs:complexContent>
             <xs:extension base="TypeDef">
+                <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:element name="stl-vector" type="StlVectorField" />
+                </xs:choice>
                 <xs:attribute name="index-enum" use="required">
                 </xs:attribute>
                 <xs:attribute name="item-type" use="required">
                 </xs:attribute>
-                <xs:choice minOccurs="0" maxOccurs="unbounded">
-                    <xs:element name="stl-vector" type="StlVectorField" />
-                </xs:choice>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>

From 68a4cd269238e6d9680e1b6ad58e3eafcc5d7c5b Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 27 Apr 2020 18:56:18 -0500
Subject: [PATCH 03/11] use a weak reference to the vector pointer type

---
 StructType.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/StructType.pm b/StructType.pm
index a32adc2d1..b53157e39 100644
--- a/StructType.pm
+++ b/StructType.pm
@@ -221,7 +221,7 @@ sub render_struct_type {
         register_ref $item_type, 1;
         $ispec = ' : DfLinkedList<'.$typename.', '.$item_type.'>';
     } elsif ($is_other_vectors) {
-        register_ref $item_type, 1;
+        register_ref $item_type, 0;
         register_ref $index_enum, 1;
         $ispec = ' : DfOtherVectors<'.$typename.', '.$index_enum.', '.$item_type.'>';
     }

From 39764b488fbe30e88947406c93546e3508aa4d4a Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 27 Apr 2020 18:59:18 -0500
Subject: [PATCH 04/11] skip explicitly negative enum items for
 df-other-vectors-type

---
 lower-1.xslt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lower-1.xslt b/lower-1.xslt
index b657c5d5a..5e9c692d9 100644
--- a/lower-1.xslt
+++ b/lower-1.xslt
@@ -82,7 +82,7 @@
         <xsl:variable name='item-type' select='@item-type'/>
 
         <ld:global-type ld:meta='struct-type' ld:subtype='df-other-vectors-type' ld:level='0' type-name='{@type-name}' index-enum='{$enum-name}' item-type='{$item-type}'>
-            <xsl:for-each select='/data-definition/enum-type[@type-name=($enum-name)]/enum-item'>
+            <xsl:for-each select="/data-definition/enum-type[@type-name=($enum-name)]/enum-item[not(starts-with(@value, '-'))]">
                 <xsl:variable name='enum-key' select='@name'/>
                 <xsl:variable name='defined' select='$vectors[@name=($enum-key)]'/>
 

From 20bf25312dde9306c950fe362e0b611bd00c6e0e Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 12:09:48 -0500
Subject: [PATCH 05/11] allow code-helper, comment, and since in
 df-other-vectors-type

---
 lower-1.xslt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lower-1.xslt b/lower-1.xslt
index 5e9c692d9..4275e8f3a 100644
--- a/lower-1.xslt
+++ b/lower-1.xslt
@@ -82,6 +82,11 @@
         <xsl:variable name='item-type' select='@item-type'/>
 
         <ld:global-type ld:meta='struct-type' ld:subtype='df-other-vectors-type' ld:level='0' type-name='{@type-name}' index-enum='{$enum-name}' item-type='{$item-type}'>
+            <xsl:apply-templates select="@comment|@since"/>
+            <xsl:apply-templates select="comment|code-helper">
+                <xsl:with-param name='level' select="1"/>
+            </xsl:apply-templates>
+
             <xsl:for-each select="/data-definition/enum-type[@type-name=($enum-name)]/enum-item[not(starts-with(@value, '-'))]">
                 <xsl:variable name='enum-key' select='@name'/>
                 <xsl:variable name='defined' select='$vectors[@name=($enum-key)]'/>

From dd855e65b044a1ae5a9123a1da6263982d7705c8 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 12:11:29 -0500
Subject: [PATCH 06/11] allow allow the shared attributes/elements in the xsd
 for df-other-vectors-type

---
 data-definition.xsd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data-definition.xsd b/data-definition.xsd
index d90fef6be..a192a7e92 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -160,8 +160,10 @@
         <xs:complexContent>
             <xs:extension base="TypeDef">
                 <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:group ref="SharedElements"/>
                     <xs:element name="stl-vector" type="StlVectorField" />
                 </xs:choice>
+                <xs:attributeGroup ref="SharedAttributes" />
                 <xs:attribute name="index-enum" use="required">
                 </xs:attribute>
                 <xs:attribute name="item-type" use="required">

From fa1d3172ab27769e02fd0fbd3c32e39288a090b7 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 12:20:15 -0500
Subject: [PATCH 07/11] fix generated other vectors not having types correctly
 set

---
 lower-1.xslt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lower-1.xslt b/lower-1.xslt
index 4275e8f3a..feb4e1830 100644
--- a/lower-1.xslt
+++ b/lower-1.xslt
@@ -98,15 +98,15 @@
                         </xsl:apply-templates>
                     </xsl:when>
                     <xsl:otherwise>
-                        <ld:field ld:meta='container' ld:level='1' ld:subtype='stl-vector' name='{$enum-key}'>
-                            <ld:field ld:meta='pointer' ld:is-container='true' ld:level='2' type-name='{$item-type}'>
-                                <ld:field>
+                        <ld:field ld:meta='container' ld:level='1' ld:subtype='stl-vector' name='{$enum-key}' pointer-type='{$item-type}'>
+                            <ld:item ld:meta='pointer' ld:is-container='true' ld:level='2' type-name='{$item-type}'>
+                                <ld:item>
                                     <xsl:call-template name='lookup-type-ref'>
                                         <xsl:with-param name='name' select='$item-type'/>
                                         <xsl:with-param name='level' select='3'/>
                                     </xsl:call-template>
-                                </ld:field>
-                            </ld:field>
+                                </ld:item>
+                            </ld:item>
                         </ld:field>
                     </xsl:otherwise>
                 </xsl:choose>

From 46c32860457c8017c20ceb98d504bb4dff630b7c Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 12:27:15 -0500
Subject: [PATCH 08/11] SharedAttributes is already pulled in by TypeDef

---
 data-definition.xsd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data-definition.xsd b/data-definition.xsd
index a192a7e92..ffdbb3334 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -163,7 +163,6 @@
                     <xs:group ref="SharedElements"/>
                     <xs:element name="stl-vector" type="StlVectorField" />
                 </xs:choice>
-                <xs:attributeGroup ref="SharedAttributes" />
                 <xs:attribute name="index-enum" use="required">
                 </xs:attribute>
                 <xs:attribute name="item-type" use="required">

From 3244170f42b22bce571c06311d4e23680fcf0e1b Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 12:46:16 -0500
Subject: [PATCH 09/11] create other_vectors_identity type

---
 StructFields.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/StructFields.pm b/StructFields.pm
index 42b73225f..65ee580de 100644
--- a/StructFields.pm
+++ b/StructFields.pm
@@ -560,10 +560,17 @@ sub emit_struct_fields($$;%) {
     &render_struct_field($_) for @fields;
 
     my $identity_type = 'struct_identity';
+    my $maybe_index_enum = '';
     if ($flags{-class}) {
         $identity_type = 'virtual_identity';
     } elsif (is_attr_true($tag, 'is-union')) {
         $identity_type = 'union_identity';
+    } elsif (($tag->getAttribute('ld:subtype') or '') eq 'df-other-vectors-type') {
+        $identity_type = 'other_vectors_identity';
+        my $xe = $tag->getAttribute('index-enum');
+        #static_include_type $xe;
+        my $enum = type_identity_reference($types{$xe});
+        $maybe_index_enum = ', '.$enum;
     }
 
     my $full_name = fully_qualified_name($tag, $name, 1);
@@ -657,7 +664,7 @@ sub emit_struct_fields($$;%) {
                     type_identity_reference($tag,-parent => 1), ', ',
                     "\"$name\", ",
                     ($inherits ? "&${inherits}::_identity" : 'NULL'), ', ',
-                    "$ftable);";
+                    "${ftable}${maybe_index_enum});";
         }
     } 'fields-' . $fields_group;
 }

From 944b7f5d6cd1e41b00a0f219ca51678f37b16c89 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 14:59:24 -0500
Subject: [PATCH 10/11] define types of other vectors

---
 df.building-vectors.xml |  80 ++++++++++++++++++++++++++++++++
 df.item-vectors.xml     | 100 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)

diff --git a/df.building-vectors.xml b/df.building-vectors.xml
index a4ac604f2..a1224a7fb 100644
--- a/df.building-vectors.xml
+++ b/df.building-vectors.xml
@@ -381,7 +381,87 @@
     </enum-type>
 
     <df-other-vectors-type type-name='buildings_other' index-enum='buildings_other_id' item-type='building'>
+        <stl-vector name='STOCKPILE' pointer-type='building_stockpilest'/>
+        <stl-vector name='ANY_ZONE' pointer-type='building_civzonest'/>
+        <stl-vector name='ACTIVITY_ZONE' pointer-type='building_civzonest'/>
+        <stl-vector name='ANY_ACTUAL' pointer-type='building_actual'/>
+        <stl-vector name='BOX' pointer-type='building_boxst'/>
+        <stl-vector name='CABINET' pointer-type='building_cabinetst'/>
+        <stl-vector name='TRAP' pointer-type='building_trapst'/>
+        <stl-vector name='DOOR' pointer-type='building_doorst'/>
+        <stl-vector name='FLOODGATE' pointer-type='building_floodgatest'/>
+        <stl-vector name='HATCH' pointer-type='building_hatchst'/>
+        <stl-vector name='GRATE_WALL' pointer-type='building_grate_wallst'/>
+        <stl-vector name='GRATE_FLOOR' pointer-type='building_grate_floorst'/>
+        <stl-vector name='BARS_VERTICAL' pointer-type='building_bars_verticalst'/>
+        <stl-vector name='BARS_FLOOR' pointer-type='building_bars_floorst'/>
+        <stl-vector name='WELL' pointer-type='building_wellst'/>
+        <stl-vector name='TABLE' pointer-type='building_tablest'/>
+        <stl-vector name='BRIDGE' pointer-type='building_bridgest'/>
+        <stl-vector name='CHAIR' pointer-type='building_chairst'/>
+        <stl-vector name='TRADE_DEPOT' pointer-type='building_tradedepotst'/>
+        <stl-vector name='NEST' pointer-type='building_nestst'/>
+        <stl-vector name='NEST_BOX' pointer-type='building_nest_boxst'/>
+        <stl-vector name='BOOKCASE' pointer-type='building_bookcasest'/>
+        <stl-vector name='DISPLAY_CASE' pointer-type='building_display_furniturest' since='v0.44.01'/>
+        <stl-vector name='HIVE' pointer-type='building_hivest'/>
+        <stl-vector name='WAGON' pointer-type='building_wagonst'/>
+        <stl-vector name='SHOP' pointer-type='building_shopst'/>
         <stl-vector name='BED' pointer-type='building_bedst'/>
+        <stl-vector name='TRACTION_BENCH' pointer-type='building_traction_benchst'/>
+        <stl-vector name='FARM_PLOT' pointer-type='building_farmplotst'/>
+        <stl-vector name='GEAR_ASSEMBLY' pointer-type='building_gear_assemblyst'/>
+        <stl-vector name='ROLLERS' pointer-type='building_rollersst'/>
+        <stl-vector name='AXLE_HORIZONTAL' pointer-type='building_axle_horizontalst'/>
+        <stl-vector name='AXLE_VERTICAL' pointer-type='building_axle_verticalst'/>
+        <stl-vector name='SUPPORT' pointer-type='building_supportst'/>
+        <stl-vector name='ARCHERY_TARGET' pointer-type='building_archerytargetst'/>
+        <stl-vector name='SCREW_PUMP' pointer-type='building_screw_pumpst'/>
+        <stl-vector name='WATER_WHEEL' pointer-type='building_water_wheelst'/>
+        <stl-vector name='WINDMILL' pointer-type='building_windmillst'/>
+        <stl-vector name='CHAIN' pointer-type='building_chainst'/>
+        <stl-vector name='CAGE' pointer-type='building_cagest'/>
+        <stl-vector name='STATUE' pointer-type='building_statuest'/>
+        <stl-vector name='SLAB' pointer-type='building_slabst'/>
+        <stl-vector name='COFFIN' pointer-type='building_coffinst'/>
+        <stl-vector name='WEAPON_RACK' pointer-type='building_weaponrackst'/>
+        <stl-vector name='ARMOR_STAND' pointer-type='building_armorstandst'/>
+        <stl-vector name='FURNACE_ANY' pointer-type='building_furnacest'/>
+        <stl-vector name='FURNACE_WOOD' pointer-type='building_furnacest'/>
+        <stl-vector name='FURNACE_SMELTER_ANY' pointer-type='building_furnacest'/>
+        <stl-vector name='FURNACE_SMELTER_MAGMA' pointer-type='building_furnacest'/>
+        <stl-vector name='FURNACE_KILN_ANY' pointer-type='building_furnacest'/>
+        <stl-vector name='FURNACE_GLASS_ANY' pointer-type='building_furnacest'/>
+        <stl-vector name='FURNACE_CUSTOM' pointer-type='building_furnacest'/>
+        <stl-vector name='WORKSHOP_ANY' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_BUTCHER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_MASON' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_KENNEL' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_FISHERY' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_JEWELER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_LOOM' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_TANNER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_DYER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_MILL_ANY' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_QUERN' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_TOOL' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_MILLSTONE' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_KITCHEN' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_STILL' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_FARMER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_ASHERY' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_CARPENTER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_CRAFTSDWARF' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_MECHANIC' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_SIEGE' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_CLOTHIER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_LEATHER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_BOWYER' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_MAGMA_FORGE' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_FORGE_ANY' pointer-type='building_workshopst'/>
+        <stl-vector name='WORKSHOP_CUSTOM' pointer-type='building_workshopst'/>
+        <stl-vector name='WEAPON_UPRIGHT' pointer-type='building_weaponst'/>
+        <stl-vector name='INSTRUMENT_STATIONARY' pointer-type='building_instrumentst'/>
     </df-other-vectors-type>
 </data-definition>
 
diff --git a/df.item-vectors.xml b/df.item-vectors.xml
index a4f259af4..ef38a75eb 100644
--- a/df.item-vectors.xml
+++ b/df.item-vectors.xml
@@ -791,6 +791,106 @@
     </enum-type>
 
     <df-other-vectors-type type-name='items_other' index-enum='items_other_id' item-type='item'>
+        <stl-vector name='WEAPON' pointer-type='item_weaponst'/>
+        <stl-vector name='ANY_TRUE_ARMOR' pointer-type='item_armorst'/>
+        <stl-vector name='ANY_ARMOR_HELM' pointer-type='item_helmst'/>
+        <stl-vector name='ANY_ARMOR_SHOES' pointer-type='item_shoesst'/>
+        <stl-vector name='SHIELD' pointer-type='item_shieldst'/>
+        <stl-vector name='ANY_ARMOR_GLOVES' pointer-type='item_glovesst'/>
+        <stl-vector name='ANY_ARMOR_PANTS' pointer-type='item_pantsst'/>
+        <stl-vector name='QUIVER' pointer-type='item_quiverst'/>
+        <stl-vector name='SPLINT' pointer-type='item_splintst'/>
+        <stl-vector name='ORTHOPEDIC_CAST' pointer-type='item_orthopedic_castst'/>
+        <stl-vector name='CRUTCH' pointer-type='item_crutchst'/>
+        <stl-vector name='BACKPACK' pointer-type='item_backpackst'/>
+        <stl-vector name='AMMO' pointer-type='item_ammost'/>
+        <stl-vector name='WOOD' pointer-type='item_woodst'/>
+        <stl-vector name='BRANCH' pointer-type='item_branchst'/>
+        <stl-vector name='BOULDER' pointer-type='item_boulderst'/>
+        <stl-vector name='ROCK' pointer-type='item_rockst'/>
+        <stl-vector name='DOOR' pointer-type='item_doorst'/>
+        <stl-vector name='FLOODGATE' pointer-type='item_floodgatest'/>
+        <stl-vector name='HATCH_COVER' pointer-type='item_hatch_coverst'/>
+        <stl-vector name='GRATE' pointer-type='item_gratest'/>
+        <stl-vector name='CAGE' pointer-type='item_cagest'/>
+        <stl-vector name='FLASK' pointer-type='item_flaskst'/>
+        <stl-vector name='WINDOW' pointer-type='item_windowst'/>
+        <stl-vector name='GOBLET' pointer-type='item_gobletst'/>
+        <stl-vector name='INSTRUMENT' pointer-type='item_instrumentst'/>
+        <stl-vector name='INSTRUMENT_STATIONARY' pointer-type='item_instrumentst'/>
+        <stl-vector name='TOY' pointer-type='item_toyst'/>
+        <stl-vector name='TOOL' pointer-type='item_toolst'/>
+        <stl-vector name='BUCKET' pointer-type='item_bucketst'/>
+        <stl-vector name='BARREL' pointer-type='item_barrelst'/>
+        <stl-vector name='CHAIN' pointer-type='item_chainst'/>
+        <stl-vector name='ANIMALTRAP' pointer-type='item_animaltrapst'/>
+        <stl-vector name='BED' pointer-type='item_bedst'/>
+        <stl-vector name='TRACTION_BENCH' pointer-type='item_traction_benchst'/>
+        <stl-vector name='CHAIR' pointer-type='item_chairst'/>
+        <stl-vector name='COFFIN' pointer-type='item_coffinst'/>
+        <stl-vector name='TABLE' pointer-type='item_tablest'/>
+        <stl-vector name='STATUE' pointer-type='item_statuest'/>
+        <stl-vector name='SLAB' pointer-type='item_slabst'/>
+        <stl-vector name='QUERN' pointer-type='item_quernst'/>
+        <stl-vector name='MILLSTONE' pointer-type='item_millstonest'/>
+        <stl-vector name='BOX' pointer-type='item_boxst'/>
+        <stl-vector name='BIN' pointer-type='item_binst'/>
+        <stl-vector name='ARMORSTAND' pointer-type='item_armorstandst'/>
+        <stl-vector name='WEAPONRACK' pointer-type='item_weaponrackst'/>
+        <stl-vector name='CABINET' pointer-type='item_cabinetst'/>
+        <stl-vector name='ANVIL' pointer-type='item_anvilst'/>
+        <stl-vector name='CATAPULTPARTS' pointer-type='item_catapultpartsst'/>
+        <stl-vector name='BALLISTAPARTS' pointer-type='item_ballistapartsst'/>
+        <stl-vector name='SIEGEAMMO' pointer-type='item_siegeammost'/>
+        <stl-vector name='TRAPPARTS' pointer-type='item_trappartsst'/>
+        <stl-vector name='ANY_WEBS' pointer-type='item_threadst'/>
+        <stl-vector name='PIPE_SECTION' pointer-type='item_pipe_sectionst'/>
+        <stl-vector name='DRINK' pointer-type='item_drinkst'/>
+        <stl-vector name='ANY_DRINK' pointer-type='item_drinkst'/>
+        <stl-vector name='LIQUID_MISC' pointer-type='item_liquid_miscst'/>
+        <stl-vector name='POWDER_MISC' pointer-type='item_powder_miscst'/>
+        <stl-vector name='VERMIN' pointer-type='item_verminst'/>
+        <stl-vector name='PET' pointer-type='item_petst'/>
+        <stl-vector name='COIN' pointer-type='item_coinst'/>
+        <stl-vector name='GLOB' pointer-type='item_globst'/>
+        <stl-vector name='TRAPCOMP' pointer-type='item_trapcompst'/>
+        <stl-vector name='BAR' pointer-type='item_barst'/>
+        <stl-vector name='SMALLGEM' pointer-type='item_smallgemst'/>
+        <stl-vector name='BLOCKS' pointer-type='item_blocksst'/>
+        <stl-vector name='ROUGH' pointer-type='item_roughst'/>
+        <stl-vector name='ANY_CORPSE' pointer-type='item_body_component'/>
+        <stl-vector name='CORPSE' pointer-type='item_corpsest'/>
+        <stl-vector name='BOOK' pointer-type='item_bookst'/>
+        <stl-vector name='FIGURINE' pointer-type='item_figurinest'/>
+        <stl-vector name='AMULET' pointer-type='item_amuletst'/>
+        <stl-vector name='SCEPTER' pointer-type='item_scepterst'/>
+        <stl-vector name='CROWN' pointer-type='item_crownst'/>
+        <stl-vector name='RING' pointer-type='item_ringst'/>
+        <stl-vector name='EARRING' pointer-type='item_earringst'/>
+        <stl-vector name='BRACELET' pointer-type='item_braceletst'/>
+        <stl-vector name='GEM' pointer-type='item_gemst'/>
+        <stl-vector name='CORPSEPIECE' pointer-type='item_corpsepiecest'/>
+        <stl-vector name='REMAINS' pointer-type='item_remainsst'/>
+        <stl-vector name='MEAT' pointer-type='item_meatst'/>
+        <stl-vector name='FISH' pointer-type='item_fishst'/>
+        <stl-vector name='FISH_RAW' pointer-type='item_fish_rawst'/>
+        <stl-vector name='EGG' pointer-type='item_eggst'/>
+        <stl-vector name='SEEDS' pointer-type='item_seedsst'/>
+        <stl-vector name='PLANT' pointer-type='item_plantst'/>
+        <stl-vector name='SKIN_TANNED' pointer-type='item_skin_tannedst'/>
+        <stl-vector name='PLANT_GROWTH' pointer-type='item_plant_growthst'/>
+        <stl-vector name='THREAD' pointer-type='item_threadst'/>
+        <stl-vector name='CLOTH' pointer-type='item_clothst'/>
+        <stl-vector name='SHEET' pointer-type='item_sheetst'/>
+        <stl-vector name='TOTEM' pointer-type='item_totemst'/>
+        <stl-vector name='PANTS' pointer-type='item_pantsst'/>
+        <stl-vector name='CHEESE' pointer-type='item_cheesest'/>
+        <stl-vector name='FOOD' pointer-type='item_foodst'/>
+        <stl-vector name='BALLISTAARROWHEAD' pointer-type='item_ballistaarrowheadst'/>
+        <stl-vector name='ARMOR' pointer-type='item_armorst'/>
+        <stl-vector name='SHOES' pointer-type='item_shoesst'/>
+        <stl-vector name='HELM' pointer-type='item_helmst'/>
+        <stl-vector name='GLOVES' pointer-type='item_glovesst'/>
     </df-other-vectors-type>
 
 </data-definition>

From a2e3a62358e4d89cca6a79f52fde20499a2cf34b Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Thu, 30 Apr 2020 17:56:20 -0500
Subject: [PATCH 11/11] add some more error checking to the xslt implementation
 of df-other-vectors-type

---
 lower-1.xslt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lower-1.xslt b/lower-1.xslt
index feb4e1830..52ab43230 100644
--- a/lower-1.xslt
+++ b/lower-1.xslt
@@ -81,6 +81,30 @@
         <xsl:variable name='enum-name' select='@index-enum'/>
         <xsl:variable name='item-type' select='@item-type'/>
 
+        <xsl:for-each select="*[not(name()='stl-vector' or name()='comment' or name()='code-helper')]">
+            <xsl:message terminate="yes">
+Error: df-other-vectors-type may only contain stl-vector fields. (<xsl:value-of select='name(.)'/>)
+            </xsl:message>
+        </xsl:for-each>
+
+        <xsl:for-each select="$vectors">
+            <xsl:variable name='enum-key' select='@name'/>
+            <xsl:variable name='enum-item' select='/data-definition/enum-type[@type-name=($enum-name)]/enum-item[@name=($enum-key)]'/>
+
+            <xsl:choose>
+                <xsl:when test='count($enum-item) = 0'>
+                    <xsl:message terminate="yes">
+Error: field <xsl:value-of select='$enum-key'/> is not a member of enum <xsl:value-of select='$enum-name'/>
+                    </xsl:message>
+                </xsl:when>
+                <xsl:when test="starts-with(($enum-item/@value), '-')">
+                    <xsl:message terminate="yes">
+Error: field <xsl:value-of select='$enum-key'/> corresponds to an enum value of <xsl:value-of select='$enum-item/@value'/>
+                    </xsl:message>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+
         <ld:global-type ld:meta='struct-type' ld:subtype='df-other-vectors-type' ld:level='0' type-name='{@type-name}' index-enum='{$enum-name}' item-type='{$item-type}'>
             <xsl:apply-templates select="@comment|@since"/>
             <xsl:apply-templates select="comment|code-helper">