External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 13:19:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor log changes and added tests.

Browse source
This commit is contained in:
LevelX2 2015-05-12 17:29:00 +02:00
parent 1561ed3fa4
commit e2cb40de70
7 changed files with 123 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/dragonsoftarkir/SunscorchRegent.java
View file

@ -54,6 +54,7 @@ public class SunscorchRegent extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Whenever an opponent casts a spell, put a +1/+1 counter on Sunscorch Regent and you gain 1 life.
Ability ability = new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
ability.addEffect(new GainLifeEffect(1));

20
Mage.Sets/src/mage/sets/judgment/CabalTherapy.java
View file

@ -28,6 +28,7 @@
package mage.sets.judgment;
import java.util.UUID;
import mage.MageObject;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
@ -57,11 +58,10 @@ public class CabalTherapy extends CardImpl {
super(ownerId, 62, "Cabal Therapy", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}");
this.expansionSetCode = "JUD";
this.color.setBlack(true);
// Name a nonland card. Target player reveals his or her hand and discards all cards with that name.
this.getSpellAbility().addTarget(new TargetPlayer());
this.getSpellAbility().addEffect(new CabalTherapyEffect());
// Flashback-Sacrifice a creature.
this.addAbility(new FlashbackAbility(
new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,new FilterControlledCreaturePermanent("a creature"), true)),
@ -91,10 +91,12 @@ class CabalTherapyEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source));
Player controller = game.getPlayer(source.getControllerId());
if (player != null && controller != null) {
Choice cardChoice = new ChoiceImpl();
MageObject sourceObject = game.getObject(source.getSourceId());
if (targetPlayer != null && controller != null && sourceObject != null) {
Choice cardChoice = new ChoiceImpl(true);
cardChoice.setMessage("Name a nonland card.");
cardChoice.setChoices(CardRepository.instance.getNonLandNames());
cardChoice.clearChoice();
@ -105,14 +107,14 @@ class CabalTherapyEffect extends OneShotEffect {
}
String cardName = cardChoice.getChoice();
game.informPlayers("Cabal Therapy, named card: [" + cardName + "]");
for (Card card : player.getHand().getCards(game)) {
game.informPlayers(sourceObject.getLogName() + ", named card: [" + cardName + "]");
for (Card card : targetPlayer.getHand().getCards(game)) {
if (card.getName().equals(cardName)) {
player.discard(card, source, game);
targetPlayer.discard(card, source, game);
}
}
controller.lookAtCards("Cabal Therapy Hand", player.getHand(), game);
controller.lookAtCards(sourceObject.getLogName() + " Hand", targetPlayer.getHand(), game);
}
return true;
}

17
Mage.Sets/src/mage/sets/magic2015/ChiefEngineer.java
View file

@ -117,16 +117,13 @@ class ChiefEngineerGainAbilitySpellsEffect extends ContinuousEffectImpl {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && permanent != null) {
for (Iterator<StackObject> iterator = game.getStack().iterator(); iterator.hasNext();) {
StackObject stackObject = iterator.next();
// only cast spells, so no copies
if (!stackObject.isCopy() && stackObject.getControllerId().equals(source.getControllerId())) {
if (stackObject instanceof Spell) {
Spell spell = (Spell) stackObject;
if (filter.match(spell, game)) {
if (!spell.getAbilities().contains(ability)) {
game.getState().addOtherAbility(spell.getCard(), ability);
}
for (StackObject stackObject : game.getStack()) {
// only spells cast, so no copies of spells
if ((stackObject instanceof Spell) && !stackObject.isCopy() && stackObject.getControllerId().equals(source.getControllerId())) {
Spell spell = (Spell) stackObject;
if (filter.match(spell, game)) {
if (!spell.getAbilities().contains(ability)) {
game.getState().addOtherAbility(spell.getCard(), ability);
}
}
}