external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Temporary crash prevention measure for manifested split cards (until the problem with the view of such cards can be figured out)

Browse Source
This commit is contained in:
Agetian
2017-06-06 14:27:20 +00:00
parent 0045be2e84
commit f1fa86a08a
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -372,6 +372,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
if (!showSplitMana) { if (!showSplitMana) {
drawManaCost(g, card.getCurrentState().getManaCost(), 0); drawManaCost(g, card.getCurrentState().getManaCost(), 0);
} else { } else {
if (!card.getName().isEmpty()) { // FIXME: temporary crash prevention measure for face-down (manifested) split cards
PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName()); PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName());
int ofs = pc != null && Card.getCardForUi(pc).hasKeyword("Aftermath") ? -12 : 12; int ofs = pc != null && Card.getCardForUi(pc).hasKeyword("Aftermath") ? -12 : 12;
@@ -379,6 +380,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
drawManaCost(g, card.getAlternateState().getManaCost(), -ofs); drawManaCost(g, card.getAlternateState().getManaCost(), -ofs);
} }
} }
}
int number = 0; int number = 0;
if (card.getCounters() != null) { if (card.getCounters() != null) {

2
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -379,6 +379,7 @@ public class CardRenderer {
if (showCardManaCostOverlay(card)) { if (showCardManaCostOverlay(card)) {
float manaSymbolSize = w / 4; float manaSymbolSize = w / 4;
if (card.isSplitCard() && card.hasAlternateState()) { if (card.isSplitCard() && card.hasAlternateState()) {
if (!card.getName().isEmpty()) { // FIXME: temporary crash prevention measure for face-down (manifested) split cards
float dy = manaSymbolSize / 2 + Utils.scale(5); float dy = manaSymbolSize / 2 + Utils.scale(5);
PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName()); PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName());
@@ -389,6 +390,7 @@ public class CardRenderer {
drawManaCost(g, card.getAlternateState().getManaCost(), x - padding, y - dy, w + 2 * padding, h, manaSymbolSize); drawManaCost(g, card.getAlternateState().getManaCost(), x - padding, y - dy, w + 2 * padding, h, manaSymbolSize);
drawManaCost(g, card.getCurrentState().getManaCost(), x - padding, y + dy, w + 2 * padding, h, manaSymbolSize); drawManaCost(g, card.getCurrentState().getManaCost(), x - padding, y + dy, w + 2 * padding, h, manaSymbolSize);
} }
}
else { else {
drawManaCost(g, card.getCurrentState().getManaCost(), x - padding, y, w + 2 * padding, h, manaSymbolSize); drawManaCost(g, card.getCurrentState().getManaCost(), x - padding, y, w + 2 * padding, h, manaSymbolSize);
} }