Fixed Godo, Bandit Warlord copies not untapping themselves (fixes #4827)

Reworked the trigger, also affects Aurelia, the Warleader

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

@@ -24,41 +24,33 @@
 *  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.common.AttacksFirstTimeTriggeredAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.AdditionalCombatPhaseEffect;
 import mage.abilities.effects.common.UntapAllControllerEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.HasteAbility;
 import mage.abilities.keyword.VigilanceAbility;
-import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.constants.Zone;
+import mage.filter.StaticFilters;
-import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
-import mage.game.permanent.Permanent;
 
 /**
-*
+ *
-* @author LevelX2
+ * @author LevelX2
-*/
+ */
 public class AureliaTheWarleader extends CardImpl {
 
     public AureliaTheWarleader(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{W}{W}");
-
 
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.ANGEL);
@@ -71,7 +63,12 @@ public class AureliaTheWarleader extends CardImpl {
         this.addAbility(HasteAbility.getInstance());
 
         // Whenever Aurelia, the Warleader attacks for the first time each turn, untap all creatures you control. After this phase, there is an additional combat phase.
-        Ability ability = new AureliaAttacksTriggeredAbility(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(),"untap all creatures you control"), false);
+        Ability ability = new AttacksFirstTimeTriggeredAbility(
+                new UntapAllControllerEffect(
+                        StaticFilters.FILTER_CONTROLLED_CREATURES,
+                        "untap all creatures you control"
+                ),
+                false);
         ability.addEffect(new AdditionalCombatPhaseEffect());
         this.addAbility(ability);
 
@@ -86,72 +83,3 @@ public class AureliaTheWarleader extends CardImpl {
         return new AureliaTheWarleader(this);
     }
 }
-
-class AureliaAttacksTriggeredAbility extends TriggeredAbilityImpl {
-
-    protected String text;
-
-    public AureliaAttacksTriggeredAbility(Effect effect, boolean optional) {
-        super(Zone.BATTLEFIELD, effect, optional);
-    }
-
-    public AureliaAttacksTriggeredAbility(Effect effect, boolean optional, String text) {
-        super(Zone.BATTLEFIELD, effect, optional);
-        this.text = text;
-    }
-
-    public AureliaAttacksTriggeredAbility(final AureliaAttacksTriggeredAbility ability) {
-        super(ability);
-        this.text = ability.text;
-    }
-
-    @Override
-    public void reset(Game game) {
-        Card sourceCard = game.getCard(getSourceId());
-        game.getState().setValue(getValueKey(sourceCard, game), 0);
-    }
-
-    @Override
-    public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == EventType.ATTACKER_DECLARED;
-    }
-
-    @Override
-    public boolean checkTrigger(GameEvent event, Game game) {
-       if (event.getSourceId().equals(this.getSourceId()) ) {
-           Permanent sourceCard = game.getPermanent(getSourceId());
-           Integer amountAttacks = (Integer) game.getState().getValue(getValueKey(sourceCard, game));
-           if (amountAttacks == null || amountAttacks < 1) {
-               if (amountAttacks == null) {
-                   amountAttacks = 1;
-               } else {
-                   ++amountAttacks;
-               }
-               game.getState().setValue(getValueKey(sourceCard, game), amountAttacks);
-               return true;
-           }
-       }
-       return false;
-    }
-
-    protected String getValueKey(Card sourceCard, Game game) {
-        if (sourceCard == null) {
-            return "";
-        }
-        return new StringBuilder(this.getId().toString()).append(sourceCard.getZoneChangeCounter(game)).append("amountAttacks").toString();
-    }
-
-    @Override
-    public String getRule() {
-       if (text == null || text.isEmpty()) {
-
-           return "Whenever {this} attacks for the first time each turn, " + super.getRule();
-       }
-       return text;
-    }
-
-    @Override
-    public AureliaAttacksTriggeredAbility copy() {
-       return new AureliaAttacksTriggeredAbility(this);
-    }
-}

Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java

