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

more codes

Browse Source
This commit is contained in:
minjaesong
2024-03-09 18:19:15 +09:00
parent 877d26667b
commit c6999e0794
2 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/net/torvald/terrarum/modulebasegame/ui/SmelterCommon.kt → src/net/torvald/terrarum/modulebasegame/ui/SmelterGuiEventBuilder.kt
View File

@@ -12,8 +12,15 @@ import java.util.concurrent.atomic.AtomicInteger
/** /**
* Created by minjaesong on 2024-03-09. * Created by minjaesong on 2024-03-09.
*/ */
object SmelterCommon { object SmelterGuiEventBuilder {
const val PRODUCT_SLOT = 0
const val ORE_SLOT_FIRST = 1
const val FIRE_SLOT_FIRST = 2
fun getPlayerSlotTouchDownFun( fun getPlayerSlotTouchDownFun(
clickedOnState: AtomicInteger, clickedOnState: AtomicInteger,
@@ -35,7 +42,7 @@ object SmelterCommon {
// oreslot // oreslot
if (amount != null && gameItem != null) { if (amount != null && gameItem != null) {
if (clickedOnState.get() == 1) { if (clickedOnState.get() == ORE_SLOT_FIRST) {
if (oreItem.itm == gameItem.dynamicID) { if (oreItem.itm == gameItem.dynamicID) {
playerInventory.remove(gameItem.dynamicID, amount) playerInventory.remove(gameItem.dynamicID, amount)
oreItem.changeCount(amount) oreItem.changeCount(amount)
@@ -46,7 +53,7 @@ object SmelterCommon {
} }
} }
// firebox // firebox
else if (clickedOnState.get() == 2) { else if (clickedOnState.get() == FIRE_SLOT_FIRST) {
if (fireboxItem.isNull()) { if (fireboxItem.isNull()) {
playerInventory.remove(gameItem.dynamicID, amount) playerInventory.remove(gameItem.dynamicID, amount)
fireboxItem.set(gameItem.dynamicID, amount) fireboxItem.set(gameItem.dynamicID, amount)
@@ -77,7 +84,7 @@ object SmelterCommon {
if (gameItem != null) { if (gameItem != null) {
val addCount1 = scrollY.toLong() val addCount1 = scrollY.toLong()
if (clickedOnState.get() == 1 && (oreItem.isNull() || oreItem.itm == gameItem.dynamicID)) { if (clickedOnState.get() == ORE_SLOT_FIRST && (oreItem.isNull() || oreItem.itm == gameItem.dynamicID)) {
val itemToUse = oreItem.itm ?: gameItem.dynamicID val itemToUse = oreItem.itm ?: gameItem.dynamicID
val addCount2 = scrollY.toLong().coerceIn( val addCount2 = scrollY.toLong().coerceIn(
@@ -102,7 +109,7 @@ object SmelterCommon {
else if (oreItem.isNotNull() && oreItem.qty!! < 0L) throw Error("Item removal count is larger than what was on the slot") else if (oreItem.isNotNull() && oreItem.qty!! < 0L) throw Error("Item removal count is larger than what was on the slot")
itemListUpdateKeepCurrentFilter() itemListUpdateKeepCurrentFilter()
} }
else if (clickedOnState.get() == 2 && (fireboxItem.isNull() || fireboxItem.itm == gameItem.dynamicID)) { else if (clickedOnState.get() == FIRE_SLOT_FIRST && (fireboxItem.isNull() || fireboxItem.itm == gameItem.dynamicID)) {
val itemToUse = fireboxItem.itm ?: gameItem.dynamicID val itemToUse = fireboxItem.itm ?: gameItem.dynamicID
val addCount2 = scrollY.toLong().coerceIn( val addCount2 = scrollY.toLong().coerceIn(
@@ -138,7 +145,7 @@ object SmelterCommon {
fun getOreItemSlotTouchDownFun( fun getOreItemSlotTouchDownFun(
clickedOnState: AtomicInteger, clickedOnState: AtomicInteger,
getFireboxItemSlot: () -> UIItemInventoryElemSimple, buttonsToUnhighlight: () -> List<UIItemInventoryElemSimple>,
playerThings: UITemplateHalfInventory, playerThings: UITemplateHalfInventory,
@@ -150,10 +157,10 @@ object SmelterCommon {
itemListUpdateKeepCurrentFilter: () -> Unit itemListUpdateKeepCurrentFilter: () -> Unit
): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, mouseButton: Int, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase -> ): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, mouseButton: Int, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase ->
if (clickedOnState.get() != 1) { if (clickedOnState.get() != ORE_SLOT_FIRST) {
clickedOnState.set(1) clickedOnState.set(ORE_SLOT_FIRST)
theButton.forceHighlighted = true theButton.forceHighlighted = true
getFireboxItemSlot().forceHighlighted = false buttonsToUnhighlight().forEach { it.forceHighlighted = false }
playerThings.itemList.itemPage = 0 playerThings.itemList.itemPage = 0
itemListUpdate { ItemCodex.hasTag(it.itm, "SMELTABLE") } itemListUpdate { ItemCodex.hasTag(it.itm, "SMELTABLE") }
} }
@@ -188,7 +195,7 @@ object SmelterCommon {
): (GameItem?, Long, Float, Float, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, scrollX: Float, scrollY: Float, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase -> ): (GameItem?, Long, Float, Float, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, scrollX: Float, scrollY: Float, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase ->
val playerInventory = getPlayerInventory() val playerInventory = getPlayerInventory()
val scrollY = -scrollY val scrollY = -scrollY
if (clickedOnState.get() == 1 && oreItem.isNotNull()) { if (clickedOnState.get() == ORE_SLOT_FIRST && oreItem.isNotNull()) {
val removeCount1 = scrollY.toLong() val removeCount1 = scrollY.toLong()
val removeCount2 = scrollY.toLong().coerceIn( val removeCount2 = scrollY.toLong().coerceIn(
-oreItem.qty!!, -oreItem.qty!!,
@@ -217,7 +224,7 @@ object SmelterCommon {
fun getFireboxItemSlotTouchDownFun( fun getFireboxItemSlotTouchDownFun(
clickedOnState: AtomicInteger, clickedOnState: AtomicInteger,
getOreItemSlot: () -> UIItemInventoryElemSimple, buttonsToUnhighlight: () -> List<UIItemInventoryElemSimple>,
playerThings: UITemplateHalfInventory, playerThings: UITemplateHalfInventory,
@@ -229,10 +236,10 @@ object SmelterCommon {
itemListUpdateKeepCurrentFilter: () -> Unit itemListUpdateKeepCurrentFilter: () -> Unit
): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, mouseButton: Int, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase -> ): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, mouseButton: Int, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase ->
if (clickedOnState.get() != 2) { if (clickedOnState.get() != FIRE_SLOT_FIRST) {
clickedOnState.set(2) clickedOnState.set(FIRE_SLOT_FIRST)
theButton.forceHighlighted = true theButton.forceHighlighted = true
getOreItemSlot().forceHighlighted = false buttonsToUnhighlight().forEach { it.forceHighlighted = false }
playerThings.itemList.itemPage = 0 playerThings.itemList.itemPage = 0
itemListUpdate { ItemCodex.hasTag(it.itm, "COMBUSTIBLE") } itemListUpdate { ItemCodex.hasTag(it.itm, "COMBUSTIBLE") }
} }
@@ -267,7 +274,7 @@ object SmelterCommon {
): (GameItem?, Long, Float, Float, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, scrollX: Float, scrollY: Float, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase -> ): (GameItem?, Long, Float, Float, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, scrollX: Float, scrollY: Float, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase ->
val playerInventory = getPlayerInventory() val playerInventory = getPlayerInventory()
val scrollY = -scrollY val scrollY = -scrollY
if (clickedOnState.get() == 2 && fireboxItem.isNotNull()) { if (clickedOnState.get() == FIRE_SLOT_FIRST && fireboxItem.isNotNull()) {
val removeCount1 = scrollY.toLong() val removeCount1 = scrollY.toLong()
val removeCount2 = scrollY.toLong().coerceIn( val removeCount2 = scrollY.toLong().coerceIn(
-fireboxItem.qty!!, -fireboxItem.qty!!,
@@ -296,8 +303,7 @@ object SmelterCommon {
fun getProductItemSlotTouchDownFun( fun getProductItemSlotTouchDownFun(
clickedOnState: AtomicInteger, clickedOnState: AtomicInteger,
getOreItemSlot: () -> UIItemInventoryElemSimple, buttonsToUnhighlight: () -> List<UIItemInventoryElemSimple>,
getFireboxItemSlot: () -> UIItemInventoryElemSimple,
playerThings: UITemplateHalfInventory, playerThings: UITemplateHalfInventory,
@@ -309,10 +315,9 @@ object SmelterCommon {
itemListUpdateKeepCurrentFilter: () -> Unit itemListUpdateKeepCurrentFilter: () -> Unit
): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, mouseButton: Int, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase -> ): (GameItem?, Long, Int, Any?, UIItemInventoryCellBase) -> Unit { return { gameItem: GameItem?, amount: Long, mouseButton: Int, itemExtraInfo: Any?, theButton: UIItemInventoryCellBase ->
if (clickedOnState.get() != 0) { if (clickedOnState.get() != PRODUCT_SLOT) {
clickedOnState.set(0) clickedOnState.set(PRODUCT_SLOT)
getOreItemSlot().forceHighlighted = false buttonsToUnhighlight().forEach { it.forceHighlighted = false }
getFireboxItemSlot().forceHighlighted = false
playerThings.itemList.itemPage = 0 playerThings.itemList.itemPage = 0
itemListUpdate() itemListUpdate()
} }

30
src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt
View File

@@ -9,6 +9,7 @@ import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.gameactors.ActorInventory import net.torvald.terrarum.modulebasegame.gameactors.ActorInventory
import net.torvald.terrarum.modulebasegame.gameactors.FixtureSmelterBasic import net.torvald.terrarum.modulebasegame.gameactors.FixtureSmelterBasic
import net.torvald.terrarum.modulebasegame.gameactors.InventoryPair import net.torvald.terrarum.modulebasegame.gameactors.InventoryPair
import net.torvald.terrarum.modulebasegame.ui.SmelterGuiEventBuilder.PRODUCT_SLOT
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.tooltipShowing import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.tooltipShowing
import net.torvald.terrarum.ui.* import net.torvald.terrarum.ui.*
import net.torvald.terrarum.ui.UIItemCatBar.Companion.FILTER_CAT_ALL import net.torvald.terrarum.ui.UIItemCatBar.Companion.FILTER_CAT_ALL
@@ -30,17 +31,17 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
override var width = Toolkit.drawWidth override var width = Toolkit.drawWidth
override var height = App.scr.height override var height = App.scr.height
private var clickedOnState = AtomicInteger(0) // Used to set inventory filter and its behaviour. 0: default, 1: oreslot, 2: firebox private var clickedOnState = AtomicInteger(PRODUCT_SLOT) // Used to set inventory filter and its behaviour. 0: default, 1: oreslot, 2: firebox
private val playerThings = UITemplateHalfInventory(this, false).also { private val playerThings = UITemplateHalfInventory(this, false).also {
it.itemListTouchDownFun = SmelterCommon.getPlayerSlotTouchDownFun( it.itemListTouchDownFun = SmelterGuiEventBuilder.getPlayerSlotTouchDownFun(
clickedOnState, clickedOnState,
smelter.fireboxItemStatus, smelter.fireboxItemStatus,
smelter.oreItemStatus, smelter.oreItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
) )
it.itemListWheelFun = SmelterCommon.getPlayerSlotWheelFun( it.itemListWheelFun = SmelterGuiEventBuilder.getPlayerSlotWheelFun(
clickedOnState, clickedOnState,
smelter.fireboxItemStatus, smelter.fireboxItemStatus,
smelter.oreItemStatus, smelter.oreItemStatus,
@@ -107,16 +108,16 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
updateOnNull = true, updateOnNull = true,
emptyCellIcon = smelterCellIcons.get(1, 1), emptyCellIcon = smelterCellIcons.get(1, 1),
keyDownFun = { _, _, _, _, _ -> }, keyDownFun = { _, _, _, _, _ -> },
touchDownFun = SmelterCommon.getOreItemSlotTouchDownFun( touchDownFun = SmelterGuiEventBuilder.getOreItemSlotTouchDownFun(
clickedOnState, clickedOnState,
{ fireboxItemSlot }, { listOf(fireboxItemSlot) },
playerThings, playerThings,
smelter.oreItemStatus, smelter.oreItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
{ filter -> itemListUpdate(filter) }, { filter -> itemListUpdate(filter) },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
), ),
wheelFun = SmelterCommon.getOreItemSlotWheelFun( wheelFun = SmelterGuiEventBuilder.getOreItemSlotWheelFun(
clickedOnState, clickedOnState,
smelter.oreItemStatus, smelter.oreItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
@@ -128,16 +129,16 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
emptyCellIcon = smelterCellIcons.get(0, 0), emptyCellIcon = smelterCellIcons.get(0, 0),
updateOnNull = true, updateOnNull = true,
keyDownFun = { _, _, _, _, _ -> }, keyDownFun = { _, _, _, _, _ -> },
touchDownFun = SmelterCommon.getFireboxItemSlotTouchDownFun( touchDownFun = SmelterGuiEventBuilder.getFireboxItemSlotTouchDownFun(
clickedOnState, clickedOnState,
{ oreItemSlot }, { listOf(oreItemSlot) },
playerThings, playerThings,
smelter.fireboxItemStatus, smelter.fireboxItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
{ filter -> itemListUpdate(filter) }, { filter -> itemListUpdate(filter) },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
), ),
wheelFun = SmelterCommon.getFireboxItemSlotWheelFun( wheelFun = SmelterGuiEventBuilder.getFireboxItemSlotWheelFun(
clickedOnState, clickedOnState,
smelter.fireboxItemStatus, smelter.fireboxItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
@@ -148,17 +149,16 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
this, productX.toInt(), productY.toInt(), this, productX.toInt(), productY.toInt(),
emptyCellIcon = smelterCellIcons.get(1, 0), emptyCellIcon = smelterCellIcons.get(1, 0),
keyDownFun = { _, _, _, _, _ -> }, keyDownFun = { _, _, _, _, _ -> },
touchDownFun = SmelterCommon.getProductItemSlotTouchDownFun( touchDownFun = SmelterGuiEventBuilder.getProductItemSlotTouchDownFun(
clickedOnState, clickedOnState,
{ oreItemSlot }, { listOf(oreItemSlot, fireboxItemSlot) },
{ fireboxItemSlot },
playerThings, playerThings,
smelter.productItemStatus, smelter.productItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
{ itemListUpdate() }, { itemListUpdate() },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
), ),
wheelFun = SmelterCommon.getProductItemSlotWheelFun( wheelFun = SmelterGuiEventBuilder.getProductItemSlotWheelFun(
smelter.productItemStatus, smelter.productItemStatus,
{ getPlayerInventory() }, { getPlayerInventory() },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
@@ -199,7 +199,7 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
override fun show() { override fun show() {
super.show() super.show()
clickedOnState.set(0) clickedOnState.set(PRODUCT_SLOT)
oreItemSlot.forceHighlighted = false oreItemSlot.forceHighlighted = false
fireboxItemSlot.forceHighlighted = false fireboxItemSlot.forceHighlighted = false
@@ -236,7 +236,7 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
!playerThings.itemList.navRemoCon.mouseUp !playerThings.itemList.navRemoCon.mouseUp
) { ) {
clickedOnState.set(0) clickedOnState.set(PRODUCT_SLOT)
oreItemSlot.forceHighlighted = false oreItemSlot.forceHighlighted = false
fireboxItemSlot.forceHighlighted = false fireboxItemSlot.forceHighlighted = false