WIP - Rework/continuous effects apply logic

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

@@ -1,5 +1,6 @@
 package mage.cards.a;
 
+import mage.MageItem;
 import mage.abilities.Ability;
 import mage.abilities.dynamicvalue.common.GetXValue;
 import mage.abilities.effects.ContinuousEffectImpl;
@@ -17,6 +18,8 @@
 import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.targetpointer.FixedTarget;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -106,12 +109,29 @@ public AbuelosAwakeningContinuousEffect copy() {
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
-        return false;
+    public void applyToObjects(Layer layer, SubLayer sublayer, Ability source, Game game, List<MageItem> affectedObjects) {
+        for (MageItem object : affectedObjects) {
+            Permanent creature = (Permanent) object;
+            switch (layer) {
+                case TypeChangingEffects_4:
+                    creature.addCardType(game, CardType.CREATURE);
+                    creature.addSubType(game, SubType.SPIRIT);
+                    break;
+                case AbilityAddingRemovingEffects_6:
+                    creature.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
+                    break;
+                case PTChangingEffects_7:
+                    if (sublayer == SubLayer.SetPT_7b) {
+                        creature.getPower().setModifiedBaseValue(1);
+                        creature.getToughness().setModifiedBaseValue(1);
+                    }
+                    break;
+            }
+        }
     }
 
     @Override
-    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+    public boolean queryAffectedObjects(Layer layer, Ability source, Game game, List<MageItem> affectedObjects) {
         Permanent creature;
         if (source.getTargets().getFirstTarget() == null) {
             creature = game.getPermanent(getTargetPointer().getFirst(game, source));
@@ -122,27 +142,23 @@ public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game)
             }
         }
         if (creature == null) {
-            this.used = true;
+            this.discard();
             return false;
         }
-        switch (layer) {
-            case TypeChangingEffects_4:
-                creature.addCardType(game, CardType.CREATURE);
-                creature.addSubType(game, SubType.SPIRIT);
-                break;
-            case AbilityAddingRemovingEffects_6:
-                creature.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
-                break;
-            case PTChangingEffects_7:
-                if (sublayer == SubLayer.SetPT_7b) {
-                    creature.getPower().setModifiedBaseValue(1);
-                    creature.getToughness().setModifiedBaseValue(1);
-                }
-                break;
-        }
+        affectedObjects.add(creature);
         return true;
     }
 
