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

sprites can be rendered across the world seam

Browse Source
This commit is contained in:
minjaesong
2021-09-17 22:54:55 +09:00
parent 58be058b86
commit 575ed4410b
47 changed files with 150 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/spriteanimation/SpriteAnimation.kt
View File

@@ -128,7 +128,7 @@ class SpriteAnimation(@Transient val parentActor: ActorWithBody) {
if (visible) { if (visible) {
val region = textureRegion.get(currentFrame, currentRow) val region = textureRegion.get(currentFrame, currentRow)
// batch.color = colorFilter batch.color = colorFilter
//val scale = parentActor.scale.toFloat() // wtf? //val scale = parentActor.scale.toFloat() // wtf?

2
src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused
View File

@@ -106,7 +106,7 @@ class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
fun generateUniqueReferenceID(renderOrder: Actor.RenderOrder): ActorID { fun generateUniqueReferenceID(renderOrder: Actor.RenderOrder): ActorID {
fun hasCollision(value: ActorID) = fun hasCollision(value: ActorID) =
try { try {
Terrarum.ingame!!.theGameHasActor(value) || INGAME.theGameHasActor(value) ||
value < ItemCodex.ACTORID_MIN || value < ItemCodex.ACTORID_MIN ||
value !in when (renderOrder) { value !in when (renderOrder) {
Actor.RenderOrder.BEHIND -> Actor.RANGE_BEHIND Actor.RenderOrder.BEHIND -> Actor.RANGE_BEHIND

8
src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt
View File

@@ -107,8 +107,8 @@ object BlockPropUtil {
private fun getDynamicLumFunc(prop: BlockProp): Cvec { private fun getDynamicLumFunc(prop: BlockProp): Cvec {
return when (prop.dynamicLuminosityFunction) { return when (prop.dynamicLuminosityFunction) {
1 -> getTorchFlicker(prop) 1 -> getTorchFlicker(prop)
2 -> (Terrarum.ingame!!.world).globalLight.cpy() // current global light 2 -> (INGAME.world).globalLight.cpy() // current global light
3 -> WeatherMixer.getGlobalLightOfTime(Terrarum.ingame!!.world, WorldTime.DAY_LENGTH / 2).cpy() // daylight at noon 3 -> WeatherMixer.getGlobalLightOfTime(INGAME.world, WorldTime.DAY_LENGTH / 2).cpy() // daylight at noon
4 -> getSlowBreath(prop) 4 -> getSlowBreath(prop)
5 -> getPulsate(prop) 5 -> getPulsate(prop)
else -> prop.baseLumCol else -> prop.baseLumCol
@@ -121,8 +121,8 @@ object BlockPropUtil {
/*private fun getDynamicLumFuncByChan(baseLum: Float, type: Int, chan: Int): Float { /*private fun getDynamicLumFuncByChan(baseLum: Float, type: Int, chan: Int): Float {
return when (type) { return when (type) {
1 -> getTorchFlicker(baseLum) 1 -> getTorchFlicker(baseLum)
2 -> (Terrarum.ingame!!.world).globalLight.cpy().mul(LightmapRenderer.DIV_FLOAT).getElem(chan) // current global light 2 -> (INGAME.world).globalLight.cpy().mul(LightmapRenderer.DIV_FLOAT).getElem(chan) // current global light
3 -> WeatherMixer.getGlobalLightOfTime(Terrarum.ingame!!.world, WorldTime.DAY_LENGTH / 2).cpy().mul(LightmapRenderer.DIV_FLOAT).getElem(chan) // daylight at noon 3 -> WeatherMixer.getGlobalLightOfTime(INGAME.world, WorldTime.DAY_LENGTH / 2).cpy().mul(LightmapRenderer.DIV_FLOAT).getElem(chan) // daylight at noon
4 -> getSlowBreath(baseLum) 4 -> getSlowBreath(baseLum)
5 -> getPulsate(baseLum) 5 -> getPulsate(baseLum)
else -> baseLum else -> baseLum

4
src/net/torvald/terrarum/blockstats/BlockStats.kt
View File

@@ -2,13 +2,13 @@ package net.torvald.terrarum.blockstats
import com.jme3.math.FastMath import com.jme3.math.FastMath
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZEF import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZEF
import net.torvald.terrarum.gameitem.ItemID import net.torvald.terrarum.gameitem.ItemID
import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.worlddrawer.BlocksDrawer import net.torvald.terrarum.worlddrawer.BlocksDrawer
import java.util.*
/** /**
* Created by minjaesong on 2016-02-01. * Created by minjaesong on 2016-02-01.
@@ -25,7 +25,7 @@ object BlockStats {
// Get stats on no-zoomed screen area. In other words, will behave as if screen zoom were 1.0 // Get stats on no-zoomed screen area. In other words, will behave as if screen zoom were 1.0
// no matter how the screen is zoomed. // no matter how the screen is zoomed.
val map = (Terrarum.ingame!!.world) val map = (INGAME.world)
val player = (Terrarum.ingame!! as TerrarumIngame).actorNowPlaying val player = (Terrarum.ingame!! as TerrarumIngame).actorNowPlaying
if (player == null) return if (player == null) return

6
src/net/torvald/terrarum/console/AVTracker.kt
View File

@@ -1,9 +1,9 @@
package net.torvald.terrarum.console package net.torvald.terrarum.console
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.debuggerapp.ActorValueTracker import net.torvald.terrarum.modulebasegame.debuggerapp.ActorValueTracker
import java.util.*
/** /**
* Created by minjaesong on 2016-12-29. * Created by minjaesong on 2016-12-29.
@@ -19,8 +19,8 @@ internal object AVTracker : ConsoleCommand {
try { try {
val actorID = args[1].toInt() val actorID = args[1].toInt()
if (Terrarum.ingame!!.theGameHasActor(actorID)) { if (INGAME.theGameHasActor(actorID)) {
jPanelInstances.add(ActorValueTracker(Terrarum.ingame!!.getActorByID(actorID))) jPanelInstances.add(ActorValueTracker(INGAME.getActorByID(actorID)))
} }
else { else {
throw IllegalArgumentException() throw IllegalArgumentException()

5
src/net/torvald/terrarum/console/Authenticator.kt
View File

@@ -1,7 +1,6 @@
package net.torvald.terrarum.console package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.ui.ConsoleWindow
import org.apache.commons.codec.digest.DigestUtils import org.apache.commons.codec.digest.DigestUtils
/** /**
@@ -40,7 +39,7 @@ internal object Authenticator : ConsoleCommand {
Echo(msg) Echo(msg)
println("[Authenticator] " + msg) println("[Authenticator] " + msg)
a = !a a = !a
Terrarum.ingame!!.consoleHandler.reset() INGAME.consoleHandler.reset()
} }
else { else {
printUsage() // thou shalt not pass! printUsage() // thou shalt not pass!

4
src/net/torvald/terrarum/console/Echo.kt
View File

@@ -18,14 +18,14 @@ internal object Echo : ConsoleCommand {
val sb = StringBuilder() val sb = StringBuilder()
for (ch in single_line) { for (ch in single_line) {
if (ch == '\n') { if (ch == '\n') {
Terrarum.ingame!!.consoleHandler.sendMessage(sb.toString()) INGAME.consoleHandler.sendMessage(sb.toString())
println("[Echo] $csiG$sb$csi0") println("[Echo] $csiG$sb$csi0")
sb.delete(0, sb.length - 1) sb.delete(0, sb.length - 1)
} }
else else
sb.append(ch) sb.append(ch)
} }
Terrarum.ingame!!.consoleHandler.sendMessage(sb.toString()) INGAME.consoleHandler.sendMessage(sb.toString())
println("[Echo] $csiG$sb$csi0") println("[Echo] $csiG$sb$csi0")
} }

5
src/net/torvald/terrarum/console/EchoError.kt
View File

@@ -1,8 +1,7 @@
package net.torvald.terrarum.console package net.torvald.terrarum.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.ccR import net.torvald.terrarum.ccR
import net.torvald.terrarum.ui.ConsoleWindow
/** /**
* Created by minjaesong on 2016-04-25. * Created by minjaesong on 2016-04-25.
@@ -15,7 +14,7 @@ internal object EchoError : ConsoleCommand {
} }
fun execute(single_line: String) { fun execute(single_line: String) {
(Terrarum.ingame!!.consoleHandler).sendMessage("$ccR$single_line") (INGAME.consoleHandler).sendMessage("$ccR$single_line")
} }
operator fun invoke(args: Array<String>) = execute(args) operator fun invoke(args: Array<String>) = execute(args)

4
src/net/torvald/terrarum/console/SetGlobalLightOverride.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console package net.torvald.terrarum.console
import net.torvald.gdx.graphics.Cvec import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.weather.WeatherMixer
/** /**
@@ -20,7 +20,7 @@ internal object SetGlobalLightOverride : ConsoleCommand {
val GL = Cvec(r, g, b, a) val GL = Cvec(r, g, b, a)
WeatherMixer.globalLightOverridden = true WeatherMixer.globalLightOverridden = true
(Terrarum.ingame!!.world).globalLight = GL (INGAME.world).globalLight = GL
} }
catch (e: NumberFormatException) { catch (e: NumberFormatException) {
Echo("Wrong number input.") Echo("Wrong number input.")

93
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -405,7 +405,7 @@ open class ActorWithBody : Actor {
if (spriteGlow != null) spriteGlow!!.update(delta) if (spriteGlow != null) spriteGlow!!.update(delta)
// make NoClip work for player // make NoClip work for player
if (true) {//this == Terrarum.ingame!!.actorNowPlaying) { if (true) {//this == INGAME.actorNowPlaying) {
isNoSubjectToGrav = isNoClip || COLLISION_TEST_MODE isNoSubjectToGrav = isNoClip || COLLISION_TEST_MODE
isNoCollideWorld = isNoClip isNoCollideWorld = isNoClip
isNoSubjectToFluidResistance = isNoClip isNoSubjectToFluidResistance = isNoClip
@@ -1616,62 +1616,29 @@ open class ActorWithBody : Actor {
protected fun drawSpriteInGoodPosition(sprite: SpriteAnimation, batch: SpriteBatch) { protected fun drawSpriteInGoodPosition(sprite: SpriteAnimation, batch: SpriteBatch) {
if (world == null) return if (world == null) return
//val offendingPad = world!!.width.times(TILE_SIZE) - WorldCamera.width - 1
val leftsidePadding = world!!.width.times(TILE_SIZE) - WorldCamera.width.ushr(1) val offsetX = (hitboxTranslateX * scale).toFloat()
val rightsidePadding = WorldCamera.width.ushr(1) val offsetY = (sprite.cellHeight * scale - hitbox.height - hitboxTranslateY * scale - 1).toFloat()
val offendingPad = world!!.width.times(TILE_SIZE) - WorldCamera.width.ushr(1) drawBodyInGoodPosition(hitbox.startX.toFloat(), hitbox.startY.toFloat()) { x, y ->
sprite.render(batch, x - offsetX, y - offsetY, scale.toFloat())
}
val offsetX = hitboxTranslateX * scale /*if (WorldCamera.x >= offendingPad && hitbox.startX < WorldCamera.width) {
val offsetY = sprite.cellHeight * scale - hitbox.height - hitboxTranslateY * scale - 1 sprite.render(batch,
(hitbox.startX - offsetX).toFloat() + world!!.width * TILE_SIZEF,
// it would be great if you can eliminate the try-catch because it may hurt the performance when there's too many actors on screen to draw (hitbox.startY - offsetY).toFloat(),
// try { (scale).toFloat()
/*if (Math.abs(WorldCamera.x - hitbox.startX) > App.scr.halfw) { )
sprite.render(batch, }
(hitbox.startX - offsetX).toFloat() + world!!.width * TILE_SIZEF, else {
(hitbox.startY - offsetY).toFloat(), sprite.render(batch,
(scale).toFloat() (hitbox.startX - offsetX).toFloat(),
) (hitbox.startY - offsetY).toFloat(),
} (scale).toFloat()
else { )
sprite.render(batch, }*/
(hitbox.startX - offsetX).toFloat(),
(hitbox.startY - offsetY).toFloat(),
(scale).toFloat()
)
}*/
batch.color = Color.WHITE
sprite.render(batch,
(hitbox.startX - offsetX).toFloat(),
(hitbox.startY - offsetY).toFloat(),
(scale).toFloat()
)
batch.color = Color.BLUE
sprite.render(batch,
(hitbox.startX - offsetX).toFloat() - world!!.width * TILE_SIZEF,
(hitbox.startY - offsetY).toFloat(),
(scale).toFloat()
)
batch.color = Color.GREEN
sprite.render(batch,
(hitbox.startX - offsetX).toFloat() + world!!.width * TILE_SIZEF,
(hitbox.startY - offsetY).toFloat(),
(scale).toFloat()
)
// }
// catch (e: UninitializedPropertyAccessException) {
// printdbgerr(this, this.javaClass.simpleName)
// printdbgerr(this, actorValue.getAsString(AVKey.NAME))
// printdbgerr(this, if (this is HasAssembledSprite) this.animDescPath else "(not HasAssembledSprite)")
// printdbgerr(this, e)
// throw e
// }
} }
override fun onActorValueChange(key: String, value: Any?) { override fun onActorValueChange(key: String, value: Any?) {
@@ -1881,8 +1848,8 @@ open class ActorWithBody : Actor {
private fun div16TruncateToMapWidth(x: Int): Int { private fun div16TruncateToMapWidth(x: Int): Int {
if (x < 0) if (x < 0)
return 0 return 0
else if (x >= Terrarum.ingame!!.world.width shl 4) else if (x >= INGAME.world.width shl 4)
return Terrarum.ingame!!.world.width - 1 return INGAME.world.width - 1
else else
return x and 0x7FFFFFFF shr 4 return x and 0x7FFFFFFF shr 4
} }
@@ -1890,8 +1857,8 @@ open class ActorWithBody : Actor {
private fun div16TruncateToMapHeight(y: Int): Int { private fun div16TruncateToMapHeight(y: Int): Int {
if (y < 0) if (y < 0)
return 0 return 0
else if (y >= Terrarum.ingame!!.world.height shl 4) else if (y >= INGAME.world.height shl 4)
return Terrarum.ingame!!.world.height - 1 return INGAME.world.height - 1
else else
return y and 0x7FFFFFFF shr 4 return y and 0x7FFFFFFF shr 4
} }
@@ -1954,3 +1921,13 @@ open class ActorWithBody : Actor {
} }
} }
inline fun drawBodyInGoodPosition(startX: Float, startY: Float, drawFun: (x: Float, y: Float) -> Unit) {
val offendingPad = INGAME.world.width.times(TerrarumAppConfiguration.TILE_SIZE) - WorldCamera.width - 1
if (WorldCamera.x >= offendingPad && startX < WorldCamera.width) {
drawFun(startX + INGAME.world.width * TILE_SIZEF, startY)
}
else {
drawFun(startX , startY)
}
}

15
src/net/torvald/terrarum/gameparticles/ParticleBase.kt
View File

@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.gameactors.Actor import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.Hitbox import net.torvald.terrarum.gameactors.Hitbox
import net.torvald.terrarum.gameactors.drawBodyInGoodPosition
import org.dyn4j.geometry.Vector2 import org.dyn4j.geometry.Vector2
/** /**
@@ -44,11 +45,11 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, val despawnUponCollision
lifetimeCounter += delta lifetimeCounter += delta
if (velocity.isZero || if (velocity.isZero ||
// simple stuck check // simple stuck check
BlockCodex[(Terrarum.ingame!!.world).getTileFromTerrain( BlockCodex[(INGAME.world).getTileFromTerrain(
hitbox.centeredX.div(TerrarumAppConfiguration.TILE_SIZE).floorInt(), hitbox.centeredX.div(TerrarumAppConfiguration.TILE_SIZE).floorInt(),
hitbox.startY.div(TerrarumAppConfiguration.TILE_SIZE).floorInt() hitbox.startY.div(TerrarumAppConfiguration.TILE_SIZE).floorInt()
)].isSolid || )].isSolid ||
BlockCodex[(Terrarum.ingame!!.world).getTileFromTerrain( BlockCodex[(INGAME.world).getTileFromTerrain(
hitbox.centeredX.div(TerrarumAppConfiguration.TILE_SIZE).floorInt(), hitbox.centeredX.div(TerrarumAppConfiguration.TILE_SIZE).floorInt(),
hitbox.endY.div(TerrarumAppConfiguration.TILE_SIZE).floorInt() hitbox.endY.div(TerrarumAppConfiguration.TILE_SIZE).floorInt()
)].isSolid) { )].isSolid) {
@@ -64,7 +65,7 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, val despawnUponCollision
// gravity, winds, etc. (external forces) // gravity, winds, etc. (external forces)
if (!isNoSubjectToGrav) { if (!isNoSubjectToGrav) {
velocity.plusAssign((Terrarum.ingame!!.world).gravitation / dragCoefficient) velocity.plusAssign((INGAME.world).gravitation / dragCoefficient)
} }
@@ -76,14 +77,18 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, val despawnUponCollision
open fun drawBody(batch: SpriteBatch) { open fun drawBody(batch: SpriteBatch) {
if (!flagDespawn) { if (!flagDespawn) {
batch.color = drawColour batch.color = drawColour
batch.draw(body, hitbox.startX.toFloat(), hitbox.startY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat()) drawBodyInGoodPosition(hitbox.startX.toFloat(), hitbox.startY.toFloat()) { x, y ->
batch.draw(body, x, y, hitbox.width.toFloat(), hitbox.height.toFloat())
}
} }
} }
open fun drawGlow(batch: SpriteBatch) { open fun drawGlow(batch: SpriteBatch) {
if (!flagDespawn && glow != null) { if (!flagDespawn && glow != null) {
batch.color = drawColour batch.color = drawColour
batch.draw(glow, hitbox.startX.toFloat(), hitbox.startY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat()) drawBodyInGoodPosition(hitbox.startX.toFloat(), hitbox.startY.toFloat()) { x, y ->
batch.draw(glow, x, y, hitbox.width.toFloat(), hitbox.height.toFloat())
}
} }
} }

10
src/net/torvald/terrarum/gameparticles/ParticleVanishingTexture.kt
View File

@@ -2,8 +2,8 @@ package net.torvald.terrarum.gameparticles
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.terrarum.gameactors.Actor import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.drawBodyInGoodPosition
import net.torvald.terrarum.imagefont.TinyAlphNum import net.torvald.terrarum.imagefont.TinyAlphNum
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
@@ -58,7 +58,9 @@ class ParticleVanishingText(val text: String, x: Double, y: Double, noCollision:
if (!flagDespawn) { if (!flagDespawn) {
batch.color = drawColour batch.color = drawColour
lines.forEachIndexed { index, line -> lines.forEachIndexed { index, line ->
TinyAlphNum.draw(batch, line, hitbox.startX.toFloat(), hitbox.startY.toFloat() + TinyAlphNum.H * index) drawBodyInGoodPosition(hitbox.startX.toFloat(), hitbox.startY.toFloat() + TinyAlphNum.H * index) { x, y ->
TinyAlphNum.draw(batch, line, x, y )
}
} }
} }
} }
@@ -101,7 +103,9 @@ open class ParticleVanishingSprite(val sprite: TextureRegionPack, val delay: Flo
override fun drawBody(batch: SpriteBatch) { override fun drawBody(batch: SpriteBatch) {
if (!flagDespawn) { if (!flagDespawn) {
batch.color = drawColour batch.color = drawColour
batch.draw(sprite.get(frame, row), hitbox.startX.toFloat(), hitbox.startY.toFloat()) drawBodyInGoodPosition(hitbox.startX.toFloat(), hitbox.startY.toFloat()) { x, y ->
batch.draw(sprite.get(frame, row), x, y)
}
} }
} }
} }

2
src/net/torvald/terrarum/gameworld/WorldSimulator.kt
View File

@@ -438,7 +438,7 @@ object WorldSimulator {
* @return List of FixtureBases, safe to cast into Electric * @return List of FixtureBases, safe to cast into Electric
*/ */
private fun wiresimGetSourceBlocks(): List<FixtureBase> = private fun wiresimGetSourceBlocks(): List<FixtureBase> =
Terrarum.ingame!!.actorContainerActive.filter { INGAME.actorContainerActive.filter {
it is FixtureBase && it is Electric && it.inUpdateRange(world) && it.wireEmitterTypes.isNotEmpty() it is FixtureBase && it is Electric && it.inUpdateRange(world) && it.wireEmitterTypes.isNotEmpty()
} as List<FixtureBase> } as List<FixtureBase>

4
src/net/torvald/terrarum/modulebasegame/console/ExportMap.kt
View File

@@ -2,7 +2,7 @@ package net.torvald.terrarum.modulebasegame.console
import net.torvald.gdx.graphics.Cvec import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError import net.torvald.terrarum.console.EchoError
@@ -22,7 +22,7 @@ internal object ExportMap : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
val world = (Terrarum.ingame!!.world) val world = (INGAME.world)
if (args.size == 2) { if (args.size == 2) {

2
src/net/torvald/terrarum/modulebasegame/console/GetFaction.kt
View File

@@ -21,7 +21,7 @@ internal object GetFaction : ConsoleCommand {
val error = Error() val error = Error()
fun printOutFactioning(id: Int) { fun printOutFactioning(id: Int) {
val a = Terrarum.ingame!!.getActorByID(id) val a = INGAME.getActorByID(id)
if (a is Factionable) { if (a is Factionable) {
Echo("$ccW== Faction assignment for $ccY${if (id == Terrarum.PLAYER_REF_ID) "player" else id.toString()} $ccW==") Echo("$ccW== Faction assignment for $ccY${if (id == Terrarum.PLAYER_REF_ID) "player" else id.toString()} $ccW==")
println("[GetFactioning] == Faction assignment for '${if (id == Terrarum.PLAYER_REF_ID) "player" else id.toString()}' ==") println("[GetFactioning] == Faction assignment for '${if (id == Terrarum.PLAYER_REF_ID) "player" else id.toString()}' ==")

4
src/net/torvald/terrarum/modulebasegame/console/GetTime.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
@@ -10,7 +10,7 @@ import net.torvald.terrarum.console.Echo
internal object GetTime : ConsoleCommand { internal object GetTime : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
val worldTime = (Terrarum.ingame!!.world).worldTime val worldTime = (INGAME.world).worldTime
Echo(worldTime.getFormattedTime()) Echo(worldTime.getFormattedTime())
} }

8
src/net/torvald/terrarum/modulebasegame/console/ImportLayerData.kt
View File

@@ -18,10 +18,10 @@ object ImportLayerData : ConsoleCommand {
val layerData = ReadLayerDataZip(file) val layerData = ReadLayerDataZip(file)
Terrarum.ingame!!.world = GameWorldExtension(1, layerData, 0, 0, 0) // FIXME null TIME_T for the (partial) test to pass INGAME.world = GameWorldExtension(1, layerData, 0, 0, 0) // FIXME null TIME_T for the (partial) test to pass
Terrarum.ingame!!.actorNowPlaying?.setPosition( INGAME.actorNowPlaying?.setPosition(
(Terrarum.ingame!!.world).spawnY * TILE_SIZED, (INGAME.world).spawnY * TILE_SIZED,
(Terrarum.ingame!!.world).spawnX * TILE_SIZED (INGAME.world).spawnX * TILE_SIZED
) )
Echo("Successfully loaded ${args[1]}")*/ Echo("Successfully loaded ${args[1]}")*/

2
src/net/torvald/terrarum/modulebasegame/console/Inventory.kt
View File

@@ -49,7 +49,7 @@ internal object Inventory : ConsoleCommand {
} }
private fun setTarget(actorRefId: Int = Terrarum.PLAYER_REF_ID) { private fun setTarget(actorRefId: Int = Terrarum.PLAYER_REF_ID) {
val actor = Terrarum.ingame!!.getActorByID(actorRefId) val actor = INGAME.getActorByID(actorRefId)
if (actor !is Pocketed) { if (actor !is Pocketed) {
EchoError("Cannot edit inventory of incompatible actor: $actor") EchoError("Cannot edit inventory of incompatible actor: $actor")
} }

4
src/net/torvald/terrarum/modulebasegame/console/KillActor.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.console.ConsoleAlias import net.torvald.terrarum.console.ConsoleAlias
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
@@ -16,7 +16,7 @@ internal object KillActor : ConsoleCommand {
if (args.size == 2) { if (args.size == 2) {
try { try {
val actorid = args[1].toInt() val actorid = args[1].toInt()
Terrarum.ingame!!.removeActor(actorid) INGAME.removeActor(actorid)
} }
catch (e: NumberFormatException) { catch (e: NumberFormatException) {
EchoError("Wrong number input.") EchoError("Wrong number input.")

6
src/net/torvald/terrarum/modulebasegame/console/PrintWorld.kt
View File

@@ -1,12 +1,10 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.ccG import net.torvald.terrarum.ccG
import net.torvald.terrarum.ccO import net.torvald.terrarum.ccO
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.gameworld.BlockAddress
import kotlin.reflect.full.memberProperties
/** /**
* Created by minjaesong on 2021-08-26. * Created by minjaesong on 2021-08-26.
@@ -14,7 +12,7 @@ import kotlin.reflect.full.memberProperties
object PrintWorld : ConsoleCommand { object PrintWorld : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
if (args.size == 2) { if (args.size == 2) {
val w = Terrarum.ingame!!.world val w = INGAME.world
val field = w::class.java.getDeclaredField(args[1]) val field = w::class.java.getDeclaredField(args[1])
val fieldAccessibility = field.isAccessible val fieldAccessibility = field.isAccessible

4
src/net/torvald/terrarum/modulebasegame/console/Seed.kt
View File

@@ -11,8 +11,8 @@ import net.torvald.terrarum.console.Echo
internal object Seed : ConsoleCommand { internal object Seed : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
Echo("Map$ccW: $ccG${(Terrarum.ingame!!.world).generatorSeed}") Echo("Map$ccW: $ccG${(INGAME.world).generatorSeed}")
println("[seed] Map$ccW: $ccG${(Terrarum.ingame!!.world).generatorSeed}") println("[seed] Map$ccW: $ccG${(INGAME.world).generatorSeed}")
// TODO display randomiser seed // TODO display randomiser seed
} }

2
src/net/torvald/terrarum/modulebasegame/console/SetAV.kt
View File

@@ -78,7 +78,7 @@ internal object SetAV : ConsoleCommand {
try { try {
val id = args[1].toInt() val id = args[1].toInt()
val newValue = parseAVInput(args[3]) val newValue = parseAVInput(args[3])
val actor = Terrarum.ingame!!.getActorByID(id) val actor = INGAME.getActorByID(id)
// check if av is number // check if av is number
if (args[2].isNum()) { if (args[2].isNum()) {

5
src/net/torvald/terrarum/modulebasegame/console/SetScale.kt
View File

@@ -1,12 +1,13 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.modulebasegame.TerrarumIngame
/** /**
* Created by minjaesong on 2017-01-20. * Created by minjaesong on 2017-01-20.
@@ -22,7 +23,7 @@ internal object SetScale : ConsoleCommand {
val targetID = if (args.size == 3) args[1].toInt() else player.referenceID val targetID = if (args.size == 3) args[1].toInt() else player.referenceID
val scale = args[if (args.size == 3) 2 else 1].toDouble() val scale = args[if (args.size == 3) 2 else 1].toDouble()
val target = Terrarum.ingame!!.getActorByID(targetID!!) val target = INGAME.getActorByID(targetID)
if (target !is ActorWithBody) { if (target !is ActorWithBody) {
EchoError("Target is not ActorWBMovable") EchoError("Target is not ActorWBMovable")

7
src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestBall.kt
View File

@@ -1,9 +1,10 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.modulebasegame.gameactors.PhysTestBall import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.modulebasegame.gameactors.PhysTestBall
import org.dyn4j.geometry.Vector2 import org.dyn4j.geometry.Vector2
/** /**
@@ -26,7 +27,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
ball.elasticity = elasticity ball.elasticity = elasticity
ball.applyForce(Vector2(xvel, yvel)) ball.applyForce(Vector2(xvel, yvel))
Terrarum.ingame!!.addNewActor(ball) INGAME.addNewActor(ball)
} }
else if (args.size == 2) { else if (args.size == 2) {
val elasticity = args[1].toDouble() val elasticity = args[1].toDouble()
@@ -35,7 +36,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
ball.setPosition(mouseX, mouseY) ball.setPosition(mouseX, mouseY)
ball.elasticity = elasticity ball.elasticity = elasticity
Terrarum.ingame!!.addNewActor(ball) INGAME.addNewActor(ball)
} }
else { else {
printUsage() printUsage()

3
src/net/torvald/terrarum/modulebasegame/console/SpawnPhysTestLunarLander.kt
View File

@@ -1,5 +1,6 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
@@ -16,7 +17,7 @@ internal object SpawnPhysTestLunarLander : ConsoleCommand {
lander.setPosition(mouseX, mouseY) lander.setPosition(mouseX, mouseY)
Terrarum.ingame!!.addNewActor(lander) INGAME.addNewActor(lander)
} }
override fun printUsage() { override fun printUsage() {

4
src/net/torvald/terrarum/modulebasegame/console/SpawnTapestry.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.modulebasegame.gameactors.DecodeTapestry import net.torvald.terrarum.modulebasegame.gameactors.DecodeTapestry
@@ -17,7 +17,7 @@ internal object SpawnTapestry : ConsoleCommand {
} }
val tapestry = DecodeTapestry(File(args[1])) val tapestry = DecodeTapestry(File(args[1]))
Terrarum.ingame!!.addNewActor(tapestry) INGAME.addNewActor(tapestry)
} }
override fun printUsage() { override fun printUsage() {

4
src/net/torvald/terrarum/modulebasegame/console/SpawnTikiTorch.kt
View File

@@ -1,10 +1,10 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.ConsoleNoExport import net.torvald.terrarum.console.ConsoleNoExport
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch
/** /**
@@ -16,7 +16,7 @@ internal object SpawnTikiTorch : ConsoleCommand {
val torch = FixtureTikiTorch() val torch = FixtureTikiTorch()
torch.setPosition(Terrarum.mouseX, Terrarum.mouseY) torch.setPosition(Terrarum.mouseX, Terrarum.mouseY)
Terrarum.ingame!!.addNewActor(torch) INGAME.addNewActor(torch)
} }
override fun printUsage() { override fun printUsage() {

14
src/net/torvald/terrarum/modulebasegame/console/Teleport.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.console.ConsoleAlias import net.torvald.terrarum.console.ConsoleAlias
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
@@ -56,13 +56,13 @@ internal object Teleport : ConsoleCommand {
// if from == target, ignore the action // if from == target, ignore the action
if (fromActorID == targetActorID) return if (fromActorID == targetActorID) return
if (Terrarum.ingame!!.getActorByID(fromActorID) !is ActorWithBody || if (INGAME.getActorByID(fromActorID) !is ActorWithBody ||
Terrarum.ingame!!.getActorByID(targetActorID) !is ActorWithBody) { INGAME.getActorByID(targetActorID) !is ActorWithBody) {
throw IllegalArgumentException() throw IllegalArgumentException()
} }
else { else {
fromActor = Terrarum.ingame!!.getActorByID(fromActorID) as ActorWithBody fromActor = INGAME.getActorByID(fromActorID) as ActorWithBody
targetActor = Terrarum.ingame!!.getActorByID(targetActorID) as ActorWithBody targetActor = INGAME.getActorByID(targetActorID) as ActorWithBody
} }
} }
catch (e: NumberFormatException) { catch (e: NumberFormatException) {
@@ -93,11 +93,11 @@ internal object Teleport : ConsoleCommand {
y = args[4].toInt() * TILE_SIZE + TILE_SIZE / 2 y = args[4].toInt() * TILE_SIZE + TILE_SIZE / 2
val actorID = args[1].toInt() val actorID = args[1].toInt()
if (Terrarum.ingame!!.getActorByID(actorID) !is ActorWithBody) { if (INGAME.getActorByID(actorID) !is ActorWithBody) {
throw IllegalArgumentException() throw IllegalArgumentException()
} }
else { else {
actor = Terrarum.ingame!!.getActorByID(actorID) as ActorWithBody actor = INGAME.getActorByID(actorID) as ActorWithBody
} }
} }
catch (e: NumberFormatException) { catch (e: NumberFormatException) {

12
src/net/torvald/terrarum/modulebasegame/console/Zoom.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.INGAME
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
@@ -20,14 +20,14 @@ internal object Zoom : ConsoleCommand {
return return
} }
if (zoom < Terrarum.ingame!!.ZOOM_MINIMUM) { if (zoom < INGAME.ZOOM_MINIMUM) {
zoom = Terrarum.ingame!!.ZOOM_MINIMUM zoom = INGAME.ZOOM_MINIMUM
} }
else if (zoom > Terrarum.ingame!!.ZOOM_MAXIMUM) { else if (zoom > INGAME.ZOOM_MAXIMUM) {
zoom = Terrarum.ingame!!.ZOOM_MAXIMUM zoom = INGAME.ZOOM_MAXIMUM
} }
Terrarum.ingame!!.screenZoom = zoom INGAME.screenZoom = zoom
System.gc() System.gc()

2
src/net/torvald/terrarum/modulebasegame/debuggerapp/ActorValueTracker.kt
View File

@@ -88,7 +88,7 @@ class ActorValueTracker constructor() : JFrame() {
actorValue = actor!!.actorValue actorValue = actor!!.actorValue
} }
else if (actorIDField.text.isNotBlank()) { else if (actorIDField.text.isNotBlank()) {
actor = Terrarum.ingame!!.getActorByID(actorIDField.text.toInt()) as ActorWithBody actor = INGAME.getActorByID(actorIDField.text.toInt()) as ActorWithBody
actorValue = actor!!.actorValue actorValue = actor!!.actorValue
} }
} }

2
src/net/torvald/terrarum/modulebasegame/gameactors/ActorHumanoid.kt
View File

@@ -161,7 +161,7 @@ open class ActorHumanoid : ActorWithBody, Controllable, Pocketed, Factionable, L
var isJumpDown = false; protected set var isJumpDown = false; protected set
var isJumpJustDown = false; protected set // TODO if jump key is held in current update frame var isJumpJustDown = false; protected set // TODO if jump key is held in current update frame
protected inline val isGamer: Boolean protected inline val isGamer: Boolean
get() = if (Terrarum.ingame == null) false else this == Terrarum.ingame!!.actorNowPlaying get() = if (Terrarum.ingame == null) false else this == INGAME.actorNowPlaying
private var jumpJustPressedLatched = false private var jumpJustPressedLatched = false

2
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt
View File

@@ -139,7 +139,7 @@ open class FixtureBase : ActorWithBody, CuedByTerrainChange {
this.hitbox.setFromWidthHeight(posX * TILE_SIZED, posY * TILE_SIZED, blockBox.width * TILE_SIZED, blockBox.height * TILE_SIZED) this.hitbox.setFromWidthHeight(posX * TILE_SIZED, posY * TILE_SIZED, blockBox.width * TILE_SIZED, blockBox.height * TILE_SIZED)
// actually add this actor into the world // actually add this actor into the world
Terrarum.ingame!!.addNewActor(this) INGAME.addNewActor(this)
return true return true

4
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt
View File

@@ -81,7 +81,7 @@ internal class UIStorageChest : UICanvas(
override fun getNegotiator() = negotiator override fun getNegotiator() = negotiator
override fun getFixtureInventory(): FixtureInventory = chestInventory override fun getFixtureInventory(): FixtureInventory = chestInventory
override fun getPlayerInventory(): FixtureInventory = Terrarum.ingame!!.actorNowPlaying!!.inventory override fun getPlayerInventory(): FixtureInventory = INGAME.actorNowPlaying!!.inventory
private lateinit var catBar: UIItemInventoryCatBar private lateinit var catBar: UIItemInventoryCatBar
private lateinit var itemListChest: UIItemInventoryItemGrid private lateinit var itemListChest: UIItemInventoryItemGrid
@@ -151,7 +151,7 @@ internal class UIStorageChest : UICanvas(
itemListPlayer = UIItemInventoryItemGrid( itemListPlayer = UIItemInventoryItemGrid(
this, this,
catBar, catBar,
{ Terrarum.ingame!!.actorNowPlaying!!.inventory }, // literally a player's inventory { INGAME.actorNowPlaying!!.inventory }, // literally a player's inventory
INVENTORY_CELLS_OFFSET_X - halfSlotOffset + (listGap + UIItemInventoryElem.height) * 7, INVENTORY_CELLS_OFFSET_X - halfSlotOffset + (listGap + UIItemInventoryElem.height) * 7,
INVENTORY_CELLS_OFFSET_Y, INVENTORY_CELLS_OFFSET_Y,
6, CELLS_VRT, 6, CELLS_VRT,

3
src/net/torvald/terrarum/modulebasegame/gameactors/HumanoidNPC.kt
View File

@@ -1,5 +1,6 @@
package net.torvald.terrarum.modulebasegame.gameactors package net.torvald.terrarum.modulebasegame.gameactors
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.AIControlled import net.torvald.terrarum.gameactors.AIControlled
import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.AVKey
@@ -52,7 +53,7 @@ open class HumanoidNPC : ActorHumanoid, AIControlled, CanBeAnItem {
try { try {
// place the actor to the world // place the actor to the world
this@HumanoidNPC.setPosition(Terrarum.mouseX, Terrarum.mouseY) this@HumanoidNPC.setPosition(Terrarum.mouseX, Terrarum.mouseY)
Terrarum.ingame!!.addNewActor(this@HumanoidNPC) INGAME.addNewActor(this@HumanoidNPC)
// successful // successful
return true return true
} }

5
src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestBall.kt
View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.modulebasegame.gameactors
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
@@ -33,13 +34,13 @@ class PhysTestBall : ActorWithBody(RenderOrder.MIDDLE, PhysProperties.PHYSICS_OB
) )
it.circle( it.circle(
hitbox.startX.toFloat() + (Terrarum.ingame!!.world).width * TILE_SIZE - 1f, hitbox.startX.toFloat() + (INGAME.world).width * TILE_SIZE - 1f,
hitbox.startY.toFloat() - 1f, hitbox.startY.toFloat() - 1f,
hitbox.width.toFloat() hitbox.width.toFloat()
) )
it.circle( it.circle(
hitbox.startX.toFloat() - (Terrarum.ingame!!.world).width * TILE_SIZE - 1f, hitbox.startX.toFloat() - (INGAME.world).width * TILE_SIZE - 1f,
hitbox.startY.toFloat() - 1f, hitbox.startY.toFloat() - 1f,
hitbox.width.toFloat() hitbox.width.toFloat()
) )

12
src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileSimple.kt
View File

@@ -83,7 +83,7 @@ open class ProjectileSimple : ActorWithBody, Luminous, Projectile {
lifetimeCounter += delta lifetimeCounter += delta
if (walledTop || walledBottom || walledRight || walledLeft || lifetimeCounter >= lifetimeMax || if (walledTop || walledBottom || walledRight || walledLeft || lifetimeCounter >= lifetimeMax ||
// stuck check // stuck check
BlockCodex[(Terrarum.ingame!!.world).getTileFromTerrain(feetPosTile.x, feetPosTile.y) ?: Block.STONE].isSolid BlockCodex[(INGAME.world).getTileFromTerrain(feetPosTile.x, feetPosTile.y) ?: Block.STONE].isSolid
) { ) {
flagDespawn() flagDespawn()
} }
@@ -103,13 +103,13 @@ open class ProjectileSimple : ActorWithBody, Luminous, Projectile {
/*batch.end() /*batch.end()
Terrarum.inShapeRenderer { Terrarum.inShapeRenderer {
// draw trail of solid colour (Terraria style maybe?) // draw trail of solid colour (Terraria style maybe?)
it.lineWidth = 2f * Terrarum.ingame!!.screenZoom it.lineWidth = 2f * INGAME.screenZoom
g.drawGradientLine( g.drawGradientLine(
hitbox.centeredX.toFloat() * Terrarum.ingame!!.screenZoom, hitbox.centeredX.toFloat() * INGAME.screenZoom,
hitbox.centeredY.toFloat() * Terrarum.ingame!!.screenZoom, hitbox.centeredY.toFloat() * INGAME.screenZoom,
displayColour, displayColour,
posPre.x.toFloat() * Terrarum.ingame!!.screenZoom, posPre.x.toFloat() * INGAME.screenZoom,
posPre.y.toFloat() * Terrarum.ingame!!.screenZoom, posPre.y.toFloat() * INGAME.screenZoom,
colourTail colourTail
) )
} }

2
src/net/torvald/terrarum/modulebasegame/gameactors/ThreadActorUpdate.kt
View File

@@ -11,7 +11,7 @@ import net.torvald.terrarum.*
class ThreadActorUpdate(val startIndex: Int, val endIndex: Int) : Callable<Unit> { class ThreadActorUpdate(val startIndex: Int, val endIndex: Int) : Callable<Unit> {
override fun call() { override fun call() {
for (i in startIndex..endIndex) { for (i in startIndex..endIndex) {
val it = Terrarum.ingame!!.actorContainerActive[i] val it = INGAME.actorContainerActive[i]
it.update(App.UPDATE_RATE) it.update(App.UPDATE_RATE)
if (it is Pocketed) { if (it is Pocketed) {

8
src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
View File

@@ -38,26 +38,26 @@ object PickaxeCore {
// return false if hitting actors // return false if hitting actors
// ** below is commented out -- don't make actors obstruct the way of digging ** // ** below is commented out -- don't make actors obstruct the way of digging **
/*var ret1 = true /*var ret1 = true
Terrarum.ingame!!.actorContainerActive.forEach { INGAME.actorContainerActive.forEach {
if (it is ActorWBMovable && it.hIntTilewiseHitbox.intersects(mousePoint)) if (it is ActorWBMovable && it.hIntTilewiseHitbox.intersects(mousePoint))
ret1 = false // return is not allowed here ret1 = false // return is not allowed here
} }
if (!ret1) return ret1*/ if (!ret1) return ret1*/
// return false if here's no tile // return false if here's no tile
if (Block.AIR == (Terrarum.ingame!!.world).getTileFromTerrain(mouseTileX, mouseTileY)) if (Block.AIR == (INGAME.world).getTileFromTerrain(mouseTileX, mouseTileY))
return false return false
// filter passed, do the job // filter passed, do the job
val swingDmgToFrameDmg = delta.toDouble() / actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!!
(Terrarum.ingame!!.world).inflictTerrainDamage( (INGAME.world).inflictTerrainDamage(
mouseTileX, mouseTileY, mouseTileX, mouseTileY,
Calculate.pickaxePower(player, item.material) * swingDmgToFrameDmg Calculate.pickaxePower(player, item.material) * swingDmgToFrameDmg
)?.let { tileBroken -> )?.let { tileBroken ->
val drop = BlockCodex[tileBroken].drop val drop = BlockCodex[tileBroken].drop
if (drop.isNotBlank()) { if (drop.isNotBlank()) {
Terrarum.ingame!!.addNewActor(DroppedItem(drop, mouseTileX * TILE_SIZE, mouseTileY * TILE_SIZE)) INGAME.addNewActor(DroppedItem(drop, mouseTileX * TILE_SIZE, mouseTileY * TILE_SIZE))
} }
} }

4
src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt
View File

@@ -45,7 +45,7 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) {
sb.clear() sb.clear()
Terrarum.ingame!!.world.getAllWiringGraph(mx, my)?.forEach { (itemID, simCell) -> INGAME.world.getAllWiringGraph(mx, my)?.forEach { (itemID, simCell) ->
if (sb.isNotEmpty()) sb.append('\n') if (sb.isNotEmpty()) sb.append('\n')
val connexionIcon = (simCell.cnx + 0xE0A0).toChar() val connexionIcon = (simCell.cnx + 0xE0A0).toChar()
@@ -57,7 +57,7 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) {
sb.append("$connexionIcon $wireName") sb.append("$connexionIcon $wireName")
sb.append("\nE: $emit") sb.append("\nE: $emit")
recv.forEach { recv.forEach {
val src = Terrarum.ingame!!.world.getWireEmitStateOf(it.src.x, it.src.y, itemID)!! val src = INGAME.world.getWireEmitStateOf(it.src.x, it.src.y, itemID)!!
sb.append("\nR: $src $EMDASH d ${it.dist}") sb.append("\nR: $src $EMDASH d ${it.dist}")
} }
} }

7
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
View File

@@ -4,10 +4,7 @@ import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Camera import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.App import net.torvald.terrarum.*
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TitleScreen
import net.torvald.terrarum.blendNormal
import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_OFFSET_Y import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_OFFSET_Y
import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_UI_HEIGHT import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_UI_HEIGHT
@@ -86,7 +83,7 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
full.handler.lockToggle() full.handler.lockToggle()
full.lockTransition() full.lockTransition()
// save the game // save the game
WriteSavegame(Terrarum.ingame!!.savegameArchive, File(App.defaultSaveDir, "${App.getTIME_T()}"), Terrarum.ingame!! as TerrarumIngame) { WriteSavegame(INGAME.savegameArchive, File(App.defaultSaveDir, "${App.getTIME_T()}"), Terrarum.ingame!! as TerrarumIngame) {
// callback: // callback:
System.gc() System.gc()
screen = 0 screen = 0

2
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -27,7 +27,7 @@ class UIInventoryFull(
) : UICanvas(toggleKeyLiteral, toggleButtonLiteral, customPositioning, doNotWarnConstant) { ) : UICanvas(toggleKeyLiteral, toggleButtonLiteral, customPositioning, doNotWarnConstant) {
val actor: ActorHumanoid val actor: ActorHumanoid
get() = Terrarum.ingame!!.actorNowPlaying!! get() = INGAME.actorNowPlaying!!
override var width: Int = App.scr.width override var width: Int = App.scr.width
override var height: Int = App.scr.height override var height: Int = App.scr.height

2
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryMinimap.kt
View File

@@ -34,7 +34,7 @@ class UIInventoryMinimap(val full: UIInventoryFull) : UICanvas() {
private val minimapRerenderInterval = .5f private val minimapRerenderInterval = .5f
override fun updateUI(delta: Float) { override fun updateUI(delta: Float) {
MinimapComposer.setWorld(Terrarum.ingame!!.world) MinimapComposer.setWorld(INGAME.world)
MinimapComposer.update() MinimapComposer.update()
minimapRerenderTimer += Gdx.graphics.deltaTime minimapRerenderTimer += Gdx.graphics.deltaTime
} }

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

@@ -90,7 +90,7 @@ class UIItemInventoryEquippedView(
// sprite // sprite
val sprite = Terrarum.ingame!!.actorNowPlaying?.sprite val sprite = INGAME.actorNowPlaying?.sprite
sprite?.let { sprite?.let {
blendNormal(batch) blendNormal(batch)
@@ -119,7 +119,7 @@ class UIItemInventoryEquippedView(
internal fun rebuild() { internal fun rebuild() {
rebuildList = false rebuildList = false
Terrarum.ingame!!.actorNowPlaying?.inventory?.let { INGAME.actorNowPlaying?.inventory?.let {
// sort by equip position // sort by equip position
// fill the grid from fastest index, make no gap in-between of slots // fill the grid from fastest index, make no gap in-between of slots

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

@@ -37,7 +37,7 @@ class UITierOneWatch() : UICanvas() {
//get() = if (ELon) lcdLitColELon else lcdLitColELoff //get() = if (ELon) lcdLitColELon else lcdLitColELoff
private val worldTime: WorldTime private val worldTime: WorldTime
get() = Terrarum.ingame!!.world.worldTime get() = INGAME.world.worldTime
override fun updateUI(delta: Float) { override fun updateUI(delta: Float) {

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

@@ -63,8 +63,8 @@ class UIVitalMetre(
/*if (vitalGetterVal() != null && vitalGetterMax() != null && player != null) { /*if (vitalGetterVal() != null && vitalGetterMax() != null && player != null) {
g.translate( g.translate(
Terrarum.ingame!!.screenZoom * (player.centrePosPoint.x.toFloat() - (WorldCamera.x)), INGAME.screenZoom * (player.centrePosPoint.x.toFloat() - (WorldCamera.x)),
Terrarum.ingame!!.screenZoom * (player.centrePosPoint.y.toFloat() - (WorldCamera.y)) INGAME.screenZoom * (player.centrePosPoint.y.toFloat() - (WorldCamera.y))
) )

4
src/net/torvald/terrarum/realestate/LandUtil.kt
View File

@@ -1,8 +1,8 @@
package net.torvald.terrarum.realestate package net.torvald.terrarum.realestate
import net.torvald.terrarum.FactionCodex import net.torvald.terrarum.FactionCodex
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.Point2i import net.torvald.terrarum.Point2i
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameworld.BlockAddress import net.torvald.terrarum.gameworld.BlockAddress
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
@@ -48,7 +48,7 @@ object LandUtil {
*/ */
fun resolveOwner(id: Int): Any = fun resolveOwner(id: Int): Any =
if (id >= 0) if (id >= 0)
Terrarum.ingame!!.getActorByID(id) INGAME.getActorByID(id)
else else
FactionCodex.getFactionByID(id) FactionCodex.getFactionByID(id)

2
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -104,7 +104,7 @@ internal object WeatherMixer : RNGConsumer {
) )
(Terrarum.ingame!! as TerrarumIngame).addParticle(rainParticle) (Terrarum.ingame!! as TerrarumIngame).addParticle(rainParticle)
} }
//globalLightNow.set(getGlobalLightOfTime((Terrarum.ingame!!.world).time.todaySeconds).mul(0.3f, 0.3f, 0.3f, 0.58f)) //globalLightNow.set(getGlobalLightOfTime((INGAME.world).time.todaySeconds).mul(0.3f, 0.3f, 0.3f, 0.58f))
} }