Merge branch 'master' of https://github.com/DFHack/df-structures

df.world-data.xml

@@ -461,7 +461,34 @@
         <enum-item/>
         <enum-item/>
     </enum-type>
+
+    <enum-type type-name='front_type' base-type='uint16_t'>
+        <enum-item name='front_none'/>
+        <enum-item name='front_warm'/>
+        <enum-item name='front_cold'/>
+        <enum-item name='front_occluded'/>
+    </enum-type>
+
+    <enum-type type-name='cumulus_type' base-type='uint16_t'>
+        <enum-item name='cumulus_none'/>
+        <enum-item name='cumulus_medium'/>
+        <enum-item name='cumulus_multi'/>
+        <enum-item name='cumulus_nimbus'/>
+    </enum-type>
 
+    <enum-type type-name='stratus_type' base-type='uint16_t'>
+        <enum-item name='stratus_none'/>
+        <enum-item name='stratus_alto'/>
+        <enum-item name='stratus_proper'/>
+        <enum-item name='stratus_nimbus'/>
+    </enum-type>
+
+    <enum-type type-name='fog_type' base-type='uint16_t'>
+        <enum-item name='fog_none'/>
+        <enum-item name='fog_mist'/>
+        <enum-item name='fog_normal'/>
+        <enum-item name='fog_thick'/>
+    </enum-type>
 
     <struct-type type-name='region_map_entry'>
         <int32_t name="unk_0"/>
@@ -480,13 +507,12 @@
         <int16_t name="unk_32" comment='0'/>
         <int16_t name="unk_34" comment='0'/>
         <bitfield name='clouds' base-type='uint16_t'>
-            <flag-bit/>
-            <flag-bit/>
-            <flag-bit name='density' count='2'/>
-            <flag-bit name='striped'/>
-            <flag-bit name='darkness' count='2'/>
-            <flag-bit name='fog' count='2'/>
-            <flag-bit count='4' comment='maybe moisture content'/>
+            <flag-bit name='front' count='2' type-name='front_type'/>
+            <flag-bit name='cumulus' count='2' type-name='cumulus_type'/>
+            <flag-bit name='cirrus' count='1'/>
+            <flag-bit name='stratus' count='2' type-name='stratus_type'/>
+            <flag-bit name='fog' count='2' type-name='fog_type'/>
+            <flag-bit name='countdown' count='4' comment='A counter for stratus clouds that randomly decreases by 1 or 0 each timer weather is checked there. it does various stratus/fog effects based on the humidity/breezes/etc.'/>
         </bitfield>
         <bitfield name='wind' base-type='uint16_t' comment='blows toward direction in morning'>
             <flag-bit name='north_1'/>
@@ -630,7 +656,7 @@
 -->
         <int32_t name='unk_78'/>
         <int32_t name='moon_phase'/>
-        <int16_t name='flip_latitude'/>
+        <int16_t name='flip_latitude' comment='-1 = no poles, 0 = pole on north, 1 = pole on south, 2 = both poles'/>
         <int16_t name='flip_longitude'/>
         <int16_t name='unk_84'/>
         <int16_t name='unk_86'/>