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

DiscardEffect: don't reveal to all if effect is just look

Browse Source
This commit is contained in:
tool4EvEr
2022-02-18 22:38:34 +01:00
parent d1210d46c1
commit 2886711f4e
8 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
View File

@@ -238,7 +238,7 @@ public class DiscardEffect extends SpellAbilityEffect {
if (toBeDiscarded.size() > 1) {
toBeDiscarded = GameActionUtil.orderCardsByTheirOwners(game, toBeDiscarded, ZoneType.Graveyard, sa);
}
} else if (mode.equals("RevealYouChoose") || mode.equals("RevealTgtChoose") || mode.equals("TgtChoose")) {
} else if (mode.endsWith("YouChoose") || mode.endsWith("TgtChoose")) {
CardCollectionView dPHand = p.getCardsIn(ZoneType.Hand);
dPHand = CardLists.filter(dPHand, Presets.NON_TOKEN);
if (dPHand.isEmpty())
@@ -253,15 +253,18 @@ public class DiscardEffect extends SpellAbilityEffect {
CardCollection validCards = CardLists.getValidCards(dPHand, valid, source.getController(), source, sa);
Player chooser = p;
if (mode.equals("RevealYouChoose")) {
if (mode.endsWith("YouChoose")) {
chooser = source.getController();
} else if (mode.equals("RevealTgtChoose")) {
} else if (mode.endsWith("TgtChoose")) {
chooser = firstTarget;
}
if (mode.startsWith("Reveal") && p != chooser) {
if (mode.startsWith("Reveal")) {
game.getAction().reveal(dPHand, p);
}
if (mode.startsWith("Look")) {
game.getAction().revealTo(dPHand, chooser);
}
if (!p.canDiscardBy(sa, true)) {
continue;
@@ -276,7 +279,7 @@ public class DiscardEffect extends SpellAbilityEffect {
toBeDiscarded = GameActionUtil.orderCardsByTheirOwners(game, toBeDiscarded, ZoneType.Graveyard, sa);
}
if (mode.startsWith("Reveal") ) {
if (mode.startsWith("Reveal") && p != chooser) {
p.getController().reveal(toBeDiscarded, ZoneType.Hand, p, Localizer.getInstance().getMessage("lblPlayerHasChosenCardsFrom", chooser.getName()));
}
}