mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 03:38:01 +00:00
Activating player is not always the player revealing cards. Added parameter to set number of cards to reveal.
This commit is contained in:
@@ -6,6 +6,7 @@ import java.util.List;
|
||||
import forge.Card;
|
||||
import forge.CardLists;
|
||||
import forge.CardUtil;
|
||||
import forge.card.abilityfactory.AbilityFactory;
|
||||
import forge.card.spellability.SpellAbility;
|
||||
import forge.card.spellability.Target;
|
||||
import forge.game.player.Player;
|
||||
@@ -38,8 +39,13 @@ public class RevealEffect extends RevealEffectBase {
|
||||
if (sa.hasParam("AnyNumber")) {
|
||||
max = valid.size();
|
||||
}
|
||||
revealed.addAll(getRevealedList(sa.getActivatingPlayer(), valid, max, anyNumber));
|
||||
if (sa.getActivatingPlayer().isComputer()) {
|
||||
else if (sa.hasParam("NumCards")) {
|
||||
max = Math.min(valid.size(), AbilityFactory.calculateAmount(sa.getSourceCard(), sa.getParam("NumCards"), sa));
|
||||
}
|
||||
//revealed.addAll(getRevealedList(sa.getActivatingPlayer(), valid, max, anyNumber));
|
||||
revealed.addAll(getRevealedList(p, valid, max, anyNumber));
|
||||
//if (sa.getActivatingPlayer().isComputer()) {
|
||||
if (p.isComputer()) {
|
||||
GuiChoose.oneOrNone("Revealed card(s)", revealed);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user