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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2020-01-14 17:43:43 +01:00
commit 55fe1db60d
22 changed files with 544 additions and 400 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Mage.Client/src/main/java/mage/client/dialog/GameEndDialog.java
View file

@ -7,18 +7,6 @@
*/
package mage.client.dialog;
import java.awt.Color;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import mage.client.MageFrame;
import mage.client.game.GamePanel;
import mage.client.util.Format;
@ -28,8 +16,17 @@ import mage.client.util.gui.BufferedImageBuilder;
import mage.view.GameEndView;
import mage.view.PlayerView;
import javax.swing.*;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
/**
*
* @author LevelX2
*/
public class GameEndDialog extends MageDialog {
@ -97,6 +94,7 @@ public class GameEndDialog extends MageDialog {
}
// get game log
try {
if (gameEndView.getMatchView().getGames().size() > 0) {
GamePanel gamePanel = MageFrame.getGame(gameEndView.getMatchView().getGames().get(gameEndView.getMatchView().getGames().size() - 1));
if (gamePanel != null) {
SimpleDateFormat sdf = new SimpleDateFormat();
@ -110,6 +108,7 @@ public class GameEndDialog extends MageDialog {
out.print(gamePanel.getGameLog());
out.close();
}
}
} catch (FileNotFoundException ex) {
JOptionPane.showMessageDialog(this, "Error while writing game log to file\n\n" + ex, "Error writing gamelog", JOptionPane.ERROR_MESSAGE);
}

12
Mage.Sets/src/mage/cards/d/Displace.java
View file

@ -1,18 +1,17 @@
package mage.cards.d;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public final class Displace extends CardImpl {
@ -23,10 +22,9 @@ public final class Displace extends CardImpl {
// Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control.
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2, new FilterControlledCreaturePermanent("creatures you control"), false));
Effect effect = new ExileTargetForSourceEffect();
effect.setText("Exile up to two target creatures you control");
this.getSpellAbility().addEffect(effect);
effect = new ReturnToBattlefieldUnderYourControlTargetEffect(true);
effect.setText(", then return those cards to the battlefield under their owner's control");
effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect()
.withReturnNames("those cards", "their owner's").concatBy(", then");
this.getSpellAbility().addEffect(effect);
}

1
Mage.Sets/src/mage/cards/d/DreamTrawler.java
View file

@ -52,6 +52,7 @@ public final class DreamTrawler extends CardImpl {
HexproofAbility.getInstance(), Duration.EndOfTurn
), new DiscardCardCost());
ability.addEffect(new TapSourceEffect().setText("Tap it"));
this.addAbility(ability);
}
private DreamTrawler(final DreamTrawler card) {

10
Mage.Sets/src/mage/cards/e/EldraziDisplacer.java
View file

@ -1,7 +1,5 @@
package mage.cards.e;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -19,8 +17,9 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public final class EldraziDisplacer extends CardImpl {
@ -42,10 +41,9 @@ public final class EldraziDisplacer extends CardImpl {
// {2}{C}: Exile another target creature, then return it to the battlefield tapped under its owner's control.
Effect effect = new ExileTargetForSourceEffect();
effect.setText("Exile another target creature");
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{C}"));
effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true);
effect.setText(", then return it to the battlefield tapped under its owner's control");
effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true)
.withReturnNames("it", "its owner's").concatBy(", then");
ability.addEffect(effect);
ability.addTarget(new TargetCreaturePermanent(FILTER));
this.addAbility(ability);

11
Mage.Sets/src/mage/cards/f/FacelessButcher.java
View file

@ -1,7 +1,5 @@
package mage.cards.f;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -19,21 +17,20 @@ import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.Target;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author Temba21
*/
public final class FacelessButcher extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature other than Faceless Butcher");
static {
filter.add(AnotherPredicate.instance);
}
public FacelessButcher(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
this.subtype.add(SubType.NIGHTMARE);
@ -41,10 +38,8 @@ public final class FacelessButcher extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(3);
// When Faceless Butcher enters the battlefield, exile target creature other than Faceless Butcher.
Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile target creature other than {this}");
Ability ability1 = new EntersBattlefieldTriggeredAbility(effect, false);
Target target = new TargetPermanent(filter);
ability1.addTarget(target);

13
Mage.Sets/src/mage/cards/f/FacelessDevourer.java
View file

@ -1,7 +1,5 @@
package mage.cards.f;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -21,13 +19,14 @@ import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.Target;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author LoneFox
*/
public final class FacelessDevourer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature with shadow");
static {
filter.add(AnotherPredicate.instance);
@ -43,15 +42,17 @@ public final class FacelessDevourer extends CardImpl {
// Shadow
this.addAbility(ShadowAbility.getInstance());
// When Faceless Devourer enters the battlefield, exile another target creature with shadow.
Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile another target creature with shadow");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
Target target = new TargetPermanent(filter);
ability.addTarget(target);
this.addAbility(ability);
// When Faceless Devourer leaves the battlefield, return the exiled card to the battlefield under its owner's control.
ability = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false);
ability = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)
.withReturnName("card", "its owner's"), false);
this.addAbility(ability);
}

