rename counttype to comparisontype

This commit is contained in:
ingmargoudt 2017-04-11 17:01:59 +02:00
parent 60a325c43f
commit 03643d53a3
489 changed files with 1062 additions and 1062 deletions

View file

@ -28,7 +28,7 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.condition.Condition;
import mage.counters.CounterType;
import mage.game.Game;
@ -47,15 +47,15 @@ public class PermanentHasCounterCondition implements Condition {
private CounterType counterType;
private int amount;
private FilterPermanent filter;
private CountType counttype;
private ComparisonType counttype;
private boolean anyPlayer;
public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter) {
this(counterType, amount, filter, CountType.EQUAL_TO);
this(counterType, amount, filter, ComparisonType.EQUAL_TO);
this.anyPlayer = false;
}
public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter, CountType type) {
public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter, ComparisonType type) {
this.counterType = counterType;
this.amount = amount;
this.filter = filter;
@ -63,7 +63,7 @@ public class PermanentHasCounterCondition implements Condition {
this.anyPlayer = false;
}
public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter, CountType type, boolean any) {
public PermanentHasCounterCondition(CounterType counterType, int amount, FilterPermanent filter, ComparisonType type, boolean any) {
this.counterType = counterType;
this.amount = amount;
this.filter = filter;
@ -77,7 +77,7 @@ public class PermanentHasCounterCondition implements Condition {
permanents = game.getBattlefield().getAllActivePermanents(this.filter, game);
}
for (Permanent permanent : permanents) {
if(CountType.compare(permanent.getCounters(game).getCount(this.counterType), counttype, this.amount))
if(ComparisonType.compare(permanent.getCounters(game).getCount(this.counterType), counttype, this.amount))
{
return true;
}