mirror of
https://github.com/correl/mage.git
synced 2025-03-17 01:06:26 -09:00
Merge origin/master
This commit is contained in:
commit
9ad11e653a
4 changed files with 12 additions and 12 deletions
|
@ -20,7 +20,7 @@ import java.util.UUID;
|
||||||
public class BlessedSanctuary extends CardImpl {
|
public class BlessedSanctuary extends CardImpl {
|
||||||
|
|
||||||
private static final FilterPermanent filterYourCreatures = new FilterControlledCreaturePermanent("creatures you control");
|
private static final FilterPermanent filterYourCreatures = new FilterControlledCreaturePermanent("creatures you control");
|
||||||
private static final FilterControlledCreaturePermanent filterNontoken = new FilterControlledCreaturePermanent("nontoken creature");
|
private static final FilterControlledCreaturePermanent filterNontoken = new FilterControlledCreaturePermanent("a nontoken creature");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
filterNontoken.add(Predicates.not(TokenPredicate.instance));
|
filterNontoken.add(Predicates.not(TokenPredicate.instance));
|
||||||
|
|
|
@ -34,9 +34,9 @@ import java.util.UUID;
|
||||||
public final class InniazTheGaleForce extends CardImpl {
|
public final class InniazTheGaleForce extends CardImpl {
|
||||||
|
|
||||||
private static final FilterCreaturePermanent filter
|
private static final FilterCreaturePermanent filter
|
||||||
= new FilterCreaturePermanent("attacking creatures with flying");
|
= new FilterCreaturePermanent("Attacking creatures with flying");
|
||||||
private static final FilterCreaturePermanent filter2
|
private static final FilterCreaturePermanent filter2
|
||||||
= new FilterCreaturePermanent("creatures you control with flying");
|
= new FilterCreaturePermanent("three or more creatures you control with flying");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
filter.add(AttackingPredicate.instance);
|
filter.add(AttackingPredicate.instance);
|
||||||
|
@ -60,7 +60,8 @@ public final class InniazTheGaleForce extends CardImpl {
|
||||||
1, 1, Duration.EndOfTurn, filter, false
|
1, 1, Duration.EndOfTurn, filter, false
|
||||||
), new ManaCostsImpl("{2}{W/U}")));
|
), new ManaCostsImpl("{2}{W/U}")));
|
||||||
|
|
||||||
// Whenever three or more creatures you control with flying attack, each player gains control of a nonland permanent of your choice controlled by the player to their right.
|
// Whenever three or more creatures you control with flying attack, each player gains control
|
||||||
|
// of a nonland permanent of your choice controlled by the player to their right.
|
||||||
this.addAbility(new AttacksWithCreaturesTriggeredAbility(
|
this.addAbility(new AttacksWithCreaturesTriggeredAbility(
|
||||||
new InniazTheGaleForceEffect(), 3, filter2
|
new InniazTheGaleForceEffect(), 3, filter2
|
||||||
));
|
));
|
||||||
|
@ -79,6 +80,7 @@ public final class InniazTheGaleForce extends CardImpl {
|
||||||
class InniazTheGaleForceEffect extends OneShotEffect {
|
class InniazTheGaleForceEffect extends OneShotEffect {
|
||||||
|
|
||||||
private static final class PlayerPair {
|
private static final class PlayerPair {
|
||||||
|
|
||||||
private final Player leftPlayer;
|
private final Player leftPlayer;
|
||||||
private final Player rightPlayer;
|
private final Player rightPlayer;
|
||||||
private final FilterPermanent filter;
|
private final FilterPermanent filter;
|
||||||
|
|
|
@ -65,8 +65,8 @@ class OrmosArchiveKeeperEffect extends ReplacementEffectImpl {
|
||||||
|
|
||||||
OrmosArchiveKeeperEffect() {
|
OrmosArchiveKeeperEffect() {
|
||||||
super(Duration.WhileOnBattlefield, Outcome.Benefit);
|
super(Duration.WhileOnBattlefield, Outcome.Benefit);
|
||||||
staticText = "If you would draw a card while your library has no cards in it, " +
|
staticText = "If you would draw a card while your library has no cards in it, "
|
||||||
"instead put five +1/+1 counters on {this}";
|
+ "instead put five +1/+1 counters on {this}";
|
||||||
}
|
}
|
||||||
|
|
||||||
private OrmosArchiveKeeperEffect(final OrmosArchiveKeeperEffect effect) {
|
private OrmosArchiveKeeperEffect(final OrmosArchiveKeeperEffect effect) {
|
||||||
|
@ -111,7 +111,7 @@ class OrmosArchiveKeeperEffect extends ReplacementEffectImpl {
|
||||||
|
|
||||||
class OrmosArchiveKeeperTarget extends TargetCardInHand {
|
class OrmosArchiveKeeperTarget extends TargetCardInHand {
|
||||||
|
|
||||||
private static final FilterCard filter = new FilterCard("3 cards with different names");
|
private static final FilterCard filter = new FilterCard("three cards with different names");
|
||||||
|
|
||||||
OrmosArchiveKeeperTarget() {
|
OrmosArchiveKeeperTarget() {
|
||||||
super(3, filter);
|
super(3, filter);
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
|
|
||||||
|
|
||||||
package mage.abilities.effects.common;
|
package mage.abilities.effects.common;
|
||||||
|
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
|
|
Loading…
Add table
Reference in a new issue