7
Mage.Sets/src/mage/cards/g/Gravegouger.java
View file

@ -1,7 +1,5 @@
package mage.cards.g;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -17,8 +15,9 @@ import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.target.common.TargetCardInASingleGraveyard;
import java.util.UUID;
/**
*
* @author LoneFox
*/
public final class Gravegouger extends CardImpl {
@ -32,10 +31,10 @@ public final class Gravegouger extends CardImpl {
// When Gravegouger enters the battlefield, exile up to two target cards from a single graveyard.
Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile up to two target cards from a single graveyard");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
ability.addTarget(new TargetCardInASingleGraveyard(0, 2, new FilterCard("cards from a single graveyard")));
this.addAbility(ability);
// When Gravegouger leaves the battlefield, return the exiled cards to their owner's graveyard.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.GRAVEYARD), false));
}

11
Mage.Sets/src/mage/cards/h/Helvault.java
View file

@ -1,7 +1,5 @@
package mage.cards.h;
import java.util.UUID;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
@ -18,8 +16,9 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author North
*/
public final class Helvault extends CardImpl {
@ -34,16 +33,18 @@ public final class Helvault extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
addSuperType(SuperType.LEGENDARY);
// {1}, {tap}: Exile target creature you control.
// {1}, {T}: Exile target creature you control.
SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(1));
ability.addCost(new TapSourceCost());
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
// {7}, {tap}: Exile target creature you don't control.
// {7}, {T}: Exile target creature you don't control.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new GenericManaCost(7));
ability.addCost(new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(filter));
this.addAbility(ability);
// When Helvault is put into a graveyard from the battlefield, return all cards exiled with it to the battlefield under their owners' control.
this.addAbility(new DiesTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)));
}

18
Mage.Sets/src/mage/cards/i/IllusionistsStratagem.java
View file

@ -1,8 +1,5 @@
package mage.cards.i;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
@ -12,8 +9,9 @@ import mage.constants.CardType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/**
*
* @author Styxo
*/
public final class IllusionistsStratagem extends CardImpl {
@ -22,13 +20,11 @@ public final class IllusionistsStratagem extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}");
// Exile up to two target creatures you control, then return those cards to the battlefield under their owner's control.
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2, new FilterControlledCreaturePermanent("creatures you control"), false));
Effect effect = new ExileTargetForSourceEffect();
effect.setText("Exile up to two target creatures you control");
this.getSpellAbility().addEffect(effect);
effect = new ReturnToBattlefieldUnderYourControlTargetEffect(true);
effect.setText(", then return those cards to the battlefield under their owner's control");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addEffect(new ExileTargetForSourceEffect());
this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true)
.withReturnNames("those cards", "their owner's").concatBy(", then"));
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, 2,
new FilterControlledCreaturePermanent("creatures you control"), false));
// Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));

20
Mage.Sets/src/mage/cards/n/N1Starfighter.java
View file

