Merge branch 'master' into master

This commit is contained in:
tsirides 2019-09-16 16:37:01 +03:00 committed by GitHub
commit 099b64f75a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,19 +2,13 @@ package mage.cards.i;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.SubType;
import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.constants.Zone;
import mage.filter.predicate.mageobject.SubtypePredicate;
import java.util.UUID;
@ -26,12 +20,6 @@ public final class InspiringVeteran extends CardImpl {
private static final FilterCreaturePermanent filter
= new FilterCreaturePermanent(SubType.KNIGHT, "Knights");
static
{
filter.add(new SubtypePredicate(SubType.KNIGHT));
filter.add(new ControllerPredicate(TargetController.YOU));
}
public InspiringVeteran(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}");
@ -41,7 +29,9 @@ public final class InspiringVeteran extends CardImpl {
this.toughness = new MageInt(2);
// Other Knights you control get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
this.addAbility(new SimpleStaticAbility(
new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)
));
}
private InspiringVeteran(final InspiringVeteran card) {
@ -52,4 +42,4 @@ public final class InspiringVeteran extends CardImpl {
public InspiringVeteran copy() {
return new InspiringVeteran(this);
}
}
}