Merge pull request #5074 from NoahGleason/serra-inquisitors

Implement Serra Inquisitors

Mage.Sets/src/mage/cards/d/DwarvenSoldier.java

@@ -1,9 +1,8 @@
 
 package mage.cards.d;
 
-import java.util.UUID;
 import mage.MageInt;
-import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility;
+import mage.abilities.common.BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -12,6 +11,8 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author MarcoMarin
@@ -26,7 +27,7 @@ public final class DwarvenSoldier extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Whenever Dwarven Soldier blocks or becomes blocked by one or more Orcs, Dwarven Soldier gets +0/+2 until end of turn.
-        this.addAbility(new BlocksOrBecomesBlockedTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), new FilterCreaturePermanent(SubType.ORC, "Orc creature"), false));
+        this.addAbility(new BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), new FilterCreaturePermanent(SubType.ORC, "Orcs"), false));
     }
 
     public DwarvenSoldier(final DwarvenSoldier card) {

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

@@ -0,0 +1,49 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.common.BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.ColorPredicate;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author noahg
+ */
+public final class SerraInquisitors extends CardImpl {
+
+    private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("black creatures");
+
+    static {
+        filter.add(new ColorPredicate(ObjectColor.BLACK));
+    }
+
+    public SerraInquisitors(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}");
+        
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.CLERIC);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Whenever Serra Inquisitors blocks or becomes blocked by one or more black creatures, Serra Inquisitors gets +2/+0 until end of turn.
+        this.addAbility(new BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), filter, false));
+    }
+
+    public SerraInquisitors(final SerraInquisitors card) {
+        super(card);
+    }
+
+    @Override
+    public SerraInquisitors copy() {
+        return new SerraInquisitors(this);
+    }
+}

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

@@ -155,6 +155,7 @@ public final class Homelands extends ExpansionSet {
         cards.add(new SetCardInfo("Sengir Bats", "57b", Rarity.COMMON, SengirBats.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Serra Aviary", 14, Rarity.RARE, mage.cards.s.SerraAviary.class));
         cards.add(new SetCardInfo("Serra Bestiary", 15, Rarity.UNCOMMON, mage.cards.s.SerraBestiary.class));
+        cards.add(new SetCardInfo("Serra Inquisitors", 16, Rarity.UNCOMMON, mage.cards.s.SerraInquisitors.class));
         cards.add(new SetCardInfo("Serra Paladin", 17, Rarity.COMMON, mage.cards.s.SerraPaladin.class));
         cards.add(new SetCardInfo("Serrated Arrows", 110, Rarity.COMMON, mage.cards.s.SerratedArrows.class));
         cards.add(new SetCardInfo("Shrink", "97a", Rarity.COMMON, mage.cards.s.Shrink.class, NON_FULL_USE_VARIOUS));

Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java

@@ -0,0 +1,92 @@
+
+package mage.abilities.common;
+
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.combat.CombatGroup;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.target.targetpointer.FixedTarget;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author North, Loki
+ */
+public class BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility extends TriggeredAbilityImpl {
+
+    protected FilterPermanent filter;
+    protected String rule;
+
+    public BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(Effect effect, boolean optional) {
+        this(effect, StaticFilters.FILTER_PERMANENT_CREATURE, optional, null);
+    }
+
+    public BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(Effect effect, FilterPermanent filter, boolean optional) {
+        this(effect, filter, optional, null);
+    }
+
+    public BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(Effect effect, FilterPermanent filter, boolean optional, String rule) {
+        super(Zone.BATTLEFIELD, effect, optional);
+        this.filter = filter;
+        this.rule = rule;
+    }
+
+    public BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(final BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility ability) {
+        super(ability);
+        this.filter = ability.filter;
+        this.rule = ability.rule;
+
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.DECLARED_BLOCKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        for (CombatGroup group : game.getCombat().getGroups()) {
+            if (group.getAttackers().contains(sourceId)){
+                if (filter == null){
+                    return group.getBlocked();
+                }
+                for (UUID uuid : group.getBlockers()){
+                    Permanent permanent = game.getPermanentOrLKIBattlefield(uuid);
+                    if (permanent != null && filter.match(permanent, game)){
+                        return true;
+                    }
+                }
+            } else if (group.getBlockers().contains(sourceId)){
+                if (filter == null){
+                    return true;
+                }
+                for (UUID uuid : group.getAttackers()){
+                    Permanent permanent = game.getPermanentOrLKIBattlefield(uuid);
+                    if (permanent != null && filter.match(permanent, game)){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        if (rule != null) {
+            return rule;
+        }
+        return "Whenever {this} blocks or becomes blocked by one or more " + (filter != null ? filter.getMessage() : "creatures") + ", " + super.getRule();
+    }
+
+    @Override
+    public BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility copy() {
+        return new BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(this);
+    }
+}