From 816c5bb04032da2483352286dcea003e8210eca2 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 4 Jul 2013 06:37:52 +0000 Subject: [PATCH] - Sound System: fixed the "life loss" sound playing when the player gains life. - Sound System: added a separate sound (linked to the file "life_gain.wav") for when the player gains life. --- src/main/java/forge/sound/EventVisualizer.java | 2 +- src/main/java/forge/sound/SoundEffectType.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/sound/EventVisualizer.java b/src/main/java/forge/sound/EventVisualizer.java index ce42fe7365a..cf09d4ef743 100644 --- a/src/main/java/forge/sound/EventVisualizer.java +++ b/src/main/java/forge/sound/EventVisualizer.java @@ -48,7 +48,7 @@ public class EventVisualizer extends IGameEventVisitor.Base { public SoundEffectType visit(GameEventCardCounters event) { return event.newValue > event.oldValue ? SoundEffectType.AddCounter : event.newValue < event.oldValue ? SoundEffectType.RemoveCounter : null; } public SoundEffectType visit(GameEventTurnEnded event) { return SoundEffectType.EndOfTurn; } public SoundEffectType visit(GameEventFlipCoin event) { return SoundEffectType.FlipCoin; } - public SoundEffectType visit(GameEventPlayerLivesChanged event) { return SoundEffectType.LifeLoss; } + public SoundEffectType visit(GameEventPlayerLivesChanged event) { return event.newLives < event.oldLives ? SoundEffectType.LifeLoss : SoundEffectType.LifeGain; } public SoundEffectType visit(GameEventPlayerPoisoned event) { return SoundEffectType.Poison; } public SoundEffectType visit(GameEventShuffle event) { return SoundEffectType.Shuffle; } public SoundEffectType visit(GameEventTokenCreated event) { return SoundEffectType.Token; } diff --git a/src/main/java/forge/sound/SoundEffectType.java b/src/main/java/forge/sound/SoundEffectType.java index 016e95ec049..559c297ae3d 100644 --- a/src/main/java/forge/sound/SoundEffectType.java +++ b/src/main/java/forge/sound/SoundEffectType.java @@ -54,6 +54,7 @@ public enum SoundEffectType { FlipCoin("flip_coin.wav", false), GreenLand("green_land.wav", false), Instant("instant.wav", false), + LifeGain("life_gain.wav", true), LifeLoss("life_loss.wav", true), LoseDuel("lose_duel.wav", false), ManaBurn("mana_burn.wav", false),