github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-14 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Elsha of the Infinite - fixed that it gives flash ability to cards in the hand instead library's top card (closes #7605);

Browse source
This commit is contained in:
Oleg Agafonov 2021-02-21 07:43:14 +04:00
parent b968637e20
commit d343511d73
6 changed files with 90 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/e/ElshaOfTheInfinite.java
View file

@ -16,6 +16,7 @@ import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.common.FilterNonlandCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardOnTopOfLibraryPredicate;
import java.util.UUID;
@ -28,6 +29,7 @@ public final class ElshaOfTheInfinite extends CardImpl {
static {
filter.add(Predicates.not(CardType.CREATURE.getPredicate()));
filter.add(CardOnTopOfLibraryPredicate.instance);
}
public ElshaOfTheInfinite(UUID ownerId, CardSetInfo setInfo) {
@ -62,3 +64,4 @@ public final class ElshaOfTheInfinite extends CardImpl {
return new ElshaOfTheInfinite(this);
}
}

55
Mage.Tests/src/test/java/org/mage/test/cards/single/c19/ElshaOfTheInfiniteTest.java Normal file
View file

@ -0,0 +1,55 @@
package org.mage.test.cards.single.c19;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* @author JayDi85
*/
public class ElshaOfTheInfiniteTest extends CardTestPlayerBase {
@Test
public void test_MustApplyToTopCardOnly() {
// bug: flash ability can be applied to all cards in hand
// https://github.com/magefree/mage/issues/7605
removeAllCardsFromLibrary(playerA);
removeAllCardsFromHand(playerA);
skipInitShuffling();
// You may look at the top card of your library any time.
// You may cast noncreature spells from the top of your library. If you cast a spell this way, you may cast it as though it had flash.
addCard(Zone.BATTLEFIELD, playerA, "Elsha of the Infinite");
//
// Sorcery
// Bolt of Keranos deals 3 damage to any target. Scry 1.
addCard(Zone.HAND, playerA, "Bolt of Keranos", 1);// {1}{R}{R}
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
//
// Birgi, God of Storytelling - creature, {2}{R}
// Harnfel, Horn of Bounty - artifact, {4}{R}
addCard(Zone.LIBRARY, playerA, "Birgi, God of Storytelling", 1);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
// possible bug: sorcery card in hand got flash and can be playable
checkPlayableAbility("hand on upkeep, can't cast", 1, PhaseStep.UPKEEP, playerA, "Cast Bolt of Keranos", false);
checkPlayableAbility("lib on upkeep, can't cast left", 1, PhaseStep.UPKEEP, playerA, "Cast Birgi, God of Storytelling", false);
checkPlayableAbility("lib on upkeep, can cast right", 1, PhaseStep.UPKEEP, playerA, "Cast Harnfel, Horn of Bounty", true);
//
checkPlayableAbility("hand on main", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cast Bolt of Keranos", true);
checkPlayableAbility("lib on main, can't cast left", 1, PhaseStep.UPKEEP, playerA, "Cast Birgi, God of Storytelling", false);
checkPlayableAbility("lib on main, can cast right", 1, PhaseStep.UPKEEP, playerA, "Cast Harnfel, Horn of Bounty", true);
checkLibraryCount("before cast", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Birgi, God of Storytelling", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Harnfel, Horn of Bounty");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
assertPermanentCount(playerA, "Harnfel, Horn of Bounty", 1);
}
}

10
Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java
View file

@ -1,8 +1,5 @@
package mage.abilities.effects.common.continuous;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.abilities.keyword.MorphAbility;
@ -14,8 +11,9 @@ import mage.constants.Outcome;
import mage.filter.FilterCard;
import mage.game.Game;
import java.util.UUID;
/**
*
* @author LevelX2
*/
@ -69,10 +67,10 @@ public class CastAsThoughItHadFlashAllEffect extends AsThoughEffectImpl {
Card cardCopy = card.copy();
cardCopy.getCardType().clear();
cardCopy.addCardType(CardType.CREATURE);
return filter.match(cardCopy, game);
return filter.match(cardCopy, source.getSourceId(), affectedControllerId, game);
}
}
return filter.match(card, game);
return filter.match(card, source.getSourceId(), affectedControllerId, game);
}
}
return false;

2
Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java
View file

@ -98,6 +98,6 @@ public class PlayTheTopCardEffect extends AsThoughEffectImpl {
}
// must be correct card
return filter.match(cardToCheck, source.getSourceId(), source.getControllerId(), game);
return filter.match(cardToCheck, source.getSourceId(), affectedControllerId, game);
}
}

2
Mage/src/main/java/mage/abilities/effects/common/ruleModifying/PlayLandsFromGraveyardControllerEffect.java
View file

@ -77,6 +77,6 @@ public class PlayLandsFromGraveyardControllerEffect extends AsThoughEffectImpl {
}
// must be correct card
return filter.match(cardToCheck, source.getSourceId(), source.getControllerId(), game);
return filter.match(cardToCheck, source.getSourceId(), affectedControllerId, game);
}
}

26
Mage/src/main/java/mage/filter/predicate/mageobject/CardOnTopOfLibraryPredicate.java Normal file
View file

@ -0,0 +1,26 @@
package mage.filter.predicate.mageobject;
import mage.cards.Card;
import mage.filter.predicate.ObjectPlayer;
import mage.filter.predicate.ObjectPlayerPredicate;
import mage.game.Game;
import mage.players.Player;
/**
* @author JayDi85
*/
public enum CardOnTopOfLibraryPredicate implements ObjectPlayerPredicate<ObjectPlayer<Card>> {
instance;
@Override
public boolean apply(ObjectPlayer<Card> input, Game game) {
Player player = game.getPlayer(input.getObject().getOwnerId());
if (player == null) {
return false;
}
Card topCard = player.getLibrary().getFromTop(game);
return topCard != null && topCard.getId().equals(input.getObject().getMainCard().getId());
}
}