curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

season variable moved to worldtime

Browse Source
This commit is contained in:
minjaesong
2023-09-07 17:21:26 +09:00
parent 37492dc8a0
commit fbc700508f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/torvald/terrarum/gameworld/WorldTime.kt
View File

@@ -155,6 +155,17 @@ class WorldTime(initTime: Long = 0L) {
return -23.44 * cos(TWO_PI * x / YEAR_DAYS)
}
/**
* Ecological season, defined as Prevernal, Vernal, Aestival, Serotinal, Autumnal and Hibernal.
*
* @return yearly progress of the six seasons, 0f (inclusve) to 6f (exclusive)
*/
val ecologicalSeason: Float
get() {
val drawTIME_T = TIME_T - (WorldTime.DAY_LENGTH * 10) // offset by -10 days
return (drawTIME_T fmod (WorldTime.DAY_LENGTH * WorldTime.YEAR_DAYS).toLong()).toFloat() / (WorldTime.DAY_LENGTH * WorldTime.YEAR_DAYS / 6)
}
@Transient private var realSecAcc: Double = 0.0
@Transient private val REAL_SEC_TO_GAME_SECS = 1.0 / GAME_MIN_TO_REAL_SEC // how slow is real-life clock (second-wise) relative to the ingame one

6
src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
View File

@@ -181,9 +181,6 @@ internal object BlocksDrawer {
return TILES_BLEND_MUL.add(blockID)
}
private var drawTIME_T = 0L
private val SECONDS_IN_MONTH = WorldTime.MONTH_LENGTH * WorldTime.DAY_LENGTH.toLong()
///////////////////////////////////////////
// NO draw lightmap using colour filter, actors must also be hidden behind the darkness
///////////////////////////////////////////
@@ -196,8 +193,7 @@ internal object BlocksDrawer {
internal fun renderData() {
try {
drawTIME_T = world.worldTime.TIME_T - (WorldTime.DAY_LENGTH * 10) // offset by -10 days
val seasonalMonth = (drawTIME_T fmod (WorldTime.DAY_LENGTH * WorldTime.YEAR_DAYS).toLong()).toFloat() / (WorldTime.DAY_LENGTH * WorldTime.YEAR_DAYS / weatherTerrains.size)
val seasonalMonth = world.worldTime.ecologicalSeason
tilesTerrain = weatherTerrains[seasonalMonth.floorToInt()]
tilesTerrainNext = weatherTerrains[(seasonalMonth + 1).floorToInt() fmod weatherTerrains.size]