Update items_other_id (2 new entries added in v0.42)

splintermind · Dec 20, 2015 · cc16113 · cc16113
1 parent dd2ddde
commit cc16113
Showing 1 changed file with 39 additions and 31 deletions.
diff --git a/df.item-vectors.xml b/df.item-vectors.xml
@@ -254,15 +254,18 @@
         <enum-item name='INSTRUMENT'>
             <item-attr name='item' value='INSTRUMENT'/>
         </enum-item>
+        <enum-item name='INSTRUMENT_STATIONARY'>
+            <item-attr name='item' value='INSTRUMENT'/>
+        </enum-item>
         <enum-item name='TOY'>
             <item-attr name='item' value='TOY'/>
         </enum-item>
-        <enum-item name='TOOL'>
-            <item-attr name='item' value='TOOL'/>
-        </enum-item>
 
         -- 50
 
+        <enum-item name='TOOL'>
+            <item-attr name='item' value='TOOL'/>
+        </enum-item>
         <enum-item name='BUCKET'>
             <item-attr name='item' value='BUCKET'/>
         </enum-item>
@@ -275,10 +278,10 @@
         <enum-item name='ANIMALTRAP'>
             <item-attr name='item' value='ANIMALTRAP'/>
         </enum-item>
+
         <enum-item name='BED'>
             <item-attr name='item' value='BED'/>
         </enum-item>
-
         <enum-item name='TRACTION_BENCH'>
             <item-attr name='item' value='TRACTION_BENCH'/>
         </enum-item>
@@ -291,12 +294,12 @@
         <enum-item name='TABLE'>
             <item-attr name='item' value='TABLE'/>
         </enum-item>
-        <enum-item name='STATUE'>
-            <item-attr name='item' value='STATUE'/>
-        </enum-item>
 
         -- 60
 
+        <enum-item name='STATUE'>
+            <item-attr name='item' value='STATUE'/>
+        </enum-item>
         <enum-item name='SLAB'>
             <item-attr name='item' value='SLAB'/>
         </enum-item>
@@ -309,10 +312,10 @@
         <enum-item name='BOX'>
             <item-attr name='item' value='BOX'/>
         </enum-item>
+
         <enum-item name='BIN'>
             <item-attr name='item' value='BIN'/>
         </enum-item>
-
         <enum-item name='ARMORSTAND'>
             <item-attr name='item' value='ARMORSTAND'/>
         </enum-item>
@@ -325,12 +328,12 @@
         <enum-item name='ANVIL'>
             <item-attr name='item' value='ANVIL'/>
         </enum-item>
-        <enum-item name='CATAPULTPARTS'>
-            <item-attr name='item' value='CATAPULTPARTS'/>
-        </enum-item>
 
         -- 70
 
+        <enum-item name='CATAPULTPARTS'>
+            <item-attr name='item' value='CATAPULTPARTS'/>
+        </enum-item>
         <enum-item name='BALLISTAPARTS'>
             <item-attr name='item' value='BALLISTAPARTS'/>
         </enum-item>
@@ -343,10 +346,10 @@
         <enum-item name='ANY_WEBS'>
             <item-attr name='generic_item' value='THREAD'/>
         </enum-item>
+
         <enum-item name='PIPE_SECTION'>
             <item-attr name='item' value='PIPE_SECTION'/>
         </enum-item>
-
         <enum-item name='ANY_ENCASED'/>
         <enum-item name='ANY_IN_CONSTRUCTION'/>
         <enum-item name='DRINK'>
@@ -355,12 +358,12 @@
         <enum-item name='ANY_DRINK'>
             <item-attr name='generic_item' value='DRINK'/>
         </enum-item>
-        <enum-item name='LIQUID_MISC'>
-            <item-attr name='item' value='LIQUID_MISC'/>
-        </enum-item>
 
         -- 80
 
+        <enum-item name='LIQUID_MISC'>
+            <item-attr name='item' value='LIQUID_MISC'/>
+        </enum-item>
         <enum-item name='POWDER_MISC'>
             <item-attr name='item' value='POWDER_MISC'/>
         </enum-item>
@@ -392,10 +395,10 @@
         <enum-item name='VERMIN'>
             <item-attr name='generic_item' value='VERMIN'/>
         </enum-item>
+
         <enum-item name='PET'>
             <item-attr name='generic_item' value='PET'/>
         </enum-item>
