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

snapshot numbering now use ISO week-numbering year to remove possible conflicts

Browse Source
This commit is contained in:
minjaesong
2023-12-22 02:03:46 +09:00
parent 3a814955d0
commit 397b4f7717
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/torvald/terrarum/TerrarumAppConfiguration.kt
View File

@@ -2,6 +2,8 @@ package net.torvald.terrarum
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.serialise.toUint import net.torvald.terrarum.serialise.toUint
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.util.* import java.util.*
/** /**
@@ -83,6 +85,9 @@ basegame
const val TILE_SIZED = TILE_SIZE.toDouble() const val TILE_SIZED = TILE_SIZE.toDouble()
/**
* @param string Text representation of the snapshot version, such as "23w50"
*/
private fun ForcedSnapshot(string: String): Snapshot { private fun ForcedSnapshot(string: String): Snapshot {
val s = Snapshot(string.last().code - 0x61) val s = Snapshot(string.last().code - 0x61)
s.year = string.substring(0, 2).toInt() s.year = string.substring(0, 2).toInt()
@@ -93,9 +98,20 @@ basegame
} }
data class Snapshot(var revision: Int) { data class Snapshot(var revision: Int) {
private var today = Calendar.getInstance() private var today = LocalDate.now()
internal var year = today.get(Calendar.YEAR) - 2000 /** The ISO year, may NOT correspond with the calendar year */
internal var week = today.get(Calendar.WEEK_OF_YEAR) internal var year: Int
/** The ISO week number, may NOT correspond with the calendar week */
internal var week: Int
init {
// THE CORRECT WAY of deriving ISO WEEK DATE format (test with LocalDate.parse("1976-12-31"); should return 1977 01)
// NOTE: Java's implementation seems to think the first day of the week is Sunday, instead of the Monday as in ISO standard. Weird...
val formatter = DateTimeFormatter.ofPattern("YYYY ww", Locale.getDefault())
val (y, w) = today.format(formatter).split(' ')
year = y.toInt() - 2000
week = w.toInt()
}
private var string = "" private var string = ""
private var bytes = byteArrayOf() private var bytes = byteArrayOf()

2
src/net/torvald/terrarum/audio/dsp/Scope.kt
View File

@@ -87,7 +87,7 @@ class Scope : TerrarumAudioFilter() {
private val scopePlotCol = Color(0x61b3df_33) private val scopePlotCol = Color(0x61b3df_33)
private val spectroPlotCol = Color(0xdf6fa0_aa.toInt()) private val spectroPlotCol = Color(0xdf6fa0_aa.toInt())
private val lowlim = -96.0 private val lowlim = -60.0
override fun drawDebugView(batch: SpriteBatch, x: Int, y: Int) { override fun drawDebugView(batch: SpriteBatch, x: Int, y: Int) {
batch.color = spectroPlotCol batch.color = spectroPlotCol