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

Activating player is not always the player revealing cards. Added parameter to set number of cards to reveal.

Browse Source
This commit is contained in:
ArsenalNut
2013-01-21 05:25:16 +00:00
parent f9da34cbf1
commit 92de6b17f7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/card/abilityfactory/effects/RevealEffect.java
View File

@@ -6,6 +6,7 @@ import java.util.List;
import forge.Card; import forge.Card;
import forge.CardLists; import forge.CardLists;
import forge.CardUtil; import forge.CardUtil;
import forge.card.abilityfactory.AbilityFactory;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.game.player.Player; import forge.game.player.Player;
@@ -38,8 +39,13 @@ public class RevealEffect extends RevealEffectBase {
if (sa.hasParam("AnyNumber")) { if (sa.hasParam("AnyNumber")) {
max = valid.size(); max = valid.size();
} }
revealed.addAll(getRevealedList(sa.getActivatingPlayer(), valid, max, anyNumber)); else if (sa.hasParam("NumCards")) {
if (sa.getActivatingPlayer().isComputer()) { 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); GuiChoose.oneOrNone("Revealed card(s)", revealed);
} }
} }