diff --git a/assets/mods/basegame/particles/bigger_smoke.tga b/assets/mods/basegame/particles/bigger_smoke.tga new file mode 100644 index 000000000..7c45b81c3 --- /dev/null +++ b/assets/mods/basegame/particles/bigger_smoke.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01d2b01c66a19cf4027d11950fb7f0572051a2892d475db665b18a89b337de64 +size 32786 diff --git a/assets/test_texture.tga b/assets/test_texture.tga index 3732624ed..f55519189 100644 --- a/assets/test_texture.tga +++ b/assets/test_texture.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:361bbd2de83878a19f6656511670ff32b0e9d8cb5dbd99d4a6c786de7d092688 -size 1048620 +oid sha256:ee4868d7b57e8e05ad22029039ecdfabce2072be65bf9a2dca8bb52e88be8510 +size 1048594 diff --git a/assets/testimage.png b/assets/testimage.png deleted file mode 100644 index b05ad6153..000000000 Binary files a/assets/testimage.png and /dev/null differ diff --git a/assets/testimage_resized.png b/assets/testimage_resized.png deleted file mode 100644 index 16450df0e..000000000 Binary files a/assets/testimage_resized.png and /dev/null differ diff --git a/src/net/torvald/terrarum/gameparticles/ParticleVanishingTexture.kt b/src/net/torvald/terrarum/gameparticles/ParticleVanishingTexture.kt index 3f763e96d..655603af9 100644 --- a/src/net/torvald/terrarum/gameparticles/ParticleVanishingTexture.kt +++ b/src/net/torvald/terrarum/gameparticles/ParticleVanishingTexture.kt @@ -69,10 +69,9 @@ class ParticleVanishingText(val text: String, x: Double, y: Double, noCollision: * @param x x-coord of the particle's initial spawn position, bottom-centre * @param y y-coord of the particle's initial spawn position, bottom-centre */ -open class ParticleVanishingSprite(val sprite: TextureRegionPack, val delay: Float, x: Double, y: Double, val start: Int = 0, noCollision: Boolean = true) : ParticleBase(Actor.RenderOrder.OVERLAY, false, noCollision, 2f) { +open class ParticleVanishingSprite(val sprite: TextureRegionPack, val delay: Float, val loop: Boolean, x: Double, y: Double, noCollision: Boolean = true, startFrame: Int = 0, val row: Int = 0) : ParticleBase(Actor.RenderOrder.OVERLAY, false, noCollision, 2f) { - private var row = 0 - private var frame = start % sprite.horizontalCount + private var frame = startFrame % sprite.horizontalCount private var frameAdvanceCounter = 0f init { @@ -90,7 +89,11 @@ open class ParticleVanishingSprite(val sprite: TextureRegionPack, val delay: Flo if (frameAdvanceCounter >= delay) { frameAdvanceCounter -= delay - frame = (frame + 1) % sprite.horizontalCount + + if (frame == sprite.horizontalCount - 1 && loop) + frame = 0 + else if (frame != sprite.horizontalCount - 1) + frame += 1 } frameAdvanceCounter += delta } diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt index efdbeeb46..ca32570b8 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt @@ -71,7 +71,7 @@ internal class FixtureTikiTorch : FixtureBase, Luminous { if (spawnTimer >= nextDelay) { (Terrarum.ingame as TerrarumIngame).addParticle(ParticleVanishingSprite( CommonResourcePool.getAsTextureRegionPack("particles-tiki_smoke.tga"), - 0.25f, hitbox.centeredX, hitbox.startY + 5, rng.nextInt(256), false + 0.25f, true, hitbox.centeredX, hitbox.startY, false, rng.nextInt(256) )) spawnTimer -= nextDelay