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

ChooseCardNameEffect support AtRandom with ValidCards and ManaCost=Imprinted

Browse Source
This commit is contained in:
Northmoc
2022-01-10 00:22:43 -05:00
parent 487cd79522
commit 343bf1e4d9
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
View File

@@ -1,13 +1,12 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.StaticData; import forge.StaticData;
import forge.card.CardFacePredicates; import forge.card.CardFacePredicates;
import forge.card.CardRules; import forge.card.CardRules;
@@ -147,14 +146,24 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
Predicate<ICardFace> cpp = Predicates.alwaysTrue(); Predicate<ICardFace> cpp = Predicates.alwaysTrue();
if (sa.hasParam("ValidCards")) { if (sa.hasParam("ValidCards")) {
//Calculating/replacing this must happen before running valid in CardFacePredicates //Calculating/replacing this must happen before running valid in CardFacePredicates
if (valid.contains("ManaCost=Equipped")) { if (valid.contains("ManaCost=")) {
String s = host.getEquipping().getManaCost().getShortString(); if (valid.contains("ManaCost=Equipped")) {
valid = valid.replace("=Equipped", s); String s = host.getEquipping().getManaCost().getShortString();
valid = valid.replace("=Equipped", s);
} else if (valid.contains("ManaCost=Imprinted")) {
String s = host.getImprintedCards().getFirst().getManaCost().getShortString();
valid = valid.replace("=Imprinted", s);
}
} }
cpp = CardFacePredicates.valid(valid); cpp = CardFacePredicates.valid(valid);
} }
if (randomChoice) {
chosen = p.getController().chooseCardName(sa, cpp, valid, message); final Iterable<ICardFace> cardsFromDb = StaticData.instance().getCommonCards().getAllFaces();
final List<ICardFace> cards = Lists.newArrayList(Iterables.filter(cardsFromDb, cpp));
chosen = Aggregates.random(cards).getName();
} else {
chosen = p.getController().chooseCardName(sa, cpp, valid, message);
}
} }
host.setNamedCard(chosen); host.setNamedCard(chosen);