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

smelter ui changes; longer music interval

Browse Source
This commit is contained in:
minjaesong
2024-03-13 04:54:59 +09:00
parent c829245b41
commit 7c2b5468bd
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
View File

@@ -194,7 +194,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
protected var ambState = 0 protected var ambState = 0
protected var ambFired = false protected var ambFired = false
fun getRandomMusicInterval() = 3.6f + Math.random().toFloat() * 1.2f // use shorter gap a la mixtape fun getRandomMusicInterval() = 20f + Math.random().toFloat() * 4f // longer gap (20s to 24s)
var stopCaller: Any? = null; private set var stopCaller: Any? = null; private set
var playCaller: Any? = null; private set var playCaller: Any? = null; private set

28
src/net/torvald/terrarum/modulebasegame/ui/UIAlloyingFurnace.kt
View File

@@ -66,23 +66,23 @@ class UIAlloyingFurnace(val smelter: FixtureAlloyingFurnace) : UICanvas(
private val leftPanelY = playerThings.posY private val leftPanelY = playerThings.posY
private val backdropColour = Color(0x999999_c8.toInt()) private val backdropColour = Color(0x999999_c8.toInt())
private val backdropZoom = 6 private val backdropZoom = 9f
private val backdropX = (leftPanelX + (leftPanelWidth - smelterBackdrops.tileW * backdropZoom) / 2).toFloat() private val backdropX = (leftPanelX + (leftPanelWidth - smelterBackdrops.tileW * backdropZoom) / 2).toFloat()
private val backdropY = (leftPanelY + (leftPanelHeight - smelterBackdrops.tileH * backdropZoom) / 2).toFloat() private val backdropY = (leftPanelY + (leftPanelHeight - smelterBackdrops.tileH * backdropZoom) / 2).toFloat()
private val oreX1 = backdropX + -1 * backdropZoom + 6 + 6 private val oreX1 = backdropX + 3 * backdropZoom + 4
private val oreX2 = backdropX + 9 * backdropZoom + 6 - 5 private val oreX2 = backdropX + 9 * backdropZoom - 1
private val oreY1 = backdropY + 3 * backdropZoom + 3 private val oreY1 = backdropY + 6 * backdropZoom + 3
private val oreY2 = backdropY + 3 * backdropZoom + 3 private val oreY2 = backdropY + 6 * backdropZoom + 3
private val fireboxX = backdropX + 4 * backdropZoom + 6 private val fireboxX = backdropX + 6 * backdropZoom + 2
private val fireboxY = backdropY + 19 * backdropZoom + 3 private val fireboxY = backdropY + 21 * backdropZoom - 2
private val productX = backdropX + 19 * backdropZoom + 3 private val productX = backdropX + 21 * backdropZoom + 1
private val productY = backdropY + 7 * backdropZoom + 3 private val productY = backdropY + 11 * backdropZoom - 3
private val thermoX = (backdropX + 16 * backdropZoom + 1).toInt() private val thermoX = (backdropX + 16 * backdropZoom + 3).toInt()
private val thermoY = (backdropY + 19 * backdropZoom + 3).toInt() private val thermoY = (backdropY + 21 * backdropZoom - 2).toInt()
private val oreItemSlot1: UIItemInventoryElemSimple = UIItemInventoryElemSimple( private val oreItemSlot1: UIItemInventoryElemSimple = UIItemInventoryElemSimple(
@@ -95,7 +95,7 @@ class UIAlloyingFurnace(val smelter: FixtureAlloyingFurnace) : UICanvas(
{ listOf(fireboxItemSlot, oreItemSlot2) }, { listOf(fireboxItemSlot, oreItemSlot2) },
playerThings, playerThings,
smelter.oreItem1Status, 0, smelter.oreItem1Status, 0,
{ ItemCodex.hasAnyTagOf(it, "SMELTABLE", "INGOT") && ItemCodex.hasNoTagOf(it, "ALLOY") }, { ItemCodex.hasAnyTagOf(it, "INGOT") && ItemCodex.hasNoTagOf(it, "ALLOY") },
{ getPlayerInventory() }, { getPlayerInventory() },
{ filter -> itemListUpdate(filter) }, { filter -> itemListUpdate(filter) },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
@@ -117,7 +117,7 @@ class UIAlloyingFurnace(val smelter: FixtureAlloyingFurnace) : UICanvas(
{ listOf(fireboxItemSlot, oreItemSlot1) }, { listOf(fireboxItemSlot, oreItemSlot1) },
playerThings, playerThings,
smelter.oreItem2Status, 1, smelter.oreItem2Status, 1,
{ ItemCodex.hasAnyTagOf(it, "SMELTABLE", "INGOT") && ItemCodex.hasNoTagOf(it, "ALLOY") }, { ItemCodex.hasAnyTagOf(it, "INGOT") && ItemCodex.hasNoTagOf(it, "ALLOY") },
{ getPlayerInventory() }, { getPlayerInventory() },
{ filter -> itemListUpdate(filter) }, { filter -> itemListUpdate(filter) },
{ itemListUpdateKeepCurrentFilter() } { itemListUpdateKeepCurrentFilter() }
@@ -331,7 +331,7 @@ class UIAlloyingFurnace(val smelter: FixtureAlloyingFurnace) : UICanvas(
batch.color = backdropColour batch.color = backdropColour
// batch.draw(smelterBackdrops.get(1,0), backdropX, backdropY, smelterBackdrops.tileW * 6f, smelterBackdrops.tileH * 6f) // batch.draw(smelterBackdrops.get(1,0), backdropX, backdropY, smelterBackdrops.tileW * 6f, smelterBackdrops.tileH * 6f)
// batch.color = backdropColour mul Color(1f, 1f, 1f, smelter.temperature) // batch.color = backdropColour mul Color(1f, 1f, 1f, smelter.temperature)
batch.draw(smelterBackdrops.get(0,0), backdropX, backdropY, smelterBackdrops.tileW * 6f, smelterBackdrops.tileH * 6f) batch.draw(smelterBackdrops.get(0,0), backdropX, backdropY, smelterBackdrops.tileW * backdropZoom, smelterBackdrops.tileH * backdropZoom)
uiItems.forEach { it.render(frameDelta, batch, camera) } uiItems.forEach { it.render(frameDelta, batch, camera) }

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

@@ -72,7 +72,7 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
private val leftPanelY = playerThings.posY private val leftPanelY = playerThings.posY
private val backdropColour = Color(0x999999_c8.toInt()) private val backdropColour = Color(0x999999_c8.toInt())
private val backdropZoom = 6 private val backdropZoom = 6f
private val backdropX = (leftPanelX + (leftPanelWidth - smelterBackdrops.tileW * backdropZoom) / 2).toFloat() private val backdropX = (leftPanelX + (leftPanelWidth - smelterBackdrops.tileW * backdropZoom) / 2).toFloat()
private val backdropY = (leftPanelY + (leftPanelHeight - smelterBackdrops.tileH * backdropZoom) / 2).toFloat() private val backdropY = (leftPanelY + (leftPanelHeight - smelterBackdrops.tileH * backdropZoom) / 2).toFloat()
@@ -318,7 +318,7 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
batch.color = backdropColour batch.color = backdropColour
// batch.draw(smelterBackdrops.get(1,0), backdropX, backdropY, smelterBackdrops.tileW * 6f, smelterBackdrops.tileH * 6f) // batch.draw(smelterBackdrops.get(1,0), backdropX, backdropY, smelterBackdrops.tileW * 6f, smelterBackdrops.tileH * 6f)
// batch.color = backdropColour mul Color(1f, 1f, 1f, smelter.temperature) // batch.color = backdropColour mul Color(1f, 1f, 1f, smelter.temperature)
batch.draw(smelterBackdrops.get(0,0), backdropX, backdropY, smelterBackdrops.tileW * 6f, smelterBackdrops.tileH * 6f) batch.draw(smelterBackdrops.get(0,0), backdropX, backdropY, smelterBackdrops.tileW * backdropZoom, smelterBackdrops.tileH * backdropZoom)
uiItems.forEach { it.render(frameDelta, batch, camera) } uiItems.forEach { it.render(frameDelta, batch, camera) }