Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Some rework to Framework.

Browse source
This commit is contained in:
LevelX2 2018-01-03 11:40:07 +01:00
parent bdd7cc48d1
commit 32fb2507c3
101 changed files with 426 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java
View file

@ -89,6 +89,9 @@ public class AuraReplacementEffect extends ReplacementEffectImpl {
if (game.getState().getValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + card.getId()) != null) {
card = card.getSecondCardFace();
if (!card.isEnchantment() || !card.hasSubtype(SubType.AURA, game)) {
return false;
}
}
// Aura cards that go to battlefield face down (Manifest) don't have to select targets
@ -210,9 +213,9 @@ public class AuraReplacementEffect extends ReplacementEffectImpl {
if (card != null && (card.isEnchantment() && card.hasSubtype(SubType.AURA, game)
|| // in case of transformable enchantments
(game.getState().getValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + card.getId()) != null
&& card.getSecondCardFace() != null
&& card.getSecondCardFace().isEnchantment()
&& card.getSecondCardFace().hasSubtype(SubType.AURA, game)))) {
&& card.getSecondCardFace() != null
&& card.getSecondCardFace().isEnchantment()
&& card.getSecondCardFace().hasSubtype(SubType.AURA, game)))) {
return true;
}
}

11
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlAttachedEffect.java
View file

@ -43,8 +43,17 @@ import mage.players.Player;
public class ReturnToBattlefieldUnderYourControlAttachedEffect extends OneShotEffect {
public ReturnToBattlefieldUnderYourControlAttachedEffect() {
this("that card");
}
/**
*
* @param objectText text for the object to return (default: "that card") if
* you use constructor without this param
*/
public ReturnToBattlefieldUnderYourControlAttachedEffect(String objectText) {
super(Outcome.Benefit);
staticText = "return that card to the battlefield under your control";
staticText = "return " + objectText + " to the battlefield under your control";
}
public ReturnToBattlefieldUnderYourControlAttachedEffect(final ReturnToBattlefieldUnderYourControlAttachedEffect effect) {