mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 20:28:00 +00:00
Update getDefinedCards for how it get Valid* cards so the syntax is consistent with other Valid script. Also remove the hacky way to set Effect as mutable for Raging River and Plague of Vermin
This commit is contained in:
@@ -58,7 +58,6 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
|
||||
Conspiracy(false, "conspiracies"),
|
||||
Creature(true, "creatures"),
|
||||
Dungeon(false, "dungeons"),
|
||||
Emblem(false, "emblems"),
|
||||
Enchantment(true, "enchantments"),
|
||||
Instant(false, "instants"),
|
||||
Land(true, "lands"),
|
||||
@@ -437,11 +436,6 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
|
||||
return coreTypes.contains(CoreType.Phenomenon);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmblem() {
|
||||
return coreTypes.contains(CoreType.Emblem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTribal() {
|
||||
return coreTypes.contains(CoreType.Tribal);
|
||||
@@ -547,7 +541,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
|
||||
if (!isInstant() && !isSorcery()) {
|
||||
Iterables.removeIf(subtypes, Predicates.IS_SPELL_TYPE);
|
||||
}
|
||||
if (!isPlaneswalker() && !isEmblem()) {
|
||||
if (!isPlaneswalker()) {
|
||||
Iterables.removeIf(subtypes, Predicates.IS_WALKER_TYPE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,7 +42,6 @@ public interface CardTypeView extends Iterable<String>, Serializable {
|
||||
boolean isBasicLand();
|
||||
boolean isPlane();
|
||||
boolean isPhenomenon();
|
||||
boolean isEmblem();
|
||||
boolean isTribal();
|
||||
boolean isDungeon();
|
||||
CardTypeView getTypeWithChanges(Iterable<CardChangedType> changedCardTypes);
|
||||
|
||||
Reference in New Issue
Block a user