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

- Currently no card has keyword "CARDNAME can't have -1/-1 counters placed on it.", replaced with canHaveCountersPlacedOnIt

Browse Source
This commit is contained in:
swordshine
2013-04-01 00:27:38 +00:00
parent 6a317ab62c
commit d1cb0b3aa1
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/card/ability/ai/CountersPutAi.java
View File

@@ -49,8 +49,7 @@ public class CountersPutAi extends SpellAbilityAi {
list = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() { list = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return c.canBeTargetedBy(sa) && !c.hasKeyword("CARDNAME can't have counters placed on it.") return c.canBeTargetedBy(sa) && c.canHaveCountersPlacedOnIt(CounterType.valueOf(type));
&& !(c.hasKeyword("CARDNAME can't have -1/-1 counters placed on it.") && type.equals("M1M1"));
} }
}); });

6
src/main/java/forge/card/cost/CostPutCounter.java
View File

@@ -193,11 +193,7 @@ public class CostPutCounter extends CostPartWithList {
final Player activator = ability.getActivatingPlayer(); final Player activator = ability.getActivatingPlayer();
final Card source = ability.getSourceCard(); final Card source = ability.getSourceCard();
if (this.payCostFromSource()) { if (this.payCostFromSource()) {
if (source.hasKeyword("CARDNAME can't have counters placed on it.")) { if (!source.canHaveCountersPlacedOnIt(this.counter)) {
return false;
}
if (source.hasKeyword("CARDNAME can't have -1/-1 counters placed on it.")
&& this.counter.equals(CounterType.M1M1)) {
return false; return false;
} }
} else { } else {