diff --git a/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt b/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt index ddc19eea6..7655d401b 100644 --- a/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt +++ b/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt @@ -93,6 +93,7 @@ class MixerTrackProcessor(val bufferSize: Int, val rate: Int, val track: Terraru // fetch deviceBufferSize amount of sample from the disk if (track.trackType != TrackType.MASTER && track.trackType != TrackType.BUS && track.streamPlaying) { streamBuf.fetchBytes { + // FIXME THIS IS NOT THREAD SAFE: trying to play different audio too fast too much, shits happen val bytesRead = track.currentTrack?.gdxMusic?.forceInvoke("read", arrayOf(it)) if (bytesRead == null || bytesRead <= 0) { // some class (namely Mp3) may return 0 instead of negative value // printdbg("Finished reading audio stream") diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 4e86b13ca..088f4a840 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -2028,8 +2028,8 @@ open class ActorWithBody : Actor { val feetTiles = getFeetTiles() if (collisionDamage > 1.0 / 1024.0) { - printdbg(this, "Collision damage: $collisionDamage N, count: $particleCount, velocity: $vecSum, mass: ${this.mass}") - printdbg(this, "feetTileCount = ${feetTiles.size}") +// printdbg(this, "Collision damage: $collisionDamage N, count: $particleCount, velocity: $vecSum, mass: ${this.mass}") +// printdbg(this, "feetTileCount = ${feetTiles.size}") val feetTileIndices = (feetTiles.indices).toList().toIntArray() for (i in 0 until trueParticleCount) { @@ -2057,7 +2057,7 @@ open class ActorWithBody : Actor { Terrarum.audioCodex.getRandomFootstep(mat)?.let { val vol = volumeMax * (cnt / feetTileCnt) startAudio(it, vol) - printdbg(this, "Playing footstep $mat (vol: $vol, file: ${it.file.name}, cd: $collisionDamage)") +// printdbg(this, "Playing footstep $mat (vol: $vol, file: ${it.file.name}, cd: $collisionDamage)") } } } diff --git a/src/net/torvald/terrarum/itemproperties/Calculate.kt b/src/net/torvald/terrarum/itemproperties/Calculate.kt index 0e8d23158..c1e6f43d2 100644 --- a/src/net/torvald/terrarum/itemproperties/Calculate.kt +++ b/src/net/torvald/terrarum/itemproperties/Calculate.kt @@ -22,11 +22,11 @@ object Calculate { * TODO Newtons as unit? */ @JvmStatic fun pickaxePower(actor: ActorWithBody, material: Material?): Float { - return (4.0 * (material?.forceMod?.toDouble() ?: 0.0) * (actor.avStrength / 1000.0)).toFloat() + return (4.0 * (material?.forceMod?.toDouble() ?: 0.15) * (actor.avStrength / 1000.0)).toFloat() } @JvmStatic fun hatchetPower(actor: ActorWithBody, material: Material?): Float { - return (1.0 * (material?.forceMod?.toDouble() ?: 0.0) * (actor.avStrength / 1000.0)).toFloat() + return (1.0 * (material?.forceMod?.toDouble() ?: 0.15) * (actor.avStrength / 1000.0)).toFloat() } private val fallDamageDampenMult = (32.0 / 1176.0).sqr()