external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newBranch' into 'master'

Browse Source 
Fix leftsplit manacost display

See merge request core-developers/forge!3290
This commit is contained in:
Anthony Calosa
2020-10-23 22:38:30 +00:00
parent f33382a4fc 152c7dd564
commit cee0ec6d5b
2 changed files with 2 additions and 1 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

@@ -462,7 +462,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName()); PaperCard pc = StaticData.instance().getCommonCards().getCard(card.getName());
int ofs = pc != null && Card.getCardForUi(pc).hasKeyword(Keyword.AFTERMATH) ? -12 : 12; int ofs = pc != null && Card.getCardForUi(pc).hasKeyword(Keyword.AFTERMATH) ? -12 : 12;
drawManaCost(g, card.getCurrentState().getManaCost(), ofs); drawManaCost(g, card.getLeftSplitState().getManaCost(), ofs);
drawManaCost(g, card.getAlternateState().getManaCost(), -ofs); drawManaCost(g, card.getAlternateState().getManaCost(), -ofs);
} }
} }

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

@@ -370,6 +370,7 @@ public class CardRenderer {
ManaCost mainManaCost = card.getCurrentState().getManaCost(); ManaCost mainManaCost = card.getCurrentState().getManaCost();
if (card.isSplitCard()) { if (card.isSplitCard()) {
//handle rendering both parts of split card //handle rendering both parts of split card
mainManaCost = card.getLeftSplitState().getManaCost();
ManaCost otherManaCost = card.getAlternateState().getManaCost(); ManaCost otherManaCost = card.getAlternateState().getManaCost();
manaCostWidth = CardFaceSymbols.getWidth(otherManaCost, MANA_SYMBOL_SIZE) + MANA_COST_PADDING; manaCostWidth = CardFaceSymbols.getWidth(otherManaCost, MANA_SYMBOL_SIZE) + MANA_COST_PADDING;
CardFaceSymbols.drawManaCost(g, otherManaCost, x + w - manaCostWidth + MANA_COST_PADDING, y, MANA_SYMBOL_SIZE); CardFaceSymbols.drawManaCost(g, otherManaCost, x + w - manaCostWidth + MANA_COST_PADDING, y, MANA_SYMBOL_SIZE);