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

Added AFR RollDice cards and Temple of the Dragon Queen

Browse Source
This commit is contained in:
Alumi
2021-07-11 04:01:53 +00:00
committed by Michael Kamensky
parent 3dd44ba71a
commit 4fe67ccb8c
13 changed files with 136 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,13 +25,14 @@ public class RevealEffect extends SpellAbilityEffect {
final Card host = sa.getHostCard();
final Game game = host.getGame();
final boolean anyNumber = sa.hasParam("AnyNumber");
final boolean optional = sa.hasParam("Optional");
int cnt = sa.hasParam("NumCards") ? AbilityUtils.calculateAmount(host, sa.getParam("NumCards"), sa) : 1;
for (final Player p : getTargetPlayers(sa)) {
if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) {
final CardCollectionView cardsInHand = p.getZone(ZoneType.Hand).getCards();
if (cardsInHand.isEmpty()) {
continue;
continue;
}
final CardCollection revealed = new CardCollection();
if (sa.hasParam("Random")) {
@@ -46,7 +47,7 @@ public class RevealEffect extends SpellAbilityEffect {
} else {
revealed.add(Aggregates.random(cardsInHand));
}
} else if (sa.hasParam("RevealDefined")) {
revealed.addAll(AbilityUtils.getDefinedCards(host, sa.getParam("RevealDefined"), sa));
} else {
@@ -55,10 +56,10 @@ public class RevealEffect extends SpellAbilityEffect {
if (sa.hasParam("RevealValid")) {
valid = CardLists.getValidCards(valid, sa.getParam("RevealValid"), p, host, sa);
}
if (valid.isEmpty())
continue;
if (cnt > valid.size())
cnt = valid.size();
@@ -66,8 +67,10 @@ public class RevealEffect extends SpellAbilityEffect {
if (anyNumber) {
cnt = valid.size();
min = 0;
} else if (optional) {
min = 0;
}
revealed.addAll(p.getController().chooseCardsToRevealFromHand(min, cnt, valid));
}