- Bundled inZone property of cards.

This commit is contained in:
Sloth
2012-11-25 10:07:15 +00:00
parent e3a367bcba
commit b0ad9063a9
7 changed files with 14 additions and 19 deletions

View File

@@ -7116,18 +7116,13 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!this.getCurSetCode().equals(setCode)) {
return false;
}
} else if (property.startsWith("OnBattlefield")) {
final List<Card> list = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield);
if (!list.contains(this)) {
} else if (property.startsWith("inZone")) {
final String strZone = property.substring(6);
final ZoneType realZone = ZoneType.smartValueOf(strZone);
if (!this.isInZone(realZone)) {
return false;
}
} else if (property.startsWith("InGraveyard")) {
final List<Card> list = Singletons.getModel().getGame().getCardsIn(ZoneType.Graveyard);
if (!list.contains(this)) {
return false;
}
}
else {
} else {
if (property.equals("ChosenType")) {
if (!this.isType(source.getChosenType())) {
return false;