External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: improved castMultipleWithAttributeForFree usage with exiled cards (close #13788) (#13794)

Browse source
This commit is contained in:
Omar Ballesteros 2025-06-28 13:07:15 -06:00 • committed by GitHub
parent c3a0c731d6
commit dc8b51c59b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/c/CollectedConjuring.java
View file

@ -76,6 +76,8 @@ class CollectedConjuringEffect extends OneShotEffect {
} }
Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, 6)); Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, 6));
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter, 2); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter, 2);
controller.putCardsOnBottomOfLibrary(cards, game, source, false); controller.putCardsOnBottomOfLibrary(cards, game, source, false);
return true; return true;

2
Mage.Sets/src/mage/cards/d/DanceWithCalamity.java
View file

@ -78,6 +78,8 @@ class DanceWithCalamityEffect extends OneShotEffect {
player.moveCards(card, Zone.EXILED, source, game); player.moveCards(card, Zone.EXILED, source, game);
cards.add(card); cards.add(card);
} }
game.processAction();
cards.retainZone(Zone.EXILED, game);
if (cards if (cards
.getCards(game) .getCards(game)
.stream() .stream()

2
Mage.Sets/src/mage/cards/e/EmergentUltimatum.java
View file

@ -79,6 +79,8 @@ class EmergentUltimatumEffect extends OneShotEffect {
boolean searched = player.searchLibrary(targetCardInLibrary, source, game); boolean searched = player.searchLibrary(targetCardInLibrary, source, game);
Cards cards = new CardsImpl(targetCardInLibrary.getTargets()); Cards cards = new CardsImpl(targetCardInLibrary.getTargets());
player.moveCards(cards, Zone.EXILED, source, game); player.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
if (cards.isEmpty()) { if (cards.isEmpty()) {
if (searched) { if (searched) {
player.shuffleLibrary(source, game); player.shuffleLibrary(source, game);

2
Mage.Sets/src/mage/cards/e/EpicExperiment.java
View file

@ -67,6 +67,8 @@ class EpicExperimentEffect extends OneShotEffect {
} }
Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, CardUtil.getSourceCostsTag(game, source, "X", 0))); Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, CardUtil.getSourceCostsTag(game, source, "X", 0)));
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
FilterCard filter = new FilterInstantOrSorceryCard(); FilterCard filter = new FilterInstantOrSorceryCard();
filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, CardUtil.getSourceCostsTag(game, source, "X", 0) + 1)); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, CardUtil.getSourceCostsTag(game, source, "X", 0) + 1));
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter);

2
Mage.Sets/src/mage/cards/e/EtaliPrimalConqueror.java
View file

@ -91,6 +91,8 @@ class EtaliPrimalConquerorEffect extends OneShotEffect {
} }
} }
} }
game.processAction();
cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, StaticFilters.FILTER_CARD); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, StaticFilters.FILTER_CARD);
return true; return true;
} }

2
Mage.Sets/src/mage/cards/e/EtaliPrimalStorm.java
View file

@ -78,6 +78,8 @@ class EtaliPrimalStormEffect extends OneShotEffect {
} }
} }
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter);
return true; return true;
} }

1
Mage.Sets/src/mage/cards/f/FeveredSuspicion.java
View file

@ -78,6 +78,7 @@ class FeveredSuspicionEffect extends OneShotEffect {
} }
} }
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
nonlands.retainZone(Zone.EXILED, game); nonlands.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree( CardUtil.castMultipleWithAttributeForFree(
controller, source, game, nonlands, controller, source, game, nonlands,

1
Mage.Sets/src/mage/cards/g/GixYawgmothPraetor.java
View file

@ -144,6 +144,7 @@ class GixYawgmothPraetorExileEffect extends OneShotEffect {
int xValue = GetXValue.instance.calculate(game, source, this); int xValue = GetXValue.instance.calculate(game, source, this);
Set<Card> toExile = opponent.getLibrary().getTopCards(game, xValue); Set<Card> toExile = opponent.getLibrary().getTopCards(game, xValue);
controller.moveCards(toExile, Zone.EXILED, source, game); controller.moveCards(toExile, Zone.EXILED, source, game);
game.processAction();
Cards cards = new CardsImpl(toExile); Cards cards = new CardsImpl(toExile);
cards.retainZone(Zone.EXILED, game); cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, StaticFilters.FILTER_CARD, Integer.MAX_VALUE, null, true); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, StaticFilters.FILTER_CARD, Integer.MAX_VALUE, null, true);

2
Mage.Sets/src/mage/cards/h/HazoretsUndyingFury.java
View file

@ -79,6 +79,8 @@ class HazoretsUndyingFuryEffect extends OneShotEffect {
// move cards from library to exile // move cards from library to exile
Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, 4)); Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, 4));
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
// cast the possible cards without paying the mana // cast the possible cards without paying the mana
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter);
return true; return true;

