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

Merge branch 'reveal' into 'master'

Browse Source 
allow "Random" and "RevealValid" in same Reveal

See merge request core-developers/forge!5178
This commit is contained in:
Michael Kamensky
2021-08-04 05:08:47 +00:00
parent 048995fb47 39e9434901
commit 2d16490aab
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,16 +36,25 @@ public class RevealEffect extends SpellAbilityEffect {
} }
final CardCollection revealed = new CardCollection(); final CardCollection revealed = new CardCollection();
if (sa.hasParam("Random")) { if (sa.hasParam("Random")) {
CardCollection valid = new CardCollection(cardsInHand);
if (sa.hasParam("RevealValid")) {
valid = CardLists.getValidCards(valid, sa.getParam("RevealValid"), p, host, sa);
}
if (valid.isEmpty())
continue;
if (sa.hasParam("NumCards")) { if (sa.hasParam("NumCards")) {
final int revealnum = Math.min(cardsInHand.size(), cnt); final int revealnum = Math.min(cardsInHand.size(), cnt);
final CardCollection hand = new CardCollection(cardsInHand); final CardCollection hand = new CardCollection(cardsInHand);
for (int i = 0; i < revealnum; i++) { for (int i = 0; i < revealnum; i++) {
final Card random = Aggregates.random(hand); final Card random = Aggregates.random(valid);
revealed.add(random); revealed.add(random);
hand.remove(random); valid.remove(random);
} }
} else { } else {
revealed.add(Aggregates.random(cardsInHand)); revealed.add(Aggregates.random(valid));
} }
} else if (sa.hasParam("RevealDefined")) { } else if (sa.hasParam("RevealDefined")) {