- Added 5 cards

This commit is contained in:
swordshine
2013-02-25 00:30:56 +00:00
parent 0b92d9e12f
commit 294a302d20
8 changed files with 94 additions and 0 deletions

View File

@@ -7,6 +7,7 @@ import javax.swing.JOptionPane;
import forge.Card;
import forge.CardLists;
import forge.CardUtil;
import forge.Command;
import forge.Singletons;
import forge.card.ability.AbilityUtils;
@@ -60,6 +61,12 @@ public class ProtectAllEffect extends SpellAbilityEffect {
for (final String color : host.getChosenColor()) {
gains.add(color.toLowerCase());
}
} else if (sa.getParam("Gains").equals("TargetedCardColor")) {
for (final Card c : sa.getSATargetingCard().getTarget().getTargetCards()) {
for(final String color : CardUtil.getColors(c)) {
gains.add(color.toLowerCase());
}
}
} else {
gains.addAll(choices);
}

View File

@@ -2478,6 +2478,21 @@ public class CardFactoryUtil {
}
return CardFactoryUtil.doXMath(cCount, m, c);
}
// Count$BushidoPoint
if (sq[0].contains("BushidoPoint")) {
final ArrayList<String> keywords = c.getKeyword();
int magnitude = 0;
for (final String kw : keywords) {
if (kw.contains("Bushido")) {
final String[] parse = kw.split(" ");
final String num = parse[1];
magnitude += Integer.parseInt(num);
}
}
return CardFactoryUtil.doXMath(magnitude, m, c);
}
// Count$TimesKicked
if (sq[0].contains("TimesKicked")) {
return CardFactoryUtil.doXMath(c.getMultiKickerMagnitude(), m, c);