Merge pull request #2540 from spjspj/master

spjspj - Armory Automaton C16

Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java

@@ -35,15 +35,15 @@ import mage.abilities.dynamicvalue.common.StaticValue;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
+import mage.abilities.keyword.PartnerAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import static mage.cards.s.SpellstutterSprite.filter;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Zone;
-import mage.abilities.keyword.PartnerAbility;
+import mage.filter.common.FilterControlledPermanent;
-
+import mage.filter.predicate.mageobject.CardTypePredicate;
 
 /**
  *
@@ -51,6 +51,12 @@ import mage.abilities.keyword.PartnerAbility;
  */
 public class AkiriLineSlinger extends CardImpl {
 
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control");
+
+    static {
+        filter.add(new CardTypePredicate(CardType.ARTIFACT));
+    }
+
     public AkiriLineSlinger(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}");
         

Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java

@@ -0,0 +1,166 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.a;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.Target;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author spjspj
+ */
+public class ArmoryAutomaton extends CardImpl {
+
+    public ArmoryAutomaton(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
+        
+        this.subtype.add("Construct");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Whenever Armory Automaton enters the battlefield or attacks, attach any number of target Equipments to it.
+        this.addAbility(new ArmoryAutomatonAbility());
+    }
+
+    public ArmoryAutomaton(final ArmoryAutomaton card) {
+        super(card);
+    }
+
+    @Override
+    public ArmoryAutomaton copy() {
+        return new ArmoryAutomaton(this);
+    }
+}
+
+class ArmoryAutomatonEffect extends OneShotEffect {
+
+    public ArmoryAutomatonEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Whenever {this} enters the battlefield or attacks, attach any number of target Equipments to it";
+    }
+
+    public ArmoryAutomatonEffect(final ArmoryAutomatonEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ArmoryAutomatonEffect copy() {
+        return new ArmoryAutomatonEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        UUID aautomaton = source.getSourceId();
+        Player player = game.getPlayer(source.getControllerId());
+        
+        FilterPermanent filterEquipment = new FilterPermanent("Equipment");
+
+        filterEquipment.add(new CardTypePredicate(CardType.ARTIFACT));
+        filterEquipment.add(new SubtypePredicate("Equipment"));
+        
+        if (player == null) {
+            return false;
+        }
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (permanent == null) {
+            return false;
+        }
+        
+        int countBattlefield = game.getBattlefield().getAllActivePermanents(filterEquipment, game).size() - permanent.getAttachments().size();
+        while (player.canRespond() 
+                && countBattlefield > 0
+                && player.chooseUse(Outcome.Benefit, "Attach a target Equipment?", source, game)) {
+            Target targetEquipment = new TargetPermanent(filterEquipment);
+            if (player.choose(Outcome.Benefit, targetEquipment, source.getSourceId(), game)) {
+                Permanent aura = game.getPermanent(targetEquipment.getFirstTarget());
+                if (aura != null) {
+                    Permanent attachedTo = game.getPermanent(aura.getAttachedTo());
+                    if (attachedTo != null) {
+                        attachedTo.removeAttachment(aura.getId(), game);
+                    }
+                    permanent.addAttachment(aura.getId(), game);
+                }
+            }
+            countBattlefield = game.getBattlefield().getAllActivePermanents(filterEquipment, game).size() - permanent.getAttachments().size();
+        }
+
+        return true;
+    }
+}
+
+class ArmoryAutomatonAbility extends TriggeredAbilityImpl {
+
+    public ArmoryAutomatonAbility() {
+        super(Zone.BATTLEFIELD, new ArmoryAutomatonEffect(), false);
+    }
+
+    public ArmoryAutomatonAbility(final ArmoryAutomatonAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public ArmoryAutomatonAbility copy() {
+        return new ArmoryAutomatonAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.ATTACKER_DECLARED || event.getType() == EventType.ENTERS_THE_BATTLEFIELD;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
+            return true;
+        }
+        return event.getType() == EventType.ENTERS_THE_BATTLEFIELD && event.getTargetId().equals(this.getSourceId());
+    }
+
+    @Override
+    public String getRule() {
+        return super.getRule();
+    }
+}

Mage.Sets/src/mage/sets/Commander2016.java

@@ -59,6 +59,7 @@ public class Commander2016 extends ExpansionSet {
         cards.add(new SetCardInfo("Ankle Shanker", 178, Rarity.RARE, mage.cards.a.AnkleShanker.class));
         cards.add(new SetCardInfo("Arcane Denial", 83, Rarity.COMMON, mage.cards.a.ArcaneDenial.class));
         cards.add(new SetCardInfo("Arcane Sanctum", 281, Rarity.UNCOMMON, mage.cards.a.ArcaneSanctum.class));
+        cards.add(new SetCardInfo("Armory Automaton", 51, Rarity.RARE, mage.cards.a.ArmoryAutomaton.class));
         cards.add(new SetCardInfo("Army of the Damned", 105, Rarity.MYTHIC, mage.cards.a.ArmyOfTheDamned.class));
         cards.add(new SetCardInfo("Artifact Mutation", 179, Rarity.RARE, mage.cards.a.ArtifactMutation.class));
         cards.add(new SetCardInfo("Ash Barrens", 56, Rarity.COMMON, mage.cards.a.AshBarrens.class));
@@ -256,6 +257,7 @@ public class Commander2016 extends ExpansionSet {
         cards.add(new SetCardInfo("Prismatic Geoscope", 55, Rarity.RARE, mage.cards.p.PrismaticGeoscope.class));
         cards.add(new SetCardInfo("Progenitor Mimic", 216, Rarity.MYTHIC, mage.cards.p.ProgenitorMimic.class));
         cards.add(new SetCardInfo("Propaganda", 94, Rarity.UNCOMMON, mage.cards.p.Propaganda.class));
+        cards.add(new SetCardInfo("Psychosis Crawler", 267, Rarity.RARE, mage.cards.p.PsychosisCrawler.class));
         cards.add(new SetCardInfo("Putrefy", 217, Rarity.UNCOMMON, mage.cards.p.Putrefy.class));
         cards.add(new SetCardInfo("Quirion Explorer", 160, Rarity.COMMON, mage.cards.q.QuirionExplorer.class));
         cards.add(new SetCardInfo("Rakdos Carnarium", 315, Rarity.UNCOMMON, mage.cards.r.RakdosCarnarium.class));