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

pickaxe sound cue

Browse Source
This commit is contained in:
minjaesong
2024-03-31 04:35:21 +09:00
parent aa2172b396
commit 742b63a8fa
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/mods/basegame/audio/effects/accessibility/pickaxe_valuable.ogg LFS Normal file
View File

Binary file not shown.

3
src/net/torvald/terrarum/CreditSingleton.kt
View File

@@ -337,6 +337,9 @@ Sound from <https://freesound.org/people/richwise>
℗ 2012, 2015 j1987 and ScouseMouseJB ℗ 2012, 2015 j1987 and ScouseMouseJB
Sound from <https://freesound.org/people/j1987> and <https://freesound.org/people/ScouseMouseJB> Sound from <https://freesound.org/people/j1987> and <https://freesound.org/people/ScouseMouseJB>
- effects/accessibility/pickaxe_valuable.ogg
℗ 2009 Benboncan
Sound from <https://freesound.org/people/Benboncan/>
$BULLET Impulse Responses: $BULLET Impulse Responses:

2
src/net/torvald/terrarum/TerrarumAppConfiguration.kt
View File

@@ -69,7 +69,7 @@ basegame
* e.g. 0x02010034 will be translated as 2.1.52 * e.g. 0x02010034 will be translated as 2.1.52
* *
*/ */
const val VERSION_RAW: Long = 0x0000_000004_000002 const val VERSION_RAW: Long = 0x0000_000004_000003
// Commit counts up to the Release 0.3.0: 2259 // Commit counts up to the Release 0.3.0: 2259
// Commit counts up to the Release 0.3.1: 2278 // Commit counts up to the Release 0.3.1: 2278
// Commit counts up to the Release 0.3.2: 2732 // Commit counts up to the Release 0.3.2: 2732

44
src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
View File

@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.audio.MusicContainer
import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
@@ -222,31 +223,44 @@ object PickaxeCore {
const val TOOL_DURABILITY_BASE = 350 // of iron pick const val TOOL_DURABILITY_BASE = 350 // of iron pick
fun showOresTooltip(actor: ActorWithBody, tool: GameItem, mx: Int, my: Int): Unit { fun showOresTooltip(actor: ActorWithBody, tool: GameItem, mx: Int, my: Int): Unit {
if (App.getConfigBoolean("basegame:showpickaxetooltip")) {
val overlayUIopen = (INGAME as? TerrarumIngame)?.uiBlur?.isVisible ?: false val overlayUIopen = (INGAME as? TerrarumIngame)?.uiBlur?.isVisible ?: false
var tooltipSet = false var tooltipSet = false
mouseInInteractableRangeTools(actor, tool) { val tooltipWasShown = tooltipShowing[hash] ?: false
val tileUnderCursor = INGAME.world.getTileFromOre(mx, my).item
val playerCodex = (actor.actorValue.getAsString(AVKey.ORE_DICT) ?: "").split(',').filter { it.isNotBlank() }
mouseInInteractableRangeTools(actor, tool) {
val tileUnderCursor = INGAME.world.getTileFromOre(mx, my).item
val playerCodex = (actor.actorValue.getAsString(AVKey.ORE_DICT) ?: "").split(',').filter { it.isNotBlank() }
if (tileUnderCursor != Block.AIR && !overlayUIopen) { if (tileUnderCursor != Block.AIR && !overlayUIopen) {
val itemForOre = OreCodex[tileUnderCursor].item val itemForOre = OreCodex[tileUnderCursor].item
val tileName = if (playerCodex.binarySearch(itemForOre) >= 0) val tileName = if (playerCodex.binarySearch(itemForOre) >= 0)
Lang[ItemCodex[itemForOre]!!.originalName] Lang[ItemCodex[itemForOre]!!.originalName]
else "???" else "???"
if (App.getConfigBoolean("basegame:showpickaxetooltip")) {
INGAME.setTooltipMessage(tileName) INGAME.setTooltipMessage(tileName)
tooltipShowing[hash] = true tooltipShowing[hash] = true
tooltipSet = true
} }
tooltipSet = true
true // just a placeholder
} }
if (!tooltipSet) tooltipShowing[hash] = false // play sound cue
if (!tooltipWasShown && tooltipSet) {
actor.startAudio(soundCue, 0.7) // TODO play on the GUI track
}
true // just a placeholder
} }
if (App.getConfigBoolean("basegame:showpickaxetooltip") && !tooltipSet) tooltipShowing[hash] = false
}
private val soundCue = MusicContainer(
"pickaxe_sound_cue",
ModMgr.getFile("basegame", "audio/effects/accessibility/pickaxe_valuable.ogg"),
).also {
App.disposables.add(it)
} }
} }