From 373ce84268202bffe6eaecb330ce118e005e3892 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 16 Jun 2013 23:20:04 +0000 Subject: [PATCH] removed specific events that can be generalized by change zone --- .gitattributes | 2 -- .../forge/game/event/GameEventCardDiscarded.java | 10 ---------- .../java/forge/game/event/GameEventDrawCard.java | 10 ---------- .../java/forge/game/event/IGameEventVisitor.java | 4 ---- src/main/java/forge/game/player/Player.java | 8 -------- src/main/java/forge/sound/EventVisualizer.java | 15 ++++++++++----- 6 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/forge/game/event/GameEventCardDiscarded.java delete mode 100644 src/main/java/forge/game/event/GameEventDrawCard.java diff --git a/.gitattributes b/.gitattributes index 98f06325073..4677744cec5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14449,14 +14449,12 @@ src/main/java/forge/game/event/GameEventBlockersDeclared.java -text src/main/java/forge/game/event/GameEventCardChangeZone.java -text src/main/java/forge/game/event/GameEventCardDamaged.java -text src/main/java/forge/game/event/GameEventCardDestroyed.java -text -src/main/java/forge/game/event/GameEventCardDiscarded.java -text src/main/java/forge/game/event/GameEventCardEquipped.java -text src/main/java/forge/game/event/GameEventCardRegenerated.java -text src/main/java/forge/game/event/GameEventCardSacrificed.java -text src/main/java/forge/game/event/GameEventCardTapped.java -text src/main/java/forge/game/event/GameEventCounterAdded.java -text src/main/java/forge/game/event/GameEventCounterRemoved.java -text -src/main/java/forge/game/event/GameEventDrawCard.java -text src/main/java/forge/game/event/GameEventFlipCoin.java -text src/main/java/forge/game/event/GameEventGameFinished.java -text src/main/java/forge/game/event/GameEventGameOutcome.java -text diff --git a/src/main/java/forge/game/event/GameEventCardDiscarded.java b/src/main/java/forge/game/event/GameEventCardDiscarded.java deleted file mode 100644 index 32bb37f792c..00000000000 --- a/src/main/java/forge/game/event/GameEventCardDiscarded.java +++ /dev/null @@ -1,10 +0,0 @@ -package forge.game.event; - -public class GameEventCardDiscarded extends GameEvent { - - @Override - public T visit(IGameEventVisitor visitor) { - return visitor.visit(this); - } - -} diff --git a/src/main/java/forge/game/event/GameEventDrawCard.java b/src/main/java/forge/game/event/GameEventDrawCard.java deleted file mode 100644 index 2d3b8b3e9e1..00000000000 --- a/src/main/java/forge/game/event/GameEventDrawCard.java +++ /dev/null @@ -1,10 +0,0 @@ -package forge.game.event; - -public class GameEventDrawCard extends GameEvent { - - - @Override - public T visit(IGameEventVisitor visitor) { - return visitor.visit(this); - } -} diff --git a/src/main/java/forge/game/event/IGameEventVisitor.java b/src/main/java/forge/game/event/IGameEventVisitor.java index 43f9d2fb853..2addcd0cee5 100644 --- a/src/main/java/forge/game/event/IGameEventVisitor.java +++ b/src/main/java/forge/game/event/IGameEventVisitor.java @@ -10,7 +10,6 @@ public interface IGameEventVisitor { T visit(GameEventBlockerAssigned event); T visit(GameEventCardDamaged event); T visit(GameEventCardDestroyed event); - T visit(GameEventCardDiscarded event); T visit(GameEventCardEquipped event); T visit(GameEventCardChangeZone event); T visit(GameEventCardRegenerated event); @@ -19,7 +18,6 @@ public interface IGameEventVisitor { T visit(GameEventCardTapped event); T visit(GameEventCounterAdded event); T visit(GameEventCounterRemoved event); - T visit(GameEventDrawCard event); T visit(GameEventGameFinished event); T visit(GameEventGameOutcome event); T visit(GameEventFlipCoin event); @@ -50,7 +48,6 @@ public interface IGameEventVisitor { public T visit(GameEventBlockerAssigned event) { return null; } public T visit(GameEventCardDamaged event) { return null; } public T visit(GameEventCardDestroyed event) { return null; } - public T visit(GameEventCardDiscarded event) { return null; } public T visit(GameEventCardEquipped event) { return null; } public T visit(GameEventCardChangeZone event) { return null; } public T visit(GameEventCardRegenerated event) { return null; } @@ -59,7 +56,6 @@ public interface IGameEventVisitor { public T visit(GameEventCardTapped event) { return null; } public T visit(GameEventCounterAdded event) { return null; } public T visit(GameEventCounterRemoved event) { return null; } - public T visit(GameEventDrawCard event) { return null; } public T visit(GameEventGameFinished event) { return null; } public T visit(GameEventGameOutcome event) { return null; } public T visit(GameEventFlipCoin event) { return null; } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 36789e2abfd..2887acaa56c 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -56,8 +56,6 @@ import forge.game.GameActionUtil; import forge.game.Game; import forge.game.GameAge; import forge.game.GlobalRuleChange; -import forge.game.event.GameEventCardDiscarded; -import forge.game.event.GameEventDrawCard; import forge.game.event.GameEventLandPlayed; import forge.game.event.GameEventLifeLoss; import forge.game.event.GameEventMulligan; @@ -1262,10 +1260,6 @@ public class Player extends GameEntity implements Comparable { drawn.addAll(this.doDraw()); } - - // Play the Draw sound - game.fireEvent(new GameEventDrawCard()); - return drawn; } @@ -1604,13 +1598,11 @@ public class Player extends GameEntity implements Comparable { if (discardToTopOfLibrary) { game.getAction().moveToLibrary(c, 0); // Play the Discard sound - game.fireEvent(new GameEventCardDiscarded()); this.numDiscardedThisTurn++; } else { game.getAction().moveToGraveyard(c); // Play the Discard sound - game.fireEvent(new GameEventCardDiscarded()); this.numDiscardedThisTurn++; } diff --git a/src/main/java/forge/sound/EventVisualizer.java b/src/main/java/forge/sound/EventVisualizer.java index d59c4b04f9c..cbd228aa644 100644 --- a/src/main/java/forge/sound/EventVisualizer.java +++ b/src/main/java/forge/sound/EventVisualizer.java @@ -7,13 +7,11 @@ import forge.game.event.GameEventBlockerAssigned; import forge.game.event.GameEventCardChangeZone; import forge.game.event.GameEventCardDamaged; import forge.game.event.GameEventCardDestroyed; -import forge.game.event.GameEventCardDiscarded; import forge.game.event.GameEventCardEquipped; import forge.game.event.GameEventCardRegenerated; import forge.game.event.GameEventCardSacrificed; import forge.game.event.GameEventCounterAdded; import forge.game.event.GameEventCounterRemoved; -import forge.game.event.GameEventDrawCard; import forge.game.event.GameEventGameOutcome; import forge.game.event.GameEventTurnEnded; import forge.game.event.GameEvent; @@ -38,14 +36,21 @@ public class EventVisualizer extends IGameEventVisitor.Base { public SoundEffectType visit(GameEventBlockerAssigned event) { return SoundEffectType.Block; } public SoundEffectType visit(GameEventCardDamaged event) { return SoundEffectType.Damage; } public SoundEffectType visit(GameEventCardDestroyed event) { return SoundEffectType.Destroy; } - public SoundEffectType visit(GameEventCardDiscarded event) { return SoundEffectType.Discard; } public SoundEffectType visit(GameEventCardEquipped event) { return SoundEffectType.Equip; } - public SoundEffectType visit(GameEventCardChangeZone event) { return event.to.getZoneType() == ZoneType.Exile ? SoundEffectType.Exile : null; } + public SoundEffectType visit(GameEventCardChangeZone event) { + ZoneType from = event.from.getZoneType(); + ZoneType to = event.to.getZoneType(); + if( from == ZoneType.Library && to == ZoneType.Hand) + return SoundEffectType.Draw; + if( from == ZoneType.Hand && (to == ZoneType.Graveyard || to == ZoneType.Library) ) + return SoundEffectType.Discard; + + return to == ZoneType.Exile ? SoundEffectType.Exile : null; + } public SoundEffectType visit(GameEventCardRegenerated event) { return SoundEffectType.Regen; } public SoundEffectType visit(GameEventCardSacrificed event) { return SoundEffectType.Sacrifice; } public SoundEffectType visit(GameEventCounterAdded event) { return event.Amount > 0 ? SoundEffectType.AddCounter : null; } public SoundEffectType visit(GameEventCounterRemoved event) { return event.Amount > 0 ? SoundEffectType.RemoveCounter : null; } - public SoundEffectType visit(GameEventDrawCard event) { return SoundEffectType.Draw; } public SoundEffectType visit(GameEventTurnEnded event) { return SoundEffectType.EndOfTurn; } public SoundEffectType visit(GameEventFlipCoin event) { return SoundEffectType.FlipCoin; } public SoundEffectType visit(GameEventLifeLoss event) { return SoundEffectType.LifeLoss; }