curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 10:34:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

choosing next weather as its own function

Browse Source
This commit is contained in:
minjaesong
2023-09-06 19:30:08 +09:00
parent 6c97a9d5ab
commit b47cc17afd
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/torvald/terrarum/weather/Weatherbox.kt
View File

@@ -41,7 +41,8 @@ class Weatherbox {
get() = weatherSchedule[0].weather get() = weatherSchedule[0].weather
val currentWeather: BaseModularWeather val currentWeather: BaseModularWeather
get() = weatherSchedule[1].weather get() = weatherSchedule[1].weather
// val nextWeather: BaseModularWeather
// val nextWeather: BaseModularWeather
// get() = weatherSchedule[2].weather // get() = weatherSchedule[2].weather
val oldWeatherDuration: Long val oldWeatherDuration: Long
get() = weatherSchedule[0].duration get() = weatherSchedule[0].duration
@@ -60,6 +61,12 @@ class Weatherbox {
var updateAkku = 0L; private set var updateAkku = 0L; private set
private fun pickNextWeather(): WeatherSchedule {
val newName = if (currentWeather.identifier == "generic01") "overcast01" else "generic01"
val newDuration = 7200L
return WeatherSchedule(WeatherMixer.weatherDict[newName]!!, newDuration)
}
fun update(world: GameWorld) { fun update(world: GameWorld) {
updateShaderParams() updateShaderParams()
updateWind(world) updateWind(world)
@@ -67,9 +74,7 @@ class Weatherbox {
if (updateAkku >= currentWeatherDuration) { if (updateAkku >= currentWeatherDuration) {
// TODO add more random weathers // TODO add more random weathers
while (weatherSchedule.size < 3) { while (weatherSchedule.size < 3) {
val newName = if (currentWeather.identifier == "generic01") "overcast01" else "generic01" weatherSchedule.add(pickNextWeather())
val newDuration = 7200L
weatherSchedule.add(WeatherSchedule(WeatherMixer.weatherDict[newName]!!, newDuration))
// printdbg(this, "Queueing next weather '$newName' that will last $newDuration seconds") // printdbg(this, "Queueing next weather '$newName' that will last $newDuration seconds")
} }