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

blocks are now 'drag-painted' again, but in better way bc fixtures won't

Browse Source
This commit is contained in:
minjaesong
2021-03-16 10:52:31 +09:00
parent 8f5a89e415
commit 0496366057
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/torvald/terrarum/gamecontroller/IngameController.kt
View File

@@ -9,8 +9,11 @@ import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.controller.TerrarumController import net.torvald.terrarum.controller.TerrarumController
import net.torvald.terrarum.floorInt import net.torvald.terrarum.floorInt
import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameitem.GameItem
import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.gameworld.fmod
import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.FixtureBase
import net.torvald.terrarum.worlddrawer.CreateTileAtlas import net.torvald.terrarum.worlddrawer.CreateTileAtlas
import net.torvald.terrarum.worlddrawer.WorldCamera import net.torvald.terrarum.worlddrawer.WorldCamera
@@ -71,7 +74,11 @@ class IngameController(val terrarumIngame: TerrarumIngame) : InputAdapter() {
ingame.worldSecondaryClickStart(AppLoader.UPDATE_RATE) 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 worldPrimaryClickLatched = false
} }

2
src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt
View File

@@ -15,7 +15,7 @@ import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch
class ItemStorageChest(originalID: ItemID) : GameItem(originalID) { class ItemStorageChest(originalID: ItemID) : GameItem(originalID) {
override var dynamicID: ItemID = 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 baseMass = FixtureTikiTorch.MASS
override var stackable = true override var stackable = true
override var inventoryCategory = Category.FIXTURE override var inventoryCategory = Category.FIXTURE