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

replace use of data.MagicIcon in IRenderableCard with model.MagicCostManaType

master
melvinzhang 2016-10-06 19:00:24 +08:00
parent 2d5983fb1e
commit be58fc13c1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/magic/cardBuilder/IRenderableCard.java
View File

@ -13,8 +13,8 @@ import magic.model.MagicManaCost;
import magic.model.MagicPermanent;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.model.MagicCostManaType;
import magic.model.event.MagicManaActivation;
import magic.data.MagicIcon;
public interface IRenderableCard {
@ -50,9 +50,9 @@ public interface IRenderableCard {
}
default boolean isHybrid() {
final List<MagicIcon> list = getCost().getIcons();
final List<MagicCostManaType> list = getCost().getCostManaTypes(0);
//If doesn't contain single color mana, and does contain hybrid mana. Checks for absence
return Collections.disjoint(list, MagicIcon.COLOR_MANA) && !Collections.disjoint(list, MagicIcon.HYBRID_COLOR_MANA);
return Collections.disjoint(list, MagicCostManaType.MONO) && !Collections.disjoint(list, MagicCostManaType.HYBRID);
}
default boolean isPlaneswalker() {

1
src/magic/model/MagicCostManaType.java
View File

@ -40,6 +40,7 @@ public enum MagicCostManaType {
public static final int NR_OF_TYPES=values().length;
public static final EnumSet<MagicCostManaType> MONO = EnumSet.range(White, Green);
public static final EnumSet<MagicCostManaType> HYBRID = EnumSet.range(HybridWhite, HybridGreen);
public static final EnumSet<MagicCostManaType> NON_MONO = EnumSet.complementOf(MONO);
private final String name;