github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3116 from spjspj/master

Browse source 
Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString'
This commit is contained in:
spjspj 2017-04-16 22:04:44 +10:00 committed by GitHub
commit 9c487b7310
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/p/PyramidOfThePantheon.java
View file

@ -61,7 +61,7 @@ public class PyramidOfThePantheon extends CardImpl {
this.addAbility(new ActivateIfConditionManaAbility(Zone.BATTLEFIELD, this.addAbility(new ActivateIfConditionManaAbility(Zone.BATTLEFIELD,
new AddManaOfAnyColorEffect(3), new AddManaOfAnyColorEffect(3),
new TapSourceCost(), new TapSourceCost(),
new SourceHasCounterCondition(CounterType.BRICK, 1))); new SourceHasCounterCondition(CounterType.BRICK, 3)));
} }
public PyramidOfThePantheon(final PyramidOfThePantheon card) { public PyramidOfThePantheon(final PyramidOfThePantheon card) {

18
Mage/src/main/java/mage/abilities/condition/common/SourceHasCounterCondition.java
View file

@ -82,12 +82,26 @@ public class SourceHasCounterCondition implements Condition {
return count >= from; return count >= from;
} }
return count >= from && count <= to; return count >= from && count <= to;
} else { // single compare (lte) } else // single compare (lte)
{
if (card != null) { if (card != null) {
return card.getCounters(game).getCount(counterType) >= amount; return card.getCounters(game).getCount(counterType) >= amount;
} else { } else {
return permanent.getCounters(game).getCount(counterType) >= amount; return permanent.getCounters(game).getCount(counterType) >= amount;
} }
} }
} }
@Override
public String toString() {
if (from != -1) { //range compare
if (to == Integer.MAX_VALUE) {
return "{this} has equal to or more than " + from + " " + this.counterType.toString() + " counters";
}
return "{this} has between " + from + " and " + to + " " + this.counterType.toString() + " counters";
} else // single compare (lte)
{
return "{this} has equal or more than " + amount + " " + this.counterType.toString() + " counters";
}
}
} }