@ -1,12 +1,9 @@
package mage.cards.n;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
@ -19,13 +16,14 @@ import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/**
*
* @author Styxo
*/
public final class N1Starfighter extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control");
static {
filter.add(AnotherPredicate.instance);
@ -40,12 +38,14 @@ public final class N1Starfighter extends CardImpl {
// Spaceflight
this.addAbility(SpaceflightAbility.getInstance());
// Whenever N-1 Starfighter deals combat damage to a player, you may pay {1}{W/U}. If you do, exile another creature you control, then return that card to the battlefield under its owner's control.
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new ExileTargetForSourceEffect(), new ManaCostsImpl("{1}{W/U}")), false);
Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, true);
effect.setText(", then return the card to the battlefield under their owner's control");
ability.addEffect(effect);
// Whenever N-1 Starfighter deals combat damage to a player, you may pay {1}{W/U}. If you do,
// exile another target creature you control, then return that card to the battlefield under its owner's control.
// P.S. original card have error with missing target word (another target creature)
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(
new ExileTargetForSourceEffect(), new ManaCostsImpl("{1}{W/U}")), false);
ability.addEffect(new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, true).concatBy(", then"));
ability.addTarget(new TargetControlledCreaturePermanent(filter));
ability.getRule();
this.addAbility(ability);
}

7
Mage.Sets/src/mage/cards/p/ParallaxTide.java
View file

@ -1,7 +1,5 @@
package mage.cards.p;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
@ -16,8 +14,9 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.target.common.TargetLandPermanent;
import java.util.UUID;
/**
*
* @author Plopman
*/
public final class ParallaxTide extends CardImpl {
@ -28,10 +27,12 @@ public final class ParallaxTide extends CardImpl {
// Fading 5
this.addAbility(new FadingAbility(5, this));
// Remove a fade counter from Parallax Tide: Exile target land.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()));
ability.addTarget(new TargetLandPermanent());
this.addAbility(ability);
// When Parallax Tide leaves the battlefield, each player returns to the battlefield all cards they own exiled with Parallax Tide.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), splitCard));
}

20
Mage.Sets/src/mage/cards/p/Petradon.java
View file

@ -1,27 +1,26 @@
package mage.cards.p;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ExileTargetForSourceEffect;
import mage.abilities.effects.common.ReturnFromExileForSourceEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent;
import mage.target.common.TargetLandPermanent;
import java.util.UUID;
/**
*
* @author LoneFox
*/
public final class Petradon extends CardImpl {
@ -34,13 +33,14 @@ public final class Petradon extends CardImpl {
this.toughness = new MageInt(6);
// When Petradon enters the battlefield, exile two target lands.
Effect effect = new ExileTargetForSourceEffect();
effect.setText("exile two target lands");
Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
ability.addTarget(new TargetLandPermanent(2));
Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false);
ability.addTarget(new TargetLandPermanent(2, 2, new FilterLandPermanent("lands"), false));
this.addAbility(ability);
// When Petradon leaves the battlefield, return the exiled cards to the battlefield under their owners' control.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false));
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)
.withReturnName("cards", "their owners'"), false));
// {R}: Petradon gets +1/+0 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
}

6
Mage.Sets/src/mage/cards/p/Petravark.java
View file

@ -1,7 +1,5 @@
package mage.cards.p;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -15,8 +13,9 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.target.common.TargetLandPermanent;
import java.util.UUID;
/**
*
* @author LoneFox
*/
public final class Petravark extends CardImpl {
@ -32,6 +31,7 @@ public final class Petravark extends CardImpl {
Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false);
ability.addTarget(new TargetLandPermanent());
this.addAbility(ability);
// When Petravark leaves the battlefield, return the exiled card to the battlefield under its owner's control.
this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false));
}

7
Mage.Sets/src/mage/cards/r/RuinGhost.java
View file

@ -1,7 +1,5 @@
package mage.cards.r;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -17,8 +15,9 @@ import mage.constants.Zone;
import mage.filter.common.FilterControlledLandPermanent;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author jeffwadsworth
*/
public final class RuinGhost extends CardImpl {
@ -30,7 +29,7 @@ public final class RuinGhost extends CardImpl {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// {W}, {tap}: Exile target land you control, then return it to the battlefield under your control.
// {W}, {T}: Exile target land you control, then return it to the battlefield under your control.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new ManaCostsImpl("{W"));
ability.addCost(new TapSourceCost());
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));

