Merge branch 'master' into 'master'

[Mobile] Shows full manacost for split cards except on choice list

See merge request core-developers/forge!3588
This commit is contained in:
Anthony Calosa
2021-01-14 02:36:32 +00:00

View File

@@ -679,15 +679,14 @@ public class CardRenderer {
float manaSymbolSize = w / 4.5f; float manaSymbolSize = w / 4.5f;
if (card.isSplitCard() && card.hasAlternateState()) { if (card.isSplitCard() && card.hasAlternateState()) {
if (!card.isFaceDown()) { // no need to draw mana symbols on face down split cards (e.g. manifested) if (!card.isFaceDown()) { // no need to draw mana symbols on face down split cards (e.g. manifested)
float dy = manaSymbolSize / 2 + Utils.scale(5); if (isChoiceList) {
if (card.getRightSplitState().getName().equals(details.getName()))
PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName()); drawManaCost(g, card.getRightSplitState().getManaCost(), x - padding, y, w + 2 * padding, h, manaSymbolSize);
if (Card.getCardForUi(pc).hasKeyword(Keyword.AFTERMATH)){ else
dy *= -1; // flip card costs for Aftermath cards drawManaCost(g, card.getLeftSplitState().getManaCost(), x - padding, y, w + 2 * padding, h, manaSymbolSize);
} else {
drawManaCost(g, card.getCurrentState().getManaCost(), x - padding, y, w + 2 * padding, h, manaSymbolSize);
} }
drawManaCost(g, card.getRightSplitState().getManaCost(), x - padding, y - dy, w + 2 * padding, h, manaSymbolSize);
drawManaCost(g, card.getLeftSplitState().getManaCost(), x - padding, y + dy, w + 2 * padding, h, manaSymbolSize);
} }
} }
else { else {