diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index a69da8761d8..2f968dc0dc8 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1257,6 +1257,12 @@ public class Card extends GameEntity implements Comparable { Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, runParams); } + + // play the Add Counter sound + if (n > 0) { + Sounds.AddCounter.play(); + } + this.updateObservers(); } @@ -1290,6 +1296,11 @@ public class Card extends GameEntity implements Comparable { Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, runParams); } + // play the Add Counter sound + if (n > 0) { + Sounds.AddCounter.play(); + } + this.updateObservers(); } @@ -1360,6 +1371,12 @@ public class Card extends GameEntity implements Comparable { } } } + + // Play the Subtract Counter sound + if (n > 0) { + Sounds.RemoveCounter.play(); + } + this.updateObservers(); } } @@ -3855,6 +3872,9 @@ public class Card extends GameEntity implements Comparable { this.addEquipping(c); c.addEquippedBy(this); this.equip(); + + // Play the Equip sound + Sounds.Equip.play(); } /** diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 89f80ac1eee..999468c86ba 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1256,6 +1256,9 @@ public class GameAction { Singletons.getModel().getGame().getAction().moveToGraveyard(c); } + // Play the Destroy sound + Sounds.Destroy.play(); + final ArrayList types = c.getType(); for (final String type : types) { if (!CardUtil.isAPlaneswalkerType(type)) { @@ -1298,6 +1301,9 @@ public class GameAction { for (int i = 0; i < b.size(); i++) { Singletons.getModel().getGame().getAction().sacrificeDestroy(b.get(i)); } + + // Play the Destroy sound + Sounds.Destroy.play(); } } } // destroyLegendaryCreatures() @@ -1325,6 +1331,9 @@ public class GameAction { } this.sacrificeDestroy(c); + // Play the Sacrifice sound + Sounds.Sacrifice.play(); + // Run triggers final HashMap runParams = new HashMap(); runParams.put("Card", c); @@ -1376,6 +1385,8 @@ public class GameAction { GameAction.this.destroy(crd); card.setDamage(0); + // Play the Destroy sound + Sounds.Destroy.play(); } }; @@ -1388,6 +1399,9 @@ public class GameAction { } } // totem armor + // Play the Destroy sound + Sounds.Destroy.play(); + return this.sacrificeDestroy(c); } @@ -1533,6 +1547,10 @@ public class GameAction { c.tap(); c.addRegeneratedThisTurn(); game.getCombat().removeFromCombat(c); + + // Play the Regen sound + Sounds.Regen.play(); + return false; } @@ -1561,10 +1579,17 @@ public class GameAction { c.setDamage(0); this.destroy(crd); System.out.println("Totem armor destroyed instead of original card"); + + // Play the Destroy sound + Sounds.Destroy.play(); + return false; } } // totem armor + // Play the Destroy sound + Sounds.Destroy.play(); + return this.sacrificeDestroy(c); }