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

fix SourceTargetsPermanentCondition

Browse source
This commit is contained in:
xenohedron 2024-05-06 00:15:22 -04:00
parent d1cca988c4
commit a97dec3e97
2 changed files with 88 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Mage.Tests/src/test/java/org/mage/test/cards/targets/TargetsPermanentConditionTest.java Normal file
View file

@ -0,0 +1,79 @@
package org.mage.test.cards.targets;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* @author xenohedron
*/
public class TargetsPermanentConditionTest extends CardTestPlayerBase {
private static final String town = "This Town Ain't Big Enough";
private static final String piker = "Goblin Piker";
private static final String ghoul = "Warpath Ghoul";
private static final String wurm = "Craw Wurm";
// Reported bug: This Town Ain't Big Enough cost reduction doesn't consider the second targeted permanent
/* This Town Ain't Big Enough {4}{U} Instant
* This spell costs {3} less to cast if it targets a permanent you control.
* Return up to two target nonland permanents to their owners’ hands.
*/
@Test
public void testThisTownAintBigEnough1() {
testThisTownAintBigEnoughBase(true);
}
@Test
public void testThisTownAintBigEnough2() {
testThisTownAintBigEnoughBase(false);
}
private void testThisTownAintBigEnoughBase(boolean targetOrder) {
addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
addCard(Zone.HAND, playerA, town);
addCard(Zone.BATTLEFIELD, playerA, piker);
addCard(Zone.BATTLEFIELD, playerB, ghoul);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, town);
if (targetOrder) {
addTarget(playerA, piker + "^" + ghoul);
} else {
addTarget(playerA, ghoul + "^" + piker);
}
setStrictChooseMode(true);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerA, town, 1);
assertHandCount(playerA, piker, 1);
assertHandCount(playerB, ghoul, 1);
}
@Test
public void testThisTownAintBigEnoughNoReduce() {
addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
addCard(Zone.HAND, playerA, town);
addCard(Zone.BATTLEFIELD, playerA, piker);
addCard(Zone.BATTLEFIELD, playerB, ghoul);
addCard(Zone.BATTLEFIELD, playerB, wurm);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, town);
addTarget(playerA, ghoul + "^" + wurm);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerA, town, 1);
assertTappedCount("Island", true, 5);
assertHandCount(playerB, ghoul, 1);
assertHandCount(playerB, wurm, 1);
}
}

22
Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java
View file

@ -4,11 +4,9 @@ import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.stack.StackObject;
import mage.target.Target;
import java.util.Iterator;
import java.util.Objects;
/**
* @author TheElk801
@ -23,18 +21,16 @@ public class SourceTargetsPermanentCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
StackObject sourceSpell = game.getStack().getStackObject(source.getSourceId());
if (sourceSpell == null) {
StackObject stackObject = game.getStack().getStackObject(source.getSourceId());
if (stackObject == null) {
return false;
}
Iterator<Target> targets = sourceSpell.getStackAbility().getTargets().iterator();
while (targets.hasNext()) {
Permanent permanent = game.getPermanentOrLKIBattlefield(targets.next().getFirstTarget());
if (filter.match(permanent, source.getControllerId(), source, game)) {
return true;
}
}
return false;
return stackObject.getStackAbility().getTargets()
.stream()
.flatMap(t -> t.getTargets().stream())
.map(game::getPermanentOrLKIBattlefield)
.filter(Objects::nonNull)
.anyMatch(p -> filter.match(p, source.getControllerId(), source, game));
}
@Override