From 0496366057392181acdfe5f8722fc442bbf93e7d Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 16 Mar 2021 10:52:31 +0900 Subject: [PATCH] blocks are now 'drag-painted' again, but in better way bc fixtures won't --- .../torvald/terrarum/gamecontroller/IngameController.kt | 9 ++++++++- .../modulebasegame/gameitems/ItemCraftingTable.kt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/gamecontroller/IngameController.kt b/src/net/torvald/terrarum/gamecontroller/IngameController.kt index 50eaaacff..8cb9852e6 100644 --- a/src/net/torvald/terrarum/gamecontroller/IngameController.kt +++ b/src/net/torvald/terrarum/gamecontroller/IngameController.kt @@ -9,8 +9,11 @@ import net.torvald.terrarum.AppLoader.printdbg import net.torvald.terrarum.controller.TerrarumController import net.torvald.terrarum.floorInt import net.torvald.terrarum.gameactors.AVKey +import net.torvald.terrarum.gameitem.GameItem import net.torvald.terrarum.gameworld.fmod +import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.modulebasegame.TerrarumIngame +import net.torvald.terrarum.modulebasegame.gameactors.FixtureBase import net.torvald.terrarum.worlddrawer.CreateTileAtlas import net.torvald.terrarum.worlddrawer.WorldCamera @@ -71,7 +74,11 @@ class IngameController(val terrarumIngame: TerrarumIngame) : InputAdapter() { ingame.worldSecondaryClickStart(AppLoader.UPDATE_RATE) }*/ - if (!Gdx.input.isButtonPressed(AppLoader.getConfigInt("config_mouseprimary"))) { + // unlatch when: + // - not clicking anymore + // - using any item that is not fixture (blocks, picks) + if (!Gdx.input.isButtonPressed(AppLoader.getConfigInt("config_mouseprimary")) || + GameItem.Category.FIXTURE != ItemCodex.get(terrarumIngame.actorNowPlaying?.inventory?.itemEquipped?.get(GameItem.EquipPosition.HAND_GRIP))?.inventoryCategory) { worldPrimaryClickLatched = false } diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt index cfb098a22..b39c7b0af 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt @@ -15,7 +15,7 @@ import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch class ItemStorageChest(originalID: ItemID) : GameItem(originalID) { override var dynamicID: ItemID = originalID - override val originalName = "ITEM_CRAFTING_TABLE" + override val originalName = "ITEM_STORAGE_CHEST" override var baseMass = FixtureTikiTorch.MASS override var stackable = true override var inventoryCategory = Category.FIXTURE