19
Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java
View file

@ -1,6 +1,5 @@
package mage.cards.t;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
@ -20,20 +19,24 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
public final class ThassaDeepDwelling extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("another target creature");
private static final FilterPermanent filterAnother = new FilterCreaturePermanent("another target creature");
private static final FilterPermanent filterOther = new FilterControlledCreaturePermanent("other target creature you control");
static {
filter.add(AnotherPredicate.instance);
filterAnother.add(AnotherPredicate.instance);
filterOther.add(AnotherPredicate.instance);
}
public ThassaDeepDwelling(UUID ownerId, CardSetInfo setInfo) {
@ -53,12 +56,12 @@ public final class ThassaDeepDwelling extends CardImpl {
// At the beginning of your end step, exile up to one other target creature you control, then return that card to the battlefield under your control.
Ability ability = new BeginningOfEndStepTriggeredAbility(
new ExileTargetForSourceEffect().setText("exile up to one other target creature you control, then "),
new ExileTargetForSourceEffect(),
TargetController.YOU, false
);
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true).concatBy(", then"));
ability.addTarget(new TargetPermanent(
0, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false
0, 1, filterOther, false
));
this.addAbility(ability);
@ -66,7 +69,7 @@ public final class ThassaDeepDwelling extends CardImpl {
ability = new SimpleActivatedAbility(
new TapTargetEffect("another target creature"), new ManaCostsImpl("{3}{U}")
);
ability.addTarget(new TargetPermanent(filter));
ability.addTarget(new TargetPermanent(filterAnother));
this.addAbility(ability);
}

3
Mage.Sets/src/mage/cards/y/YorvoLordOfGarenbrig.java
View file

@ -17,6 +17,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
@ -88,7 +89,7 @@ class YorvoLordOfGarenbrigEffect extends OneShotEffect {
return false;
}
sourcePerm.addCounters(CounterType.P1P1.createInstance(), source, game);
Permanent permanent = game.getPermanentOrLKIBattlefield(targetPointer.getFirst(game, source));
Permanent permanent = ((FixedTarget) targetPointer).getTargetedPermanentOrLKIBattlefield(game);
if (permanent == null) {
return true;
}

82
Mage.Tests/src/test/java/org/mage/test/commander/duel/YorvoLordOfGarenbrigOnCommandersTest.java Normal file
View file

