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

Merge branch 'master' into 'master'

Browse Source 
[Mobile] Update fix for exiled facedown

See merge request core-developers/forge!5458
This commit is contained in:
Anthony Calosa
2021-09-27 17:23:33 +00:00
parent b707a23710 99c7743e46
commit 993eb634da
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-gui-mobile/src/forge/card/CardImageRenderer.java
View File

@@ -735,7 +735,25 @@ public class CardImageRenderer {
} else } else
g.drawRotatedImage(image, new_x, new_y, new_w, new_h, new_x + new_w / 2, new_y + new_h / 2, isAftermath ? 90 : -90); g.drawRotatedImage(image, new_x, new_y, new_w, new_h, new_x + new_w / 2, new_y + new_h / 2, isAftermath ? 90 : -90);
} else { } else {
if (Forge.enableUIMask.equals("Full") && canshow) { if (card.isFaceDown() && ZoneType.Exile.equals(card.getZone())) {
if (card.isForeTold() || altState) {
if (Forge.enableUIMask.equals("Full")) {
if (ImageCache.isBorderlessCardArt(image))
g.drawImage(image, x, y, w, h);
else {
g.drawImage(ImageCache.getBorderImage(image.toString()), ImageCache.borderColor(image), x, y, w, h);
g.drawImage(ImageCache.croppedBorderImage(image), x + radius / 2.4f-minusxy, y + radius / 2-minusxy, w * croppedArea, h * croppedArea);
}
} else if (Forge.enableUIMask.equals("Crop")) {
g.drawImage(ImageCache.croppedBorderImage(image), x, y, w, h);
} else {
g.drawImage(image, x, y, w, h);
}
} else {
//show sleeves instead
g.drawImage(sleeves, x, y, w, h);
}
} else if (Forge.enableUIMask.equals("Full") && canshow) {
if (ImageCache.isBorderlessCardArt(image)) if (ImageCache.isBorderlessCardArt(image))
g.drawImage(image, x, y, w, h); g.drawImage(image, x, y, w, h);
else { else {
@@ -745,7 +763,7 @@ public class CardImageRenderer {
} else if (Forge.enableUIMask.equals("Crop") && canshow) { } else if (Forge.enableUIMask.equals("Crop") && canshow) {
g.drawImage(ImageCache.croppedBorderImage(image), x, y, w, h); g.drawImage(ImageCache.croppedBorderImage(image), x, y, w, h);
} else { } else {
if (canshow||card.isForeTold()) if (canshow)
g.drawImage(image, x, y, w, h); g.drawImage(image, x, y, w, h);
else // sleeve else // sleeve
g.drawImage(sleeves, x, y, w, h); g.drawImage(sleeves, x, y, w, h);