Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused condition, choice, and filter

master
melvinzhang 2017-08-16 23:44:45 +08:00
parent a753da355b
commit 0872c1b9a3
3 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/magic/model/choice/MagicTargetChoice.java
View File

@ -142,21 +142,12 @@ public class MagicTargetChoice extends MagicChoice {
public static final MagicTargetChoice NEG_TARGET_ARTIFACT_OR_CREATURE =
MagicTargetChoice.Negative("target artifact or creature");
public static final MagicTargetChoice TARGET_ARTIFACT_OR_ENCHANTMENT_YOUR_OPPONENT_CONTROLS =
new MagicTargetChoice("target artifact or enchantment an opponent controls");
public static final MagicTargetChoice POS_TARGET_ARTIFACT_CREATURE =
MagicTargetChoice.Positive("target artifact creature");
public static final MagicTargetChoice TARGET_ENCHANTMENT =
new MagicTargetChoice("target enchantment");
public static final MagicTargetChoice TARGET_ENCHANTMENT_YOU_CONTROL =
new MagicTargetChoice("target enchantment you control");
public static final MagicTargetChoice TARGET_ENCHANTMENT_YOUR_OPPONENT_CONTROLS =
new MagicTargetChoice("target enchantment an opponent controls");
public static final MagicTargetChoice NEG_TARGET_ENCHANTMENT =
MagicTargetChoice.Negative("target enchantment");
@ -220,9 +211,6 @@ public class MagicTargetChoice extends MagicChoice {
public static final MagicTargetChoice POS_TARGET_CREATURE_OR_PLAYER =
MagicTargetChoice.Positive("target creature or player");
public static final MagicTargetChoice NEG_TARGET_VAMPIRE =
MagicTargetChoice.Negative("target Vampire");
public static final MagicTargetChoice SACRIFICE_PERMANENT =
new MagicTargetChoice("a permanent to sacrifice");
@ -262,12 +250,6 @@ public class MagicTargetChoice extends MagicChoice {
public static final MagicTargetChoice TARGET_CARD_FROM_OPPONENTS_GRAVEYARD =
new MagicTargetChoice("target card from an opponent's graveyard");
public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_OPPONENTS_GRAVEYARD =
new MagicTargetChoice("target creature card from an opponent's graveyard");
public static final MagicTargetChoice TARGET_INSTANT_OR_SORCERY_CARD_FROM_OPPONENTS_GRAVEYARD =
new MagicTargetChoice("target instant or sorcery card from an opponent's graveyard");
public static final MagicTargetChoice TARGET_CREATURE_CARD_FROM_ALL_GRAVEYARDS =
new MagicTargetChoice("target creature card from a graveyard");
@ -301,9 +283,6 @@ public class MagicTargetChoice extends MagicChoice {
public static final MagicTargetChoice TARGET_CREATURE_YOUR_OPPONENT_CONTROLS =
new MagicTargetChoice("target creature an opponent controls");
public static final MagicTargetChoice TARGET_ARTIFACT_YOUR_OPPONENT_CONTROLS =
new MagicTargetChoice("target artifact an opponent controls");
public static final MagicTargetChoice ANOTHER_CREATURE_YOU_CONTROL =
new MagicTargetChoice("another creature you control");

9
src/magic/model/condition/MagicCondition.java
View File

@ -884,15 +884,6 @@ public abstract class MagicCondition implements MagicMatchedCostEvent {
}
};
public static MagicCondition WAS_NONCREATURE_ARTIFACT = new MagicCondition() {
@Override
public boolean accept(final MagicSource source) {
final MagicPermanent permanent = (MagicPermanent)source;
return permanent.getCardDefinition().hasType(MagicType.Artifact) &&
!permanent.getCardDefinition().hasType(MagicType.Creature);
}
};
public static MagicCondition WAS_KICKED = new MagicCondition() {
@Override
public boolean accept(final MagicSource source) {

26
src/magic/model/target/MagicTargetFilterFactory.java
View File

@ -701,8 +701,6 @@ public class MagicTargetFilterFactory {
}
};
public static final MagicPermanentFilterImpl ARTIFACT_OR_ENCHANTMENT_YOUR_OPPONENT_CONTROLS = permanentOr(MagicType.Artifact, MagicType.Enchantment, Control.Opp);
public static final MagicPermanentFilterImpl NONCREATURE = new MagicPermanentFilterImpl() {
@Override
public boolean accept(final MagicSource source, final MagicPlayer player, final MagicPermanent target) {
@ -1070,8 +1068,6 @@ public class MagicTargetFilterFactory {
public static final MagicPermanentFilterImpl HUMAN = permanent(MagicSubType.Human, Control.Any);
public static final MagicPermanentFilterImpl HUMAN_CREATURE = creature(MagicSubType.Human, Control.Any);
public static final MagicPermanentFilterImpl NONENCHANTMENT_CREATURE = new MagicPermanentFilterImpl() {
@Override
public boolean accept(final MagicSource source, final MagicPlayer player, final MagicPermanent target) {
@ -1880,15 +1876,9 @@ public class MagicTargetFilterFactory {
}
};
public static final MagicCardFilterImpl INSTANT_OR_SORCERY_CARD_FROM_OPPONENTS_GRAVEYARD =
card(MagicType.Instant).or(MagicType.Sorcery).from(MagicTargetType.OpponentsGraveyard);
public static final MagicCardFilterImpl CREATURE_CARD_FROM_OPPONENTS_GRAVEYARD =
card(MagicType.Creature).from(MagicTargetType.OpponentsGraveyard);
public static final MagicCardFilterImpl ARTIFACT_CARD_FROM_GRAVEYARD =
card(MagicType.Artifact).from(MagicTargetType.Graveyard);
public static final MagicCardFilterImpl ARTIFACT_CARD = new MagicCardFilterImpl() {
@Override
public boolean accept(final MagicSource source, final MagicPlayer player, final MagicCard target) {
@ -2008,12 +1998,8 @@ public class MagicTargetFilterFactory {
}
};
public static final MagicCardFilterImpl ZOMBIE_CREATURE_CARD_FROM_GRAVEYARD = card(MagicSubType.Zombie).and(MagicType.Creature).from(MagicTargetType.Graveyard);
public static final MagicCardFilterImpl SPIRIT_CARD_FROM_GRAVEYARD = card(MagicSubType.Spirit).from(MagicTargetType.Graveyard);
public static final MagicCardFilterImpl HUMAN_CREATURE_CARD_FROM_GRAVEYARD = card(MagicSubType.Human).and(MagicType.Creature).from(MagicTargetType.Graveyard);
public static final MagicCardFilterImpl CARD_FROM_HAND = new MagicCardFilterImpl() {
@Override
public boolean accept(final MagicSource source, final MagicPlayer player, final MagicCard target) {
@ -2163,18 +2149,6 @@ public class MagicTargetFilterFactory {
}
};
public static final MagicCardFilterImpl WARRIOR_CARD_FROM_GRAVEYARD = new MagicCardFilterImpl() {
@Override
public boolean acceptType(final MagicTargetType targetType) {
return targetType == MagicTargetType.Graveyard;
}
@Override
public boolean accept(final MagicSource source, final MagicPlayer player, final MagicCard target) {
return target.hasSubType(MagicSubType.Warrior);
}
};
public static final MagicPermanentFilterImpl NONARTIFACT_NONWHITE_CREATURE = new MagicPermanentFilterImpl() {
@Override
public boolean accept(final MagicSource source, final MagicPlayer player, final MagicPermanent target) {