external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
ManaBurn sound working again + Edition files for Mythic Edition of Guild of Ravnica and Ravnica Allegiance

See merge request core-developers/forge!1437
This commit is contained in:
Michael Kamensky
2019-03-04 03:22:56 +00:00
parent fc987a81a0 df55bc5d34
commit 940cd71d34
8 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -375,6 +375,11 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
return processPlayer(event.player, livesUpdate);
}
@Override
public Void visit(GameEventManaBurn event) {
return processPlayer(event.player, livesUpdate);
}
@Override
public Void visit(final GameEventPlayerPoisoned event) {
return processPlayer(event.receiver, livesUpdate);

3
forge-gui/src/main/java/forge/sound/EventVisualizer.java
View File

@@ -22,6 +22,7 @@ import forge.game.event.GameEventCardTapped;
import forge.game.event.GameEventFlipCoin;
import forge.game.event.GameEventGameOutcome;
import forge.game.event.GameEventLandPlayed;
import forge.game.event.GameEventManaBurn;
import forge.game.event.GameEventPlayerLivesChanged;
import forge.game.event.GameEventPlayerPoisoned;
import forge.game.event.GameEventShuffle;
@@ -76,6 +77,8 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
@Override
public SoundEffectType visit(final GameEventPlayerLivesChanged event) { return event.newLives < event.oldLives ? SoundEffectType.LifeLoss : SoundEffectType.LifeGain; }
@Override
public SoundEffectType visit(final GameEventManaBurn event) { return SoundEffectType.ManaBurn; }
@Override
public SoundEffectType visit(final GameEventPlayerPoisoned event) { return SoundEffectType.Poison; }
@Override
public SoundEffectType visit(final GameEventShuffle event) { return SoundEffectType.Shuffle; }