From aec0bad678503ba5d5e662fbd1423a8336deec0e Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 25 Jan 2014 21:49:53 +0000
Subject: [PATCH] more problems with art indices solved

---
 forge-core/src/main/java/forge/card/CardDb.java   | 4 ++--
 forge-core/src/main/java/forge/deck/CardPool.java | 9 +++++++--
 forge-core/src/main/java/forge/deck/Deck.java     | 4 +++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 189439f7c33..58feec3dcb8 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -183,8 +183,8 @@ public final class CardDb implements ICardDatabase {
         CardRequest request = CardRequest.fromString(cardName);
         if(setName != null)
             request.edition = setName;
-        if(artIndex >= 0)
-            request.artIndex = artIndex;
+        if(artIndex > 0)
+            request.artIndex = artIndex - 1;
         return tryGetCard(request);
     }
     
diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java
index 8c9d2a268be..a3470cdce78 100644
--- a/forge-core/src/main/java/forge/deck/CardPool.java
+++ b/forge-core/src/main/java/forge/deck/CardPool.java
@@ -74,8 +74,13 @@ public class CardPool extends ItemPool<PaperCard> {
                 // random art index specified, make sure we get different groups of cards with different art
                 int[] artGroups = MyRandom.splitIntoRandomGroups(amount, artCount);
                 for (int i = 1; i <= artGroups.length; i++) {
-                    PaperCard cp_random = isCommonCard ? StaticData.instance().getCommonCards().getCard(cardName, setCode, i) : StaticData.instance().getVariantCards().getCard(cardName, setCode, i);
-                    this.add(cp_random, artGroups[i]);
+                    int cnt = artGroups[i-1];
+                    if (cnt <= 0)
+                        continue;
+                    PaperCard cp_random = isCommonCard 
+                            ? StaticData.instance().getCommonCards().getCard(cardName, setCode, i) 
+                            : StaticData.instance().getVariantCards().getCard(cardName, setCode, i);
+                    this.add(cp_random, cnt);
                 }
             }
         }
diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index 04e6ece3e21..5e46ca54a7f 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -245,7 +245,9 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
                 
                 PaperCard c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.LatestCoreExp, artIndex);
                 if( null == c ) {
-                    c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.Latest, -1);
+                    c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.LatestCoreExp, -1);
+                    if( c == null)
+                        c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.Latest, -1);
                     // this is to randomize art of all those cards
                     newPool.add(cardName, c.getEdition(), cp.getValue());
                 } else