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

* Renamed ControlsPermanentCondition to PermanentsOnTheBattlefieldCondition.

Browse source
This commit is contained in:
LevelX2 2014-10-17 09:31:36 +02:00
parent e20a5f68e6
commit 1b7001798d
107 changed files with 255 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ import mage.game.Game;
*/
public class DefendingPlayerControlsCondition implements Condition {
private FilterPermanent filter;
private final FilterPermanent filter;
public DefendingPlayerControlsCondition(FilterPermanent filter) {
this.filter = filter;

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

@ -36,7 +36,8 @@ import mage.game.Game;
* @author nantuko
*/
public class NoCreatureCondition implements Condition {
private static NoCreatureCondition fInstance = new NoCreatureCondition();
private static final NoCreatureCondition fInstance = new NoCreatureCondition();
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();

10
Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java → Mage/src/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java
View file

@ -43,7 +43,7 @@ import mage.game.Game;
* @author nantuko
* @author maurer.it_at_gmail.com
*/
public class ControlsPermanentCondition implements Condition {
public class PermanentsOnTheBattlefieldCondition implements Condition {
public static enum CountType { MORE_THAN, FEWER_THAN, EQUAL_TO };
private FilterPermanent filter;
@ -59,7 +59,7 @@ public class ControlsPermanentCondition implements Condition {
*
* @param filter
*/
public ControlsPermanentCondition(FilterPermanent filter) {
public PermanentsOnTheBattlefieldCondition(FilterPermanent filter) {
this(filter, CountType.MORE_THAN, 0);
}
@ -72,11 +72,11 @@ public class ControlsPermanentCondition implements Condition {
* @param type
* @param count
*/
public ControlsPermanentCondition ( FilterPermanent filter, CountType type, int count ) {
public PermanentsOnTheBattlefieldCondition ( FilterPermanent filter, CountType type, int count ) {
this(filter, type, count, true);
}
public ControlsPermanentCondition ( FilterPermanent filter, CountType type, int count, boolean onlyControlled ) {
public PermanentsOnTheBattlefieldCondition ( FilterPermanent filter, CountType type, int count, boolean onlyControlled ) {
this.filter = filter;
this.type = type;
this.count = count;
@ -94,7 +94,7 @@ public class ControlsPermanentCondition implements Condition {
* @param count
* @param conditionToDecorate
*/
public ControlsPermanentCondition ( FilterPermanent filter, CountType type, int count, Condition conditionToDecorate ) {
public PermanentsOnTheBattlefieldCondition ( FilterPermanent filter, CountType type, int count, Condition conditionToDecorate ) {
this(filter, type, count);
this.condition = conditionToDecorate;
}

4
Mage/src/mage/abilities/effects/common/continious/BoostSourceWhileControlsEffect.java
View file

@ -33,7 +33,7 @@ import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.abilities.Ability;
import mage.abilities.condition.common.ControlsPermanentCondition;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.effects.WhileConditionContiniousEffect;
import mage.filter.FilterPermanent;
import mage.game.Game;
@ -50,7 +50,7 @@ public class BoostSourceWhileControlsEffect extends WhileConditionContiniousEffe
private final String filterDescription;
public BoostSourceWhileControlsEffect(FilterPermanent filter, int power, int toughness) {
super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, new ControlsPermanentCondition(filter), Outcome.BoostCreature);
super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, new PermanentsOnTheBattlefieldCondition(filter), Outcome.BoostCreature);
this.power = power;
this.toughness = toughness;
this.filterDescription = filter.getMessage();