From 19c9689f89d4d696b2ed6bba077914c453e75b7b Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 11 Nov 2017 12:39:42 +1100 Subject: [PATCH 01/25] Apostrophes --- .../src/mage/deck/CanadianHighlander.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java index 75babb9a1b..9f742d4fbc 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java @@ -117,9 +117,9 @@ public class CanadianHighlander extends Constructed { || cn.equals("Mana Crypt") || cn.equals("Mystical Tutor") || cn.equals("Strip Mine") - || cn.equals("Summoner’s Pact") + || cn.equals("Summoner's Pact") || cn.equals("Survival of the Fittest") - || cn.equals("Umezawa’s Jitte")) { + || cn.equals("Umezawa's Jitte")) { totalPoints += 2; invalid.put(entry.getKey(), " 2 points " + cn); } From 2a12e788d528553fe8023ee33049eebc38d3c97b Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 11 Nov 2017 13:02:49 +0400 Subject: [PATCH 02/25] clean git source --- .../target/maven-archiver/pom.properties | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/target/maven-archiver/pom.properties diff --git a/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/target/maven-archiver/pom.properties b/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/target/maven-archiver/pom.properties deleted file mode 100644 index 8603daf326..0000000000 --- a/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Oct 22 00:34:49 EDT 2017 -version=1.4.26 -groupId=org.mage -artifactId=mage-game-pennydreadfulcommanderfreeforall From 036bc12508fc1ed3c5c1298b60b9ddd05a6efa64 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 11 Nov 2017 10:21:17 -0500 Subject: [PATCH 03/25] fixed delayed end step triggers not triggering if created during an end step --- .../delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java index 3b533fa098..7357c3bd41 100644 --- a/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java @@ -59,7 +59,7 @@ public class AtTheBeginOfNextEndStepDelayedTriggeredAbility extends DelayedTrigg } public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Zone zone, Effect effect, TargetController targetController, Condition condition) { - super(effect, Duration.EndOfTurn); + super(effect, Duration.Custom); this.zone = zone; this.targetController = targetController; this.condition = condition; From badaed63cb2846a9dec7cbdfba041f961288c34d Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 12 Nov 2017 02:06:24 +0400 Subject: [PATCH 04/25] fix #4148 error on downloading double faces cards from scryfall --- .../card/dl/sources/ScryfallImageSource.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java index 759a9bdacf..b95cc3fefd 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java @@ -214,10 +214,18 @@ public enum ScryfallImageSource implements CardImageSource { @Override public String generateURL(CardDownloadData card) throws Exception { - return "https://api.scryfall.com/cards/" + formatSetName(card.getSet()) + "/" - + card.getCollectorId() - + (card.isSecondSide() ? "b" : "") - + "?format=image"; + + if (card.isTwoFacedCard()) { + // double faced cards do not supporte by API (need direct link for img) + // example: https://img.scryfall.com/cards/large/en/xln/173b.jpg + return "https://img.scryfall.com/cards/large/en/" + formatSetName(card.getSet()) + "/" + + card.getCollectorId() + (card.isSecondSide() ? "b" : "a") + ".jpg"; + }else { + // single face cards support by single API call (redirect to img link) + // example: https://api.scryfall.com/cards/xln/121?format=image + return "https://api.scryfall.com/cards/" + formatSetName(card.getSet()) + "/" + + card.getCollectorId() + "?format=image"; + } } @Override From 9b95e20d83270b34525ac30fd6fea557a23ffd55 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 12 Nov 2017 06:16:29 +0400 Subject: [PATCH 05/25] Fix error on download images of Ixalan set from Wizards site --- .../org/mage/plugins/card/dl/sources/WizardCardsImageSource.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 5ea83188bf..f5b83c9779 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -451,6 +451,7 @@ public enum WizardCardsImageSource implements CardImageSource { setsAliases.put("WMCQ", "World Magic Cup Qualifier"); setsAliases.put("WTH", "Weatherlight"); setsAliases.put("WWK", "Worldwake"); + setsAliases.put("XLN", "Ixalan"); setsAliases.put("ZEN", "Zendikar"); languageAliases = new HashMap<>(); From b97edec5b98a2ba779ef0eef0f942d663f4febcf Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 12 Nov 2017 07:34:45 +0400 Subject: [PATCH 06/25] Fix error on download backside.jpg symbol --- .../mage/plugins/card/dl/sources/DirectLinksForDownload.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java index 0ab60ad086..374257a693 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java @@ -22,7 +22,7 @@ import static org.mage.plugins.card.dl.DownloadJob.toFile; */ public class DirectLinksForDownload implements Iterable { - private static final String backsideUrl = "http://upload.wikimedia.org/wikipedia/en/a/aa/Magic_the_gathering-card_back.jpg"; + private static final String backsideUrl = "https://upload.wikimedia.org/wikipedia/en/a/aa/Magic_the_gathering-card_back.jpg"; private static final Map directLinks = new LinkedHashMap<>(); From 8dcc26600ac5472690ab8ed910421c45d10e7666 Mon Sep 17 00:00:00 2001 From: Zzooouhh Date: Sun, 12 Nov 2017 10:34:27 +0100 Subject: [PATCH 07/25] Minor fix for Krovikan Plague --- Mage.Sets/src/mage/cards/k/KrovikanPlague.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java index 7597a464d7..190b341536 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java @@ -48,8 +48,10 @@ import mage.constants.Outcome; import mage.constants.Duration; import mage.constants.Zone; import mage.counters.BoostCounter; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -60,6 +62,12 @@ import mage.target.common.TargetCreatureOrPlayer; * @author L_J */ public class KrovikanPlague extends CardImpl { + + private static final FilterControlledCreaturePermanent filterNonWall = new FilterControlledCreaturePermanent("non-Wall creature you control"); + + static { + filterNonWall.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + } private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("enchanted creature is untapped"); @@ -71,8 +79,8 @@ public class KrovikanPlague extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.subtype.add(SubType.AURA); - // Enchant creature you control - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); + // Enchant non-Wall creature you control + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(filterNonWall); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); From 12b420d68b697e862e1cee472dcbcf50bac9f558 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 15 Nov 2017 00:09:31 +0400 Subject: [PATCH 08/25] Add new logs and checks in symbols download (for easy setup and fix settings) --- .../plugins/card/dl/sources/GathererSets.java | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 41a6fb93dc..e3a117a51b 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -9,11 +9,15 @@ import java.util.Iterator; import mage.cards.ExpansionSet; import mage.cards.Sets; import org.mage.plugins.card.dl.DownloadJob; + import static org.mage.plugins.card.dl.DownloadJob.fromURL; import static org.mage.plugins.card.dl.DownloadJob.toFile; +import org.apache.log4j.Logger; public class GathererSets implements Iterable { + private static final Logger logger = Logger.getLogger(GathererSets.class); + private static final String SETS_PATH = File.separator + "sets"; private static final File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SETS_PATH); private static File outDir = DEFAULT_OUT_DIR; @@ -60,6 +64,8 @@ public class GathererSets implements Iterable { "SOI", "EMN", "KLD", "AER", "AKH", "HOU", + "XLN", "C17", + "RIX", "DOM", "M19", // not released "E01" }; @@ -105,7 +111,7 @@ public class GathererSets implements Iterable { symbolsReplacements.put("PCY", "PR"); symbolsReplacements.put("PLS", "PS"); symbolsReplacements.put("POR", "PO"); - symbolsReplacements.put("PO2", "P2"); + symbolsReplacements.put("P02", "P2"); symbolsReplacements.put("PTK", "PK"); symbolsReplacements.put("STH", "ST"); symbolsReplacements.put("TMP", "TE"); @@ -124,6 +130,42 @@ public class GathererSets implements Iterable { } } + // checks for wrong card settings and support (easy to control what all good) + private static final HashMap setsToDonwload = new HashMap<>(); + + private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask){ + + // duplicated in settings + ExpansionSet existsExp = setsToDonwload.get(searchCode); + if (existsExp != null) { + logger.error(String.format("Symbols: founded duplicated code: %s", searchCode)); + } else { + setsToDonwload.put(searchCode, foundedExp); + } + + // not found + if (foundedExp == null) { + logger.error(String.format("Symbols: can't find set by code: %s", searchCode)); + return; + } + + // checks for founded sets only + + // to early to download + if (!canDownloadTask){ + logger.warn(String.format("Symbols: early to download, set is not released: %s (%s) after %s", searchCode, foundedExp.getName(), foundedExp.getReleaseDate())); + } + } + + private void AnalyseSearchResult(){ + // analyze supported sets and show wrong settings (who without symbol settings) + for (ExpansionSet set : Sets.getInstance().values()) { + if (setsToDonwload.get(set.getCode()) == null) { + logger.warn(String.format("Symbols: set is not configured: %s (%s)", set.getCode(), set.getName())); + } + } + } + @Override public Iterator iterator() { Calendar c = Calendar.getInstance(); @@ -131,35 +173,57 @@ public class GathererSets implements Iterable { c.add(Calendar.DATE, +14); // Try to load the symbols eralies 14 days before release date Date compareDate = c.getTime(); ArrayList jobs = new ArrayList<>(); + boolean canDownload = false; + + setsToDonwload.clear(); + for (String symbol : symbols) { ExpansionSet exp = Sets.findSet(symbol); + canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { + canDownload = true; jobs.add(generateDownloadJob(symbol, "C", "C")); jobs.add(generateDownloadJob(symbol, "U", "U")); jobs.add(generateDownloadJob(symbol, "R", "R")); } + CheckSearchResult(symbol, exp, canDownload); } + for (String symbol : withMythics) { ExpansionSet exp = Sets.findSet(symbol); + canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { + canDownload = true; jobs.add(generateDownloadJob(symbol, "C", "C")); jobs.add(generateDownloadJob(symbol, "U", "U")); jobs.add(generateDownloadJob(symbol, "R", "R")); jobs.add(generateDownloadJob(symbol, "M", "M")); } + CheckSearchResult(symbol, exp, canDownload); } + for (String symbol : onlyMythics) { ExpansionSet exp = Sets.findSet(symbol); + canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { + canDownload = true; jobs.add(generateDownloadJob(symbol, "M", "M")); } } + for (String symbol : onlyMythicsAsSpecial) { ExpansionSet exp = Sets.findSet(symbol); + canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { + canDownload = true; jobs.add(generateDownloadJob(symbol, "M", "S")); } + CheckSearchResult(symbol, exp, canDownload); } + + // check wrong settings + AnalyseSearchResult(); + return jobs.iterator(); } From 080b4fc1a2a876d9fd761a32001e4a94008b825d Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 15 Nov 2017 01:44:10 +0400 Subject: [PATCH 09/25] Add new logs and checks in symbols download (for easy setup and fix settings) --- .../plugins/card/dl/sources/GathererSets.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index e3a117a51b..1e1305f1a6 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -16,6 +16,7 @@ import org.apache.log4j.Logger; public class GathererSets implements Iterable { + private static final int DAYS_BEFORE_RELEASE_TO_DOWNLOAD = +14; // Try to load the symbols eralies 14 days before release date private static final Logger logger = Logger.getLogger(GathererSets.class); private static final String SETS_PATH = File.separator + "sets"; @@ -40,7 +41,7 @@ public class GathererSets implements Iterable { "LRW", "MOR", "SHM", "EVE", "MED", "ME2", "ME3", "ME4", - "POR", "PO2", "PTK", + "POR", "P02", "PTK", "ARC", "DD3EVG", "W16", "W17"}; @@ -153,13 +154,18 @@ public class GathererSets implements Iterable { // to early to download if (!canDownloadTask){ - logger.warn(String.format("Symbols: early to download, set is not released: %s (%s) after %s", searchCode, foundedExp.getName(), foundedExp.getReleaseDate())); + Calendar c = Calendar.getInstance(); + c.setTime(foundedExp.getReleaseDate()); + c.add(Calendar.DATE, -1 * DAYS_BEFORE_RELEASE_TO_DOWNLOAD); + logger.warn(String.format("Symbols: early to download: %s (%s), available after %s", + searchCode, foundedExp.getName(), c.getTime())); } } private void AnalyseSearchResult(){ - // analyze supported sets and show wrong settings (who without symbol settings) + // analyze supported sets and show wrong settings for (ExpansionSet set : Sets.getInstance().values()) { + // not configured at all if (setsToDonwload.get(set.getCode()) == null) { logger.warn(String.format("Symbols: set is not configured: %s (%s)", set.getCode(), set.getName())); } @@ -170,7 +176,7 @@ public class GathererSets implements Iterable { public Iterator iterator() { Calendar c = Calendar.getInstance(); c.setTime(new Date()); - c.add(Calendar.DATE, +14); // Try to load the symbols eralies 14 days before release date + c.add(Calendar.DATE, DAYS_BEFORE_RELEASE_TO_DOWNLOAD); Date compareDate = c.getTime(); ArrayList jobs = new ArrayList<>(); boolean canDownload = false; @@ -209,6 +215,7 @@ public class GathererSets implements Iterable { canDownload = true; jobs.add(generateDownloadJob(symbol, "M", "M")); } + CheckSearchResult(symbol, exp, canDownload); } for (String symbol : onlyMythicsAsSpecial) { From 45aad8b6bc915379e9bbcebc1365b0ce770b7247 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 15 Nov 2017 02:43:38 +0400 Subject: [PATCH 10/25] add new checks for symbol download --- .../plugins/card/dl/sources/GathererSets.java | 77 +++++++++++++++---- 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 1e1305f1a6..6f81effd83 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -6,8 +6,10 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Iterator; + import mage.cards.ExpansionSet; import mage.cards.Sets; +import mage.constants.Rarity; import org.mage.plugins.card.dl.DownloadJob; import static org.mage.plugins.card.dl.DownloadJob.fromURL; @@ -16,6 +18,24 @@ import org.apache.log4j.Logger; public class GathererSets implements Iterable { + private class CheckResult { + String code; + ExpansionSet set; + boolean haveCommon; + boolean haveUncommon; + boolean haveRare; + boolean haveMyth; + + private CheckResult(String ACode, ExpansionSet ASet, boolean AHaveCommon, boolean AHaveUncommon, boolean AHhaveRare, boolean AHaveMyth) { + code = ACode; + set = ASet; + haveCommon = AHaveCommon; + haveUncommon = AHaveUncommon; + haveRare = AHhaveRare; + haveMyth = AHaveMyth; + } + } + private static final int DAYS_BEFORE_RELEASE_TO_DOWNLOAD = +14; // Try to load the symbols eralies 14 days before release date private static final Logger logger = Logger.getLogger(GathererSets.class); @@ -132,16 +152,18 @@ public class GathererSets implements Iterable { } // checks for wrong card settings and support (easy to control what all good) - private static final HashMap setsToDonwload = new HashMap<>(); - - private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask){ + private static final HashMap setsToDonwload = new HashMap<>(); + private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask, + boolean haveCommon, boolean haveUncommon, boolean haveRare, boolean haveMyth){ // duplicated in settings - ExpansionSet existsExp = setsToDonwload.get(searchCode); - if (existsExp != null) { + CheckResult res = setsToDonwload.get(searchCode); + + if (res != null) { logger.error(String.format("Symbols: founded duplicated code: %s", searchCode)); } else { - setsToDonwload.put(searchCode, foundedExp); + res = new CheckResult(searchCode, foundedExp, haveCommon, haveUncommon, haveRare, haveMyth); + setsToDonwload.put(searchCode, res); } // not found @@ -164,12 +186,41 @@ public class GathererSets implements Iterable { private void AnalyseSearchResult(){ // analyze supported sets and show wrong settings + Date startedDate = new Date(); + for (ExpansionSet set : Sets.getInstance().values()) { - // not configured at all - if (setsToDonwload.get(set.getCode()) == null) { + + CheckResult res = setsToDonwload.get(set.getCode()); + + // 1. not configured at all + if (res == null) { logger.warn(String.format("Symbols: set is not configured: %s (%s)", set.getCode(), set.getName())); + continue; // can't do other checks + } + + // 2. do not load needed card rarity: + // - simple check for base type, not all + // - when card not implemented then download is not necessary + // WARNING, need too much time (60+ secs), only for debug mode, may be move to tests? + if (logger.isDebugEnabled()) { + if ((set.getCardsByRarity(Rarity.COMMON).size() > 0) && !res.haveCommon) { + logger.error(String.format("Symbols: set have common cards, but don't download icon: %s (%s)", set.getCode(), set.getName())); + } + if ((set.getCardsByRarity(Rarity.UNCOMMON).size() > 0) && !res.haveUncommon) { + logger.error(String.format("Symbols: set have uncommon cards, but don't download icon: %s (%s)", set.getCode(), set.getName())); + } + if ((set.getCardsByRarity(Rarity.RARE).size() > 0) && !res.haveRare) { + logger.error(String.format("Symbols: set have rare cards, but don't download icon: %s (%s)", set.getCode(), set.getName())); + } + if ((set.getCardsByRarity(Rarity.MYTHIC).size() > 0) && !res.haveMyth) { + logger.error(String.format("Symbols: set have mythic cards, but don't download icon: %s (%s)", set.getCode(), set.getName())); + } } } + + Date endedDate = new Date(); + long secs = (endedDate.getTime() - startedDate.getTime()) / 1000; + logger.debug(String.format("Symbols: check time: %d seconds", secs)); } @Override @@ -179,7 +230,7 @@ public class GathererSets implements Iterable { c.add(Calendar.DATE, DAYS_BEFORE_RELEASE_TO_DOWNLOAD); Date compareDate = c.getTime(); ArrayList jobs = new ArrayList<>(); - boolean canDownload = false; + boolean canDownload; setsToDonwload.clear(); @@ -192,7 +243,7 @@ public class GathererSets implements Iterable { jobs.add(generateDownloadJob(symbol, "U", "U")); jobs.add(generateDownloadJob(symbol, "R", "R")); } - CheckSearchResult(symbol, exp, canDownload); + CheckSearchResult(symbol, exp, canDownload, true, true, true, false); } for (String symbol : withMythics) { @@ -205,7 +256,7 @@ public class GathererSets implements Iterable { jobs.add(generateDownloadJob(symbol, "R", "R")); jobs.add(generateDownloadJob(symbol, "M", "M")); } - CheckSearchResult(symbol, exp, canDownload); + CheckSearchResult(symbol, exp, canDownload, true, true, true, true); } for (String symbol : onlyMythics) { @@ -215,7 +266,7 @@ public class GathererSets implements Iterable { canDownload = true; jobs.add(generateDownloadJob(symbol, "M", "M")); } - CheckSearchResult(symbol, exp, canDownload); + CheckSearchResult(symbol, exp, canDownload, false, false, false, true); } for (String symbol : onlyMythicsAsSpecial) { @@ -225,7 +276,7 @@ public class GathererSets implements Iterable { canDownload = true; jobs.add(generateDownloadJob(symbol, "M", "S")); } - CheckSearchResult(symbol, exp, canDownload); + CheckSearchResult(symbol, exp, canDownload, false, false, false, true); } // check wrong settings From feb53492e64326b5a6665f2eed7918cc5bf5c723 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 15 Nov 2017 20:10:17 +0400 Subject: [PATCH 11/25] Add new checks for symbol download settings Fix error on download some symbols --- .../plugins/card/dl/sources/GathererSets.java | 131 ++++++++++-------- 1 file changed, 74 insertions(+), 57 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 6f81effd83..0d174ceed0 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -36,14 +36,14 @@ public class GathererSets implements Iterable { } } - private static final int DAYS_BEFORE_RELEASE_TO_DOWNLOAD = +14; // Try to load the symbols eralies 14 days before release date + private static final int DAYS_BEFORE_RELEASE_TO_DOWNLOAD = +14; // Try to load the symbolsBasic eralies 14 days before release date private static final Logger logger = Logger.getLogger(GathererSets.class); private static final String SETS_PATH = File.separator + "sets"; private static final File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + SETS_PATH); private static File outDir = DEFAULT_OUT_DIR; - private static final String[] symbols = {"10E", "9ED", "8ED", "7ED", "6ED", "5ED", "4ED", "3ED", "2ED", "LEB", "LEA", + private static final String[] symbolsBasic = {"10E", "9ED", "8ED", "7ED", "6ED", "5ED", "4ED", "3ED", "2ED", "LEB", "LEA", "HOP", "ARN", "ATQ", "LEG", "DRK", "FEM", "HML", "ICE", "ALL", "CSP", @@ -63,12 +63,15 @@ public class GathererSets implements Iterable { "MED", "ME2", "ME3", "ME4", "POR", "P02", "PTK", "ARC", "DD3EVG", - "W16", "W17"}; + "W16", "W17", + "APAC", "ARENA", "CHR", "CLASH", "CP", "DD3GVL", "DPA", "EURO", "FNMP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "MPS-AKH", "PTC", "S00", "S99", "SUS", "SWS", "UGIN", "UGL", "V10", "V17", "WMCQ", // need to fix + "H09", "PD2", "PD3", "UNH", "CM1", "E02", "V11", "M25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "DDT", "8EB", "9EB" // ok + // current testing + }; - private static final String[] withMythics = {"M10", "M11", "M12", "M13", "M14", "M15", "ORI", - "ANB", + private static final String[] symbolsBasicWithMyth = {"M10", "M11", "M12", "M13", "M14", "M15", "ORI", "DDF", "DDG", "DDH", "DDI", "DDJ", "DDK", "DDL", "DDM", "DDN", - "DD3DVD", "DD3GLV", "DD3JVC", "DDO", "DDP", "DDQ", "DDR", "DDS", + "DD3DVD", "DD3JVC", "DDO", "DDP", "DDQ", "DDR", "DDS", "ALA", "CON", "ARB", "ZEN", "WWK", "ROE", "SOM", "MBS", "NPH", @@ -90,57 +93,58 @@ public class GathererSets implements Iterable { "E01" }; - private static final String[] onlyMythics = { - "DRB", "V09", "V12", "V12", "V13", "V14", "V15", "V16", "EXP" + private static final String[] symbolsOnlyMyth = { + "DRB", "V09", "V12", "V13", "V14", "V15", "V16", "EXP" }; - private static final String[] onlyMythicsAsSpecial = { + private static final String[] symbolsOnlySpecial = { "MPS" }; - private static final HashMap symbolsReplacements = new HashMap<>(); + private static final HashMap codeReplacements = new HashMap<>(); static { - symbolsReplacements.put("2ED", "2U"); - symbolsReplacements.put("3ED", "3E"); - symbolsReplacements.put("4ED", "4E"); - symbolsReplacements.put("5ED", "5E"); - symbolsReplacements.put("6ED", "6E"); - symbolsReplacements.put("7ED", "7E"); - symbolsReplacements.put("ALL", "AL"); - symbolsReplacements.put("APC", "AP"); - symbolsReplacements.put("ARN", "AN"); - symbolsReplacements.put("ATQ", "AQ"); - symbolsReplacements.put("CMA", "CM1"); - symbolsReplacements.put("DD3DVD", "DD3_DVD"); - symbolsReplacements.put("DD3EVG", "DD3_EVG"); - symbolsReplacements.put("DD3GLV", "DD3_GLV"); - symbolsReplacements.put("DD3JVC", "DD3_JVC"); - symbolsReplacements.put("DRK", "DK"); - symbolsReplacements.put("EXO", "EX"); - symbolsReplacements.put("FEM", "FE"); - symbolsReplacements.put("HML", "HM"); - symbolsReplacements.put("ICE", "IA"); - symbolsReplacements.put("INV", "IN"); - symbolsReplacements.put("LEA", "1E"); - symbolsReplacements.put("LEB", "2E"); - symbolsReplacements.put("LEG", "LE"); - symbolsReplacements.put("MPS", "MPS_KLD"); - symbolsReplacements.put("MIR", "MI"); - symbolsReplacements.put("MMQ", "MM"); - symbolsReplacements.put("NEM", "NE"); - symbolsReplacements.put("ODY", "OD"); - symbolsReplacements.put("PCY", "PR"); - symbolsReplacements.put("PLS", "PS"); - symbolsReplacements.put("POR", "PO"); - symbolsReplacements.put("P02", "P2"); - symbolsReplacements.put("PTK", "PK"); - symbolsReplacements.put("STH", "ST"); - symbolsReplacements.put("TMP", "TE"); - symbolsReplacements.put("UDS", "CG"); - symbolsReplacements.put("ULG", "GU"); - symbolsReplacements.put("USG", "UZ"); - symbolsReplacements.put("VIS", "VI"); - symbolsReplacements.put("WTH", "WL"); + codeReplacements.put("2ED", "2U"); + codeReplacements.put("3ED", "3E"); + codeReplacements.put("4ED", "4E"); + codeReplacements.put("5ED", "5E"); + codeReplacements.put("6ED", "6E"); + codeReplacements.put("7ED", "7E"); + codeReplacements.put("ALL", "AL"); + codeReplacements.put("APC", "AP"); + codeReplacements.put("ARN", "AN"); + codeReplacements.put("ATQ", "AQ"); + codeReplacements.put("CMA", "CM1"); + codeReplacements.put("DD3DVD", "DD3_DVD"); + codeReplacements.put("DD3EVG", "DD3_EVG"); + codeReplacements.put("DD3JVC", "DD3_JVC"); + codeReplacements.put("DRK", "DK"); + codeReplacements.put("EXO", "EX"); + codeReplacements.put("FEM", "FE"); + codeReplacements.put("HML", "HM"); + codeReplacements.put("ICE", "IA"); + codeReplacements.put("INV", "IN"); + codeReplacements.put("LEA", "1E"); + codeReplacements.put("LEB", "2E"); + codeReplacements.put("LEG", "LE"); + codeReplacements.put("MPS", "MPS_KLD"); + codeReplacements.put("MIR", "MI"); + codeReplacements.put("MMQ", "MM"); + codeReplacements.put("NEM", "NE"); + codeReplacements.put("ODY", "OD"); + codeReplacements.put("PCY", "PR"); + codeReplacements.put("PLS", "PS"); + codeReplacements.put("POR", "PO"); + codeReplacements.put("P02", "P2"); + codeReplacements.put("PTK", "PK"); + codeReplacements.put("STH", "ST"); + codeReplacements.put("TMP", "TE"); + codeReplacements.put("UDS", "CG"); + codeReplacements.put("ULG", "GU"); + codeReplacements.put("USG", "UZ"); + codeReplacements.put("VIS", "VI"); + codeReplacements.put("WTH", "WL"); + codeReplacements.put("8EB", "8ED"); // inner xmage set for 8th edition + codeReplacements.put("9EB", "8ED"); // inner xmage set for 9th edition } public GathererSets(String path) { @@ -153,6 +157,14 @@ public class GathererSets implements Iterable { // checks for wrong card settings and support (easy to control what all good) private static final HashMap setsToDonwload = new HashMap<>(); + private static final HashMap codesToIgnoreCheck = new HashMap<>(); + static { + // xMage have inner sets for 8th and 9th Edition for booster workaround (cards from core game do not include in boosters) + // see https://mtg.gamepedia.com/8th_Edition/Core_Game + // check must ignore that sets + //codesToIgnoreCheck.put("8EB", "8th Edition Box"); + //codesToIgnoreCheck.put("9EB", "9th Edition Box"); + } private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask, boolean haveCommon, boolean haveUncommon, boolean haveRare, boolean haveMyth){ @@ -190,6 +202,11 @@ public class GathererSets implements Iterable { for (ExpansionSet set : Sets.getInstance().values()) { + // ignore some inner sets + if (codesToIgnoreCheck.get(set.getCode()) != null){ + continue; + } + CheckResult res = setsToDonwload.get(set.getCode()); // 1. not configured at all @@ -234,7 +251,7 @@ public class GathererSets implements Iterable { setsToDonwload.clear(); - for (String symbol : symbols) { + for (String symbol : symbolsBasic) { ExpansionSet exp = Sets.findSet(symbol); canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { @@ -246,7 +263,7 @@ public class GathererSets implements Iterable { CheckSearchResult(symbol, exp, canDownload, true, true, true, false); } - for (String symbol : withMythics) { + for (String symbol : symbolsBasicWithMyth) { ExpansionSet exp = Sets.findSet(symbol); canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { @@ -259,7 +276,7 @@ public class GathererSets implements Iterable { CheckSearchResult(symbol, exp, canDownload, true, true, true, true); } - for (String symbol : onlyMythics) { + for (String symbol : symbolsOnlyMyth) { ExpansionSet exp = Sets.findSet(symbol); canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { @@ -269,7 +286,7 @@ public class GathererSets implements Iterable { CheckSearchResult(symbol, exp, canDownload, false, false, false, true); } - for (String symbol : onlyMythicsAsSpecial) { + for (String symbol : symbolsOnlySpecial) { ExpansionSet exp = Sets.findSet(symbol); canDownload = false; if (exp != null && exp.getReleaseDate().before(compareDate)) { @@ -287,8 +304,8 @@ public class GathererSets implements Iterable { private DownloadJob generateDownloadJob(String set, String rarity, String urlRarity) { File dst = new File(outDir, set + '-' + rarity + ".jpg"); - if (symbolsReplacements.containsKey(set)) { - set = symbolsReplacements.get(set); + if (codeReplacements.containsKey(set)) { + set = codeReplacements.get(set); } String url = "http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + set + "&size=small&rarity=" + urlRarity; return new DownloadJob(set + '-' + rarity, fromURL(url), toFile(dst)); From b53d57bce9030de36f358104dc80ccb906b91990 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 15 Nov 2017 21:21:36 +0400 Subject: [PATCH 12/25] Fix error on download some symbols --- .../plugins/card/dl/sources/GathererSets.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 0d174ceed0..496768a6cf 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -64,8 +64,10 @@ public class GathererSets implements Iterable { "POR", "P02", "PTK", "ARC", "DD3EVG", "W16", "W17", - "APAC", "ARENA", "CHR", "CLASH", "CP", "DD3GVL", "DPA", "EURO", "FNMP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "MPS-AKH", "PTC", "S00", "S99", "SUS", "SWS", "UGIN", "UGL", "V10", "V17", "WMCQ", // need to fix - "H09", "PD2", "PD3", "UNH", "CM1", "E02", "V11", "M25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "DDT", "8EB", "9EB" // ok + //"APAC" -- gatherer do not have that set, scrly have PALP + //"ARENA" -- is't many set with different codes, not one + "CLASH", "CP", "DD3GVL", "DPA", "EURO", "FNMP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "MPS-AKH", "PTC", "S00", "S99", "SUS", "SWS", "UGIN", "UGL", "V10", "V17", "WMCQ", // need to fix + "H09", "PD2", "PD3", "UNH", "CM1", "E02", "V11", "M25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "DDT", "8EB", "9EB", "CHR" // ok // current testing }; @@ -145,6 +147,7 @@ public class GathererSets implements Iterable { codeReplacements.put("WTH", "WL"); codeReplacements.put("8EB", "8ED"); // inner xmage set for 8th edition codeReplacements.put("9EB", "8ED"); // inner xmage set for 9th edition + codeReplacements.put("CHR", "CH"); } public GathererSets(String path) { @@ -156,26 +159,26 @@ public class GathererSets implements Iterable { } // checks for wrong card settings and support (easy to control what all good) - private static final HashMap setsToDonwload = new HashMap<>(); + private static final HashMap setsToDownload = new HashMap<>(); private static final HashMap codesToIgnoreCheck = new HashMap<>(); static { // xMage have inner sets for 8th and 9th Edition for booster workaround (cards from core game do not include in boosters) // see https://mtg.gamepedia.com/8th_Edition/Core_Game // check must ignore that sets - //codesToIgnoreCheck.put("8EB", "8th Edition Box"); - //codesToIgnoreCheck.put("9EB", "9th Edition Box"); + codesToIgnoreCheck.put("8EB", "8th Edition Box"); + codesToIgnoreCheck.put("9EB", "9th Edition Box"); } private void CheckSearchResult(String searchCode, ExpansionSet foundedExp, boolean canDownloadTask, boolean haveCommon, boolean haveUncommon, boolean haveRare, boolean haveMyth){ // duplicated in settings - CheckResult res = setsToDonwload.get(searchCode); + CheckResult res = setsToDownload.get(searchCode); if (res != null) { logger.error(String.format("Symbols: founded duplicated code: %s", searchCode)); } else { res = new CheckResult(searchCode, foundedExp, haveCommon, haveUncommon, haveRare, haveMyth); - setsToDonwload.put(searchCode, res); + setsToDownload.put(searchCode, res); } // not found @@ -207,7 +210,7 @@ public class GathererSets implements Iterable { continue; } - CheckResult res = setsToDonwload.get(set.getCode()); + CheckResult res = setsToDownload.get(set.getCode()); // 1. not configured at all if (res == null) { @@ -215,10 +218,8 @@ public class GathererSets implements Iterable { continue; // can't do other checks } - // 2. do not load needed card rarity: - // - simple check for base type, not all - // - when card not implemented then download is not necessary - // WARNING, need too much time (60+ secs), only for debug mode, may be move to tests? + // 2. missing rarity icon: + // WARNING, need too much time (60+ secs), only for debug mode if (logger.isDebugEnabled()) { if ((set.getCardsByRarity(Rarity.COMMON).size() > 0) && !res.haveCommon) { logger.error(String.format("Symbols: set have common cards, but don't download icon: %s (%s)", set.getCode(), set.getName())); @@ -237,7 +238,7 @@ public class GathererSets implements Iterable { Date endedDate = new Date(); long secs = (endedDate.getTime() - startedDate.getTime()) / 1000; - logger.debug(String.format("Symbols: check time: %d seconds", secs)); + logger.debug(String.format("Symbols: check completed after %d seconds", secs)); } @Override @@ -249,7 +250,7 @@ public class GathererSets implements Iterable { ArrayList jobs = new ArrayList<>(); boolean canDownload; - setsToDonwload.clear(); + setsToDownload.clear(); for (String symbol : symbolsBasic) { ExpansionSet exp = Sets.findSet(symbol); From 7bab56e9102740645b1e8d46457ca438d9c2328c Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 16 Nov 2017 10:31:11 -0500 Subject: [PATCH 13/25] fixed Hubris bouncing equipment (fixes #4167) --- Mage.Sets/src/mage/cards/h/Hubris.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/h/Hubris.java b/Mage.Sets/src/mage/cards/h/Hubris.java index cb4cb55983..c8ce846378 100644 --- a/Mage.Sets/src/mage/cards/h/Hubris.java +++ b/Mage.Sets/src/mage/cards/h/Hubris.java @@ -99,7 +99,13 @@ class HubrisReturnEffect extends OneShotEffect { for (UUID targetId : targetPointer.getTargets(game, source)) { Permanent creature = game.getPermanent(targetId); if (creature != null) { - Cards cardsToHand = new CardsImpl(creature.getAttachments()); + Cards cardsToHand = new CardsImpl(); + for (UUID cardId : creature.getAttachments()) { + Permanent card = game.getPermanent(cardId); + if (card != null && card.hasSubtype(SubType.AURA, game)) { + cardsToHand.add(card); + } + } cardsToHand.add(creature); controller.moveCards(cardsToHand, Zone.HAND, source, game); } From 42479543180aa81fc0daaa4487cdf522151744a1 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 18 Nov 2017 01:37:10 +1100 Subject: [PATCH 14/25] spjspj - Add in a new way to allow just the Face Art for cards into the viewer. --- .../mage/card/arcane/CardPanelRenderImpl.java | 20 +- .../org/mage/card/arcane/CardRenderer.java | 47 +- .../mage/card/arcane/ModernCardRenderer.java | 29 +- .../mage/plugins/card/images/ImageCache.java | 109 + .../plugins/card/utils/CardImageUtils.java | 10 +- Utils/cut.pl | 35 +- Utils/get_modo_artids.pl | 263 + Utils/modo_artids | 31904 ++++++++++++++++ 8 files changed, 32394 insertions(+), 23 deletions(-) create mode 100644 Utils/get_modo_artids.pl create mode 100644 Utils/modo_artids diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java index b418cd22df..2bf644ca6b 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java @@ -218,13 +218,15 @@ public class CardPanelRenderImpl extends CardPanel { } } - // Map of generated images private final static Map IMAGE_CACHE = new MapMaker().softValues().makeMap(); // The art image for the card, loaded in from the disk private BufferedImage artImage; + // The faceart image for the card, loaded in from the disk (based on artid from mtgo) + private BufferedImage faceArtImage; + // Factory to generate card appropriate views private CardRendererFactory cardRendererFactory = new CardRendererFactory(); @@ -252,6 +254,8 @@ public class CardPanelRenderImpl extends CardPanel { // Use the art image and current rendered image from the card artImage = impl.artImage; cardRenderer.setArtImage(artImage); + faceArtImage = impl.faceArtImage; + cardRenderer.setFaceArtImage(faceArtImage); cardImage = impl.cardImage; } } @@ -263,8 +267,8 @@ public class CardPanelRenderImpl extends CardPanel { // Try to get card image from cache based on our card characteristics ImageKey key = new ImageKey(gameCard, artImage, - getCardWidth(), getCardHeight(), - isChoosable(), isSelected()); + getCardWidth(), getCardHeight(), + isChoosable(), isSelected()); cardImage = IMAGE_CACHE.computeIfAbsent(key, k -> renderCard()); // No cached copy exists? Render one and cache it @@ -277,7 +281,6 @@ public class CardPanelRenderImpl extends CardPanel { /** * Create an appropriate card renderer for the */ - /** * Render the card to a new BufferedImage at it's current dimensions * @@ -315,6 +318,7 @@ public class CardPanelRenderImpl extends CardPanel { artImage = null; cardImage = null; cardRenderer.setArtImage(null); + cardRenderer.setFaceArtImage(null); // Stop animation tappedAngle = isTapped() ? CardPanel.TAPPED_ANGLE : 0; @@ -332,19 +336,26 @@ public class CardPanelRenderImpl extends CardPanel { Util.threadPool.submit(() -> { try { final BufferedImage srcImage; + final BufferedImage faceArtSrcImage; if (gameCard.isFaceDown()) { // Nothing to do srcImage = null; + faceArtSrcImage = null; } else if (getCardWidth() > THUMBNAIL_SIZE_FULL.width) { srcImage = ImageCache.getImage(gameCard, getCardWidth(), getCardHeight()); + faceArtSrcImage = ImageCache.getFaceImage(gameCard, getCardWidth(), getCardHeight()); } else { srcImage = ImageCache.getThumbnail(gameCard); + faceArtSrcImage = ImageCache.getFaceImage(gameCard, getCardWidth(), getCardHeight()); } UI.invokeLater(() -> { if (stamp == updateArtImageStamp) { artImage = srcImage; cardRenderer.setArtImage(srcImage); + faceArtImage = faceArtSrcImage; + cardRenderer.setFaceArtImage(faceArtSrcImage); + if (srcImage != null) { // Invalidate and repaint cardImage = null; @@ -370,6 +381,7 @@ public class CardPanelRenderImpl extends CardPanel { cardImage = null; cardRenderer = cardRendererFactory.create(gameCard, isTransformed()); cardRenderer.setArtImage(artImage); + cardRenderer.setFaceArtImage(faceArtImage); // Repaint repaint(); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java index f28cb134e4..2c0f7cd44b 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java @@ -66,6 +66,9 @@ public abstract class CardRenderer { // The card image protected BufferedImage artImage; + // The face card image + protected BufferedImage faceArtImage; + /////////////////////////////////////////////////////////////////////////// // Common layout metrics between all cards // Polygons for counters @@ -289,8 +292,8 @@ public abstract class CardRenderer { try { BufferedImage subImg = artImage.getSubimage( - (int) (artRect.getX() * fullCardImgWidth), (int) (artRect.getY() * fullCardImgHeight), - (int) artWidth, (int) artHeight); + (int) (artRect.getX() * fullCardImgWidth), (int) (artRect.getY() * fullCardImgHeight), + (int) artWidth, (int) artHeight); g.drawImage(subImg, x, y, (int) targetWidth, (int) targetHeight, @@ -300,6 +303,40 @@ public abstract class CardRenderer { } } + protected void drawFaceArtIntoRect(Graphics2D g, int x, int y, int w, int h, Rectangle2D artRect, boolean shouldPreserveAspect) { + // Perform a process to make sure that the art is scaled uniformly to fill the frame, cutting + // off the minimum amount necessary to make it completely fill the frame without "squashing" it. + double fullCardImgWidth = faceArtImage.getWidth(); + double fullCardImgHeight = faceArtImage.getHeight(); + double artWidth = fullCardImgWidth; + double artHeight = fullCardImgHeight; + double targetWidth = w; + double targetHeight = h; + double targetAspect = targetWidth / targetHeight; + if (!shouldPreserveAspect) { + // No adjustment to art + } else if (targetAspect * artHeight < artWidth) { + // Trim off some width + artWidth = targetAspect * artHeight; + } else { + // Trim off some height + artHeight = artWidth / targetAspect; + } + try { + /*BufferedImage subImg + = faceArtImage.getSubimage( + (int) (artRect.getX() * fullCardImgWidth), (int) (artRect.getY() * fullCardImgHeight), + (int) artWidth, (int) artHeight);*/ + g.drawImage(faceArtImage, + x, y, + (int) targetWidth, (int) targetHeight, + null); + } catch (RasterFormatException e) { + // At very small card sizes we may encounter a problem with rounding error making the rect not fit + System.out.println(e); + } + } + // Draw +1/+1 and other counters protected void drawCounters(Graphics2D g) { int xPos = (int) (0.65 * cardWidth); @@ -442,4 +479,10 @@ public abstract class CardRenderer { public void setArtImage(Image image) { artImage = CardRendererUtils.toBufferedImage(image); } + + // Set the card art image (CardPanel will give it to us when it + // is loaded and ready) + public void setFaceArtImage(Image image) { + faceArtImage = CardRendererUtils.toBufferedImage(image); + } } diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index a3de811495..e603ac6d1e 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -279,6 +279,8 @@ public class ModernCardRenderer extends CardRenderer { // Just draw a brown rectangle drawCardBack(g); } else { + BufferedImage bufferedImage = new BufferedImage(300, 300, BufferedImage.TYPE_INT_RGB); + // Set texture to paint with g.setPaint(getBackgroundPaint(cardView.getColor(), cardView.getCardTypes(), cardView.getSubTypes())); @@ -348,8 +350,15 @@ public class ModernCardRenderer extends CardRenderer { @Override protected void drawArt(Graphics2D g) { if (artImage != null && !cardView.isFaceDown()) { + + boolean useFaceArt = false; + if (faceArtImage != null) { + useFaceArt = true; + } + // Invention rendering, art fills the entire frame if (useInventionFrame()) { + useFaceArt = false; drawArtIntoRect(g, borderWidth, borderWidth, cardWidth - 2 * borderWidth, cardHeight - 2 * borderWidth, @@ -360,6 +369,7 @@ public class ModernCardRenderer extends CardRenderer { Rectangle2D sourceRect = getArtRect(); if (cardView.getMageObjectType() == MageObjectType.SPELL) { + useFaceArt = false; ArtRect rect = cardView.getArtRect(); if (rect == ArtRect.SPLIT_FUSED) { // Special handling for fused, draw the art from both halves stacked on top of one and other @@ -380,10 +390,17 @@ public class ModernCardRenderer extends CardRenderer { } // Normal drawing of art from a source part of the card frame into the rect - drawArtIntoRect(g, - totalContentInset + 1, totalContentInset + boxHeight, - contentWidth - 2, typeLineY - totalContentInset - boxHeight, - sourceRect, shouldPreserveAspect); + if (useFaceArt) { + drawFaceArtIntoRect(g, + totalContentInset + 1, totalContentInset + boxHeight, + contentWidth - 2, typeLineY - totalContentInset - boxHeight, + sourceRect, shouldPreserveAspect); + } else { + drawArtIntoRect(g, + totalContentInset + 1, totalContentInset + boxHeight, + contentWidth - 2, typeLineY - totalContentInset - boxHeight, + sourceRect, shouldPreserveAspect); + } } } @@ -420,6 +437,7 @@ public class ModernCardRenderer extends CardRenderer { g.setPaint(new Color(255, 255, 255, 150)); } else { g.setPaint(textboxPaint); + } g.fillRect( totalContentInset + 1, typeLineY, @@ -476,6 +494,9 @@ public class ModernCardRenderer extends CardRenderer { // Draw the transform circle int nameOffset = drawTransformationCircle(g, borderPaint); + // Draw the transform circle + nameOffset = drawTransformationCircle(g, borderPaint); + // Draw the name line drawNameLine(g, cardView.getDisplayName(), manaCostString, totalContentInset + nameOffset, totalContentInset, diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java index 97cbd4af82..3d9c98d953 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java @@ -44,6 +44,7 @@ public final class ImageCache { private static final Logger LOGGER = Logger.getLogger(ImageCache.class); private static final Map IMAGE_CACHE; + private static final Map FACE_IMAGE_CACHE; /** * Common pattern for keys. Format: "##" @@ -155,6 +156,55 @@ public final class ImageCache { return makeThumbnail(image, thumbnailPath); } }); + + FACE_IMAGE_CACHE = new MapMaker().softValues().makeComputingMap(new Function() { + @Override + public BufferedImage apply(String key) { + try { + + Matcher m = KEY_PATTERN.matcher(key); + + if (m.matches()) { + String name = m.group(1); + String set = m.group(2); + //Integer artid = Integer.parseInt(m.group(2)); + + String path; + path = CardImageUtils.generateFaceImagePath(name, set); + + if (path == null) { + return null; + } + TFile file = getTFile(path); + if (file == null) { + return null; + } + + BufferedImage image = loadImage(file); + return image; + } else { + throw new RuntimeException( + "Requested face image doesn't fit the requirement for key (##: " + key); + } + } catch (Exception ex) { + if (ex instanceof ComputationException) { + throw (ComputationException) ex; + } else { + throw new ComputationException(ex); + } + } + } + + public BufferedImage makeThumbnailByFile(String key, TFile file, String thumbnailPath) { + BufferedImage image = loadImage(file); + image = getWizardsCard(image); + if (image == null) { + return null; + } + LOGGER.debug("creating thumbnail for " + key); + return makeThumbnail(image, thumbnailPath); + } + }); } public static String getFilePath(CardView card, int width) { @@ -263,6 +313,10 @@ public final class ImageCache { return getImage(getKey(card, card.getName(), "")); } + public static BufferedImage getImageFaceOriginal(CardView card) { + return getFaceImage(getFaceKey(card, card.getName(), card.getExpansionSetCode())); + } + public static BufferedImage getImageOriginalAlternateName(CardView card) { return getImage(getKey(card, card.getAlternateName(), "")); } @@ -288,6 +342,27 @@ public final class ImageCache { } } + /** + * Returns the Image corresponding to the key + */ + private static BufferedImage getFaceImage(String key) { + try { + return FACE_IMAGE_CACHE.get(key); + } catch (NullPointerException ex) { + // unfortunately NullOutputException, thrown when apply() returns + // null, is not public + // NullOutputException is a subclass of NullPointerException + // legitimate, happens when a card has no image + return null; + } catch (ComputationException ex) { + if (ex.getCause() instanceof NullPointerException) { + return null; + } + LOGGER.error(ex, ex); + return null; + } + } + /** * Returns the Image corresponding to the key only if it already exists in * the cache. @@ -296,6 +371,14 @@ public final class ImageCache { return IMAGE_CACHE.containsKey(key) ? IMAGE_CACHE.get(key) : null; } + /** + * Returns the Image corresponding to the key only if it already exists in + * the cache. + */ + private static BufferedImage tryGetFaceImage(String key) { + return FACE_IMAGE_CACHE.containsKey(key) ? FACE_IMAGE_CACHE.get(key) : null; + } + /** * Returns the map key for a card, without any suffixes for the image size. */ @@ -307,6 +390,13 @@ public final class ImageCache { + (card.getTokenDescriptor() != null ? '#' + card.getTokenDescriptor() : "#"); } + /** + * Returns the map key for a card, without any suffixes for the image size. + */ + private static String getFaceKey(CardView card, String name, String set) { + return name + '#' + set + "####"; + } + // /** // * Returns the map key for the flip image of a card, without any suffixes for the image size. // */ @@ -409,6 +499,25 @@ public final class ImageCache { return TransformedImageCache.getResizedImage(original, (int) (original.getWidth() * scale), (int) (original.getHeight() * scale)); } + /** + * Returns the image appropriate to display the card in the picture panel + * + * @param card + * @param width + * @param height + * @return + */ + public static BufferedImage getFaceImage(CardView card, int width, int height) { + String key = getFaceKey(card, card.getName(), card.getExpansionSetCode()); + BufferedImage original = getFaceImage(key); + if (original == null) { + LOGGER.debug(key + " (faceimage) not found"); + return null; + } + + return original; + } + /** * Returns the image appropriate to display for a card in a picture panel, * but only it was ALREADY LOADED. That is, the call is immediate and will diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java index 7cbe1ec9a0..e8611b63e0 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java @@ -48,7 +48,7 @@ public final class CardImageUtils { log.warn("Token image file not found: " + card.getSet() + " - " + card.getTokenSetCode() + " - " + card.getName()); return null; } - + /** * * @param card @@ -204,6 +204,14 @@ public final class CardImageUtils { return imageDir + TFile.separator + imageName; } + public static String generateFaceImagePath(String cardname, String set) { + String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true"); + String imagesPath = Objects.equals(useDefault, "true") ? Constants.IO.imageBaseDir : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null); + String imageDir = imagesPath; + String imageName = set + TFile.separator + cardname + ".jpg"; + return imageDir + TFile.separator + "FACE" + TFile.separator + imageName; + } + public static String generateTokenDescriptorImagePath(CardDownloadData card) { // String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true"); // String imagesPath = Objects.equals(useDefault, "true") ? null : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null); diff --git a/Utils/cut.pl b/Utils/cut.pl index 674a7982d1..3b03a0a5b5 100644 --- a/Utils/cut.pl +++ b/Utils/cut.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl ## -# File : get_all.pl +# File : cut.pl # Author : spjspj ## @@ -22,6 +22,7 @@ use POSIX qw(strftime); print (" cut.pl full_text.txt keys 0 filegrep\n"); print (" cut.pl full_text.txt 0 0 make_code_bat\n"); print (" dir /a /b /s *.java | cut.pl stdin 0 0 make_code_bat > bob.bat\n"); + print (" dir /a /b /s *.xml | cut.pl stdin 0 0 make_code_bat > bob_xml.bat\n"); print (" cut.pl d:\\perl_programs output.*txt 7 age_dir | cut.pl list . 0 grep\n"); print (" cut.pl bob.txt 0 0 uniquelines \n"); print (" cut.pl file 0 0 strip_http\n"); @@ -331,16 +332,27 @@ use POSIX qw(strftime); { my $i; { - my $url = $term; - print ("Download :$url:\n"); - my $content = get $url; - print ("Saw " . length ($content) . " bytes!\n"); - print ("Save in $helper\n"); - open OUTPUT, "> " . $helper or die "No dice!"; - binmode (OUTPUT); - print OUTPUT $content; - close OUTPUT; - print $url, " >>> ", $helper, "\n"; + if (!(-f "$helper")) + { + my $url = $term; + print ("Download :$url:\n"); + my $content = get $url; + print ("Saw " . length ($content) . " bytes!\n"); + print ("Save in $helper\n"); + open OUTPUT, "> " . $helper or die "No dice!"; + binmode (OUTPUT); + print OUTPUT $content; + close OUTPUT; + print $url, " >>> ", $helper, "\n"; + } + else + { + print ("Found $helper existed already..\n"); + if (-s "$helper" == 0) + { + `del "$helper"`; + } + } } } if ($operation eq "grep") @@ -898,5 +910,4 @@ use POSIX qw(strftime); } } } - } diff --git a/Utils/get_modo_artids.pl b/Utils/get_modo_artids.pl new file mode 100644 index 0000000000..8fc67f5e2a --- /dev/null +++ b/Utils/get_modo_artids.pl @@ -0,0 +1,263 @@ +#!/usr/bin/perl +## +# File : get_modo_artids.pl +# Date : 12/Nov/2017 +# Author : spjspj +# Purpose : Get the artid for each face art of each card from modo (mtgo) +# this then goes into some form of image such as: +# http://mtgoclientdepot.onlinegaming.wizards.com/Graphics/Cards/Pics/161922_typ_reg_sty_050.jpg +# "" /00100_typ_reg_sty_001.jpg +# "" /01440_typ_reg_sty_010.jpg +# "" /102392_typ_reg_sty_010.jpg +# "" /400603_typ_reg_sty_050.jpg +# This program expects that you've copied the relevant .xml files from an installation of mtgo +# into the current working directory for this perl script: +# For example: CARDNAME_STRING.xml, client_BNG.xml, +# Also, it expects to be running on windows +## + +use strict; +use LWP::Simple; +use POSIX qw(strftime); + + +# From xmage code - fix from MODO to XMAGE type set codes +my %fix_set_codes; +$fix_set_codes {"2U"} = "2ED"; +$fix_set_codes {"3E"} = "3ED"; +$fix_set_codes {"4E"} = "4ED"; +$fix_set_codes {"5E"} = "5ED"; +$fix_set_codes {"6E"} = "6ED"; +$fix_set_codes {"7E"} = "7ED"; +$fix_set_codes {"AL"} = "ALL"; +$fix_set_codes {"AP"} = "APC"; +$fix_set_codes {"AN"} = "ARN"; +$fix_set_codes {"AQ"} = "ATQ"; +$fix_set_codes {"CM1"} = "CMA"; +$fix_set_codes {"DD3_DVD"} = "DD3DVD"; +$fix_set_codes {"DD3_EVG"} = "DD3EVG"; +$fix_set_codes {"DD3_GLV"} = "DD3GLV"; +$fix_set_codes {"DD3_JVC"} = "DD3JVC"; +$fix_set_codes {"DK"} = "DRK"; +$fix_set_codes {"EX"} = "EXO"; +$fix_set_codes {"FE"} = "FEM"; +$fix_set_codes {"HM"} = "HML"; +$fix_set_codes {"IA"} = "ICE"; +$fix_set_codes {"IN"} = "INV"; +$fix_set_codes {"1E"} = "LEA"; +$fix_set_codes {"2E"} = "LEB"; +$fix_set_codes {"LE"} = "LEG"; +$fix_set_codes {"MI"} = "MIR"; +$fix_set_codes {"MM"} = "MMQ"; +$fix_set_codes {"MPS_KLD"} = "MPS"; +$fix_set_codes {"NE"} = "NEM"; +$fix_set_codes {"NE"} = "NMS"; +$fix_set_codes {"OD"} = "ODY"; +$fix_set_codes {"PR"} = "PCY"; +$fix_set_codes {"PS"} = "PLS"; +$fix_set_codes {"P2"} = "PO2"; +$fix_set_codes {"PO"} = "POR"; +$fix_set_codes {"PK"} = "PTK"; +$fix_set_codes {"ST"} = "STH"; +$fix_set_codes {"TE"} = "TMP"; +$fix_set_codes {"CG"} = "UDS"; +$fix_set_codes {"UD"} = "UDS"; +$fix_set_codes {"GU"} = "ULG"; +$fix_set_codes {"UZ"} = "USG"; +$fix_set_codes {"VI"} = "VIS"; +$fix_set_codes {"WL"} = "WTH"; + +# Main +{ + my $card = $ARGV [0]; + + # Example: Abandoned Sarcophagus + my $vals = `find /I "CARDNAME" *CARDNAME*STR*`; + my %ids; + my %set_names; + my $count = 0; + while ($vals =~ s/^.*CARDNAME_STRING_ITEM id='(.*?)'>(.*?)<\/CARDNAME_STRING.*\n//im) + { + $ids {$1} = $2; + $count++; + } + print ("Finished reading $count names\n"); + + + #$vals = `find /I "<" *lient*`; + $vals = `findstr /I "CARDNAME_STRING DIGITALOBJECT ARTID CLONE" *lient* | find /I /V "_DO.xml"`; + + my $current_artid = ""; + my $current_clone_id = ""; + my $current_doc_id = ""; + my $current_line = ""; + my $current_name = ""; + my $current_set = ""; + my $num_set = 1; + my %docid_to_clone; + + while ($vals =~ s/^(.*)\n//im) + { + my $line = $1; + $line =~ m/^client_(.*)?\.xml/; + $current_set = $1; + +# *** IN +# *** IN +# +# *** IN +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# + + if ($line =~ m/