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

- ORI：Added Alhammaret, High Arbiter

Browse Source
This commit is contained in:
swordshine
2015-06-23 12:33:40 +00:00
parent 05e5966a0d
commit 640ce4a6de
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,18 +4,22 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.StaticData;
import forge.card.CardRules;
import forge.card.CardRulesPredicates;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardLists;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions;
import forge.item.PaperCard;
import forge.util.Aggregates;
import forge.util.ComparableOp;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
@@ -49,6 +53,7 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
}
boolean randomChoice = sa.hasParam("AtRandom");
boolean chooseFromDefined = sa.hasParam("ChooseFromDefinedCards");
for (final Player p : tgtPlayers) {
if ((tgt == null) || p.canBeTargetedBy(sa)) {
String chosen = "";
@@ -72,7 +77,11 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
} else {
chosen = "";
}
} else if (chooseFromDefined) {
CardCollection choices = AbilityUtils.getDefinedCards(host, sa.getParam("ChooseFromDefinedCards"), sa);
choices = CardLists.getValidCards(choices, valid, host.getController(), host);
Card c = p.getController().chooseSingleEntityForEffect(choices, sa, "Choose a card name");
chosen = c != null ? c.getName() : "";
} else {
final String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card.";