Check and update various structures in world.raws.

PatrikLundell · Feb 19, 2012 · 093e6c9 · 093e6c9
1 parent be1f462
commit 093e6c9
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 116 deletions.
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
@@ -664,15 +664,6 @@
                 <stl-string/>
             </static-array>
 
-            <stl-vector type-name='int16_t' name='material_breath_attack_mattype'/>
-            <stl-vector type-name='int32_t' name='material_breath_attack_matindex'/>
-            <static-array name='material_breath_attack_str' count='3'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
-            </static-array>
-            <stl-vector type-name='int16_t' name='material_breath_attack_type'/>
-
             <stl-vector type-name='int16_t' name='egg_material_mattype'/>
             <stl-vector type-name='int32_t' name='egg_material_matindex'/>
             <static-array name='egg_material_str' count='3'>
@@ -704,6 +695,10 @@
             <stl-vector name='unk23a' type-name='int32_t'/>
             <stl-vector name='unk23b' type-name='int32_t'/>
             <stl-vector name='unk23c' type-name='int32_t'/>
+            <stl-vector type-name='int32_t' comment='v0.34.01'/>
+            <stl-vector type-name='int32_t' comment='v0.34.01'/>
+            <stl-vector type-name='int32_t' comment='v0.34.01'/>
+            <stl-vector type-name='int32_t' comment='v0.34.01'/>
 
             <df-flagarray name='unk24_flags'/>
             <df-flagarray name='unk25_flags'/>
@@ -714,6 +709,7 @@
             <stl-vector name='unk_2f20' type-name='int16_t'/>
             <stl-vector name='unk_2f30' type-name='int8_t'/>
             <stl-vector name='unk_2f40' type-name='int32_t'/>
+            <stl-vector name='unk_2f50' type-name='int16_t' comment='v0.34.01'/>
 
             muscle:
             <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
@@ -731,6 +727,8 @@
         <stl-vector name='sound'><pointer/></stl-vector>
         <stl-vector type-name='int32_t' name='sound_alert'/>
         <stl-vector type-name='int32_t' name='sound_peaceful_intermittent'/>
+
+        <stl-vector type-name='pointer' comment='v0.34.01'/>
     </struct-type>
 
     <struct-type type-name='creature_raw' instance-vector='$global.world.raws.creatures.all'>
@@ -940,7 +938,7 @@
         <stl-string name='tissue_name_singular'/>
         <stl-string name='tissue_name_plural'/>
         <static-array name='tissue_material_str' type-name='stl-string' count='3'/>
-        <int32_t/>
+        <int16_t/>
         <int32_t/>
         <int32_t name='relative_thickness'/>
         <int32_t name='healing_rate'/>

diff --git a/df.descriptors.xml b/df.descriptors.xml
@@ -5,6 +5,7 @@
         <enum-item name='IRIS_EYE'/>
         <enum-item name='SPOTS'/>
         <enum-item name='PUPIL_EYE'/>
+        <enum-item name='MOTTLED'/>
     </enum-type>
 
     <struct-type type-name='descriptor_color' instance-vector='$global.world.raws.language.colors'>
@@ -33,6 +34,13 @@
         <stl-vector name="adj">
             <pointer type-name='stl-string'/>
         </stl-vector>
+
+        <bitfield name='gems_use'>
+            <flag-bit name='noun'/>
+            <flag-bit name='adj'/>
+            <flag-bit name='adj_noun'/>
+        </bitfield>
+
         <uint8_t name="tile"/>
     </struct-type>
 

diff --git a/df.entity-raws.xml b/df.entity-raws.xml
@@ -268,13 +268,14 @@
             <static-array name='sphere_alignment' type-name='int32_t' count='130' index-enum='sphere_type'/>
             <static-array name='art_facet_modifier' type-name='int32_t' count='4' index-enum='art_facet_type'/>
             <static-array name='art_image_element_modifier' type-name='int32_t' count='5' index-enum='art_image_element_type'/>
