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

[ALA] Finish fixing Death Baron and add test

Browse source
This commit is contained in:
Alex W. Jackson 2022-04-08 01:42:41 -04:00
parent ff5efb525a
commit a48dedcd76
5 changed files with 77 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public final class DeathBaron extends CardImpl {
1, 1, Duration.WhileOnBattlefield, filter, false
));
ability.addEffect(new GainAbilityControlledEffect(
DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter, true
DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter
).setText("and have deathtouch"));
this.addAbility(ability);
}

66
Mage.Tests/src/test/java/org/mage/test/cards/single/ala/DeathBaronTest.java Normal file
View file

@ -0,0 +1,66 @@
package org.mage.test.cards.single.ala;
import mage.abilities.Ability;
import mage.abilities.keyword.DeathtouchAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* @author awjackson
*/
public class DeathBaronTest extends CardTestPlayerBase {
private static final String baron = "Death Baron";
private static final String skeleton = "Drudge Skeletons";
private static final String zombie = "Scathe Zombies";
private static final String knight = "Black Knight";
@Test
public void testDoesntNormallyAffectSelf() {
addCard(Zone.BATTLEFIELD, playerA, baron);
addCard(Zone.BATTLEFIELD, playerA, skeleton);
addCard(Zone.BATTLEFIELD, playerA, zombie);
addCard(Zone.BATTLEFIELD, playerA, knight);
addCard(Zone.BATTLEFIELD, playerB, skeleton);
addCard(Zone.BATTLEFIELD, playerB, zombie);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
Ability deathtouch = DeathtouchAbility.getInstance();
// Death Baron doesn't normally affect itself
assertPowerToughness(playerA, baron, 2, 2);
assertAbility(playerA, baron, deathtouch, false);
assertPowerToughness(playerA, skeleton, 2, 2);
assertPowerToughness(playerA, zombie, 3, 3);
assertPowerToughness(playerA, knight, 2, 2);
assertAbility(playerA, skeleton, deathtouch, true);
assertAbility(playerA, zombie, deathtouch, true);
assertAbility(playerA, knight, deathtouch, false);
assertPowerToughness(playerB, skeleton, 1, 1);
assertPowerToughness(playerB, zombie, 2, 2);
assertAbility(playerB, skeleton, deathtouch, false);
assertAbility(playerB, zombie, deathtouch, false);
}
@Test
public void testBecomeSkeleton() {
addCard(Zone.BATTLEFIELD, playerA, baron);
addCard(Zone.BATTLEFIELD, playerA, "Amoeboid Changeling");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target creature gains", baron);
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
// If you manage to turn it into a Skeleton, however, then it will give itself +1/+1 and deathtouch
assertPowerToughness(playerA, baron, 3, 3);
assertAbility(playerA, baron, DeathtouchAbility.getInstance(), true);
}
}

5
Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java
View file

@ -117,8 +117,9 @@ public class BoostControlledEffect extends ContinuousEffectImpl {
}
}
} else {
for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
if (!(excludeSource && perm.getId().equals(source.getSourceId()))) {
for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
if (perm.isControlledBy(source.getControllerId())
&& (!(excludeSource && perm.getId().equals(source.getSourceId())))) {
perm.addPower(power.calculate(game, source, this));
perm.addToughness(toughness.calculate(game, source, this));
}

6
Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java
View file

@ -98,8 +98,9 @@ public class GainAbilityControlledEffect extends ContinuousEffectImpl {
}
}
} else {
for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
if (!(excludeSource && perm.getId().equals(source.getSourceId()))) {
for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
if (perm.isControlledBy(source.getControllerId())
&& !(excludeSource && perm.getId().equals(source.getSourceId()))) {
for (Ability abilityToAdd : ability) {
perm.addAbility(abilityToAdd, source.getSourceId(), game);
}
@ -149,5 +150,4 @@ public class GainAbilityControlledEffect extends ContinuousEffectImpl {
setText();
return this;
}
}

7
Mage/src/main/java/mage/game/permanent/Battlefield.java
View file

@ -237,8 +237,8 @@ public class Battlefield implements Serializable {
/**
* Returns all {@link Permanent} on the battlefield that match the supplied
* filter. This method ignores the range of influence. It ignores controller
* predicates
* filter. This method ignores the range of influence and ignores
* ObjectSourcePlayer predicates in the filter (e.g. controller predicates)
*
* @param filter
* @param game
@ -254,7 +254,8 @@ public class Battlefield implements Serializable {
/**
* Returns all {@link Permanent} that match the filter and are controlled by
* controllerId. This method ignores the range of influence.
* controllerId. This method ignores the range of influence and ignores
* ObjectSourcePlayer predicates in the filter
*
* @param filter
* @param controllerId