Merge pull request #74 from magefree/master

merge

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java

@@ -251,6 +251,7 @@ public enum MythicspoilerComSource implements CardImageSource {
         supportedSets.add("E01");
         supportedSets.add("HOU");
         supportedSets.add("C17");
+        supportedSets.add("IMA");
         supportedSets.add("XLN");
 
         sets = new LinkedHashMap<>();

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java

@@ -199,11 +199,25 @@ public enum ScryfallImageSource implements CardImageSource {
         supportedSets.add("E01");
         supportedSets.add("HOU");
         supportedSets.add("C17");
+        supportedSets.add("XLN");
+//        supportedSets.add("DDT");
+        supportedSets.add("IMA");
+//        supportedSets.add("E02");
+//        supportedSets.add("V17");
+//        supportedSets.add("UST");
+//        supportedSets.add("RIX");
+//        supportedSets.add("A25");
+//        supportedSets.add("DOM");
+//        supportedSets.add("M19");
+
     }
 
     @Override
     public String generateURL(CardDownloadData card) throws Exception {
-        return "https://api.scryfall.com/cards/" + formatSetName(card.getSet()) + "/" + card.getCollectorId() + "?format=image";
+        return "https://api.scryfall.com/cards/" + formatSetName(card.getSet()) + "/"
+                + card.getCollectorId()
+                + (card.isSecondSide() ? "b" : "")
+                + "?format=image";
     }
 
     @Override

Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java

@@ -40,7 +40,7 @@ public class CardDownloadData {
     }
 
     public CardDownloadData(String name, String set, String collectorId, boolean usesVariousArt, Integer type, String tokenSetCode, String tokenDescriptor, boolean token, boolean twoFacedCard, boolean secondSide) {
-        this(name, set, collectorId, usesVariousArt, type, tokenSetCode, tokenDescriptor, token, false, false, "");
+        this(name, set, collectorId, usesVariousArt, type, tokenSetCode, tokenDescriptor, token, twoFacedCard, secondSide, "");
     }
 
     public CardDownloadData(String name, String set, String collectorId, boolean usesVariousArt, Integer type, String tokenSetCode, String tokenDescriptor, boolean token, boolean twoFacedCard, boolean secondSide, String tokenClassName) {
@@ -72,7 +72,7 @@ public class CardDownloadData {
         this.usesVariousArt = card.usesVariousArt;
         this.tokenSetCode = card.tokenSetCode;
         this.tokenDescriptor = card.tokenDescriptor;
-        this.tokenClassName = tokenClassName;
+        this.tokenClassName = card.tokenClassName;
         this.fileName = card.fileName;
 
     }

Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java

@@ -429,6 +429,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                         if (card.getSecondSideName() == null || card.getSecondSideName().trim().isEmpty()) {
                             throw new IllegalStateException("Second side card can't have empty name.");
                         }
+
                         url = new CardDownloadData(card.getSecondSideName(), card.getSetCode(), card.getCardNumber(), card.usesVariousArt(), 0, "", "", false, card.isDoubleFaced(), true);
                         url.setType2(isType2);
                         allCardsUrls.add(url);
@@ -444,11 +445,11 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                         allCardsUrls.add(cardDownloadData);
                     }
                 } else if (card.getCardNumber().isEmpty() || "0".equals(card.getCardNumber())) {
-                    System.err.println("There was a critical error!");
                     logger.error("Card has no collector ID and won't be sent to client: " + card.getName());
                 } else if (card.getSetCode().isEmpty()) {
-                    System.err.println("There was a critical error!");
                     logger.error("Card has no set name and won't be sent to client:" + card.getName());
+                } else {
+                    logger.info("Card was not selected: " + card.getName());
                 }
             });
             allCardsUrls.addAll(getTokenCardUrls());

Mage.Client/src/main/resources/image.url.properties

@@ -74,6 +74,6 @@ dd3evg=ddaevg
 dd3gvl=ddagvl
 dd3jvc=ddajvc
 # Remove setname as soon as the images can be downloaded
-ignore.urls=TOK,DDT,V17,IMA,RIX,E02,M19,M25,DOM,UST,H17
+ignore.urls=TOK,DDT,V17,RIX,E02,M19,M25,DOM,UST,H17
 # sets ordered by release time (newest goes first)
 token.lookup.order=M19,M25,DOM,E02,RIX,UST,XLN,IMA,H17,C17,V17,E01,DDT,CMA,HOU,MM3,DDS,AKH,DD3DVD,DD3EVG,DD3GVL,DD3JVC,H09,AER,PCA,C16,V16,MPS,KLD,DDR,CN2,EMN,EMA,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,DRB,V09,V10,V11,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC

Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java