-            <static-array name='item_improvement_modifier' type-name='int32_t' count='9' index-enum='improvement_type'/>
+            <static-array name='item_improvement_modifier' type-name='int32_t'
+                          count='11' index-enum='improvement_type'/>
             <int32_t name='adventure_tier'/>
             <static-array name='friendly_color' type-name='int16_t' count='3'/>
 
             <int32_t name='default_site_type'/>
-            <static-array name='likes_site' type-name='int8_t' count='10' index-enum='site_type'/>
-            <static-array name='tolerates_site' type-name='int8_t' count='10' index-enum='site_type'/>
+            <static-array name='likes_site' type-name='int8_t' count='11' index-enum='site_type'/>
+            <static-array name='tolerates_site' type-name='int8_t' count='11' index-enum='site_type'/>
 
             <static-array name='biome_support' type-name='int32_t' count='51' index-enum='biome_type'/>
             <static-array name='start_biome' type-name='int8_t' count='51' index-enum='biome_type'/>
@@ -303,7 +304,7 @@
             <int16_t/>
         </stl-vector>
         <stl-vector name='religion_sphere'>
-            <int16_t/>
+            <enum base-type='int16_t' type-name='sphere_type'/>
         </stl-vector>
 
         <compound name='jobs'>
@@ -354,6 +355,16 @@
 
         <stl-vector name='unk2'/>
         <stl-vector name='currency'/>
+
+        <stl-vector name='gem_shapes' comment='v0.34.01'>
+            <int32_t ref-target='descriptor_shape'/>
+        </stl-vector>
+        <stl-vector name='stone_shapes' comment='v0.34.01'>
+            <int32_t ref-target='descriptor_shape'/>
+        </stl-vector>
+
+        <stl-vector comment='v0.34.01'/>
+        <stl-vector comment='v0.34.01'/>
     </struct-type>
 
     <enum-type type-name='entity_position_raw_flags'>

diff --git a/df.history.xml b/df.history.xml
@@ -107,8 +107,10 @@
             </stl-bit-vector>
         </pointer>
 
-        <pointer comment='v0.34.01'>
-            <stl-vector name="unk_0"/>
+        <pointer name='secret' comment='v0.34.01'>
+            <stl-vector name="interactions">
+                <pointer type-name='interaction'/>
+            </stl-vector>
             <int32_t name="unk_10"/>
             <stl-vector name="unk_14"/>
         </pointer>

diff --git a/df.item-raws.xml b/df.item-raws.xml
@@ -300,6 +300,7 @@
         <enum-item name='FOOD_STORAGE'/>
         <enum-item name='HIVE'/>
         <enum-item name='NEST_BOX'/>
+        <enum-item name='POUCH'/>
     </enum-type>
 
     <class-type type-name='itemdef_toolst' inherits-from='itemdef'

diff --git a/df.reaction-raws.xml b/df.reaction-raws.xml
@@ -29,7 +29,9 @@
                     <pointer type-name='stl-string'/>
                 </stl-vector>
             </static-array>
-            <stl-vector type-name='int32_t' name='type'/>
+            <stl-vector name='type'>
+                <enum base-type='int32_t' type-name='building_type'/>
+            </stl-vector>
             <stl-vector type-name='int32_t' name='subtype'/>
             <stl-vector type-name='int32_t' name='custom'/>
             <stl-vector type-name='int32_t' name='hotkey'/>

diff --git a/df.syndrome.xml b/df.syndrome.xml
@@ -129,7 +129,9 @@
     </class-type>
 
     <class-type type-name='creature_interaction_effect_feverst'
-                inherits-from='creature_interaction_effect'/>
+                inherits-from='creature_interaction_effect'>
+        <int32_t name="sev"/>
+    </class-type>
 
     <class-type type-name='creature_interaction_effect_bleedingst'
                 inherits-from='creature_interaction_effect'>