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

forgot to make changes to picaxes

Browse Source
This commit is contained in:
minjaesong
2021-10-04 14:27:24 +09:00
parent e0fbc54839
commit dc0b5029f2
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitem.GameItem
import net.torvald.terrarum.gameitem.ItemID
import net.torvald.terrarum.gameitem.inInteractableRange
import net.torvald.terrarum.itemproperties.Calculate
import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem
import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore.BASE_MASS_AND_SIZE
@@ -18,7 +19,7 @@ import kotlin.math.roundToInt
* Created by minjaesong on 2019-03-10.
*/
object PickaxeCore {
fun startPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {
fun startPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem) = inInteractableRange(actor) {
val mouseTileX = Terrarum.mouseTileX
val mouseTileY = Terrarum.mouseTileY
@@ -39,7 +40,7 @@ object PickaxeCore {
// return false if here's no tile
if (Block.AIR == (INGAME.world).getTileFromTerrain(mouseTileX, mouseTileY))
return false
return@inInteractableRange false
// filter passed, do the job
val swingDmgToFrameDmg = delta.toDouble() / actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!!
@@ -54,7 +55,7 @@ object PickaxeCore {
}
}
return true
true
}
fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {