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

tossing items on the inventory

Browse Source
This commit is contained in:
minjaesong
2023-10-03 19:07:00 +09:00
parent dcdd7eb313
commit e95dcdec9f
7 changed files with 79 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryCells.kt
View File

@@ -1,12 +1,15 @@
package net.torvald.terrarum.modulebasegame.ui
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem
import net.torvald.terrarum.modulebasegame.gameactors.FixtureInventory
import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.CELLS_HOR
import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.CELLS_VRT
@@ -18,6 +21,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryItemGrid.Companion.
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryItemGrid.Companion.createInvCellGenericTouchDownFun
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import org.dyn4j.geometry.Vector2
import kotlin.math.max
import kotlin.math.min
@@ -83,6 +87,25 @@ internal class UIInventoryCells(
override fun updateUI(delta: Float) {
itemList.update(delta)
equipped.update(delta)
// make tossing work on the inventory ui
if (Gdx.input.isKeyJustPressed(ControlPresets.getKey("control_key_discard"))) {
itemList.find { it.mouseUp }?.let { cell -> cell.item?.let { item ->
val player = full.actor
// remove an item from the inventory
player.inventory.remove(item, 1)
// create and spawn the droppeditem
DroppedItem(item.dynamicID,
player.hitbox.centeredX,
player.hitbox.centeredY,
Vector2(-4.0 * player.scale.sqrt() * player.sprite!!.flipHorizontal.toInt(1).minus(1), -0.1)
).let { drop ->
INGAME.queueActorAddition(drop)
}
// update inventory
rebuildList()
} }
}
}
override fun renderUI(batch: SpriteBatch, camera: OrthographicCamera) {

15
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
View File

@@ -636,4 +636,19 @@ open class UIItemInventoryItemGrid(
return true
}
fun find(predicate: (UIItemInventoryCellBase) -> Boolean): UIItemInventoryCellBase? {
var c = 0
var ret: UIItemInventoryCellBase? = null
while (c < items.size) {
if (predicate(items[c])) {
ret = items[c]
break
}
c++
}
return ret
}
}