From 7f8325fb6c9e572c3e6a7ff5dd876fe11d401d72 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 18 Nov 2019 12:06:59 +0800 Subject: [PATCH 1/2] Fix declare attackers --- forge-game/src/main/java/forge/game/combat/Combat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index 36f1a58fc9f..7ce208dd8a8 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -70,7 +70,7 @@ public class Combat { public Combat(final Player attacker) { playerWhoAttacks = attacker; - + initConstraints(); } public Combat(Combat combat, GameObjectMap map) { @@ -116,9 +116,9 @@ public class Combat { } public void initConstraints() { + attackableEntries.clear(); // Create keys for all possible attack targets attackableEntries.addAll(CombatUtil.getAllPossibleDefenders(playerWhoAttacks)); - attackConstraints = new AttackConstraints(this); } From 44c66058041b75589bee8500c7c315942e693025 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 24 Nov 2019 12:05:45 +0800 Subject: [PATCH 2/2] Update LQ downloader (dont download full image equivalent to an existing fullborder images) --- .../main/java/forge/download/GuiDownloadPicturesLQ.java | 8 ++++++++ .../java/forge/download/GuiDownloadSetPicturesLQ.java | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java index 8faf330004f..d7e5b8bc54d 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java @@ -22,6 +22,7 @@ import forge.item.PaperCard; import forge.model.FModel; import forge.properties.ForgeConstants; import forge.util.ImageUtil; +import forge.util.TextUtil; import java.io.File; import java.util.*; @@ -62,6 +63,13 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService { private void addDLObject(final PaperCard c, final boolean backFace) { final String imageKey = ImageUtil.getImageKey(c, backFace, false); final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey + ".jpg"; + final String setcode2 = StaticData.instance().getEditions().getCode2ByCode(c.getEdition()); + final String fullborderPath = ForgeConstants.CACHE_CARD_PICS_DIR + setcode2 + "\\" + TextUtil.fastReplace(imageKey,".full",".fullborder") + ".jpg"; + final File existingFB = new File (fullborderPath); + + if (existingFB.exists()) { + return; //don't download equivalent full image with an existing fullborder image + } if (existingImages.contains(imageKey + ".jpg")) { return; diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java index db8c95d195a..b74442bc8cc 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java @@ -24,6 +24,7 @@ import forge.item.PaperCard; import forge.model.FModel; import forge.properties.ForgeConstants; import forge.util.ImageUtil; +import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; import java.io.File; @@ -83,6 +84,12 @@ public class GuiDownloadSetPicturesLQ extends GuiDownloadService { private static void addDLObject(final String urlPath, final String filename, final Map downloads) { final File destFile = new File(ForgeConstants.CACHE_CARD_PICS_DIR, filename + ".jpg"); + String modifier = !filename.contains(".full") ? ".fullborder" : ""; + final File fullborder = new File(ForgeConstants.CACHE_CARD_PICS_DIR, TextUtil.fastReplace(filename, ".full", ".fullborder") + modifier + ".jpg"); + + if (fullborder.exists()) + return; //don't add on download if you have an existing fullborder image in this set... + // System.out.println(filename); if (!destFile.exists()) { downloads.put(destFile.getAbsolutePath(), ForgeConstants.URL_PIC_DOWNLOAD + urlPath);