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

variable renaming

Browse Source
This commit is contained in:
minjaesong
2020-10-25 11:37:05 +09:00
parent 01e10824f7
commit feb2becbc2
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/torvald/terrarum/modulebasegame/gameworld/WorldTime.kt
View File

@@ -96,20 +96,20 @@ class WorldTime(initTime: Long = 0L) {
// these functions won't need inlining for performance // these functions won't need inlining for performance
val yearlyDays: Int // 0 - 119 val ordinalDay: Int // 0 - 119
get() = (TIME_T.div(DAY_LENGTH) fmod YEAR_DAYS.toLong()).toInt() get() = (TIME_T.div(DAY_LENGTH) fmod YEAR_DAYS.toLong()).toInt()
val days: Int // 1 - 30 fixed val calendarDay: Int // 1 - 30 fixed
get() = (yearlyDays % MONTH_LENGTH) + 1 get() = (ordinalDay % MONTH_LENGTH) + 1
val months: Int // 1 - 4 val calendarMonth: Int // 1 - 4
get() = (yearlyDays / MONTH_LENGTH) + 1 get() = (ordinalDay / MONTH_LENGTH) + 1
val years: Int val years: Int
get() = TIME_T.div(YEAR_DAYS * DAY_LENGTH).abs().toInt() + EPOCH_YEAR get() = TIME_T.div(YEAR_DAYS * DAY_LENGTH).abs().toInt() + EPOCH_YEAR
val quarter = months - 1 // 0 - 3 val quarter = calendarMonth - 1 // 0 - 3
val dayOfWeek: Int //0: Mondag-The first day of weekday (0 - 7) val dayOfWeek: Int //0: Mondag-The first day of weekday (0 - 7)
get() = if (yearlyDays == YEAR_DAYS - 1) 7 else yearlyDays % 7 get() = if (ordinalDay == YEAR_DAYS - 1) 7 else ordinalDay % 7
var timeDelta: Int = 1 var timeDelta: Int = 1
set(value) { set(value) {
@@ -206,17 +206,17 @@ class WorldTime(initTime: Long = 0L) {
fun getFormattedTime() = "${getDayNameShort()}, " + fun getFormattedTime() = "${getDayNameShort()}, " +
"$years " + "$years " +
"${getMonthNameFull()} " + "${getMonthNameFull()} " +
"$days " + "$calendarDay " +
"${String.format("%02d", hours)}:" + "${String.format("%02d", hours)}:" +
"${String.format("%02d", minutes)}:" + "${String.format("%02d", minutes)}:" +
"${String.format("%02d", seconds)}" "${String.format("%02d", seconds)}"
fun getShortTime() = "${years.toString().padStart(4, '0')}-${getMonthNameShort()}-${days.toString().padStart(2, '0')}" fun getShortTime() = "${years.toString().padStart(4, '0')}-${getMonthNameShort()}-${calendarDay.toString().padStart(2, '0')}"
fun getFilenameTime() = "${years.toString().padStart(4, '0')}${months.toString().padStart(2, '0')}${days.toString().padStart(2, '0')}" fun getFilenameTime() = "${years.toString().padStart(4, '0')}${calendarMonth.toString().padStart(2, '0')}${calendarDay.toString().padStart(2, '0')}"
fun getDayNameFull() = DAY_NAMES[dayOfWeek] fun getDayNameFull() = DAY_NAMES[dayOfWeek]
fun getDayNameShort() = DAY_NAMES_SHORT[dayOfWeek] fun getDayNameShort() = DAY_NAMES_SHORT[dayOfWeek]
fun getMonthNameFull() = MONTH_NAMES[months - 1] fun getMonthNameFull() = MONTH_NAMES[calendarMonth - 1]
fun getMonthNameShort() = MONTH_NAMES_SHORT[months - 1] fun getMonthNameShort() = MONTH_NAMES_SHORT[calendarMonth - 1]
override fun toString() = getFormattedTime() override fun toString() = getFormattedTime()
} }

4
src/net/torvald/terrarum/modulebasegame/ui/UITierOneWatch.kt
View File

@@ -76,7 +76,7 @@ class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() {
watchFont.draw(batch, worldTime.getDayNameShort().toUpperCase(), 73f, 7f) watchFont.draw(batch, worldTime.getDayNameShort().toUpperCase(), 73f, 7f)
// day // day
watchFont.draw(batch, worldTime.days.toString().padStart(2, '@'), 107f, 7f) watchFont.draw(batch, worldTime.calendarDay.toString().padStart(2, '@'), 107f, 7f)
// hour // hour
watchFont.draw(batch, worldTime.hours.toString().padStart(2, '@'), 27f, 7f) watchFont.draw(batch, worldTime.hours.toString().padStart(2, '@'), 27f, 7f)
@@ -84,7 +84,7 @@ class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() {
watchFont.draw(batch, worldTime.minutes.toString().padStart(2, '0'), 49f, 7f) watchFont.draw(batch, worldTime.minutes.toString().padStart(2, '0'), 49f, 7f)
// season marker // season marker
batch.draw(atlas.get(1, worldTime.months - 1), 0f, 0f) batch.draw(atlas.get(1, worldTime.calendarMonth - 1), 0f, 0f)
// moon dial // moon dial