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

wires now appear connected in game

Browse Source
This commit is contained in:
minjaesong
2021-07-31 16:33:40 +09:00
parent b10fb0a30b
commit 930cc55353
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

42
src/net/torvald/terrarum/gameactors/WireActor.kt
View File

@@ -1,20 +1,38 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.Point2i
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.gameitem.ItemID import net.torvald.terrarum.gameitem.ItemID
import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 2021-07-30. * Created by minjaesong on 2021-07-30.
*/ */
class WireActor(id: ActorID) : ActorWithBody(RenderOrder.WIRES, PhysProperties.IMMOBILE) { class WireActor(id: ActorID) : ActorWithBody(RenderOrder.WIRES, PhysProperties.IMMOBILE) {
companion object {
private val nearbyArr = arrayOf(
(-1 to 0), // tileL
(0 to +1), // tileB
(+1 to 0), // tileR
(0 to -1) // tileT
)
}
init { init {
referenceID = id referenceID = id
setHitboxDimension(2, 2, 0, 0) setHitboxDimension(2, 2, 0, 0)
} }
private var oldWireId = "" private var oldWireId = ""
private var worldX = 0
private var worldY = 0
private val world: GameWorld
get() = Terrarum.ingame!!.world
/** /**
* @param itemID must start with "wire@" * @param itemID must start with "wire@"
@@ -30,14 +48,32 @@ class WireActor(id: ActorID) : ActorWithBody(RenderOrder.WIRES, PhysProperties.I
oldWireId = itemID oldWireId = itemID
} }
this.worldX = worldX
this.worldY = worldY
setPosition(worldX * TILE_SIZE + 1.0, (worldY + 1.0) * TILE_SIZE - 1.0) // what the fuck? setPosition(worldX * TILE_SIZE + 1.0, (worldY + 1.0) * TILE_SIZE - 1.0) // what the fuck?
sprite!!.currentRow = 1 sprite!!.currentRow = 1
sprite!!.currentFrame = 15
val nearbyTiles = getNearbyTilesPos(worldX, worldY).map { world.getAllWiresFrom(it.x, it.y) }
var ret = 0
for (i in nearbyTiles.indices) {
if (nearbyTiles[i]?.contains(itemID) == true) {
ret += (1 shl i) // add 1, 2, 4, 8 for i = 0, 1, 2, 3
}
}
sprite!!.currentFrame = ret
}
private fun getNearbyTilesPos(x: Int, y: Int): Array<Point2i> {
return arrayOf(
Point2i(x + 1, y),
Point2i(x, y - 1),
Point2i(x - 1, y),
Point2i(x, y + 1)
)
} }
override fun update(delta: Float) { override fun update(delta: Float) {
// set autotiling here
// hint: manipulate `sprite!!.currentFrame`
} }