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

reducing down HistoricalFigure to nothing

Browse Source 
It doesn't seem like a good idea
This commit is contained in:
minjaesong
2018-07-03 22:45:00 +09:00
parent a702aac12f
commit 98d9cc49c1
15 changed files with 33 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/modulebasegame/gameworld/WorldSimulator.kt
View File

@@ -3,7 +3,6 @@ package net.torvald.terrarum.modulebasegame.gameworld
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.modulebasegame.gameactors.AnyPlayer
import net.torvald.terrarum.roundInt
import net.torvald.terrarum.worlddrawer.BlocksDrawer
import net.torvald.terrarum.worlddrawer.FeaturesDrawer
@@ -12,6 +11,7 @@ import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.gameworld.FluidCodex
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.modulebasegame.Ingame
import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
/**
* Created by minjaesong on 2016-08-03.
@@ -40,7 +40,7 @@ object WorldSimulator {
private val world = (Terrarum.ingame!! as Ingame).world
operator fun invoke(p: AnyPlayer?, delta: Float) {
operator fun invoke(p: ActorHumanoid?, delta: Float) {
if (p != null) {
updateXFrom = p.hitbox.centeredX.div(FeaturesDrawer.TILE_SIZE).minus(FLUID_UPDATING_SQUARE_RADIUS).roundInt()
updateYFrom = p.hitbox.centeredY.div(FeaturesDrawer.TILE_SIZE).minus(FLUID_UPDATING_SQUARE_RADIUS).roundInt()

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

@@ -1,6 +1,7 @@
package net.torvald.terrarum.modulebasegame.gameworld
import net.torvald.terrarum.modulebasegame.gameactors.GameDate
typealias time_t = Long
/**
* The World Calendar implementation of Dwarven Calendar, except:
@@ -108,9 +109,6 @@ class WorldTime(initTime: Long = 0L) {
val MONTH_NAMES_SHORT = arrayOf("Opal", "Obsi", "Gran", "Slat", "Fels", "Hema",
"Mala", "Gale", "Lime", "Sand", "Timb", "Moon")
inline val currentTimeAsGameDate: GameDate
get() = GameDate(years, yearlyDays)
companion object {
/** Each day is 22-hour long */
val DAY_LENGTH = 79200 //must be the multiple of 3600

4
src/net/torvald/terrarum/modulebasegame/gameworld/WorldTime_old.kt
View File

@@ -1,7 +1,5 @@
package net.torvald.terrarum.modulebasegame.gameworld
import net.torvald.terrarum.modulebasegame.gameactors.GameDate
/**
* The World Calendar implementation of Dwarven Calendar (we're talking about DF!)
*
@@ -49,8 +47,6 @@ class YeOldeWorldTime {
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