From 41b4a929d8809c750e1e9640abc0c82b7717c953 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sat, 15 Oct 2016 12:19:50 +0900 Subject: [PATCH] player now created with proper born date Former-commit-id: c77996cb7074d7c32421bb1f5a37194de0f16946 Former-commit-id: a9613ef941030ffe2b441bb19538573144b00608 --- src/net/torvald/terrarum/gameactors/PlayerBuilder.kt | 3 ++- src/net/torvald/terrarum/gameworld/WorldTime.kt | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt index 3d6ef7e34..77f6161ad 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt @@ -1,5 +1,6 @@ package net.torvald.terrarum.gameactors +import net.torvald.terrarum.Terrarum import org.newdawn.slick.SlickException import java.io.IOException @@ -12,7 +13,7 @@ object PlayerBuilder { @Throws(IOException::class, SlickException::class) fun create(): Player { - val p: Player = Player() + val p: Player = Player(Terrarum.ingame.world.time.currentTimeAsGameDate) CreatureRawInjector.inject(p.actorValue, "CreatureHuman.json") // attach sprite diff --git a/src/net/torvald/terrarum/gameworld/WorldTime.kt b/src/net/torvald/terrarum/gameworld/WorldTime.kt index efa2391dd..531c369d0 100644 --- a/src/net/torvald/terrarum/gameworld/WorldTime.kt +++ b/src/net/torvald/terrarum/gameworld/WorldTime.kt @@ -1,5 +1,7 @@ package net.torvald.terrarum.gameworld +import net.torvald.terrarum.gameactors.GameDate + /** * The World Calendar implementation of Dwarven Calendar (we're talking about DF!) * @@ -15,6 +17,8 @@ package net.torvald.terrarum.gameworld * Created by minjaesong on 16-01-24. */ class WorldTime { + internal var TIME_T = 0L // TODO use it! Epoch: Year 125, 1st Granite, 0h00:00 + internal var seconds: Int // 0 - 59 internal var minutes: Int // 0 - 59 internal var hours: Int // 0 - 21 @@ -45,6 +49,9 @@ class WorldTime { val MONTH_NAMES_SHORT = arrayOf("Opal", "Obsi", "Gran", "Slat", "Fels", "Hema", "Mala", "Gale", "Lime", "Sand", "Timb", "Moon") + val currentTimeAsGameDate: GameDate + get() = GameDate(years, yearlyDays) + @Transient val REAL_SEC_IN_MILLI = 1000 companion object {