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

removed specific events that can be generalized by change zone

Browse Source
This commit is contained in:
Maxmtg
2013-06-16 23:20:04 +00:00
parent 9aff5237ea
commit 373ce84268
6 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -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

10
src/main/java/forge/game/event/GameEventCardDiscarded.java
View File

@@ -1,10 +0,0 @@
package forge.game.event;
public class GameEventCardDiscarded extends GameEvent {
@Override
public <T> T visit(IGameEventVisitor<T> visitor) {
return visitor.visit(this);
}
}

10
src/main/java/forge/game/event/GameEventDrawCard.java
View File

@@ -1,10 +0,0 @@
package forge.game.event;
public class GameEventDrawCard extends GameEvent {
@Override
public <T> T visit(IGameEventVisitor<T> visitor) {
return visitor.visit(this);
}
}

4
src/main/java/forge/game/event/IGameEventVisitor.java
View File

@@ -10,7 +10,6 @@ public interface IGameEventVisitor<T> {
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> {
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<T> {
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<T> {
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; }

8
src/main/java/forge/game/player/Player.java
View File

@@ -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<Player> {
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<Player> {
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++;
}

15
src/main/java/forge/sound/EventVisualizer.java
View File

@@ -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<SoundEffectType> {
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; }