more axe wip

2026-06-12 11:34:05 +09:00 · 2023-11-13 16:07:06 +09:00
parent 60e8aa45cd
commit 483f770198
7 changed files with 79 additions and 76 deletions
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt
@@ -67,22 +67,24 @@ object AxeCore {

                INGAME.world.inflictTerrainDamage(
                    x, y,
-                    Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg
+                    Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg
                ).let { tileBroken ->
                    // tile busted
                    if (tileBroken != null) {
-                        // make tree fell by scanning upwards
-                        TODO()
-                        var drop = ""
-                        if (drop.isNotBlank()) {
-                            INGAME.queueActorAddition(
-                                DroppedItem(
-                                    drop,
-                                    (x + 0.5) * TerrarumAppConfiguration.TILE_SIZED,
-                                    (y + 1.0) * TerrarumAppConfiguration.TILE_SIZED
-                                )
-                            )
+                        var upCtr = 0
+                        while (true) {
+                            val tileHere = INGAME.world.getTileFromTerrain(x, y - upCtr)
+
+                            if (BlockCodex[tileHere].hasTag("TREETRUNK")) {
+                                PickaxeCore.dropItem(tileHere, x, y - upCtr) // todo use log item
+                            }
+                            else { // TODO check for leaves
+                                break
+                            }
+
+                            upCtr += 1
                        }
+
                        PickaxeCore.makeDust(tile, x, y, 9)
                    }
                    // tile not busted
@@ -104,45 +106,8 @@ object AxeCore {
        usageStatus
    }

-    private val pixelOffs = intArrayOf(2, 7, 12) // hard-coded assuming TILE_SIZE=16
-    fun makeDust(tile: ItemID, x: Int, y: Int, density: Int = 9, drawCol: Color = Color.WHITE) {
-        val pw = 3
-        val ph = 3
-        val xo = App.GLOBAL_RENDER_TIMER and 1
-        val yo = App.GLOBAL_RENDER_TIMER.ushr(1) and 1
-
-        val renderTag = App.tileMaker.getRenderTag(tile)
-        val baseTilenum = renderTag.tileNumber
-        val representativeTilenum = when (renderTag.maskType) {
-            CreateTileAtlas.RenderTag.MASK_47 -> 17
-            CreateTileAtlas.RenderTag.MASK_PLATFORM -> 7
-            else -> 0
-        }
-        val tileNum = baseTilenum + representativeTilenum // the particle won't match the visible tile anyway because of the seasons stuff
-
-        val indices = (0..8).toList().shuffled().subList(0, density)
-        for (it in indices) {
-            val u = pixelOffs[it % 3]
-            val v = pixelOffs[it / 3]
-            val pos = Vector2(
-                TerrarumAppConfiguration.TILE_SIZED * x + u + xo + 0.5,
-                TerrarumAppConfiguration.TILE_SIZED * y + v + yo + 2,
-            )
-            val veloMult = Vector2(
-                1.0 * (if (Math.random() < 0.5) -1 else 1),
-                (2.0 - (it / 3)) / 2.0 // 1, 0.5, 0
-            )
-            createRandomBlockParticle(tileNum, pos, veloMult, u, v, pw, ph).let {
-                it.despawnUponCollision = true
-                it.drawColour.set(drawCol)
-                (Terrarum.ingame as TerrarumIngame).addParticle(it)
-            }
-        }
-    }
-
-    fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {
-
-        item.using = false
+    fun endPrimaryUse(actor: ActorWithBody, item: GameItem?): Boolean {
+        item?.using = false
        // reset action timer to zero
        actor.actorValue.set(AVKey.__ACTION_TIMER, 0.0)
        return true
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
@@ -102,7 +102,7 @@ object PickaxeCore {
                            BlockCodex[tileBroken].drop

                        if (drop.isNotBlank()) {
-                            INGAME.queueActorAddition(DroppedItem(drop, (x + 0.5) * TILE_SIZED, (y + 1.0) * TILE_SIZED))
+                            dropItem(drop, x, y)
                        }
                        makeDust(tile, x, y, 9)
                    }
@@ -120,6 +120,16 @@ object PickaxeCore {
        usageStatus
    }

+    fun dropItem(item: ItemID, tx: Int, ty: Int) {
+        INGAME.queueActorAddition(
+            DroppedItem(
+                item,
+                (tx + 0.5) * TerrarumAppConfiguration.TILE_SIZED,
+                (ty + 1.0) * TerrarumAppConfiguration.TILE_SIZED
+            )
+        )
+    }
+
    private val pixelOffs = intArrayOf(2, 7, 12) // hard-coded assuming TILE_SIZE=16
    fun makeDust(tile: ItemID, x: Int, y: Int, density: Int = 9, drawCol: Color = Color.WHITE) {
        val pw = 3
@@ -156,9 +166,8 @@ object PickaxeCore {
        }
    }

-    fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {
-
-        item.using = false
+    fun endPrimaryUse(actor: ActorWithBody, item: GameItem?): Boolean {
+        item?.using = false
        // reset action timer to zero
        actor.actorValue.set(AVKey.__ACTION_TIMER, 0.0)
        return true
@@ -219,7 +228,7 @@ class PickaxeCopper(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
            if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, this)
    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY)
    override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) }

@@ -249,7 +258,7 @@ class PickaxeIron(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
            if (PickaxeCore.startPrimaryUse(actor , delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, this)
    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY)
    override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) }

@@ -279,7 +288,7 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
            if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, this)
    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY)
    override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) }

@@ -309,7 +318,7 @@ class PickaxeWood(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
        if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, this)
    override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY)
    override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) }

--- a/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt
@@ -101,7 +101,7 @@ object SledgehammerCore {
                    if (Math.random() < dropProbability) {
                        val drop = BlockCodex[tileBroken].drop
                        if (drop.isNotBlank()) {
-                            INGAME.queueActorAddition(DroppedItem("wall@$drop", (x + 0.5) * TILE_SIZED, (y + 1.0) * TILE_SIZED))
+                            PickaxeCore.dropItem("wall@$drop", x, y)
                        }
                        PickaxeCore.makeDust(wall, x, y, 9, WALL_OVERLAY_COLOUR)
                    }
@@ -119,9 +119,8 @@ object SledgehammerCore {
        usageStatus
    }

-    fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {
-
-        item.using = false
+    fun endPrimaryUse(actor: ActorWithBody, item: GameItem?): Boolean {
+        item?.using = false
        // reset action timer to zero
        actor.actorValue.set(AVKey.__ACTION_TIMER, 0.0)
        return true
@@ -152,7 +151,7 @@ class SledgehammerCopper(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
        if (SledgehammerCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, this)
 }

 class SledgehammerIron(originalID: ItemID) : GameItem(originalID) {
@@ -176,7 +175,7 @@ class SledgehammerIron(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
        if (SledgehammerCore.startPrimaryUse(actor , delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, this)
 }

 class SledgehammerSteel(originalID: ItemID) : GameItem(originalID) {
@@ -200,7 +199,7 @@ class SledgehammerSteel(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
        if (SledgehammerCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, this)
 }

 /**
@@ -227,5 +226,5 @@ class SledgehammerWood(originalID: ItemID) : GameItem(originalID) {

    override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
        if (SledgehammerCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
-    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, delta, this)
+    override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, this)
 }