Fix broken instance-vectors

PatrikLundell · Mar 10, 2018 · a6297f1 · a6297f1
1 parent 91d2c57
commit a6297f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/df.descriptors.xml b/df.descriptors.xml
@@ -8,7 +8,7 @@
         <enum-item name='MOTTLED'/>
     </enum-type>
 
-    <struct-type type-name='descriptor_color' instance-vector='$global.world.raws.language.colors'>
+    <struct-type type-name='descriptor_color' instance-vector='$global.world.raws.descriptors.colors'>
         <stl-string name="id"/>
         <code-helper name='describe'>$.id</code-helper>
         <stl-vector name="word_unk"/>
@@ -21,7 +21,7 @@
         <s-float name="blue"/>
     </struct-type>
 
-    <struct-type type-name='descriptor_shape' instance-vector='$global.world.raws.language.shapes'>
+    <struct-type type-name='descriptor_shape' instance-vector='$global.world.raws.descriptors.shapes'>
         <stl-string name="id"/>
         <code-helper name='describe'>$.id</code-helper>
         <stl-vector name="word_unk"/>
@@ -39,7 +39,7 @@
         <uint8_t name="tile"/>
     </struct-type>
 
-    <struct-type type-name='descriptor_pattern' instance-vector='$global.world.raws.language.patterns'>
+    <struct-type type-name='descriptor_pattern' instance-vector='$global.world.raws.descriptors.patterns'>
         <stl-string name='id'/>
         <code-helper name='describe'>$.id</code-helper>
         <stl-vector name="colors" type-name='int16_t' ref-target='descriptor_color'/>

diff --git a/df.reaction-raws.xml b/df.reaction-raws.xml
@@ -6,7 +6,7 @@
     </enum-type>
 
     <struct-type type-name='reaction'
-                instance-vector='$global.world.raws.reactions'>
+                instance-vector='$global.world.raws.reactions.reactions'>
         <stl-string name="code"/>
         <stl-string name="name"/>