1
Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
View file

@ -108,6 +108,7 @@ class JaceArchitectOfThoughtEffect3 extends OneShotEffect {
controller.moveCards(card, Zone.EXILED, source, game); controller.moveCards(card, Zone.EXILED, source, game);
player.shuffleLibrary(source, game); player.shuffleLibrary(source, game);
} }
game.processAction();
cards.retainZone(Zone.EXILED, game); cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, StaticFilters.FILTER_CARD); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, StaticFilters.FILTER_CARD);
return true; return true;

1
Mage.Sets/src/mage/cards/k/KefkaDancingMad.java
View file

@ -114,6 +114,7 @@ class KefkaDancingMadEffect extends OneShotEffect {
return false; return false;
} }
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game); cards.retainZone(Zone.EXILED, game);
KefkaDancingMadTracker tracker = new KefkaDancingMadTracker(); KefkaDancingMadTracker tracker = new KefkaDancingMadTracker();
CardUtil.castMultipleWithAttributeForFree( CardUtil.castMultipleWithAttributeForFree(

2
Mage.Sets/src/mage/cards/k/KotisTheFangkeeper.java
View file

@ -80,6 +80,8 @@ class KotisTheFangkeeperEffect extends OneShotEffect {
controller.moveCards(cards, Zone.EXILED, source, game); controller.moveCards(cards, Zone.EXILED, source, game);
FilterCard filter = new FilterCard(); FilterCard filter = new FilterCard();
filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1));
game.processAction();
cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter);
return true; return true;
} }

2
Mage.Sets/src/mage/cards/k/KyloxVisionaryInventor.java
View file

@ -110,6 +110,8 @@ class KyloxVisionaryInventorEffect extends OneShotEffect {
return true; return true;
} }
player.moveCards(cards, Zone.EXILED, source, game); player.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree( CardUtil.castMultipleWithAttributeForFree(
player, source, game, cards, player, source, game, cards,
StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY

2
Mage.Sets/src/mage/cards/p/PrimevalSpawn.java
View file

@ -132,6 +132,8 @@ class PrimevalSpawnSpellEffect extends OneShotEffect {
} }
Cards cards = new CardsImpl(player.getLibrary().getTopCards(game, 10)); Cards cards = new CardsImpl(player.getLibrary().getTopCards(game, 10));
player.moveCards(cards, Zone.EXILED, source, game); player.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
CardUtil.castMultipleWithAttributeForFree( CardUtil.castMultipleWithAttributeForFree(
player, source, game, cards, StaticFilters.FILTER_CARD, player, source, game, cards, StaticFilters.FILTER_CARD,
Integer.MAX_VALUE, new PrimevalSpawnTracker() Integer.MAX_VALUE, new PrimevalSpawnTracker()

2
Mage.Sets/src/mage/cards/v/VillainousWealth.java
View file

@ -71,6 +71,8 @@ class VillainousWealthEffect extends OneShotEffect {
} }
Cards cards = new CardsImpl(opponent.getLibrary().getTopCards(game, xValue)); Cards cards = new CardsImpl(opponent.getLibrary().getTopCards(game, xValue));
opponent.moveCards(cards, Zone.EXILED, source, game); opponent.moveCards(cards, Zone.EXILED, source, game);
game.processAction();
cards.retainZone(Zone.EXILED, game);
FilterCard filter = new FilterCard(); FilterCard filter = new FilterCard();
filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, CardUtil.getSourceCostsTag(game, source, "X", 0) + 1)); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, CardUtil.getSourceCostsTag(game, source, "X", 0) + 1));
CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter); CardUtil.castMultipleWithAttributeForFree(controller, source, game, cards, filter);