[MOC] Implement Uncivil Unrest

Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java

@@ -16,11 +16,9 @@ import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.TargetController;
 import mage.counters.CounterType;
-import mage.filter.FilterPermanent;
 import mage.filter.FilterSpell;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterCreatureSpell;
-import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.Game;
 import mage.game.events.EntersTheBattlefieldEvent;
 import mage.game.events.GameEvent;
@@ -38,12 +36,9 @@ public final class RhythmOfTheWild extends CardImpl {
 
     private static final FilterSpell filter
             = new FilterCreatureSpell("Creature spells you control");
-    private static final FilterPermanent filter2
-            = new FilterControlledCreaturePermanent();
 
     static {
         filter.add(TargetController.YOU.getControllerPredicate());
-        filter2.add(TokenPredicate.FALSE);
     }
 
     public RhythmOfTheWild(UUID ownerId, CardSetInfo setInfo) {
@@ -57,7 +52,8 @@ public final class RhythmOfTheWild extends CardImpl {
         // Nontoken creatures you control have riot.
         Ability ability = new SimpleStaticAbility(new RhythmOfTheWildEffect());
         ability.addEffect(new GainAbilityControlledEffect(
-                new RiotAbility(), Duration.WhileOnBattlefield, filter2
+                new RiotAbility(), Duration.WhileOnBattlefield,
+                StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN
         ).setText(""));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/u/UncivilUnrest.java

@@ -0,0 +1,148 @@
+package mage.cards.u;
+
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.keyword.HasteAbility;
+import mage.abilities.keyword.RiotAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.events.EntersTheBattlefieldEvent;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.game.permanent.PermanentToken;
+import mage.players.Player;
+import mage.target.targetpointer.FixedTarget;
+import mage.util.CardUtil;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class UncivilUnrest extends CardImpl {
+
+    public UncivilUnrest(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}");
+
+        // Nontoken creatures you control have riot.
+        Ability ability = new SimpleStaticAbility(new UncivilUnrestRiotEffect());
+        ability.addEffect(new GainAbilityControlledEffect(
+                new RiotAbility(), Duration.WhileOnBattlefield,
+                StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN
+        ).setText(""));
+        this.addAbility(ability);
+
+        // If a creature you control with a +1/+1 counter on it would deal damage to a permanent or player, it deals double that damage instead.
+        this.addAbility(new SimpleStaticAbility(new UncivilUnrestDamageEffect()));
+    }
+
+    private UncivilUnrest(final UncivilUnrest card) {
+        super(card);
+    }
+
+    @Override
+    public UncivilUnrest copy() {
+        return new UncivilUnrest(this);
+    }
+}
+
+class UncivilUnrestRiotEffect extends ReplacementEffectImpl {
+
+    UncivilUnrestRiotEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.BoostCreature);
+        staticText = "Nontoken creatures you control have riot. " +
+                "<i>(They enter the battlefield with your choice of a +1/+1 counter or haste.)</i>";
+    }
+
+    private UncivilUnrestRiotEffect(UncivilUnrestRiotEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
+        return creature != null
+                && creature.isControlledBy(source.getControllerId())
+                && creature.isCreature(game)
+                && !(creature instanceof PermanentToken);
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
+        Player player = game.getPlayer(source.getControllerId());
+        if (creature == null || player == null) {
+            return false;
+        }
+        if (player.chooseUse(
+                outcome, "Have " + creature.getLogName() + " enter the battlefield with a +1/+1 counter on it or with haste?",
+                null, "+1/+1 counter", "Haste", source, game
+        )) {
+            game.informPlayers(player.getLogName() + " choose to put a +1/+1 counter on " + creature.getName());
+            creature.addCounters(CounterType.P1P1.createInstance(), source.getControllerId(), source, game, event.getAppliedEffects());
+        } else {
+            ContinuousEffect effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.Custom);
+            effect.setTargetPointer(new FixedTarget(creature.getId(), creature.getZoneChangeCounter(game) + 1));
+            game.addEffect(effect, source);
+        }
+        return false;
+    }
+
+    @Override
+    public UncivilUnrestRiotEffect copy() {
+        return new UncivilUnrestRiotEffect(this);
+    }
+}
+
+class UncivilUnrestDamageEffect extends ReplacementEffectImpl {
+
+    UncivilUnrestDamageEffect() {
+        super(Duration.WhileOnBattlefield, Outcome.Damage);
+        staticText = "if a creature you control with a +1/+1 counter on it " +
+                "would deal damage to a permanent or player, it deals double that damage instead";
+    }
+
+    private UncivilUnrestDamageEffect(final UncivilUnrestDamageEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public UncivilUnrestDamageEffect copy() {
+        return new UncivilUnrestDamageEffect(this);
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType().equals(GameEvent.EventType.DAMAGE_PLAYER)
+                || event.getType().equals(GameEvent.EventType.DAMAGE_PERMANENT);
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        Permanent permanent = game.getPermanent(event.getSourceId());
+        return permanent != null
+                && permanent.getCounters(game).containsKey(CounterType.P1P1)
+                && game.getControllerId(event.getSourceId()).equals(source.getControllerId());
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        event.setAmount(CardUtil.overflowMultiply(event.getAmount(), 2));
+        return false;
+    }
+}

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

@@ -328,6 +328,7 @@ public final class MarchOfTheMachineCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Together Forever", 212, Rarity.RARE, mage.cards.t.TogetherForever.class));
         cards.add(new SetCardInfo("Triskelion", 387, Rarity.RARE, mage.cards.t.Triskelion.class));
         cards.add(new SetCardInfo("Unbreakable Formation", 213, Rarity.RARE, mage.cards.u.UnbreakableFormation.class));
+        cards.add(new SetCardInfo("Uncivil Unrest", 35, Rarity.RARE, mage.cards.u.UncivilUnrest.class));
         cards.add(new SetCardInfo("Utter End", 341, Rarity.RARE, mage.cards.u.UtterEnd.class));
         cards.add(new SetCardInfo("Valiant Knight", 214, Rarity.RARE, mage.cards.v.ValiantKnight.class));
         cards.add(new SetCardInfo("Vampires' Vengeance", 289, Rarity.UNCOMMON, mage.cards.v.VampiresVengeance.class));