github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

* fixed ControlsPermanentCondition

Browse source
This commit is contained in:
North 2013-07-15 20:25:02 +03:00
parent 1bff2da1eb
commit 7db8f5e37e
2 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ package mage.abilities.condition.common;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.condition.Condition; import mage.abilities.condition.Condition;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game; import mage.game.Game;
/** /**
@ -95,15 +96,18 @@ public class ControlsPermanentCondition implements Condition {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
boolean conditionApplies = false; boolean conditionApplies = false;
FilterPermanent localFilter = filter.copy();
localFilter.add(new ControllerIdPredicate(source.getControllerId()));
switch ( this.type ) { switch ( this.type ) {
case FEWER_THAN: case FEWER_THAN:
conditionApplies = game.getBattlefield().countControlled(filter, source.getSourceId(), source.getControllerId(), game) < this.count; conditionApplies = game.getBattlefield().count(localFilter, source.getSourceId(), source.getControllerId(), game) < this.count;
break; break;
case MORE_THAN: case MORE_THAN:
conditionApplies = game.getBattlefield().countControlled(filter, source.getSourceId(), source.getControllerId(), game) > this.count; conditionApplies = game.getBattlefield().count(localFilter, source.getSourceId(), source.getControllerId(), game) > this.count;
break; break;
case EQUAL_TO: case EQUAL_TO:
conditionApplies = game.getBattlefield().countControlled(filter, source.getSourceId(), source.getControllerId(), game) == this.count; conditionApplies = game.getBattlefield().count(localFilter, source.getSourceId(), source.getControllerId(), game) == this.count;
break; break;
} }

33
Mage/src/mage/game/permanent/Battlefield.java
View file

@ -115,39 +115,6 @@ public class Battlefield implements Serializable {
} }
return count; return count;
} }
/**
* Returns a count of all {@link Permanent} that are within the range of influence of the specified player id
* and is controlled by specified player ,and that match the supplied filter.
*
* @param filter
* @param sourceId
* @param sourcePlayerId
* @param game
* @return count
*/
public int countControlled(FilterPermanent filter, UUID sourceId, UUID sourcePlayerId, Game game) {
int count = 0;
if (game.getRangeOfInfluence() == RangeOfInfluence.ALL) {
for (Permanent permanent: field.values()) {
if (filter.match(permanent, sourceId, sourcePlayerId, game)
&& permanent.getControllerId().equals(sourcePlayerId)) {
count++;
}
}
}
else {
Set<UUID> range = game.getPlayer(sourcePlayerId).getInRange();
for (Permanent permanent: field.values()) {
if (range.contains(permanent.getControllerId())
&& filter.match(permanent, sourceId, sourcePlayerId, game)
&& permanent.getControllerId().equals(sourcePlayerId)) {
count++;
}
}
}
return count;
}
/** /**
* Returns true if the battlefield contains at least 1 {@link Permanent} * Returns true if the battlefield contains at least 1 {@link Permanent}