+    @Override
+    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        List<MageItem> affectedObjects = new ArrayList<>();
+        if (queryAffectedObjects(layer, source, game, affectedObjects)) {
+            applyToObjects(layer, sublayer, source, game, affectedObjects);
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public boolean hasLayer(Layer layer) {
         return layer == Layer.TypeChangingEffects_4 ||

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

@@ -1,13 +1,13 @@
 package mage.cards.a;
 
-import java.util.UUID;
+import mage.MageItem;
 import mage.abilities.Ability;
-import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ExileTargetEffect;
+import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -17,6 +17,9 @@
 import mage.target.TargetPermanent;
 import mage.target.targetpointer.FixedTarget;
 
+import java.util.List;
+import java.util.UUID;
+
 /**
  *
  * @author LevelX2
@@ -106,17 +109,22 @@ public ActOfAuthorityGainControlEffect copy() {
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent permanent;
-        permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+    public void applyToObjects(Layer layer, SubLayer sublayer, Ability source, Game game, List<MageItem> affectedObjects) {
+        for (MageItem object : affectedObjects) {
+            ((Permanent) object).changeControllerId(controller, game, source);
+        }
+    }
+
+    @Override
+    public boolean queryAffectedObjects(Layer layer, Ability source, Game game, List<MageItem> affectedObjects) {
+        Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
         if (permanent == null) {
             permanent = game.getPermanent(source.getFirstTarget());
         }
-
         if (permanent == null) {
             return false;
         }
-
-        return permanent.changeControllerId(controller, game, source);
+        affectedObjects.add(permanent);
+        return true;
     }
 }

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

@@ -1,18 +1,18 @@
 package mage.cards.a;
 
+import mage.MageItem;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.keyword.EquipAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.game.Controllable;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
-import java.util.Optional;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -60,23 +60,26 @@ public AettirAndPriwenEffect copy() {
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent permanent = Optional
-                .ofNullable(source.getSourcePermanentIfItStillExists(game))
-                .map(Permanent::getAttachedTo)
-                .map(game::getPermanent)
-                .orElse(null);
-        if (permanent == null) {
+    public void applyToObjects(Layer layer, SubLayer sublayer, Ability source, Game game, List<MageItem> affectedObjects) {
+        int life = game.getPlayer(source.getControllerId()).getLife();
+        for (MageItem object : affectedObjects) {
+            Permanent permanent = (Permanent) object;
+            permanent.getPower().setModifiedBaseValue(life);
+            permanent.getToughness().setModifiedBaseValue(life);
+        }
+    }
+
+    @Override
+    public boolean queryAffectedObjects(Layer layer, Ability source, Game game, List<MageItem> affectedObjects) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null) {
             return false;
         }
-        Optional.ofNullable(source)
-                .map(Controllable::getControllerId)
-                .map(game::getPlayer)
-                .map(Player::getLife)
-                .ifPresent(life -> {
-                    permanent.getPower().setModifiedBaseValue(life);
-                    permanent.getToughness().setModifiedBaseValue(life);
-                });
-        return true;
+        Permanent permanent = game.getPermanent(source.getSourceId());
+        if (permanent != null) {
+            affectedObjects.add(permanent);
+            return true;
+        }
+        return false;
     }
 }

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

@@ -1,6 +1,7 @@
 package mage.cards.a;
 
 import mage.MageInt;
+import mage.MageItem;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -18,6 +19,7 @@
 import mage.game.permanent.Permanent;
 import mage.game.permanent.PermanentToken;
 
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -79,10 +81,17 @@ public AeveProgenitorOozeNonLegendaryEffect copy() {
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
+    public void applyToObjects(Layer layer, SubLayer sublayer, Ability source, Game game, List<MageItem> affectedObjects) {
+        for (MageItem object : affectedObjects) {
+            ((Permanent) object).removeSuperType(game, SuperType.LEGENDARY);
+        }
+    }
+
+    @Override
+    public boolean queryAffectedObjects(Layer layer, Ability source, Game game, List<MageItem> affectedObjects) {
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (permanent instanceof PermanentToken) {
-            permanent.removeSuperType(game, SuperType.LEGENDARY);
+            affectedObjects.add(permanent);
             return true;
         }
         return false;

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

@@ -1,5 +1,6 @@
 package mage.cards.a;
 
+import mage.MageItem;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -28,6 +29,7 @@
 import mage.util.CardUtil;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -119,7 +121,26 @@ private AgathasSoulCauldronAbilityEffect(final AgathasSoulCauldronAbilityEffect
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
+    public void applyToObjects(Layer layer, SubLayer sublayer, Ability source, Game game, List<MageItem> affectedObjects) {
+        ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(
+                game, source.getSourceId(), game.getState().getZoneChangeCounter(source.getSourceId())
+        ));
+        Set<Ability> abilities = exileZone
+                .getCards(StaticFilters.FILTER_CARD_CREATURE, game)
+                .stream()
+                .map(card -> card.getAbilities(game))
+                .flatMap(Collection::stream)
+                .filter(Ability::isActivatedAbility)
+                .collect(Collectors.toSet());
+        for (MageItem object : affectedObjects) {
+            for (Ability ability : abilities) {
+                ((Permanent) object).addAbility(ability, source.getSourceId(), game, true);
+            }
+        }
+    }
+
+    @Override
+    public boolean queryAffectedObjects(Layer layer, Ability source, Game game, List<MageItem> affectedObjects) {
         ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(
                 game, source.getSourceId(), game.getState().getZoneChangeCounter(source.getSourceId())
         ));
@@ -136,12 +157,8 @@ public boolean apply(Game game, Ability source) {
         if (abilities.isEmpty()) {
             return false;
         }
-        for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
-            for (Ability ability : abilities) {
-                permanent.addAbility(ability, source.getSourceId(), game, true);
-            }
-        }
-        return true;
+        affectedObjects.addAll(game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game));
+        return !affectedObjects.isEmpty();
     }
 
     @Override

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

@@ -3,16 +3,16 @@
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BlocksSourceTriggeredAbility;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.AddCardSubTypeSourceEffect;
 import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect;
 import mage.abilities.keyword.DefenderAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.*;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
 
 import java.util.UUID;
 
@@ -35,7 +35,8 @@ public AgelessSentinels(UUID ownerId, CardSetInfo setInfo) {
         this.addAbility(FlyingAbility.getInstance());
 
         // When Ageless Sentinels blocks, it becomes a Bird Giant, and it loses defender.
-        Ability ability = new BlocksSourceTriggeredAbility(new AgelessSentinelsEffect()).setTriggerPhrase("When {this} blocks, ");
+        Effect becomeBirdGiantEffect = new AddCardSubTypeSourceEffect(Duration.WhileOnBattlefield, SubType.BIRD, SubType.GIANT);
+        Ability ability = new BlocksSourceTriggeredAbility(becomeBirdGiantEffect).setTriggerPhrase("When {this} blocks, ");
         Effect effect = new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield);
         effect.setText(", and it loses defender. <i>(It's no longer a Wall. This effect lasts indefinitely.)</i>");
         ability.addEffect(effect);
@@ -51,36 +52,3 @@ public AgelessSentinels copy() {
         return new AgelessSentinels(this);
     }
 }
-
-class AgelessSentinelsEffect extends ContinuousEffectImpl {
-
-    AgelessSentinelsEffect() {
-        super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature);
-        staticText = "it becomes a Bird Giant";
-    }
-
-    private AgelessSentinelsEffect(final AgelessSentinelsEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public AgelessSentinelsEffect copy() {
-        return new AgelessSentinelsEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanent(source.getSourceId());
-        if (permanent == null) {
-            return false;
-        }
-        permanent.removeAllCreatureTypes(game);
-        permanent.addSubType(game, SubType.BIRD, SubType.GIANT);
-        return true;
-    }
-
-    @Override
-    public boolean hasLayer(Layer layer) {
-        return layer == Layer.TypeChangingEffects_4;
-    }
-}