[AER] Implement Spoiled Cards

Implemented
-Freejam Regent
-Siege Modification
-Untethered Express

Added
-Additional Spoiled cards to data file

Fixed
-Keywords file to enable autogeneration of Improvise ability

Mage.Sets/src/mage/cards/s/SiegeModification.java

@@ -0,0 +1,130 @@
+/*
+ *  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.s;
+
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.FirstStrikeAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author JRHerlehy
+ */
+public class SiegeModification extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("creature or vehicle");
+
+    static {
+        filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE),
+                new SubtypePredicate("Vehicle")));
+    }
+
+    public SiegeModification(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}");
+
+        this.subtype.add("Aura");
+
+        // Enchant creature or Vehicle
+        TargetPermanent auraTarget = new TargetPermanent(filter);
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit));
+        Ability ability = new EnchantAbility(auraTarget.getTargetName());
+        this.addAbility(ability);
+
+        // As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureIfVehicleEffect()));
+
+        // Enchanted creature gets +3/+0 and has first strike.
+        Effect effect = new BoostEnchantedEffect(3, 0);
+        effect.setText("Enchanted creature gets +3/+0");
+        ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
+        effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA);
+        effect.setText(" and has first strike");
+        ability.addEffect(effect);
+        this.addAbility(ability);
+    }
+
+    public SiegeModification(final SiegeModification card) {
+        super(card);
+    }
+
+    @Override
+    public SiegeModification copy() {
+        return new SiegeModification(this);
+    }
+
+    private class BecomesCreatureIfVehicleEffect extends ContinuousEffectImpl {
+
+        private CardType addedType = CardType.CREATURE;
+
+        public BecomesCreatureIfVehicleEffect() {
+            super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit);
+            this.staticText = "As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types";
+        }
+
+        public BecomesCreatureIfVehicleEffect(final BecomesCreatureIfVehicleEffect effect) {
+            super(effect);
+            this.staticText = effect.staticText;
+        }
+
+        @Override
+        public boolean apply(Game game, Ability source) {
+            Permanent aura = game.getPermanent(source.getSourceId());
+            if (aura != null && aura.getAttachedTo() != null) {
+                Permanent enchanted = game.getPermanent(aura.getAttachedTo());
+                if (enchanted != null && enchanted.getSubtype(game).contains("Vehicle")) {
+                    enchanted.getCardType().add(addedType);
+                }
+            }
+
+            return true;
+        }
+
+        @Override
+        public BecomesCreatureIfVehicleEffect copy() {
+            return new BecomesCreatureIfVehicleEffect(this);
+        }
+    }
+}