From 4b50b0cff172292dc1cd2014f1c1b31d669e8322 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 6 Aug 2021 22:01:59 +0900 Subject: [PATCH] pickaxe to drop a tile defined in 'drop' property --- .../terrarum/modulebasegame/gameactors/DroppedItem.kt | 3 --- .../terrarum/modulebasegame/gameitems/PickaxeGeneric.kt | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt index bdde9807a..5381b85ab 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt @@ -41,9 +41,6 @@ open class DroppedItem(private val itemID: ItemID, topLeftX: Int, topLeftY: Int) ) setPosition(topLeftX + (hitbox.width / 2.0), topLeftY + hitbox.height) - - - printdbg(this, "New dropped item $itemID") } override fun drawBody(batch: SpriteBatch) { diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt index 32d1713f6..3d7ff6cab 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt @@ -6,6 +6,7 @@ import net.torvald.terrarum.Point2d import net.torvald.terrarum.Terrarum import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.blockproperties.Block +import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameitem.GameItem import net.torvald.terrarum.gameitem.ItemID @@ -53,7 +54,10 @@ object PickaxeCore { mouseTileX, mouseTileY, Calculate.pickaxePower(player, item.material) * swingDmgToFrameDmg )?.let { tileBroken -> - Terrarum.ingame!!.addNewActor(DroppedItem(tileBroken, mouseTileX * TILE_SIZE, mouseTileY * TILE_SIZE)) + val drop = BlockCodex[tileBroken].drop + if (drop.isNotBlank()) { + Terrarum.ingame!!.addNewActor(DroppedItem(drop, mouseTileX * TILE_SIZE, mouseTileY * TILE_SIZE)) + } } return true