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

sledgehammer: don't punch the cave wall!

Browse Source
This commit is contained in:
minjaesong
2023-09-09 23:58:53 +09:00
parent 07a70ffba4
commit 9ea070d075
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt
View File

@@ -3,7 +3,6 @@ package net.torvald.terrarum.modulebasegame.gameitems
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.GameItem
@@ -45,15 +44,24 @@ object SledgehammerCore {
var usageStatus = false var usageStatus = false
for (oy in 0 until mh) for (ox in 0 until mw) { for (oy in 0 until mh) for (ox in 0 until mw) {
val x = mx + xoff + ox val x = mx + xoff + ox
val y = my + yoff + oy val y = my + yoff + oy
val mousePoint = Point2d(x.toDouble(), y.toDouble()) val mousePoint = Point2d(x.toDouble(), y.toDouble())
val actorvalue = actor.actorValue val actorvalue = actor.actorValue
val tile = INGAME.world.getTileFromWall(x, y) val wall = INGAME.world.getTileFromWall(x, y)
val tileTerrain = INGAME.world.getTileFromTerrain(x, y) val tileTerrain = INGAME.world.getTileFromTerrain(x, y)
val wallNear = listOf(
INGAME.world.getTileFromWall(x, (y - 1).coerceAtLeast(0)),
INGAME.world.getTileFromWall(x, (y + 1).coerceAtMost(INGAME.world.height - 1)),
INGAME.world.getTileFromWall(x - 1, y),
INGAME.world.getTileFromWall(x + 1, y)
)
item?.using = true item?.using = true
// linear search filter (check for intersection with tilewise mouse point and tilewise hitbox) // linear search filter (check for intersection with tilewise mouse point and tilewise hitbox)
@@ -66,8 +74,9 @@ object SledgehammerCore {
} }
if (!ret1) return ret1*/ if (!ret1) return ret1*/
// return false if there is no open tile nearby (to prevent making hole on deep underground)
// return false if here's no tile, or if the wall is covered by a solid tile // return false if here's no tile, or if the wall is covered by a solid tile
if (Block.AIR == tile || BlockCodex[tile].isActorBlock || BlockCodex[tileTerrain].isSolid) { if (wallNear.none { BlockCodex[it].hasTag("INCONSEQUENTIAL") } || Block.AIR == wall || BlockCodex[wall].isActorBlock || BlockCodex[tileTerrain].isSolid) {
usageStatus = usageStatus or false usageStatus = usageStatus or false
continue continue
} }