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

Reveal cards to human player and add game log when the cards from Command Zone moves to Player's hand.

Browse Source 
closes issue #1550
This commit is contained in:
Anthony Calosa
2020-10-22 11:26:55 +08:00
parent 4b318bda5a
commit fcb76f341b
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -10,6 +10,7 @@ import forge.GameCommand;
import forge.card.CardStateName; import forge.card.CardStateName;
import forge.game.Game; import forge.game.Game;
import forge.game.GameEntity; import forge.game.GameEntity;
import forge.game.GameLogEntryType;
import forge.game.GameObject; import forge.game.GameObject;
import forge.game.ability.AbilityKey; import forge.game.ability.AbilityKey;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -431,6 +432,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final Player player = sa.getActivatingPlayer(); final Player player = sa.getActivatingPlayer();
final Card hostCard = sa.getHostCard(); final Card hostCard = sa.getHostCard();
final Game game = player.getGame(); final Game game = player.getGame();
final List<Card> commandCards = Lists.newArrayList();
ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination")); ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
final List<ZoneType> origin = Lists.newArrayList(); final List<ZoneType> origin = Lists.newArrayList();
@@ -664,6 +666,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
tgtC.setExiledWith(host); tgtC.setExiledWith(host);
} }
movedCard = game.getAction().moveTo(destination, tgtC, sa); movedCard = game.getAction().moveTo(destination, tgtC, sa);
if (ZoneType.Hand.equals(destination) && ZoneType.Command.equals(originZone.getZoneType())) {
StringBuilder sb = new StringBuilder();
sb.append(movedCard.getName()).append(" has moved from Command Zone to ").append(player).append("'s hand.");
game.getGameLog().add(GameLogEntryType.ZONE_CHANGE, sb.toString());
commandCards.add(movedCard); //add to list to reveal the commandzone cards
}
// If a card is Exiled from the stack, remove its spells from the stack // If a card is Exiled from the stack, remove its spells from the stack
if (sa.hasParam("Fizzle")) { if (sa.hasParam("Fizzle")) {
if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand) if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand)
@@ -709,6 +717,15 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
} }
//reveal command cards that changes zone from command zone to player's hand
if (!commandCards.isEmpty()) {
for (Player observer : game.getPlayers()){
if(!observer.isAI() && !observer.getController().isAI() && observer != player) {
observer.getController().reveal(new CardCollection(commandCards), player.getZone(ZoneType.Hand).getZoneType(), player, "Revealed cards in ");
}
}
}
triggerList.triggerChangesZoneAll(game); triggerList.triggerChangesZoneAll(game);
// for things like Gaea's Blessing // for things like Gaea's Blessing