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

- Momir Avatar was completely broken

Browse Source
This commit is contained in:
Sol
2013-05-11 04:02:59 +00:00
parent 5d157fafbf
commit ee0f3e04dc
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java
View File

@@ -13,7 +13,9 @@ import com.google.common.collect.Lists;
import forge.Card;
import forge.CardLists;
import forge.CardPredicates.Presets;
import forge.card.CardRules;
import forge.card.CardRulesPredicates;
import forge.card.ability.AbilityUtils;
import forge.card.ability.SpellAbilityEffect;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
@@ -23,6 +25,8 @@ import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
import forge.item.CardDb;
import forge.item.CardPrinted;
import forge.util.Aggregates;
import forge.util.ComparableOp;
public class ChooseCardNameEffect extends SpellAbilityEffect {
@@ -56,8 +60,23 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
if ((tgt == null) || p.canBeTargetedBy(sa)) {
boolean ok = false;
while (!ok) {
if (p.isHuman()) {
if (sa.hasParam("AtRandom")) {
// Currently only used for Momir Avatar, if something else gets added here, make it more generic
Predicate<CardRules> baseRule = CardRulesPredicates.Presets.IS_CREATURE;
String numericAmount = "X";
final int validAmount = StringUtils.isNumeric(numericAmount) ? Integer.parseInt(numericAmount) :
AbilityUtils.calculateAmount(host, numericAmount, sa);
Predicate<CardRules> additionalRule = CardRulesPredicates.cmc(ComparableOp.EQUALS, validAmount);
List<CardPrinted> cards = Lists.newArrayList(CardDb.instance().getUniqueCards());
Predicate<CardPrinted> cpp = Predicates.and(Predicates.compose(baseRule, CardPrinted.FN_GET_RULES),
Predicates.compose(additionalRule, CardPrinted.FN_GET_RULES));
cards = Lists.newArrayList(Iterables.filter(cards, cpp));
host.setNamedCard(Aggregates.random(cards).getName());
ok = true;
} else if (p.isHuman()) {
final String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card.";
List<CardPrinted> cards = Lists.newArrayList(CardDb.instance().getUniqueCards());

15
src/main/java/forge/card/ability/effects/CopyPermanentEffect.java
View File

@@ -96,12 +96,21 @@ public class CopyPermanentEffect extends SpellAbilityEffect {
}
tgtCards = choice;
} else if (sa.hasParam("DefinedName")) {
final String name = sa.getParam("DefinedName");
String name = sa.getParam("DefinedName");
if (name.equals("NamedCard")) {
if (!hostCard.getNamedCard().isEmpty()) {
name = hostCard.getNamedCard();
}
}
Predicate<CardPrinted> cpp = Predicates.compose(CardRulesPredicates.name(StringOp.EQUALS, name), CardPrinted.FN_GET_RULES);
cards = Lists.newArrayList(Iterables.filter(cards, cpp));
Card c = cards.get(0).getMatchingForgeCard();
tgtCards.clear();
tgtCards.add(c);
if (!cards.isEmpty()) {
Card c = cards.get(0).getMatchingForgeCard();
tgtCards.add(c);
}
}
}