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

- Support using art from standard (non-variant) Magic cards in PConq mode when there is no plane art available (e.g. for the newer sets like Kaladesh).

Browse Source
This commit is contained in:
Agetian
2017-07-02 09:23:41 +00:00
parent 2b5d3b0511
commit 07d65014ed
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
View File

@@ -177,9 +177,19 @@ public class ConquestPlaneSelector extends FDisplayObject {
float artWidth = monitorWidth - 2 * monitorLeftOffset + 2; float artWidth = monitorWidth - 2 * monitorLeftOffset + 2;
float artHeight = monitorHeight - monitorTopOffset - monitorBottomOffset + 2; float artHeight = monitorHeight - monitorTopOffset - monitorBottomOffset + 2;
//scale up art to fill height of monitor while retain aspect ratio //scale up art to fill height of monitor while retaining aspect ratio
float fullArtWidth = artHeight * currentArt.getWidth() / currentArt.getHeight(); float fullArtWidth = artHeight * currentArt.getWidth() / currentArt.getHeight();
g.startClip(x, y, artWidth, artHeight);
float artHeightClipMod = 0f;
if (fullArtWidth < monitorWidth) {
//if the card art is too narrow, widen it to fully cover the monitor size
float scaledArtHeight = monitorWidth * (artHeight / fullArtWidth);
fullArtWidth = monitorWidth;
artHeightClipMod = scaledArtHeight - artHeight;
artHeight = scaledArtHeight;
}
g.startClip(x, y, artWidth, artHeight - artHeightClipMod);
g.drawImage(currentArt, x + (monitorWidth - fullArtWidth) / 2, y, fullArtWidth, artHeight); g.drawImage(currentArt, x + (monitorWidth - fullArtWidth) / 2, y, fullArtWidth, artHeight);
g.endClip(); g.endClip();

6
forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
View File

@@ -139,9 +139,13 @@ public class ConquestPlane {
for (String name : planeCardNames) { for (String name : planeCardNames) {
PaperCard pc = variantCards.getCard(name); PaperCard pc = variantCards.getCard(name);
if (pc == null) { if (pc == null) {
System.out.println("\"" + name + "\" does not correspond to a valid Plane card"); // try to get a non-variant Magic card in case a plane card with the given name does not exist
pc = FModel.getMagicDb().getCommonCards().getCard(name);
if (pc == null) {
System.out.println("\"" + name + "\" does not correspond to a valid Plane card or standard Magic card!");
continue; continue;
} }
}
planeCards.add(pc); planeCards.add(pc);
} }
} }