github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tibalt, Cosmic Impostor - fixed that emblem can't cast not owned cards (#7598)

Browse source 
* Fixed ability.canChooseTarget not using correct playerId

* Fixed Necrotic Plague

* Revert "Fixed Necrotic Plague"

This reverts commit 7659039670293ce1ea428dad042511d9d75f9da6.

* Set target controller on Necrotic Plague and add check in canChooseTarget

* Add test for Tibalt + Ephemerate interaction

* Tests improved

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
This commit is contained in:
Daniel Bomar 2021-02-22 13:06:43 -06:00 committed by GitHub
parent b94af941df
commit bb0a995541
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 84 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/SimulatedPlayerMCTS.java
View file

@ -118,7 +118,7 @@ public class SimulatedPlayerMCTS extends MCTSPlayer {
@Override
public boolean triggerAbility(TriggeredAbility source, Game game) {
// logger.info("trigger");
if (source != null && source.canChooseTarget(game)) {
if (source != null && source.canChooseTarget(game, playerId)) {
Ability ability;
List<Ability> options = getPlayableOptions(source, game);
if (options.isEmpty()) {

2
Mage.Sets/src/mage/cards/l/LivingLore.java
View file

@ -183,7 +183,7 @@ class LivingLoreSacrificeEffect extends OneShotEffect {
}
}
if (exiledCard != null) {
if (exiledCard.getSpellAbility().canChooseTarget(game)) {
if (exiledCard.getSpellAbility().canChooseTarget(game, controller.getId())) {
game.getState().setValue("PlayFromNotOwnHandZone" + exiledCard.getId(), Boolean.TRUE);
controller.cast(controller.chooseAbilityForCast(exiledCard, game, true),
game, true, new ApprovingObject(source, game));

2
Mage.Sets/src/mage/cards/m/MaelstromArchangel.java
View file

@ -81,7 +81,7 @@ class MaelstromArchangelCastEffect extends OneShotEffect {
while (controller.canRespond() && !cancel) {
if (controller.chooseTarget(outcome, target, source, game)) {
cardToCast = game.getCard(target.getFirstTarget());
if (cardToCast != null && cardToCast.getSpellAbility().canChooseTarget(game)) {
if (cardToCast != null && cardToCast.getSpellAbility().canChooseTarget(game, controller.getId())) {
cancel = true;
}
} else {

4
Mage.Sets/src/mage/cards/m/MizzixsMastery.java
View file

@ -79,7 +79,7 @@ class MizzixsMasteryEffect extends OneShotEffect {
if (card != null) {
if (controller.moveCards(card, Zone.EXILED, source, game)) {
Card cardCopy = game.copyCard(card, source, source.getControllerId());
if (cardCopy.getSpellAbility().canChooseTarget(game)
if (cardCopy.getSpellAbility().canChooseTarget(game, controller.getId())
&& controller.chooseUse(outcome, "Cast copy of "
+ card.getName() + " without paying its mana cost?", source, game)) {
game.getState().setValue("PlayFromNotOwnHandZone" + cardCopy.getId(), Boolean.TRUE);
@ -135,7 +135,7 @@ class MizzixsMasteryOverloadEffect extends OneShotEffect {
if (controller.chooseTarget(Outcome.PlayForFree, copiedCards, targetCard, source, game)) {
Card selectedCard = game.getCard(targetCard.getFirstTarget());
if (selectedCard != null
&& selectedCard.getSpellAbility().canChooseTarget(game)) {
&& selectedCard.getSpellAbility().canChooseTarget(game, controller.getId())) {
game.getState().setValue("PlayFromNotOwnHandZone" + selectedCard.getId(), Boolean.TRUE);
controller.cast(controller.chooseAbilityForCast(selectedCard, game, true),
game, true, new ApprovingObject(source, game));

1
Mage.Sets/src/mage/cards/n/NecroticPlague.java
View file

@ -85,6 +85,7 @@ enum NecroticPlagueAdjuster implements TargetAdjuster {
ability.setControllerId(creatureController.getId());
ability.getTargets().clear();
TargetPermanent target = new TargetOpponentsCreaturePermanent();
target.setTargetController(creatureController.getId());
ability.getTargets().add(target);
}
}

2
Mage.Sets/src/mage/cards/o/OmnispellAdept.java
View file

@ -97,7 +97,7 @@ class OmnispellAdeptEffect extends OneShotEffect {
}
realFilter.add(Predicates.not(new CardIdPredicate(cardToCast.getId()))); // remove card from choose dialog (infinite fix)
if (!cardToCast.getSpellAbility().canChooseTarget(game)) {
if (!cardToCast.getSpellAbility().canChooseTarget(game, controller.getId())) {
continue;
}

2
Mage.Sets/src/mage/cards/o/OracleOfBones.java
View file

@ -95,7 +95,7 @@ class OracleOfBonesCastEffect extends OneShotEffect {
if (controller.chooseTarget(outcome, target, source, game)) {
cardToCast = game.getCard(target.getFirstTarget());
if (cardToCast != null
&& cardToCast.getSpellAbility().canChooseTarget(game)) {
&& cardToCast.getSpellAbility().canChooseTarget(game, controller.getId())) {
cancel = true;
}
} else {

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

@ -127,7 +127,7 @@ class PossibilityStormEffect extends OneShotEffect {
if (card != null && sharesType(card, spell.getCardType())
&& !card.isLand()
&& card.getSpellAbility().canChooseTarget(game)) {
&& card.getSpellAbility().canChooseTarget(game, spellController.getId())) {
if (spellController.chooseUse(Outcome.PlayForFree, "Cast " + card.getLogName() + " without paying cost?", source, game)) {
spellController.cast(card.getSpellAbility(), game, true, new ApprovingObject(source, game));
}

2
Mage.Sets/src/mage/cards/s/Sunforger.java
View file

@ -179,7 +179,7 @@ class CardCanBeCastPredicate implements Predicate<Card> {
SpellAbility ability = input.getSpellAbility().copy();
ability.setControllerId(controllerId);
input.adjustTargets(ability, game);
return ability.canChooseTarget(game);
return ability.canChooseTarget(game, controllerId);
}
@Override

35
Mage.Tests/src/test/java/org/mage/test/cards/single/khm/ValkiGodOfLiesTest.java Normal file
View file

@ -0,0 +1,35 @@
package org.mage.test.cards.single.khm;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
public class ValkiGodOfLiesTest extends CardTestPlayerBase {
@Test
public void ephmerateTest() {
removeAllCardsFromLibrary(playerB);
addCard(Zone.BATTLEFIELD, playerA, "Badlands", 7);
addCard(Zone.HAND, playerA, "Plains");
addCard(Zone.HAND, playerA, "Valki, God of Lies");
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
addCard(Zone.LIBRARY, playerB, "Ephemerate");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Tibalt, Cosmic Impostor");
setChoice(playerA, "Tibalt, Cosmic Impostor"); // two etb effects
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Exile the top card of each player's library.");
playLand(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Plains");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ephemerate", "Grizzly Bears");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
assertPermanentCount(playerA, "Tibalt, Cosmic Impostor", 1);
assertPermanentCount(playerA, "Grizzly Bears", 1);
assertGraveyardCount(playerB, "Ephemerate", 1);
}
}

7
Mage.Tests/src/test/java/org/mage/test/cards/single/m11/NecroticPlagueTest.java
View file

@ -22,8 +22,10 @@ public class NecroticPlagueTest extends CardTestPlayerBase {
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Necrotic Plague", "Sejiri Merfolk");
setStrictChooseMode(true);
setStopAt(2, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAllCommandsUsed();
assertLife(playerA, 20);
assertLife(playerB, 20);
@ -38,7 +40,7 @@ public class NecroticPlagueTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4);
/**
* Goblin Deathraiders English
* Goblin Deathraiders
* Creature — Goblin Warrior 3/1, BR
* Trample
*/
@ -63,9 +65,12 @@ public class NecroticPlagueTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Sejiri Merfolk");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Necrotic Plague", "Sejiri Merfolk");
addTarget(playerB, "Goblin Deathraiders"); // target for new necro attach
setStrictChooseMode(true);
setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAllCommandsUsed();
assertLife(playerA, 20);
assertLife(playerB, 20);

2
Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java
View file

@ -123,7 +123,7 @@ public class RandomPlayer extends ComputerPlayer {
@Override
public boolean triggerAbility(TriggeredAbility source, Game game) {
if (source != null && source.canChooseTarget(game)) {
if (source != null && source.canChooseTarget(game, playerId)) {
Ability ability;
List<Ability> options = getPlayableOptions(source, game);
if (options.isEmpty()) {

2
Mage/src/main/java/mage/abilities/Ability.java
View file

@ -320,7 +320,7 @@ public interface Ability extends Controllable, Serializable {
Modes getModes();
boolean canChooseTarget(Game game);
boolean canChooseTarget(Game game, UUID playerId);
/**
* Gets the list of sub-abilities associated with this ability.

22
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -901,24 +901,36 @@ public abstract class AbilityImpl implements Ability {
}
@Override
public boolean canChooseTarget(Game game) {
public boolean canChooseTarget(Game game, UUID playerId) {
if (this instanceof SpellAbility) {
if (SpellAbilityType.SPLIT_FUSED.equals(((SpellAbility) this).getSpellAbilityType())) {
Card card = game.getCard(getSourceId());
if (card != null) {
return canChooseTargetAbility(((SplitCard) card).getLeftHalfCard().getSpellAbility(), game, getControllerId())
&& canChooseTargetAbility(((SplitCard) card).getRightHalfCard().getSpellAbility(), game, getControllerId());
return canChooseTargetAbility(((SplitCard) card).getLeftHalfCard().getSpellAbility(), game, playerId)
&& canChooseTargetAbility(((SplitCard) card).getRightHalfCard().getSpellAbility(), game, playerId);
}
return false;
}
}
return canChooseTargetAbility(this, game, getControllerId());
return canChooseTargetAbility(this, game, playerId);
}
private static boolean canChooseTargetAbility(Ability ability, Game game, UUID controllerId) {
int found = 0;
for (Mode mode : ability.getModes().values()) {
if (mode.getTargets().canChoose(ability.getSourceId(), ability.getControllerId(), game)) {
boolean validTargets = true;
for (Target target : mode.getTargets()) {
UUID abilityControllerId = controllerId;
if (target.getTargetController() != null) {
abilityControllerId = target.getTargetController();
}
if (!target.canChoose(ability.getSourceId(), abilityControllerId, game)) {
validTargets = false;
break;
}
}
if (validTargets) {
found++;
if (ability.getModes().isEachModeMoreThanOnce()) {
return true;

2
Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java
View file

@ -194,7 +194,7 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa
|| game.canPlaySorcery(playerId)
|| null != approvingObject) {
if (costs.canPay(this, this, playerId, game)
&& canChooseTarget(game)) {
&& canChooseTarget(game, playerId)) {
this.activatorId = playerId;
return new ActivationStatus(true, approvingObject);
}

6
Mage/src/main/java/mage/abilities/SpellAbility.java
View file

@ -118,13 +118,13 @@ public class SpellAbility extends ActivatedAbilityImpl {
// fused can be called from hand only, so not permitting object allows or other zones checks
// see https://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/magic-rulings-archives/251926-snapcaster-mage-and-fuse
if (game.getState().getZone(splitCard.getId()) == Zone.HAND) {
return new ActivationStatus(splitCard.getLeftHalfCard().getSpellAbility().canChooseTarget(game)
&& splitCard.getRightHalfCard().getSpellAbility().canChooseTarget(game), null);
return new ActivationStatus(splitCard.getLeftHalfCard().getSpellAbility().canChooseTarget(game, playerId)
&& splitCard.getRightHalfCard().getSpellAbility().canChooseTarget(game, playerId), null);
}
}
return ActivationStatus.getFalse();
} else {
return new ActivationStatus(canChooseTarget(game), approvingObject);
return new ActivationStatus(canChooseTarget(game, playerId), approvingObject);
}
}
}

2
Mage/src/main/java/mage/abilities/effects/common/cost/CastWithoutPayingManaCostEffect.java
View file

@ -76,7 +76,7 @@ public class CastWithoutPayingManaCostEffect extends OneShotEffect {
+ cardToCast.getName() + " is no land and has no spell ability!");
cancel = true;
}
if (cardToCast.getSpellAbility().canChooseTarget(game)) {
if (cardToCast.getSpellAbility().canChooseTarget(game, controller.getId())) {
cancel = true;
}
}

4
Mage/src/main/java/mage/game/stack/StackAbility.java
View file

@ -437,8 +437,8 @@ public class StackAbility extends StackObjImpl implements Ability {
}
@Override
public boolean canChooseTarget(Game game) {
return ability.canChooseTarget(game);
public boolean canChooseTarget(Game game, UUID playerId) {
return ability.canChooseTarget(game, playerId);
}
@Override

12
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1495,7 +1495,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (sourceObject != null) {
sourceObject.adjustTargets(ability, game);
}
if (ability.canChooseTarget(game)) {
if (ability.canChooseTarget(game, playerId)) {
if (ability.isUsesStack()) {
game.getStack().push(new StackAbility(ability, playerId));
}
@ -1539,28 +1539,28 @@ public abstract class PlayerImpl implements Player, Serializable {
return useable;
case SPLIT_FUSED:
if (zone == Zone.HAND) {
if (ability.canChooseTarget(game)) {
if (ability.canChooseTarget(game, playerId)) {
useable.put(ability.getId(), (SpellAbility) ability);
}
}
case SPLIT:
if (((SplitCard) object).getLeftHalfCard().getSpellAbility().canChooseTarget(game)) {
if (((SplitCard) object).getLeftHalfCard().getSpellAbility().canChooseTarget(game, playerId)) {
useable.put(((SplitCard) object).getLeftHalfCard().getSpellAbility().getId(),
((SplitCard) object).getLeftHalfCard().getSpellAbility());
}
if (((SplitCard) object).getRightHalfCard().getSpellAbility().canChooseTarget(game)) {
if (((SplitCard) object).getRightHalfCard().getSpellAbility().canChooseTarget(game, playerId)) {
useable.put(((SplitCard) object).getRightHalfCard().getSpellAbility().getId(),
((SplitCard) object).getRightHalfCard().getSpellAbility());
}
return useable;
case SPLIT_AFTERMATH:
if (zone == Zone.GRAVEYARD) {
if (((SplitCard) object).getRightHalfCard().getSpellAbility().canChooseTarget(game)) {
if (((SplitCard) object).getRightHalfCard().getSpellAbility().canChooseTarget(game, playerId)) {
useable.put(((SplitCard) object).getRightHalfCard().getSpellAbility().getId(),
((SplitCard) object).getRightHalfCard().getSpellAbility());
}
} else {
if (((SplitCard) object).getLeftHalfCard().getSpellAbility().canChooseTarget(game)) {
if (((SplitCard) object).getLeftHalfCard().getSpellAbility().canChooseTarget(game, playerId)) {
useable.put(((SplitCard) object).getLeftHalfCard().getSpellAbility().getId(),
((SplitCard) object).getLeftHalfCard().getSpellAbility());
}

2
Mage/src/main/java/mage/target/targetadjustment/TargetAdjuster.java
View file

@ -4,10 +4,10 @@ import mage.abilities.Ability;
import mage.game.Game;
/**
*
* @author TheElk801
*/
public interface TargetAdjuster {
void adjustTargets(Ability ability, Game game);
}