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

selecting and consuming item in inventory

Browse Source
This commit is contained in:
Song Minjae
2017-04-11 19:21:32 +09:00
parent bb797a0910
commit d20190b2bd
15 changed files with 223 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/UIItemInventoryElem.kt
View File

@@ -66,10 +66,12 @@ class UIItemInventoryElem(
// mouseover background
if (item != null || drawBackOnNull) {
if (mouseUp) {
// do not highlight even if drawBackOnNull is true
if (mouseUp && item != null) {
BlendMode.resolve(mouseoverBackBlendMode)
g.color = mouseoverBackCol
}
// if drawBackOnNull, just draw background
else {
BlendMode.resolve(backBlendMode)
g.color = backCol
@@ -136,11 +138,11 @@ class UIItemInventoryElem(
val itemEquipSlot = item!!.equipPosition
val player = Terrarum.ingame!!.player
if (item != player.itemEquipped[itemEquipSlot]) { // if this item is unequipped, equip it
player.itemEquipped[itemEquipSlot] = item
if (item != player.inventory.itemEquipped[itemEquipSlot]) { // if this item is unequipped, equip it
player.equipItem(item!!)
}
else { // if not, unequip it
player.itemEquipped[itemEquipSlot] = null
player.unequipItem(item!!)
}
}