@@ -30,29 +30,22 @@ package mage.cards.g;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.AttacksFirstTimeTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.AdditionalCombatPhaseEffect;
 import mage.abilities.effects.common.UntapAllControllerEffect;
+import mage.abilities.effects.common.UntapSourceEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.CardTypePredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.filter.predicate.permanent.PermanentIdPredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
 import mage.target.common.TargetCardInLibrary;
-import mage.util.CardUtil;
 
 /**
  *
@@ -61,13 +54,15 @@ import mage.util.CardUtil;
 public class GodoBanditWarlord extends CardImpl {
 
     private static final FilterCard filter = new FilterCard("an Equipment card");
+    private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent(SubType.SAMURAI);
+
     static {
-        filter.add(new CardTypePredicate(CardType.ARTIFACT));
         filter.add(new SubtypePredicate(SubType.EQUIPMENT));
+        filter2.add(new AnotherPredicate());
     }
 
     public GodoBanditWarlord(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.HUMAN);
         this.subtype.add(SubType.BARBARIAN);
@@ -77,10 +72,10 @@ public class GodoBanditWarlord extends CardImpl {
 
         // When Godo, Bandit Warlord enters the battlefield, you may search your library for an Equipment card and put it onto the battlefield. If you do, shuffle your library.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true), true));
+
         // Whenever Godo attacks for the first time each turn, untap it and all Samurai you control. After this phase, there is an additional combat phase.
-        FilterControlledCreaturePermanent untapFilter = new FilterControlledCreaturePermanent();
+        Ability ability = new AttacksFirstTimeTriggeredAbility(new UntapSourceEffect().setText("untap it"), false);
-        untapFilter.add(Predicates.or(new PermanentIdPredicate(this.getId()), new SubtypePredicate(SubType.SAMURAI)));
+        ability.addEffect(new UntapAllControllerEffect(filter2, "and all Samurai you control"));
-        Ability ability = new GodoBanditWarlordAttacksTriggeredAbility(new UntapAllControllerEffect(untapFilter,"untap it and all Samurai you control"), false);
         ability.addEffect(new AdditionalCombatPhaseEffect());
         this.addAbility(ability);
     }
@@ -94,52 +89,3 @@ public class GodoBanditWarlord extends CardImpl {
         return new GodoBanditWarlord(this);
     }
 }
-
-class GodoBanditWarlordAttacksTriggeredAbility extends TriggeredAbilityImpl {
-
-    public GodoBanditWarlordAttacksTriggeredAbility(Effect effect, boolean optional) {
-        super(Zone.BATTLEFIELD, effect, optional);
-    }
-
-    public GodoBanditWarlordAttacksTriggeredAbility(final GodoBanditWarlordAttacksTriggeredAbility ability) {
-        super(ability);
-    }
-
-    @Override
-    public void reset(Game game) {
-        game.getState().setValue(CardUtil.getCardZoneString("amountAttacks", this.getSourceId(), game), 0);
-    }
-
-    @Override
-    public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == EventType.ATTACKER_DECLARED;
-    }
-
-    @Override
-    public boolean checkTrigger(GameEvent event, Game game) {
-       if (event.getSourceId().equals(this.getSourceId()) ) {
-           Integer amountAttacks = (Integer) game.getState().getValue(CardUtil.getCardZoneString("amountAttacks", this.getSourceId(), game));
-           if (amountAttacks == null || amountAttacks < 1) {
-               if (amountAttacks == null) {
-                   amountAttacks = 1;
-               } else {
-                   ++amountAttacks;
-               }
-               game.getState().setValue(CardUtil.getCardZoneString("amountAttacks", this.getSourceId(), game), amountAttacks);
-               return true;
-           }
-       }
-       return false;
-    }
-
-    @Override
-    public String getRule() {
-        return "Whenever {this} attacks for the first time each turn, " + super.getRule();
-    }
-
-    @Override
-    public GodoBanditWarlordAttacksTriggeredAbility copy() {
-       return new GodoBanditWarlordAttacksTriggeredAbility(this);
-    }
-}
-

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

@@ -0,0 +1,90 @@
+/*
+ *  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.abilities.common;
+
+import mage.MageObjectReference;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.watchers.common.AttackedThisTurnWatcher;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class AttacksFirstTimeTriggeredAbility extends TriggeredAbilityImpl {
+
+    public AttacksFirstTimeTriggeredAbility(Effect effect, boolean optional) {
+        super(Zone.BATTLEFIELD, effect, optional);
+        this.addWatcher(new AttackedThisTurnWatcher());
+    }
+
+    public AttacksFirstTimeTriggeredAbility(final AttacksFirstTimeTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.ATTACKER_DECLARED;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (!event.getSourceId().equals(this.getSourceId())) {
+            return false;
+        }
+        AttackedThisTurnWatcher watcher = (AttackedThisTurnWatcher) game.getState().getWatchers().get(AttackedThisTurnWatcher.class.getSimpleName());
+        if (watcher == null) {
+            return false;
+        }
+        Permanent sourcePerm = game.getPermanentOrLKIBattlefield(event.getSourceId());
+        if (sourcePerm == null) {
+            return false;
+        }
+        for (MageObjectReference mor : watcher.getAttackedThisTurnCreaturesCounts().keySet()) {
+            if (mor.refersTo(sourcePerm, game)
+                    && watcher.getAttackedThisTurnCreaturesCounts().get(mor) > 1) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever {this} attacks for the first time each turn, " + super.getRule();
+    }
+
+    @Override
+    public AttacksFirstTimeTriggeredAbility copy() {
+        return new AttacksFirstTimeTriggeredAbility(this);
+    }
+}

Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java

@@ -27,7 +27,9 @@
  */
 package mage.watchers.common;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import mage.MageObjectReference;
 import mage.constants.WatcherScope;
