From b0e4bd31eb25d4dcb14a2b68f54abbf8b0abe336 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 6 Sep 2023 22:33:42 +0900 Subject: [PATCH] temporary setup for picking next weather --- src/net/torvald/terrarum/weather/Weatherbox.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/weather/Weatherbox.kt b/src/net/torvald/terrarum/weather/Weatherbox.kt index c229772ad..1f3f26b68 100644 --- a/src/net/torvald/terrarum/weather/Weatherbox.kt +++ b/src/net/torvald/terrarum/weather/Weatherbox.kt @@ -7,6 +7,7 @@ import net.torvald.terrarum.floorToInt import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.fmod import java.util.* +import kotlin.math.roundToLong data class WeatherSchedule(val weather: BaseModularWeather = WeatherMixer.DEFAULT_WEATHER, val duration: Long = 3600) @@ -62,8 +63,9 @@ class Weatherbox { var updateAkku = 0L; private set private fun pickNextWeather(): WeatherSchedule { - val newName = if (currentWeather.identifier == "generic01") "overcast01" else "generic01" - val newDuration = 7200L + // temporary setup for the release + val newName = if (takeUniformRand(0f..1f) < 0.5f) "generic01" else "generic02" + val newDuration = takeTriangularRand(3600f..10800f).roundToLong() return WeatherSchedule(WeatherMixer.weatherDict[newName]!!, newDuration) }