-
         <enum-item name='ANY_CRITTER'>
             <item-attr name='generic_item' value='VERMIN'/>
             <item-attr name='generic_item' value='PET'/>
@@ -409,12 +412,12 @@
         <enum-item name='TRAPCOMP'>
             <item-attr name='item' value='TRAPCOMP'/>
         </enum-item>
-        <enum-item name='BAR'>
-            <item-attr name='item' value='BAR'/>
-        </enum-item>
 
         -- 90
 
+        <enum-item name='BAR'>
+            <item-attr name='item' value='BAR'/>
+        </enum-item>
         <enum-item name='SMALLGEM'>
             <item-attr name='item' value='SMALLGEM'/>
         </enum-item>
@@ -428,13 +431,13 @@
             <item-attr name='generic_item' value='CORPSE'/>
             <item-attr name='generic_item' value='CORPSEPIECE'/>
         </enum-item>
+
         <enum-item name='CORPSE'>
             <item-attr name='item' value='CORPSE'/>
         </enum-item>
         <enum-item name='BOOK'>
             <item-attr name='item' value='BOOK'/>
         </enum-item>
-
         <enum-item name='FIGURINE'>
             <item-attr name='item' value='FIGURINE'/>
         </enum-item>
@@ -444,6 +447,9 @@
         <enum-item name='SCEPTER'>
             <item-attr name='item' value='SCEPTER'/>
         </enum-item>
+
+        -- 100
+
         <enum-item name='CROWN'>
             <item-attr name='item' value='CROWN'/>
         </enum-item>
@@ -453,15 +459,13 @@
         <enum-item name='EARRING'>
             <item-attr name='item' value='EARRING'/>
         </enum-item>
-
-        -- 102
-
         <enum-item name='BRACELET'>
             <item-attr name='item' value='BRACELET'/>
         </enum-item>
         <enum-item name='GEM'>
             <item-attr name='item' value='GEM'/>
         </enum-item>
+
         <enum-item name='CORPSEPIECE'>
             <item-attr name='item' value='CORPSEPIECE'/>
         </enum-item>
@@ -471,13 +475,15 @@
         <enum-item name='MEAT'>
             <item-attr name='item' value='MEAT'/>
         </enum-item>
-
         <enum-item name='FISH'>
             <item-attr name='item' value='FISH'/>
         </enum-item>
         <enum-item name='FISH_RAW'>
             <item-attr name='item' value='FISH_RAW'/>
         </enum-item>
+
+        -- 110
+
         <enum-item name='EGG'>
             <item-attr name='item' value='EGG'/>
         </enum-item>
@@ -487,28 +493,31 @@
         <enum-item name='PLANT'>
             <item-attr name='item' value='PLANT'/>
         </enum-item>
-
-        -- 112
-
         <enum-item name='SKIN_TANNED'>
             <item-attr name='item' value='SKIN_TANNED'/>
         </enum-item>
         <enum-item name='PLANT_GROWTH'>
             <item-attr name='item' value='PLANT_GROWTH'/>
         </enum-item>
+
         <enum-item name='THREAD'>
             <item-attr name='item' value='THREAD'/>
         </enum-item>
         <enum-item name='CLOTH'>
             <item-attr name='item' value='CLOTH'/>
         </enum-item>
+        <enum-item name='SHEET'>
+            <item-attr name='item' value='SHEET'/>
+        </enum-item>
         <enum-item name='TOTEM'>
             <item-attr name='item' value='TOTEM'/>
         </enum-item>
-
         <enum-item name='PANTS'>
             <item-attr name='item' value='PANTS'/>
         </enum-item>
+
+        -- 120
+
         <enum-item name='CHEESE'>
             <item-attr name='item' value='CHEESE'/>
         </enum-item>
@@ -521,12 +530,10 @@
         <enum-item name='ARMOR'>
             <item-attr name='item' value='ARMOR'/>
         </enum-item>
-
-        -- 122
-
         <enum-item name='SHOES'>
             <item-attr name='item' value='SHOES'/>
         </enum-item>
+
         <enum-item name='HELM'>
             <item-attr name='item' value='HELM'/>
         </enum-item>
@@ -555,6 +562,7 @@
             <item-attr name='generic_item' value='TOOL'/>
         </enum-item>
 
+        -- 129
         <enum-item name='ANY_RECENTLY_DROPPED'/>
         <enum-item name='ANY_MELT_DESIGNATED'/>