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

Fix rendering of mana cost for split cards

Browse Source
This commit is contained in:
drdev
2014-06-15 23:12:39 +00:00
parent 5c511f7785
commit 5b21c3399d
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,21 +237,32 @@ public class CardRenderer {
if (cardArt != null) { if (cardArt != null) {
g.drawImage(cardArt, x - FList.PADDING, y - FList.PADDING, cardArtWidth, cardArtHeight); g.drawImage(cardArt, x - FList.PADDING, y - FList.PADDING, cardArtWidth, cardArtHeight);
} }
x += cardArtWidth;
//render card name and mana cost on first line
float manaCostWidth = 0;
ManaCost mainManaCost = cardRules.getMainPart().getManaCost();
if (cardRules.getSplitType() == CardSplitType.Split) {
//handle rendering both parts of split card
ManaCost otherManaCost = cardRules.getOtherPart().getManaCost();
manaCostWidth = CardFaceSymbols.getWidth(otherManaCost, MANA_SYMBOL_SIZE) + MANA_COST_PADDING;
CardFaceSymbols.drawManaCost(g, otherManaCost, x + w - manaCostWidth + MANA_COST_PADDING, y, MANA_SYMBOL_SIZE);
//draw "//" between two parts of mana cost
manaCostWidth += font.getBounds("//").width + MANA_COST_PADDING;
g.drawText("//", font, foreColor, x + w - manaCostWidth + MANA_COST_PADDING, y, w, MANA_SYMBOL_SIZE, false, HAlignment.LEFT, true);
}
manaCostWidth += CardFaceSymbols.getWidth(mainManaCost, MANA_SYMBOL_SIZE);
CardFaceSymbols.drawManaCost(g, mainManaCost, x + w - manaCostWidth, y, MANA_SYMBOL_SIZE);
x += cardArtWidth;
String name = cardRules.getName(); String name = cardRules.getName();
ManaCost manaCost = cardRules.getManaCost();
float availableNameWidth = w - CardFaceSymbols.getWidth(manaCost, MANA_SYMBOL_SIZE) - cardArtWidth - FList.PADDING;
if (count > 0) { //preface name with count if applicable if (count > 0) { //preface name with count if applicable
name = count + " " + name; name = count + " " + name;
} }
g.drawText(name, font, foreColor, x, y, availableNameWidth, MANA_SYMBOL_SIZE, false, HAlignment.LEFT, true); g.drawText(name, font, foreColor, x, y, w - manaCostWidth - cardArtWidth - FList.PADDING, MANA_SYMBOL_SIZE, false, HAlignment.LEFT, true);
x += availableNameWidth + FList.PADDING;
CardFaceSymbols.drawManaCost(g, manaCost, x, y, MANA_SYMBOL_SIZE);
x -= availableNameWidth + FList.PADDING;
y += MANA_SYMBOL_SIZE + FList.PADDING + SET_BOX_MARGIN; y += MANA_SYMBOL_SIZE + FList.PADDING + SET_BOX_MARGIN;
//render card type, p/t, and set box on second line
FSkinFont typeFont = FSkinFont.get(12); FSkinFont typeFont = FSkinFont.get(12);
float availableTypeWidth = w - cardArtWidth; float availableTypeWidth = w - cardArtWidth;
float lineHeight = typeFont.getLineHeight(); float lineHeight = typeFont.getLineHeight();
@@ -301,16 +312,30 @@ public class CardRenderer {
//make sure name/mana cost row height is tall enough for both //make sure name/mana cost row height is tall enough for both
h = Math.max(MANA_SYMBOL_SIZE + 2 * MANA_COST_PADDING, 2 * NAME_FONT.getCapHeight()); h = Math.max(MANA_SYMBOL_SIZE + 2 * MANA_COST_PADDING, 2 * NAME_FONT.getCapHeight());
//draw mana cost for card
float manaCostWidth = 0; float manaCostWidth = 0;
if (canShow) { if (canShow) {
manaCostWidth = CardFaceSymbols.getWidth(card.getManaCost(), MANA_SYMBOL_SIZE) + MANA_COST_PADDING; ManaCost mainManaCost = card.getManaCost();
CardFaceSymbols.drawManaCost(g, card.getManaCost(), x + w - manaCostWidth, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE); if (card.isSplitCard() && card.getCurState() == CardCharacteristicName.Original) {
//handle rendering both parts of split card
mainManaCost = card.getRules().getMainPart().getManaCost();
ManaCost otherManaCost = card.getRules().getOtherPart().getManaCost();
manaCostWidth = CardFaceSymbols.getWidth(otherManaCost, MANA_SYMBOL_SIZE) + MANA_COST_PADDING;
CardFaceSymbols.drawManaCost(g, otherManaCost, x + w - manaCostWidth, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE);
//draw "//" between two parts of mana cost
manaCostWidth += NAME_FONT.getBounds("//").width + MANA_COST_PADDING;
g.drawText("//", NAME_FONT, Color.BLACK, x + w - manaCostWidth, y, w, h, false, HAlignment.LEFT, true);
}
manaCostWidth += CardFaceSymbols.getWidth(mainManaCost, MANA_SYMBOL_SIZE) + MANA_COST_PADDING;
CardFaceSymbols.drawManaCost(g, mainManaCost, x + w - manaCostWidth, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE);
} }
//draw name for card
x += padding; x += padding;
w -= 2 * padding; w -= 2 * padding;
g.drawText(!canShow || card.isFaceDown() ? "???" : card.getName(), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true); g.drawText(!canShow || card.isFaceDown() ? "???" : card.getName(), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true);
//draw type and set label for card
if (canShow) { if (canShow) {
y += h; y += h;
h = 2 * TYPE_FONT.getCapHeight(); h = 2 * TYPE_FONT.getCapHeight();