@ -0,0 +1,82 @@
package org.mage.test.commander.duel;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestCommanderDuelBase;
/**
* @author JayDi85
*/
public class YorvoLordOfGarenbrigOnCommandersTest extends CardTestCommanderDuelBase {
@Test
public void test_TriggerOnSimpleCommander() {
// Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it.
// Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo.
addCard(Zone.HAND, playerA, "Yorvo, Lord of Garenbrig", 5); // {G}{G}{G}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
//
addCard(Zone.COMMAND, playerA, "Aggressive Mammoth"); // {3}{G}{G}{G}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 6);
// prepare yorvo
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
// cast commander
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aggressive Mammoth");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCounters("must get +2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig", CounterType.P1P1, 4 + 2);
checkPermanentCount("must play commander", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Aggressive Mammoth", 1);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
@Test
public void test_TriggerOnUroTitanOfNaturesWrath() {
// Yorvo, Lord of Garenbrig enters the battlefield with four +1/+1 counters on it.
// Whenever another green creature enters the battlefield under your control, put a +1/+1 counter on Yorvo. Then if that creature’s power is greater than Yorvo’s power, put another +1/+1 counter on Yorvo.
addCard(Zone.HAND, playerA, "Yorvo, Lord of Garenbrig", 5); // {G}{G}{G}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
//
// When Uro enters the battlefield, sacrifice it unless it escaped.
// Whenever Uro enters the battlefield or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield.
// Escape-{G}{G}{U}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
addCard(Zone.COMMAND, playerA, "Uro, Titan of Nature's Wrath"); // {1}{G}{U}
addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
// prepare yorvo
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig");
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
// cast commander
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath");
// If the entering green creature dies before Yorvo’s triggered ability resolves, use its power as it last
// existed on the battlefield to determine whether Yorvo gets a second +1/+1 counter.
// (2019-10-04)
// order triggers to remove commander first
setChoice(playerA, "Whenever {this} enters the battlefield or attacks"); // draw trigger
setChoice(playerA, "Whenever another green creature enters the battlefield"); // get counters trigger
//setChoice(playerA, "When {this} enters the battlefield, sacrifice it"); // sacrifice trigger must be on top
setChoice(playerA, "Yes"); // return commander to command zone
setChoice(playerA, "No"); // do not put land to battlefield
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
checkPermanentCounters("must get +2", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Yorvo, Lord of Garenbrig", CounterType.P1P1, 4 + 2);
checkCommandCardCount("return commander", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Uro, Titan of Nature's Wrath", 1);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
}
}

13
Mage/src/main/java/mage/abilities/effects/Effects.java
View file

@ -71,7 +71,18 @@ public class Effects extends ArrayList<Effect> {
nextRule = Character.toUpperCase(nextRule.charAt(0)) + nextRule.substring(1);
}
}
sbText.append(endString).append(nextRule);
String currentRule = endString + nextRule;
// fix dot in the combined effect like IfDoCost
if (sbText.length() > 0 && currentRule.length() > 0) {
boolean prevTextEndsWithDot = sbText.charAt(sbText.length() - 1) == '.';
boolean currentTextStartsWithDot = currentRule.startsWith(",") || currentRule.startsWith(".");
if (prevTextEndsWithDot && currentTextStartsWithDot) {
sbText.delete(sbText.length() - 1, sbText.length());
}
}
sbText.append(currentRule);
}
lastRule = nextRule;
}

27
Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java
View file

@ -1,9 +1,5 @@
package mage.abilities.effects.common;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -16,8 +12,11 @@ import mage.target.Target;
import mage.target.targetpointer.FirstTargetPointer;
import mage.util.CardUtil;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class ExileTargetForSourceEffect extends OneShotEffect {
@ -70,12 +69,24 @@ public class ExileTargetForSourceEffect extends OneShotEffect {
return staticText;
}
String amountText = "";
if (mode.getTargets().get(0).getMinNumberOfTargets() < mode.getTargets().get(0).getMaxNumberOfTargets()) {
amountText = "up to " + CardUtil.numberToText(mode.getTargets().get(0).getMaxNumberOfTargets()) + " ";
} else if (mode.getTargets().get(0).getMinNumberOfTargets() > 1) {
amountText = CardUtil.numberToText(mode.getTargets().get(0).getMinNumberOfTargets()) + " ";
}
String targetText = "";
if (mode.getTargets().get(0).getTargetName().contains("target ")) {
targetText = "";
} else {
targetText = "target ";
}
if (mode.getTargets().isEmpty()) {
return "exile it";
} else if (mode.getTargets().get(0).getTargetName().startsWith("another")) {
return "exile " + mode.getTargets().get(0).getTargetName();
} else {
return "exile target " + mode.getTargets().get(0).getTargetName();
return "exile " + amountText + targetText + mode.getTargets().get(0).getTargetName();
}
}
}

