more clouds

src/net/torvald/terrarum/weather/BaseModularWeather.kt

@@ -1,9 +1,9 @@
 package net.torvald.terrarum.weather
 
-import com.badlogic.gdx.graphics.Texture
+import com.badlogic.gdx.math.Vector2
+import com.badlogic.gdx.utils.JsonValue
 import net.torvald.terrarum.GdxColorMap
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
-import java.util.*
 
 /**
  * Note: Colour maps are likely to have sparse data points
@@ -13,11 +13,23 @@ import java.util.*
  * Created by minjaesong on 2016-07-11.
  */
 data class BaseModularWeather(
+        val json: JsonValue,
         var skyboxGradColourMap: GdxColorMap, // row 0: skybox grad top, row 1: skybox grad bottom, row 2: sunlight (RGBA)
         val daylightClut: GdxColorMap,
         val classification: String,
-        val cloudGamma: FloatArray,
-        var clouds: HashMap<String, TextureRegionPack>,
+        val cloudChance: Float,
+        val cloudDriftSpeed: Float,
+        val cloudGamma: Vector2,
+        var clouds: List<CloudProps>, // sorted by CloudProps.probability
+
         val mixFrom: String? = null,
         val mixPercentage: Double? = null
+)
+
+data class CloudProps(
+        val category: String,
+        val spriteSheet: TextureRegionPack,
+        val probability: Float,
+        val baseScale: Float,
+        val scaleVariance: Float
 )