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

a cell for items to craft will highlight when selected

Browse Source
This commit is contained in:
minjaesong
2022-06-29 00:02:18 +09:00
parent b34502ebd3
commit 9edfc90ad8
7 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/UIItemInventoryElemSimple.kt
View File

@@ -25,8 +25,8 @@ class UIItemInventoryElemSimple(
override var quickslot: Int? = null, override var quickslot: Int? = null,
override var equippedSlot: Int? = null, override var equippedSlot: Int? = null,
val drawBackOnNull: Boolean = true, val drawBackOnNull: Boolean = true,
keyDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Keycode, extra info keyDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Keycode, extra info, self
touchDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Button, extra info touchDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Button, extra info, self
extraInfo: Any? = null extraInfo: Any? = null
) : UIItemInventoryCellBase(parentUI, initialX, initialY, item, amount, itemImage, quickslot, equippedSlot, keyDownFun, touchDownFun, extraInfo) { ) : UIItemInventoryCellBase(parentUI, initialX, initialY, item, amount, itemImage, quickslot, equippedSlot, keyDownFun, touchDownFun, extraInfo) {
@@ -55,7 +55,7 @@ class UIItemInventoryElemSimple(
Toolkit.fillArea(batch, posX, posY, width, height) Toolkit.fillArea(batch, posX, posY, width, height)
} }
// cell border // cell border
batch.color = if (equippedSlot != null) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (equippedSlot != null || forceHighlighted) Toolkit.Theme.COL_HIGHLIGHT
else if (mouseUp) Toolkit.Theme.COL_ACTIVE else if (mouseUp) Toolkit.Theme.COL_ACTIVE
else Toolkit.Theme.COL_INVENTORY_CELL_BORDER else Toolkit.Theme.COL_INVENTORY_CELL_BORDER
Toolkit.drawBoxBorder(batch, posX, posY, width, height) Toolkit.drawBoxBorder(batch, posX, posY, width, height)
@@ -95,7 +95,7 @@ class UIItemInventoryElemSimple(
// if mouse is over, text lights up // if mouse is over, text lights up
// highlight item count (blocks/walls) if the item is equipped // highlight item count (blocks/walls) if the item is equipped
batch.color = item!!.nameColour mul ( batch.color = item!!.nameColour mul (
if (equippedSlot != null) Toolkit.Theme.COL_HIGHLIGHT if (equippedSlot != null || forceHighlighted) Toolkit.Theme.COL_HIGHLIGHT
else if (mouseUp) Toolkit.Theme.COL_ACTIVE else if (mouseUp) Toolkit.Theme.COL_ACTIVE
else Color.WHITE else Color.WHITE
) )

8
src/net/torvald/terrarum/UIItemInventoryElemWide.kt
View File

@@ -28,8 +28,8 @@ class UIItemInventoryElemWide(
override var quickslot: Int? = null, override var quickslot: Int? = null,
override var equippedSlot: Int? = null, override var equippedSlot: Int? = null,
val drawBackOnNull: Boolean = true, val drawBackOnNull: Boolean = true,
keyDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Keycode, extra info keyDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Keycode, extra info, self
touchDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Button, extra info touchDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Button, extra info, self
extraInfo: Any? = null extraInfo: Any? = null
) : UIItemInventoryCellBase(parentUI, initialX, initialY, item, amount, itemImage, quickslot, equippedSlot, keyDownFun, touchDownFun, extraInfo) { ) : UIItemInventoryCellBase(parentUI, initialX, initialY, item, amount, itemImage, quickslot, equippedSlot, keyDownFun, touchDownFun, extraInfo) {
@@ -73,7 +73,7 @@ class UIItemInventoryElemWide(
Toolkit.fillArea(batch, posX, posY, width, height) Toolkit.fillArea(batch, posX, posY, width, height)
} }
// cell border // cell border
batch.color = if (equippedSlot != null) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (equippedSlot != null || forceHighlighted) Toolkit.Theme.COL_HIGHLIGHT
else if (mouseUp) Toolkit.Theme.COL_ACTIVE else if (mouseUp) Toolkit.Theme.COL_ACTIVE
else Toolkit.Theme.COL_INVENTORY_CELL_BORDER else Toolkit.Theme.COL_INVENTORY_CELL_BORDER
Toolkit.drawBoxBorder(batch, posX, posY, width, height) Toolkit.drawBoxBorder(batch, posX, posY, width, height)
@@ -91,7 +91,7 @@ class UIItemInventoryElemWide(
// if mouse is over, text lights up // if mouse is over, text lights up
// highlight item name and count (blocks/walls) if the item is equipped // highlight item name and count (blocks/walls) if the item is equipped
batch.color = item!!.nameColour mul ( batch.color = item!!.nameColour mul (
if (equippedSlot != null) Toolkit.Theme.COL_HIGHLIGHT if (equippedSlot != null || forceHighlighted) Toolkit.Theme.COL_HIGHLIGHT
else if (mouseUp) Toolkit.Theme.COL_ACTIVE else if (mouseUp) Toolkit.Theme.COL_ACTIVE
else Color.WHITE else Color.WHITE
) )

8
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt
View File

@@ -121,8 +121,8 @@ internal class UIStorageChest : UICanvas(
6, CELLS_VRT, 6, CELLS_VRT,
drawScrollOnRightside = false, drawScrollOnRightside = false,
drawWallet = false, drawWallet = false,
keyDownFun = { _, _, _, _ -> Unit }, keyDownFun = { _, _, _, _, _ -> Unit },
touchDownFun = { gameItem, amount, _, _ -> touchDownFun = { gameItem, amount, _, _, _ ->
if (gameItem != null) { if (gameItem != null) {
negotiator.reject(getFixtureInventory(), getPlayerInventory(), gameItem, amount) negotiator.reject(getFixtureInventory(), getPlayerInventory(), gameItem, amount)
} }
@@ -142,8 +142,8 @@ internal class UIStorageChest : UICanvas(
6, CELLS_VRT, 6, CELLS_VRT,
drawScrollOnRightside = true, drawScrollOnRightside = true,
drawWallet = false, drawWallet = false,
keyDownFun = { _, _, _, _ -> Unit }, keyDownFun = { _, _, _, _, _ -> Unit },
touchDownFun = { gameItem, amount, _, _ -> touchDownFun = { gameItem, amount, _, _, _ ->
if (gameItem != null) { if (gameItem != null) {
negotiator.accept(getPlayerInventory(), getFixtureInventory(), gameItem, amount) negotiator.accept(getPlayerInventory(), getFixtureInventory(), gameItem, amount)
} }

25
src/net/torvald/terrarum/modulebasegame/gameactors/UICrafting.kt
View File

@@ -34,7 +34,7 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
override var openCloseTime: Second = 0.0f override var openCloseTime: Second = 0.0f
private val itemListPlayer: UIItemInventoryItemGrid private val itemListPlayer: UIItemInventoryItemGrid
private val itemListCraftable: UIItemInventoryItemGrid // might be changed to something else private val itemListCraftable: UIItemCraftingCandidateGrid // might be changed to something else
private val itemListIngredients: UIItemInventoryItemGrid // this one is definitely not to be changed private val itemListIngredients: UIItemInventoryItemGrid // this one is definitely not to be changed
private val buttonCraft: UIItemTextButton private val buttonCraft: UIItemTextButton
private val spinnerCraftCount: UIItemSpinner private val spinnerCraftCount: UIItemSpinner
@@ -86,8 +86,8 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
drawScrollOnRightside = false, drawScrollOnRightside = false,
drawWallet = false, drawWallet = false,
hideSidebar = true, hideSidebar = true,
keyDownFun = { _, _, _, _ -> }, keyDownFun = { _, _, _, _, _ -> },
touchDownFun = { _, _, _, _ -> } touchDownFun = { _, _, _, _, _ -> }
) )
// make sure grid buttons for ingredients do nothing (even if they are hidden!) // make sure grid buttons for ingredients do nothing (even if they are hidden!)
@@ -108,8 +108,8 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
thisOffsetX, thisOffsetX,
thisOffsetY, thisOffsetY,
6, UIInventoryFull.CELLS_VRT - 2, // decrease the internal height so that craft/cancel button would fit in 6, UIInventoryFull.CELLS_VRT - 2, // decrease the internal height so that craft/cancel button would fit in
keyDownFun = { _, _, _, _ -> }, keyDownFun = { _, _, _, _, _ -> },
touchDownFun = { gameItem, amount, _, recipe0 -> touchDownFun = { gameItem, amount, _, recipe0, button ->
/*if (gameItem != null) { /*if (gameItem != null) {
negotiator.reject(craftables, getPlayerInventory(), gameItem, amount) negotiator.reject(craftables, getPlayerInventory(), gameItem, amount)
} }
@@ -120,7 +120,7 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
(recipe0 as? CraftingCodex.CraftingRecipe)?.let { recipe -> (recipe0 as? CraftingCodex.CraftingRecipe)?.let { recipe ->
ingredients.clear() ingredients.clear()
recipeClicked = recipe recipeClicked = recipe
printdbg(this, "Recipe selected: $recipe") // printdbg(this, "Recipe selected: $recipe")
recipe.ingredients.forEach { ingredient -> recipe.ingredients.forEach { ingredient ->
// TODO item tag support // TODO item tag support
if (ingredient.keyMode == CraftingCodex.CraftingItemKeyMode.TAG) { if (ingredient.keyMode == CraftingCodex.CraftingItemKeyMode.TAG) {
@@ -129,17 +129,18 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
ItemCodex[itm]?.tags?.contains(ingredient.key) == true && qty >= ingredient.qty ItemCodex[itm]?.tags?.contains(ingredient.key) == true && qty >= ingredient.qty
}.maxByOrNull { it.qty }?.itm ?: ((ItemCodex.itemCodex.firstNotNullOfOrNull { if (it.value.tags.contains(ingredient.key)) it.key else null }) ?: throw NullPointerException("Item with tag '${ingredient.key}' not found. Possible cause: game or a module not updated or installed")) }.maxByOrNull { it.qty }?.itm ?: ((ItemCodex.itemCodex.firstNotNullOfOrNull { if (it.value.tags.contains(ingredient.key)) it.key else null }) ?: throw NullPointerException("Item with tag '${ingredient.key}' not found. Possible cause: game or a module not updated or installed"))
printdbg(this, "Adding ingredients by tag ${selectedItem} (${ingredient.qty})") // printdbg(this, "Adding ingredients by tag ${selectedItem} (${ingredient.qty})")
ingredients.add(selectedItem, ingredient.qty) ingredients.add(selectedItem, ingredient.qty)
} }
else { else {
printdbg(this, "Adding ingredients by name ${ingredient.key} (${ingredient.qty})") // printdbg(this, "Adding ingredients by name ${ingredient.key} (${ingredient.qty})")
ingredients.add(ingredient.key, ingredient.qty) ingredients.add(ingredient.key, ingredient.qty)
} }
} }
} }
itemListIngredients.rebuild(catAll) itemListIngredients.rebuild(catAll)
highlightCraftingCandidateButton(button)
} }
) )
buttonCraft = UIItemTextButton(this, "GAME_ACTION_CRAFT", thisOffsetX + 3 + buttonWidth + listGap, craftButtonsY, buttonWidth, true, alignment = UIItemTextButton.Companion.Alignment.CENTRE, hasBorder = true) buttonCraft = UIItemTextButton(this, "GAME_ACTION_CRAFT", thisOffsetX + 3 + buttonWidth + listGap, craftButtonsY, buttonWidth, true, alignment = UIItemTextButton.Companion.Alignment.CENTRE, hasBorder = true)
@@ -162,8 +163,8 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
6, UIInventoryFull.CELLS_VRT, 6, UIInventoryFull.CELLS_VRT,
drawScrollOnRightside = true, drawScrollOnRightside = true,
drawWallet = false, drawWallet = false,
keyDownFun = { _, _, _, _ -> }, keyDownFun = { _, _, _, _, _ -> },
touchDownFun = { gameItem, amount, _, _ -> touchDownFun = { gameItem, amount, _, _, _ ->
/*if (gameItem != null) { /*if (gameItem != null) {
negotiator.accept(getPlayerInventory(), getFixtureInventory(), gameItem, amount) negotiator.accept(getPlayerInventory(), getFixtureInventory(), gameItem, amount)
} }
@@ -183,6 +184,10 @@ class UICrafting(val full: UIInventoryFull) : UICanvas(
addUIitem(buttonCraft) addUIitem(buttonCraft)
} }
private fun highlightCraftingCandidateButton(button: UIItemInventoryCellBase) { // a proxy function
itemListCraftable.highlightButton(button)
}
// reset whatever player has selected to null and bring UI to its initial state // reset whatever player has selected to null and bring UI to its initial state
fun resetUI() { fun resetUI() {

9
src/net/torvald/terrarum/modulebasegame/ui/UIItemCraftingCandidateGrid.kt
View File

@@ -16,8 +16,8 @@ class UIItemCraftingCandidateGrid(
initialX: Int, initialY: Int, initialX: Int, initialY: Int,
horizontalCells: Int, verticalCells: Int, horizontalCells: Int, verticalCells: Int,
drawScrollOnRightside: Boolean = false, drawScrollOnRightside: Boolean = false,
keyDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Keycode, extra info keyDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Keycode, extra info, keyed button
touchDownFun: (GameItem?, Long, Int, Any?) -> Unit // Item, Amount, Button, extra info touchDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit // Item, Amount, Button, extra info, clicked button
) : UIItemInventoryItemGrid( ) : UIItemInventoryItemGrid(
parentUI, catBar, parentUI, catBar,
{ TODO() /* UNUSED and MUST NOT BE USED! */ }, { TODO() /* UNUSED and MUST NOT BE USED! */ },
@@ -37,6 +37,11 @@ class UIItemCraftingCandidateGrid(
internal val recipesSortList = ArrayList<CraftingCodex.CraftingRecipe>() // a dual to the [inventorySortList] which contains the actual recipes instead of crafting recipes internal val recipesSortList = ArrayList<CraftingCodex.CraftingRecipe>() // a dual to the [inventorySortList] which contains the actual recipes instead of crafting recipes
fun highlightButton(button: UIItemInventoryCellBase) {
items.forEach { it.forceHighlighted = false }
button.forceHighlighted = true
}
override fun rebuild(filter: Array<String>) { override fun rebuild(filter: Array<String>) {
// test fill craftingRecipes with every possible recipes in the game // test fill craftingRecipes with every possible recipes in the game
craftingRecipes.clear() craftingRecipes.clear()

10
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryCellBase.kt
View File

@@ -26,21 +26,23 @@ abstract class UIItemInventoryCellBase(
open var itemImage: TextureRegion?, open var itemImage: TextureRegion?,
open var quickslot: Int? = null, open var quickslot: Int? = null,
open var equippedSlot: Int? = null, open var equippedSlot: Int? = null,
val keyDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Keycode, extra info val keyDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Keycode, extra info, self
val touchDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Button, extra info val touchDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Button, extra info, self
open var extraInfo: Any? open var extraInfo: Any?
) : UIItem(parentUI, initialX, initialY) { ) : UIItem(parentUI, initialX, initialY) {
abstract override fun update(delta: Float) abstract override fun update(delta: Float)
abstract override fun render(batch: SpriteBatch, camera: Camera) abstract override fun render(batch: SpriteBatch, camera: Camera)
var forceHighlighted = false
override fun keyDown(keycode: Int): Boolean { override fun keyDown(keycode: Int): Boolean {
keyDownFun(item, amount, keycode, extraInfo) keyDownFun(item, amount, keycode, extraInfo, this)
super.keyDown(keycode) super.keyDown(keycode)
return true return true
} }
override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
touchDownFun(item, amount, button, extraInfo) touchDownFun(item, amount, button, extraInfo, this)
super.touchDown(screenX, screenY, pointer, button) super.touchDown(screenX, screenY, pointer, button)
return true return true
} }

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

@@ -42,8 +42,8 @@ open class UIItemInventoryItemGrid(
val drawScrollOnRightside: Boolean = false, val drawScrollOnRightside: Boolean = false,
val drawWallet: Boolean = true, val drawWallet: Boolean = true,
val hideSidebar: Boolean = false, val hideSidebar: Boolean = false,
keyDownFun: (GameItem?, Long, Int, Any?) -> Unit, // Item, Amount, Keycode, extra info keyDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit, // Item, Amount, Keycode, extra info, self
touchDownFun: (GameItem?, Long, Int, Any?) -> Unit // Item, Amount, Button, extra info touchDownFun: (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit // Item, Amount, Button, extra info, self
) : UIItem(parentUI, initialX, initialY) { ) : UIItem(parentUI, initialX, initialY) {
// deal with the moving position // deal with the moving position
@@ -101,8 +101,8 @@ open class UIItemInventoryItemGrid(
fun getEstimatedW(horizontalCells: Int) = horizontalCells * UIItemInventoryElemSimple.height + (horizontalCells - 1) * listGap fun getEstimatedW(horizontalCells: Int) = horizontalCells * UIItemInventoryElemSimple.height + (horizontalCells - 1) * listGap
fun getEstimatedH(verticalCells: Int) = verticalCells * UIItemInventoryElemSimple.height + (verticalCells - 1) * listGap fun getEstimatedH(verticalCells: Int) = verticalCells * UIItemInventoryElemSimple.height + (verticalCells - 1) * listGap
fun createInvCellGenericKeyDownFun(): (GameItem?, Long, Int, Any?) -> Unit { fun createInvCellGenericKeyDownFun(): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit {
return { item: GameItem?, amount: Long, keycode: Int, _ -> return { item: GameItem?, amount: Long, keycode: Int, _, _ ->
if (item != null && Terrarum.ingame != null && keycode in Input.Keys.NUM_0..Input.Keys.NUM_9) { if (item != null && Terrarum.ingame != null && keycode in Input.Keys.NUM_0..Input.Keys.NUM_9) {
val player = (Terrarum.ingame!! as TerrarumIngame).actorNowPlaying val player = (Terrarum.ingame!! as TerrarumIngame).actorNowPlaying
if (player != null) { if (player != null) {
@@ -131,8 +131,8 @@ open class UIItemInventoryItemGrid(
} }
} }
fun createInvCellGenericTouchDownFun(listRebuildFun: () -> Unit): (GameItem?, Long, Int, Any?) -> Unit { fun createInvCellGenericTouchDownFun(listRebuildFun: () -> Unit): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit {
return { item: GameItem?, amount: Long, button: Int, _ -> return { item: GameItem?, amount: Long, button: Int, _, _ ->
if (item != null && Terrarum.ingame != null) { if (item != null && Terrarum.ingame != null) {
// equip da shit // equip da shit
val itemEquipSlot = item.equipPosition val itemEquipSlot = item.equipPosition