39
Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common;
import mage.MageObject;
@ -14,7 +13,6 @@ import mage.util.CardUtil;
import org.apache.log4j.Logger;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class ReturnFromExileForSourceEffect extends OneShotEffect {
@ -22,9 +20,10 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
private Zone returnToZone;
private boolean tapped;
private boolean previousZone;
private String returnName = "cards";
private String returnControlName;
/**
*
* @param zone Zone the card should return to
*/
public ReturnFromExileForSourceEffect(Zone zone) {
@ -36,7 +35,6 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
}
/**
*
* @param zone
* @param tapped
* @param previousZone if this is used from a dies leave battlefield or
@ -47,7 +45,18 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
this.returnToZone = zone;
this.tapped = tapped;
this.previousZone = previousZone;
setText();
// different default name for zones
switch (zone) {
case BATTLEFIELD:
this.returnControlName = "its owner's";
break;
default:
this.returnControlName = "their owner's";
break;
}
updateText();
}
public ReturnFromExileForSourceEffect(final ReturnFromExileForSourceEffect effect) {
@ -55,6 +64,10 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
this.returnToZone = effect.returnToZone;
this.tapped = effect.tapped;
this.previousZone = effect.previousZone;
this.returnName = effect.returnName;
this.returnControlName = effect.returnControlName;
updateText();
}
@Override
@ -85,24 +98,30 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
return false;
}
private void setText() {
private void updateText() {
StringBuilder sb = new StringBuilder();
sb.append("return the exiled cards ");
sb.append("return the exiled " + this.returnName + " ");
switch (returnToZone) {
case BATTLEFIELD:
sb.append("to the battlefield under its owner's control");
sb.append("to the battlefield under " + this.returnControlName + " control");
if (tapped) {
sb.append(" tapped");
}
break;
case HAND:
sb.append("to their owner's hand");
sb.append("to " + this.returnControlName + " hand");
break;
case GRAVEYARD:
sb.append("to their owner's graveyard");
sb.append("to " + this.returnControlName + " graveyard");
break;
}
staticText = sb.toString();
}
public ReturnFromExileForSourceEffect withReturnName(String returnName, String returnControlName) {
this.returnName = returnName;
this.returnControlName = returnControlName;
updateText();
return this;
}
}

30
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java
View file

@ -1,7 +1,5 @@
package mage.abilities.effects.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
@ -15,14 +13,17 @@ import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEffect {
private boolean tapped;
protected boolean fromExileZone;
private String returnName = "that card";
private String returnUnderControlName = "its owner's";
public ReturnToBattlefieldUnderOwnerControlTargetEffect() {
this(false);
@ -34,15 +35,26 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
public ReturnToBattlefieldUnderOwnerControlTargetEffect(boolean tapped, boolean fromExileZone) {
super(Outcome.Benefit);
staticText = "return that card to the battlefield under its owner's control";
this.tapped = tapped;
this.fromExileZone = fromExileZone;
updateText();
}
public ReturnToBattlefieldUnderOwnerControlTargetEffect(final ReturnToBattlefieldUnderOwnerControlTargetEffect effect) {
super(effect);
this.tapped = effect.tapped;
this.fromExileZone = effect.fromExileZone;
this.returnName = effect.returnName;
this.returnUnderControlName = effect.returnUnderControlName;
updateText();
}
private void updateText() {
this.staticText = "return " + this.returnName
+ " to the battlefield" + (tapped ? " tapped" : "")
+ " under " + this.returnUnderControlName + " control";
}
@Override
@ -63,8 +75,7 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
for (UUID targetId : this.getTargetPointer().getTargets(game, source)) {
if (exileZone.contains(targetId)) {
cardsToBattlefield.add(targetId);
}
else {
} else {
Card card = game.getCard(targetId);
if (card instanceof MeldCard) {
MeldCard meldCard = (MeldCard) card;
@ -91,4 +102,11 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
}
return false;
}
public ReturnToBattlefieldUnderOwnerControlTargetEffect withReturnNames(String returnName, String returnUnderControlName) {
this.returnName = returnName;
this.returnUnderControlName = returnUnderControlName;
updateText();
return this;
}
}

13
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java
View file

@ -23,6 +23,8 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
private boolean fromExileZone;
private boolean tapped;
private boolean attacking;
private String returnName = "that card";
private String returnUnderControlName = "your";
public ReturnToBattlefieldUnderYourControlTargetEffect() {
this(false);
@ -50,12 +52,14 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
this.fromExileZone = effect.fromExileZone;
this.tapped = effect.tapped;
this.attacking = effect.attacking;
this.returnName = effect.returnName;
this.returnUnderControlName = effect.returnUnderControlName;
updateText();
}
private void updateText() {
this.staticText = "return that card to the battlefield under your control"
this.staticText = "return " + returnName + " to the battlefield under " + returnUnderControlName + " control"
+ (tapped ? " tapped" : "")
+ (tapped && attacking ? " and" : "")
+ (attacking ? " attacking" : "");
@ -111,4 +115,11 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
}
return false;
}
public ReturnToBattlefieldUnderYourControlTargetEffect withReturnNames(String returnName, String returnUnderControlName) {
this.returnName = returnName;
this.returnUnderControlName = returnUnderControlName;
updateText();
return this;
}
}