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

some more changes to CDA effects, tested and working correctly

Browse source
This commit is contained in:
Evan Kranzler 2017-10-02 16:32:36 -04:00
parent 6b2c20b29e
commit 549103a2f0
7 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/cards/a/ApocalypseDemon.java
View file

@ -17,11 +17,11 @@ import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetControlledPermanent;
public class ApocalypseDemon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("nother creature");
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
filter.add(new AnotherPredicate());
}
@ -37,10 +37,10 @@ public class ApocalypseDemon extends CardImpl {
// At the beginning of your upkeep, tap Apocalypse Demon unless you sacrifice another creature.
TapSourceUnlessPaysEffect tapEffect = new TapSourceUnlessPaysEffect(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
tapEffect.setText("At the beginning of your upkeep, tap Apocalypse Demon unless you sacrifice another creature.");
tapEffect.setText("tap {this} unless you sacrifice another creature.");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(tapEffect, TargetController.YOU, false));
}
}
public ApocalypseDemon(final ApocalypseDemon apocalypseDemon) {
super(apocalypseDemon);
}

5
Mage/src/main/java/mage/MageObject.java
View file

@ -17,11 +17,8 @@ import mage.util.SubTypeList;
import java.io.Serializable;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
public interface MageObject extends MageItem, Serializable {
@ -201,7 +198,7 @@ public interface MageObject extends MageItem, Serializable {
TextPart addTextPart(TextPart textPart);
public void removePTCDA();
void removePTCDA();
default void changeSubType(SubType fromSubType, SubType toSubType) {

1
Mage/src/main/java/mage/MageObjectImpl.java
View file

@ -342,6 +342,7 @@ public abstract class MageObjectImpl implements MageObject {
}
}
@Override
public void removePTCDA() {
for (Iterator<Ability> iter = this.getAbilities().iterator(); iter.hasNext();) {
Ability ability = iter.next();

3
Mage/src/main/java/mage/designations/Designation.java
View file

@ -215,4 +215,7 @@ public abstract class Designation implements MageObject {
throw new UnsupportedOperationException("Unsupported operation");
}
@Override
public void removePTCDA() {
}
}

3
Mage/src/main/java/mage/game/command/Commander.java
View file

@ -249,4 +249,7 @@ public class Commander implements CommandObject {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public void removePTCDA() {
}
}

3
Mage/src/main/java/mage/game/stack/StackObjImpl.java
View file

@ -268,4 +268,7 @@ public abstract class StackObjImpl implements StackObject {
return name;
}
@Override
public void removePTCDA() {
}
}

2
Mage/src/main/java/mage/game/stack/StackObject.java
View file

@ -50,7 +50,7 @@ public interface StackObject extends MageObject, Controllable {
// int getConvertedManaCost();
boolean chooseNewTargets(Game game, UUID playerId, boolean forceChange, boolean onlyOneTarget, FilterPermanent filterNewTarget);
StackObject createCopyOnStack(Game game, Ability source, UUID newControllerId, boolean chooseNewTargets);
@Override