konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.0.2: blacksmith sfx now pause if music is paused in BG

Browse Source
This commit is contained in:
Evan Debenham
2025-03-17 14:45:40 -04:00
parent 434c467ac1
commit 6b61425cd8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SPD-classes/src/main/java/com/watabou/noosa/audio/Music.java
View File

@@ -234,6 +234,10 @@ public enum Music {
} }
private boolean paused = false; private boolean paused = false;
public synchronized boolean paused(){
return paused;
}
public synchronized void pause() { public synchronized void pause() {
paused = true; paused = true;

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java
View File

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.watabou.noosa.TextureFilm; import com.watabou.noosa.TextureFilm;
import com.watabou.noosa.audio.Music;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.watabou.noosa.particles.Emitter; import com.watabou.noosa.particles.Emitter;
@@ -77,8 +78,10 @@ public class BlacksmithSprite extends MobSprite {
if (visible && emitter != null && anim == idle) { if (visible && emitter != null && anim == idle) {
emitter.burst( Speck.factory( Speck.FORGE ), 3 ); emitter.burst( Speck.factory( Speck.FORGE ), 3 );
float volume = 0.2f / (Dungeon.level.distance( ch.pos, Dungeon.hero.pos )); if (!Music.INSTANCE.paused()) {
Sample.INSTANCE.play( Assets.Sounds.EVOKE, volume, volume, 0.8f ); float volume = 0.2f / (Dungeon.level.distance(ch.pos, Dungeon.hero.pos));
Sample.INSTANCE.play(Assets.Sounds.EVOKE, volume, volume, 0.8f);
}
} }
} }