@@ -139,10 +139,9 @@ class SunbirdsInvocationEffect extends OneShotEffect {
                 Card card = cards.get(target.getFirstTarget(), game);
                 if (card != null) {
                     if (controller.chooseUse(outcome, "Do you wish to cast " + card.getName(), source, game)) {
-                        Card copy = game.copyCard(card, source, source.getControllerId());
+                        controller.cast(card.getSpellAbility(), game, true);
-                        controller.cast(copy.getSpellAbility(), game, true);
+                        cards.remove(card);
                     }
-                    return true;
                 }
             }
         }

Mage.Sets/src/mage/sets/IconicMasters.java

@@ -25,7 +25,6 @@
 * authors and should not be interpreted as representing official policies, either expressed
 * or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.sets;
 
 import mage.cards.ExpansionSet;
@@ -56,7 +55,7 @@ public class IconicMasters extends ExpansionSet {
         this.ratioBoosterMythic = 8;
 
         cards.add(new SetCardInfo("Scion of Ugin", 1, Rarity.COMMON, mage.cards.s.ScionOfUgin.class));
-        cards.add(new SetCardInfo("Abzan Battle Priest", 2, Rarity.COMMON, mage.cards.a.AbzanBattlePriest.class));
+        cards.add(new SetCardInfo("Abzan Battle Priest", 2, Rarity.UNCOMMON, mage.cards.a.AbzanBattlePriest.class));
         cards.add(new SetCardInfo("Abzan Falconer", 3, Rarity.UNCOMMON, mage.cards.a.AbzanFalconer.class));
         cards.add(new SetCardInfo("Ainok Bond-Kin", 4, Rarity.COMMON, mage.cards.a.AinokBondKin.class));
         cards.add(new SetCardInfo("Ajani's Pridemate", 5, Rarity.UNCOMMON, mage.cards.a.AjanisPridemate.class));
@@ -197,7 +196,7 @@ public class IconicMasters extends ExpansionSet {
         cards.add(new SetCardInfo("Monastery Swiftspear", 140, Rarity.UNCOMMON, mage.cards.m.MonasterySwiftspear.class));
         cards.add(new SetCardInfo("Pillar of Flame", 141, Rarity.COMMON, mage.cards.p.PillarOfFlame.class));
         cards.add(new SetCardInfo("Prodigal Pyromancer", 142, Rarity.UNCOMMON, mage.cards.p.ProdigalPyromancer.class));
-        cards.add(new SetCardInfo("Rift Bolt", 143, Rarity.COMMON, mage.cards.r.RiftBolt.class));
+        cards.add(new SetCardInfo("Rift Bolt", 143, Rarity.UNCOMMON, mage.cards.r.RiftBolt.class));
         cards.add(new SetCardInfo("Ryusei, the Falling Star", 144, Rarity.RARE, mage.cards.r.RyuseiTheFallingStar.class));
         cards.add(new SetCardInfo("Scourge of Valkas", 145, Rarity.RARE, mage.cards.s.ScourgeOfValkas.class));
         cards.add(new SetCardInfo("Splatter Thug", 146, Rarity.COMMON, mage.cards.s.SplatterThug.class));
@@ -227,7 +226,7 @@ public class IconicMasters extends ExpansionSet {
         cards.add(new SetCardInfo("Ivy Elemental", 170, Rarity.COMMON, mage.cards.i.IvyElemental.class));
         cards.add(new SetCardInfo("Jaddi Offshoot", 171, Rarity.COMMON, mage.cards.j.JaddiOffshoot.class));
         cards.add(new SetCardInfo("Jugan, the Rising Star", 172, Rarity.RARE, mage.cards.j.JuganTheRisingStar.class));
-        cards.add(new SetCardInfo("Lead the Stampede", 173, Rarity.UNCOMMON, mage.cards.l.LeadTheStampede.class));
+        cards.add(new SetCardInfo("Lead the Stampede", 173, Rarity.COMMON, mage.cards.l.LeadTheStampede.class));
         cards.add(new SetCardInfo("Lotus Cobra", 174, Rarity.RARE, mage.cards.l.LotusCobra.class));
         cards.add(new SetCardInfo("Lure", 175, Rarity.UNCOMMON, mage.cards.l.Lure.class));
         cards.add(new SetCardInfo("Nantuko Shaman", 176, Rarity.COMMON, mage.cards.n.NantukoShaman.class));