External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 04:12:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6251 from Dilnu/Bonecrusher

Browse source 
Only fire one TARGETTED event per target selected while changing targets.
This commit is contained in:
Oleg Agafonov 2020-02-08 16:31:04 +01:00 • committed by GitHub
commit 6674ca5d20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 123 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

95
Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java
View file

@ -77,6 +77,101 @@ public class CopySpellTest extends CardTestPlayerBase {
assertAbility(playerB, "Silvercoat Lion", FlyingAbility.getInstance(), false);
}
@Test
public void BonecrusherGiantChangeTargets_BoneTargetBoth() {
// Whenever Bonecrusher Giant becomes the target of a spell, Bonecrusher Giant deals 2 damage to that spell’s controller.
addCard(Zone.BATTLEFIELD, playerA, "Bonecrusher Giant");
//
// Target creature gets +2/+2 until end of turn.
// Conspire (As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)
addCard(Zone.HAND, playerA, "Barkshell Blessing");
addCard(Zone.BATTLEFIELD, playerA, "Plains");
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions");
castSpell(1, PhaseStep.UPKEEP, playerA, "Barkshell Blessing");
setChoice(playerA, "Yes"); // use Conspire
addTarget(playerA, "Bonecrusher Giant"); // target bone
setChoice(playerA, "Grizzly Bears"); // pay for conspire
setChoice(playerA, "Savannah Lions"); // pay for conspire
setChoice(playerA, "When you pay"); // Put Conspire on the stack first.
setChoice(playerA, "No"); // both spells target bone
setStrictChooseMode(true);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAllCommandsUsed();
assertPowerToughness(playerA, "Bonecrusher Giant", 4 + 2 * 2, 3 + 2 * 2);
assertPowerToughness(playerA, "Grizzly Bears", 2, 2);
assertPowerToughness(playerA, "Savannah Lions", 2, 1);
assertLife(playerA, 20 - 2 * 2); // bone trigger from both spells
}
@Test
public void BonecrusherGiantChangeTargets_BoneTargetFirst() {
// Whenever Bonecrusher Giant becomes the target of a spell, Bonecrusher Giant deals 2 damage to that spell’s controller.
addCard(Zone.BATTLEFIELD, playerA, "Bonecrusher Giant");
//
// Target creature gets +2/+2 until end of turn.
// Conspire (As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)
addCard(Zone.HAND, playerA, "Barkshell Blessing");
addCard(Zone.BATTLEFIELD, playerA, "Plains");
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions");
castSpell(1, PhaseStep.UPKEEP, playerA, "Barkshell Blessing");
setChoice(playerA, "Yes"); // use Conspire
addTarget(playerA, "Bonecrusher Giant"); // target bone
setChoice(playerA, "Grizzly Bears"); // pay for conspire
setChoice(playerA, "Savannah Lions"); // pay for conspire
setChoice(playerA, "When you pay"); // Put Conspire on the stack first.
setChoice(playerA, "Yes"); // new target for copy: bear
addTarget(playerA, "Grizzly Bears");
setStrictChooseMode(true);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAllCommandsUsed();
assertPowerToughness(playerA, "Bonecrusher Giant", 4 + 2, 3 + 2);
assertPowerToughness(playerA, "Grizzly Bears", 2 + 2, 2 + 2);
assertPowerToughness(playerA, "Savannah Lions", 2, 1);
assertLife(playerA, 20 - 2); // one trigger
}
@Test
public void BonecrusherGiantChangeTargets_BoneTargetSecond() {
// Whenever Bonecrusher Giant becomes the target of a spell, Bonecrusher Giant deals 2 damage to that spell’s controller.
addCard(Zone.BATTLEFIELD, playerA, "Bonecrusher Giant");
//
// Target creature gets +2/+2 until end of turn.
// Conspire (As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)
addCard(Zone.HAND, playerA, "Barkshell Blessing");
addCard(Zone.BATTLEFIELD, playerA, "Plains");
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
addCard(Zone.BATTLEFIELD, playerA, "Savannah Lions");
castSpell(1, PhaseStep.UPKEEP, playerA, "Barkshell Blessing");
setChoice(playerA, "Yes"); // use Conspire
addTarget(playerA, "Grizzly Bears"); // target bear
setChoice(playerA, "Grizzly Bears"); // pay for conspire
setChoice(playerA, "Savannah Lions"); // pay for conspire
setChoice(playerA, "Yes"); // new target for copy: bone
addTarget(playerA, "Bonecrusher Giant");
// setChoice(playerA, "When {this} becomes the target of a spell"); // must be one trigger from bone, not two
setStrictChooseMode(true);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAllCommandsUsed();
assertPowerToughness(playerA, "Bonecrusher Giant", 4 + 2, 3 + 2);
assertPowerToughness(playerA, "Grizzly Bears", 2 + 2, 2 + 2);
assertPowerToughness(playerA, "Savannah Lions", 2, 1);
assertLife(playerA, 20 - 2); // one trigger
}
/*
* Reported bug: "Silverfur Partisan and fellow wolves did not trigger off
* of copies of Strength of Arms made by Zada, Hedron Grinder. Not sure

14
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -1883,7 +1883,7 @@ public class TestPlayer implements Player {
for (Player player : game.getPlayers().values()) {
if (player.getName().equals(playerName)
&& target.canTarget(computerPlayer.getId(), player.getId(), source, game)) {
target.add(player.getId(), game);
target.addTarget(player.getId(), source, game);
targets.remove(targetDefinition);
return true;
}
@ -1932,7 +1932,7 @@ public class TestPlayer implements Player {
if (isObjectHaveTargetNameOrAlias(permanent, targetName) || (permanent.getName() + '-' + permanent.getExpansionSetCode()).equals(targetName)) { // TODO: remove exp code search?
if (target.canTarget(abilityControllerId, permanent.getId(), source, game) && !target.getTargets().contains(permanent.getId())) {
if ((permanent.isCopy() && !originOnly) || (!permanent.isCopy() && !copyOnly)) {
target.add(permanent.getId(), game);
target.addTarget(permanent.getId(), source, game);
targetFound = true;
break; // return to for (String targetName
}
@ -1957,7 +1957,7 @@ public class TestPlayer implements Player {
for (Card card : computerPlayer.getHand().getCards(((TargetCardInHand) target.getOriginalTarget()).getFilter(), game)) {
if (isObjectHaveTargetNameOrAlias(card, targetName) || (card.getName() + '-' + card.getExpansionSetCode()).equals(targetName)) { // TODO: remove set code search?
if (target.canTarget(abilityControllerId, card.getId(), source, game) && !target.getTargets().contains(card.getId())) {
target.add(card.getId(), game);
target.addTarget(card.getId(), source, game);
targetFound = true;
break; // return to for (String targetName
}
@ -1982,7 +1982,7 @@ public class TestPlayer implements Player {
for (Card card : game.getExile().getCards(targetFull.getFilter(), game)) {
if (isObjectHaveTargetNameOrAlias(card, targetName) || (card.getName() + '-' + card.getExpansionSetCode()).equals(targetName)) { // TODO: remove set code search?
if (target.canTarget(abilityControllerId, card.getId(), source, game) && !target.getTargets().contains(card.getId())) {
target.add(card.getId(), game);
target.addTarget(card.getId(), source, game);
targetFound = true;
break; // return to for (String targetName
}
@ -2057,7 +2057,7 @@ public class TestPlayer implements Player {
for (Card card : player.getGraveyard().getCards(targetFull.getFilter(), game)) {
if (isObjectHaveTargetNameOrAlias(card, targetName) || (card.getName() + '-' + card.getExpansionSetCode()).equals(targetName)) { // TODO: remove set code search?
if (target.canTarget(abilityControllerId, card.getId(), source, game) && !target.getTargets().contains(card.getId())) {
target.add(card.getId(), game);
target.addTarget(card.getId(), source, game);
targetFound = true;
break IterateGraveyards; // return to for (String targetName
}
@ -2084,7 +2084,7 @@ public class TestPlayer implements Player {
for (StackObject stackObject : game.getStack()) {
if (isObjectHaveTargetNameOrAlias(stackObject, targetName)) {
if (target.canTarget(abilityControllerId, stackObject.getId(), source, game) && !target.getTargets().contains(stackObject.getId())) {
target.add(stackObject.getId(), game);
target.addTarget(stackObject.getId(), source, game);
targetFound = true;
break; // return to for (String targetName
}
@ -2133,7 +2133,7 @@ public class TestPlayer implements Player {
for (String targetName : targetList) {
for (Card card : cards.getCards(game)) {
if (isObjectHaveTargetNameOrAlias(card, targetName) && !target.getTargets().contains(card.getId())) {
target.add(card.getId(), game);
target.addTarget(card.getId(), source, game);
targetFound = true;
break;
}