External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Rix] Added 5 cards.

Browse source
This commit is contained in:
LevelX2 2018-01-04 18:00:08 +01:00
parent ad6bdb33ad
commit 145fe8ca15
10 changed files with 455 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage/src/main/java/mage/abilities/effects/common/ExileReturnBattlefieldOwnerNextEndStepSourceEffect.java
View file

@ -42,28 +42,37 @@ import mage.players.Player;
*/
public class ExileReturnBattlefieldOwnerNextEndStepSourceEffect extends OneShotEffect {
private static final String effectText = "exile {this}. Return it to the battlefield under its owner's control at the beginning of the next end step";
private boolean returnAlways;
private boolean returnTapped;
public ExileReturnBattlefieldOwnerNextEndStepSourceEffect() {
this(false);
}
public ExileReturnBattlefieldOwnerNextEndStepSourceEffect(boolean returnAlways) {
this(returnAlways, false);
}
/**
*
* @param returnAlways return the permanent also if it does not go to exile
* @param returnAlways Return the permanent also if it does not go to exile
* but is moved to another zone (e.g. command zone by commander replacement
* effect)
* @param returnTapped Does the source return tapped to the battlefield
*/
public ExileReturnBattlefieldOwnerNextEndStepSourceEffect(boolean returnAlways) {
public ExileReturnBattlefieldOwnerNextEndStepSourceEffect(boolean returnAlways, boolean returnTapped) {
super(Outcome.Benefit);
staticText = effectText;
this.returnTapped = returnTapped;
this.returnAlways = returnAlways;
staticText = "exile {this}. Return it to the battlefield "
+ (returnTapped ? "tapped " : "")
+ "under its owner's control at the beginning of the next end step";
}
public ExileReturnBattlefieldOwnerNextEndStepSourceEffect(ExileReturnBattlefieldOwnerNextEndStepSourceEffect effect) {
super(effect);
this.returnAlways = effect.returnAlways;
this.returnTapped = effect.returnTapped;
}
@Override
@ -77,7 +86,7 @@ public class ExileReturnBattlefieldOwnerNextEndStepSourceEffect extends OneShotE
if (exiled || (returnAlways && (zcc == game.getState().getZoneChangeCounter(permanent.getId()) - 1))) {
//create delayed triggered ability and return it from every public zone he was next moved to
AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(
new ReturnToBattlefieldUnderOwnerControlSourceEffect(false, zcc + 1));
new ReturnToBattlefieldUnderOwnerControlSourceEffect(returnTapped, zcc + 1));
game.addDelayedTriggeredAbility(delayedAbility, source);
}
}

2
Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java
View file

@ -170,7 +170,7 @@ public class MaximumHandSizeControllerEffect extends ContinuousEffectImpl {
sb.append(" is increased by ");
} else if (handSizeModification == HandSizeModification.REDUCE) {
sb.append(" is reduced by ");
} else if ((handSize instanceof StaticValue && ((StaticValue) handSize).getValue() == Integer.MAX_VALUE) || !(handSize instanceof StaticValue)) {
} else if (!((handSize instanceof StaticValue) && ((StaticValue) handSize).getValue() != Integer.MAX_VALUE) || !(handSize instanceof StaticValue)) {
sb.append(" is ");
}
if ((handSize instanceof StaticValue && ((StaticValue) handSize).getValue() != Integer.MAX_VALUE)) {

1
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -32,6 +32,7 @@ public final class StaticFilters {
public static final FilterArtifactCard FILTER_CARD_ARTIFACT = new FilterArtifactCard();
public static final FilterCard FILTER_CARD_ARTIFACT_OR_CREATURE = new FilterCard("artifact or creature card");
public static final FilterCreatureCard FILTER_CARD_CREATURE_YOUR_GRAVEYARD = new FilterCreatureCard("creature card from your graveyard");
public static final FilterCard FILTER_CARD_LAND = new FilterLandCard();
public static final FilterNonlandCard FILTER_CARD_NON_LAND = new FilterNonlandCard();
public static final FilterNonlandCard FILTER_CARD_A_NON_LAND = new FilterNonlandCard("a nonland card");