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

fixed a bug where the barehand action would do nothing

Browse Source
This commit is contained in:
minjaesong
2022-01-14 15:44:37 +09:00
parent a7357c00a9
commit b87dc1f28b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/gameitems/GameItem.kt
View File

@@ -372,7 +372,6 @@ fun mouseInInteractableRange(actor: ActorWithBody, action: () -> Boolean): Boole
if (dist <= distMax.sqr()) return action() else return false
}
fun mouseInInteractableRangeTools(actor: ActorWithBody, item: GameItem?, reachMultiplierInTiles: (Int) -> Double = { it.toDouble() }, action: () -> Boolean): Boolean {
if (item == null) return false
val mousePos1 = Vector2(Terrarum.mouseX, Terrarum.mouseY)
val mousePos2 = Vector2(Terrarum.mouseX + INGAME.world.width * TILE_SIZED, Terrarum.mouseY)
val mousePos3 = Vector2(Terrarum.mouseX - INGAME.world.width * TILE_SIZED, Terrarum.mouseY)
@@ -381,7 +380,7 @@ fun mouseInInteractableRangeTools(actor: ActorWithBody, item: GameItem?, reachMu
val reachBonus = (actor.actorValue.getAsDouble(AVKey.REACHBUFF) ?: 1.0) * actor.scale
val distMax = actor.actorValue.getAsDouble(AVKey.REACH)!! * reachBonus // perform some error checking here
val toolDistMax = (TILE_SIZED * reachMultiplierInTiles(item.material.toolReach)) * reachBonus
val toolDistMax = (TILE_SIZED * reachMultiplierInTiles(item?.material?.toolReach ?: Int.MAX_VALUE)) * reachBonus
if (dist <= minOf(toolDistMax, distMax).sqr()) return action() else return false
}

2
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -1231,7 +1231,6 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
}
fun performBarehandAction(actor: ActorWithBody, delta: Float) {
// println("whack!")
fun getActorsAtVicinity(worldX: Double, worldY: Double, radius: Double): List<ActorWithBody> {
val outList = java.util.ArrayList<ActorWithBody>()
@@ -1252,6 +1251,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
// else, punch a block
val punchBlockSize = punchSize.div(TILE_SIZED).floorInt()
if (punchBlockSize > 0) {
// println("whack!")
PickaxeCore.startPrimaryUse(actor, delta, null, Terrarum.mouseTileX, Terrarum.mouseTileY, 1.0 / punchBlockSize, punchBlockSize, punchBlockSize, false)
}
}