From 5186f690d74904ff185850d64d2dd1cc84a68a64 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 21 Nov 2013 09:58:22 +0100 Subject: [PATCH] Added IsPhaseCondition, some minor framework formatting. --- .../ActivateIfConditionActivatedAbility.java | 8 ++- .../abilities/condition/InvertCondition.java | 7 ++- .../condition/common/IsPhaseCondition.java | 58 +++++++++++++++++++ Mage/src/mage/constants/TurnPhase.java | 2 +- Mage/src/mage/target/TargetCard.java | 1 + Mage/src/mage/target/TargetImpl.java | 1 + Mage/src/mage/target/TargetObject.java | 1 + .../target/common/TargetCardInGraveyard.java | 10 +++- 8 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 Mage/src/mage/abilities/condition/common/IsPhaseCondition.java diff --git a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java index dd365ad1fde..86f8c599b4f 100644 --- a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java +++ b/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java @@ -31,6 +31,7 @@ package mage.abilities.common; import java.util.UUID; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.condition.Condition; +import mage.abilities.condition.InvertCondition; import mage.abilities.costs.Cost; import mage.abilities.effects.Effect; import mage.constants.Zone; @@ -80,7 +81,12 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl */ public class TargetCard> extends TargetObject> { diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index 1f5b9d5d120..7967c1bc9fd 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -42,6 +42,7 @@ import java.util.*; /** * * @author BetaSteward_at_googlemail.com + * @param */ public abstract class TargetImpl> implements Target { diff --git a/Mage/src/mage/target/TargetObject.java b/Mage/src/mage/target/TargetObject.java index 12e664c001c..14d4c63c1d6 100644 --- a/Mage/src/mage/target/TargetObject.java +++ b/Mage/src/mage/target/TargetObject.java @@ -38,6 +38,7 @@ import java.util.UUID; /** * * @author BetaSteward_at_googlemail.com + * @param */ public abstract class TargetObject> extends TargetImpl { diff --git a/Mage/src/mage/target/common/TargetCardInGraveyard.java b/Mage/src/mage/target/common/TargetCardInGraveyard.java index f7db3177d71..21e40fa013c 100644 --- a/Mage/src/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInGraveyard.java @@ -28,15 +28,14 @@ package mage.target.common; -import mage.constants.Zone; +import java.util.UUID; import mage.abilities.Ability; import mage.cards.Card; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.target.TargetCard; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com @@ -47,6 +46,11 @@ public class TargetCardInGraveyard extends TargetCard { this(1, 1, new FilterCard("card from a graveyard")); } + public TargetCardInGraveyard(boolean required) { + this(); + this.setRequired(required); + } + public TargetCardInGraveyard(FilterCard filter) { this(1, 1, filter); }