@@ -40,7 +42,8 @@ import mage.watchers.Watcher;
  */
 public class AttackedThisTurnWatcher extends Watcher {
 
-    public final Set<MageObjectReference> attackedThisTurnCreatures = new HashSet<>();
+    protected final Set<MageObjectReference> attackedThisTurnCreatures = new HashSet<>();
+    protected final Map<MageObjectReference, Integer> attackedThisTurnCreaturesCounts = new HashMap<>();
 
     public AttackedThisTurnWatcher() {
         super(AttackedThisTurnWatcher.class.getSimpleName(), WatcherScope.GAME);
@@ -49,12 +52,16 @@ public class AttackedThisTurnWatcher extends Watcher {
     public AttackedThisTurnWatcher(final AttackedThisTurnWatcher watcher) {
         super(watcher);
         this.attackedThisTurnCreatures.addAll(watcher.attackedThisTurnCreatures);
+        this.attackedThisTurnCreaturesCounts.putAll(watcher.attackedThisTurnCreaturesCounts);
     }
 
     @Override
     public void watch(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) {
-            this.attackedThisTurnCreatures.add(new MageObjectReference(event.getSourceId(), game));
+            MageObjectReference mor = new MageObjectReference(event.getSourceId(), game);
+            this.attackedThisTurnCreatures.add(mor);
+            this.attackedThisTurnCreaturesCounts.putIfAbsent(mor, 0);
+            this.attackedThisTurnCreaturesCounts.compute(mor, (k, v) -> (v + 1));
         }
     }
 
@@ -62,6 +69,10 @@ public class AttackedThisTurnWatcher extends Watcher {
         return this.attackedThisTurnCreatures;
     }
 
+    public Map<MageObjectReference, Integer> getAttackedThisTurnCreaturesCounts() {
+        return this.attackedThisTurnCreaturesCounts;
+    }
+
     @Override
     public AttackedThisTurnWatcher copy() {
         return new AttackedThisTurnWatcher(this);
@@ -71,6 +82,7 @@ public class AttackedThisTurnWatcher extends Watcher {
     public void reset() {
         super.reset();
         this.attackedThisTurnCreatures.clear();
+        this.attackedThisTurnCreaturesCounts.clear();
     }
 
 }