diff --git a/assets/mods/basegame/weathers/WeatherOvercast.json b/assets/mods/basegame/weathers/WeatherOvercast.json new file mode 100644 index 000000000..5780058a3 --- /dev/null +++ b/assets/mods/basegame/weathers/WeatherOvercast.json @@ -0,0 +1,27 @@ +{ + "skyboxGradColourMap": "generic_skybox.tga", + "daylightClut": "clut_daylight.tga", + "classification": "overcast", + "cloudChance": 300, + "cloudGamma": [2.2, 2.0], + "cloudGammaVariance": [0.1, 0.1], + "windSpeed": 10.45, + "windSpeedVariance": 1.0, + "clouds": { + "cumulus": { + "filename": "cloud_normal.png", "tw": 1024, "th": 512, "probability": 0.1, + "baseScale": 0.8, "scaleVariance": 0.6, + "altLow": 80, "altHigh": 800 + }, + "cumulonimbus": { + "filename": "cloud_large.png", "tw": 2048, "th": 1024, "probability": 0.4, + "baseScale": 2.0, "scaleVariance": 0.3333333, + "altLow": 90, "altHigh": 120 + }, + "nimbostratus": { + "filename": "cloud_wide.png", "tw": 4096, "th": 1024, "probability": 1.0, + "baseScale": 4.0, "scaleVariance": 0.1, + "altLow": 100, "altHigh": 100 + } + } +} \ No newline at end of file diff --git a/assets/mods/basegame/weathers/cloud_wide.kra b/assets/mods/basegame/weathers/cloud_wide.kra new file mode 100644 index 000000000..e3c279bb7 --- /dev/null +++ b/assets/mods/basegame/weathers/cloud_wide.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:550dc244b939526569a2cc938009dda52b2cf8946ea7375c2ec45ff2f06889a1 +size 24791822 diff --git a/assets/mods/basegame/weathers/cloud_wide.png b/assets/mods/basegame/weathers/cloud_wide.png new file mode 100644 index 000000000..d489ae10a --- /dev/null +++ b/assets/mods/basegame/weathers/cloud_wide.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c17caaac01e47a27040a97e97f7f22636ae9d5856083ebee4053c2b8a0e77a7 +size 1783494 diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index 11e9e03b5..922660d93 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -19,7 +19,6 @@ import net.torvald.terrarum.gameworld.WorldTime import net.torvald.terrarum.gameworld.WorldTime.Companion.DAY_LENGTH import net.torvald.terrarum.RNGConsumer import net.torvald.terrarum.clut.Skybox -import net.torvald.terrarum.modulebasegame.worldgenerator.TWO_PI import net.torvald.terrarum.utils.JsonFetcher import net.torvald.terrarum.utils.forEachSiblings import net.torvald.terrarum.weather.WeatherObjectCloud.Companion.ALPHA_ROLLOFF_Z @@ -68,7 +67,7 @@ internal object WeatherMixer : RNGConsumer { // Weather indices const val WEATHER_GENERIC = "generic" - const val WEATHER_GENERIC_RAIN = "genericrain" + const val WEATHER_OVERCAST = "overcast" // TODO add weather classification indices manually // TODO to save from GL overhead, store lightmap to array; use GdxColorMap