External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

cards now use the new CountType

Browse source
This commit is contained in:
ingmargoudt 2017-03-05 23:29:51 +01:00
parent dd84287305
commit 5387f06898
139 changed files with 325 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/abilities/CountType.java Normal file
View file

@ -0,0 +1,8 @@
package mage.abilities;
/**
* Created by IGOUDT on 5-3-2017.
*/
public enum CountType {
MORE_THAN, FEWER_THAN, EQUAL_TO;
}

4
Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java
View file

@ -29,6 +29,7 @@ package mage.abilities.condition.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.abilities.condition.Condition;
import mage.constants.TargetController;
import mage.game.Game;
@ -44,9 +45,6 @@ import mage.util.CardUtil;
*/
public class CardsInHandCondition implements Condition {
public enum CountType {
MORE_THAN, FEWER_THAN, EQUAL_TO
}
private Condition condition;
private CountType type;

2
Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java
View file

@ -30,6 +30,7 @@ package mage.abilities.condition.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.abilities.condition.Condition;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
@ -44,7 +45,6 @@ import mage.game.Game;
public class OpponentControlsPermanentCondition implements Condition {
public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO }
private FilterPermanent filter;
private CountType type;

5
Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java
View file

@ -28,6 +28,7 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.abilities.condition.Condition;
import mage.counters.CounterType;
import mage.game.Game;
@ -41,9 +42,7 @@ import java.util.List;
*/
public class PermanentHasCounterCondition implements Condition {
public static enum CountType {
MORE_THAN, FEWER_THAN, EQUAL_TO
}
private CounterType counterType;
private int amount;

3
Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java
View file

@ -28,6 +28,7 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.abilities.condition.Condition;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
@ -45,8 +46,6 @@ import mage.game.Game;
*/
public class PermanentsOnTheBattlefieldCondition implements Condition {
public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO }
private FilterPermanent filter;
private Condition condition;
private CountType type;

3
Mage/src/main/java/mage/filter/common/FilterLandPermanent.java
View file

@ -36,7 +36,6 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class FilterLandPermanent extends FilterPermanent {
@ -67,7 +66,7 @@ public class FilterLandPermanent extends FilterPermanent {
filter.add(Predicates.not(new SupertypePredicate("Basic")));
return filter;
}
public FilterLandPermanent(final FilterLandPermanent filter) {
super(filter);
}