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

fixed Lumbering Battlement implementation

Browse source
This commit is contained in:
Evan Kranzler 2019-01-13 20:42:03 -05:00
parent d895f6ccc0
commit cfca1e4948
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Mage.Sets/src/mage/cards/l/LumberingBattlement.java
View file

@ -19,7 +19,9 @@ import mage.constants.SubType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.TokenPredicate; import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.ExileZone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -53,8 +55,8 @@ public final class LumberingBattlement extends CardImpl {
// Lumbering Battlement gets +2/+2 for each card exiled with it. // Lumbering Battlement gets +2/+2 for each card exiled with it.
this.addAbility(new SimpleStaticAbility(new BoostSourceEffect( this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(
LumberinBattlementValue.instance, LumberingBattlementValue.instance,
LumberinBattlementValue.instance, LumberingBattlementValue.instance,
Duration.WhileOnBattlefield Duration.WhileOnBattlefield
).setText("{this} gets +2/+2 for each card exiled with it."))); ).setText("{this} gets +2/+2 for each card exiled with it.")));
} }
@ -72,10 +74,11 @@ public final class LumberingBattlement extends CardImpl {
class LumberingBattlementEffect extends OneShotEffect { class LumberingBattlementEffect extends OneShotEffect {
private static final FilterPermanent filter private static final FilterPermanent filter
= new FilterControlledCreaturePermanent("nontoken creatures"); = new FilterControlledCreaturePermanent("other nontoken creatures");
static { static {
filter.add(Predicates.not(TokenPredicate.instance)); filter.add(Predicates.not(TokenPredicate.instance));
filter.add(AnotherPredicate.instance);
} }
LumberingBattlementEffect() { LumberingBattlementEffect() {
@ -119,15 +122,26 @@ class LumberingBattlementEffect extends OneShotEffect {
} }
} }
enum LumberinBattlementValue implements DynamicValue { enum LumberingBattlementValue implements DynamicValue {
instance; instance;
@Override @Override
public int calculate(Game game, Ability sourceAbility, Effect effect) { public int calculate(Game game, Ability sourceAbility, Effect effect) {
if (sourceAbility == null) {
return 0;
}
ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(
game, sourceAbility.getSourceId(),
sourceAbility.getSourceObjectZoneChangeCounter()
));
if (exileZone == null) {
exileZone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, sourceAbility));
}
if (exileZone == null) {
return 0;
}
int counter = 0; int counter = 0;
for (UUID cardId : game.getExile().getExileZone(CardUtil.getExileZoneId( for (UUID cardId : exileZone) {
game, sourceAbility.getSourceId(), sourceAbility.getSourceObjectZoneChangeCounter()
))) {
Card card = game.getCard(cardId); Card card = game.getCard(cardId);
if (card != null) { if (card != null) {
counter++; counter++;