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

fix: door spawn required wall be exist on the cells that don't matter

Browse Source
This commit is contained in:
minjaesong
2024-01-21 03:51:08 +09:00
parent 3da37408a2
commit d927d1d240
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -1013,3 +1013,9 @@ fun distBetween(a: ActorWithBody, bpos: Vector2): Double {
}
const val hashStrMap = "YBNDRFG8EJKMCPQXOTLVWIS2A345H769"
fun getHashStr(length: Int = 5) = (0 until length).map { hashStrMap[Math.random().times(32).toInt()] }.joinToString("")
fun <S, T> List<S>.cartesianProduct(other: List<T>) = this.flatMap { thisIt ->
other.map { otherIt ->
thisIt to otherIt
}
}

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

@@ -218,12 +218,6 @@ open class FixtureBase : ActorWithBody, CuedByTerrainChange {
}
}
private fun <S, T> List<S>.cartesianProduct(other: List<T>) = this.flatMap { thisIt ->
other.map { otherIt ->
thisIt to otherIt
}
}
val everyBlockboxPos: List<Pair<Int, Int>>?
get() = worldBlockPos?.let { (posX, posY) ->
(posX until posX + blockBox.width).toList().cartesianProduct((posY until posY + blockBox.height).toList())
@@ -254,7 +248,7 @@ open class FixtureBase : ActorWithBody, CuedByTerrainChange {
return canSpawnHere0(posX, posY)
}
private fun canSpawnHere0(posX: Int, posY: Int): Boolean {
open fun canSpawnHere0(posX: Int, posY: Int): Boolean {
val everyBlockboxPos = (posX until posX + blockBox.width).toList().cartesianProduct((posY until posY + blockBox.height).toList())
// check for existing blocks (and fixtures)

27
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt
View File

@@ -145,6 +145,33 @@ open class FixtureSwingingDoorBase : FixtureBase {
override fun spawn(posX: Int, posY: Int, installersUUID: UUID?): Boolean = spawn(posX, posY, installersUUID, tilewiseHitboxWidth, tilewiseHitboxHeight)
override fun canSpawnHere0(posX: Int, posY: Int): Boolean {
val everyBlockboxPos = (posX until posX + blockBox.width).toList().cartesianProduct((posY until posY + blockBox.height).toList())
val xoffToFrame = (tilewiseHitboxWidth - twClosed) / 2
val everyDoorframePos = (posX + xoffToFrame until posX + blockBox.width - 1).toList().cartesianProduct((posY until posY + blockBox.height).toList())
// check for existing blocks (and fixtures)
var cannotSpawn = false
worldBlockPos = Point2i(posX, posY)
cannotSpawn = everyBlockboxPos.any { (x, y) -> !BlockCodex[world!!.getTileFromTerrain(x, y)].hasTag("INCONSEQUENTIAL") }
// check for walls, if spawnNeedsWall = true
if (spawnNeedsWall) {
cannotSpawn = cannotSpawn or everyDoorframePos.any { (x, y) -> !BlockCodex[world!!.getTileFromWall(x, y)].isSolid }
}
// check for floors, if spawnNeedsFloor == true
if (spawnNeedsFloor) {
val y = posY + blockBox.height
val xs = posX + xoffToFrame until posX + blockBox.width - xoffToFrame
cannotSpawn = cannotSpawn or xs.any { x -> !BlockCodex[world!!.getTileFromTerrain(x, y)].isSolid }
}
return !cannotSpawn
}
override fun reload() {
super.reload()