* Modal double faces cards - fixed that color identity doesn't contains second side colors;

This commit is contained in:
Oleg Agafonov 2021-02-02 20:22:12 +04:00
parent 10ac8ab86f
commit 31d134843a
4 changed files with 48 additions and 24 deletions

View file

@ -1,4 +1,3 @@
package mage.filter;
import java.io.Serializable;
@ -115,11 +114,11 @@ public class FilterMana implements Serializable {
@Override
public String toString() {
return (black ? "{B}" : "")
+ (green ? "{G}" : "")
+ (red ? "{R}" : "")
// wubrg order
return (white ? "{W}" : "")
+ (blue ? "{U}" : "")
+ (white ? "{W}" : "");
+ (black ? "{B}" : "")
+ (red ? "{R}" : "")
+ (green ? "{G}" : "");
}
}

View file

@ -12,7 +12,10 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.ManacostVariableValue;
import mage.abilities.effects.Effect;
import mage.abilities.mana.*;
import mage.cards.AdventureCard;
import mage.cards.Card;
import mage.cards.ModalDoubleFacesCard;
import mage.cards.SplitCard;
import mage.choices.Choice;
import mage.constants.ColoredManaSymbol;
import mage.filter.FilterMana;
@ -610,10 +613,17 @@ public final class ManaUtil {
}
public static FilterMana getColorIdentity(Card card) {
// TODO: is it support mdf cards?
// TODO: is it support adventure cards?
Card secondSide = card.getSecondCardFace();
return getColorIdentity(card.getColor(null), card.getManaCost().getSymbols(), card.getRules(), secondSide);
Card secondSide;
if (card instanceof SplitCard) {
secondSide = ((SplitCard) card).getRightHalfCard();
} else if (card instanceof AdventureCard) {
secondSide = ((AdventureCard) card).getSpellCard();
} else if (card instanceof ModalDoubleFacesCard) {
secondSide = ((ModalDoubleFacesCard) card).getRightHalfCard();
} else {
secondSide = card.getSecondCardFace();
}
return getColorIdentity(card.getColor(), card.getManaCost().getSymbols(), card.getRules(), secondSide);
}
public static int getColorIdentityHash(FilterMana colorIdentity) {