From 0fa11cb668ee0cb4bc958c716ead6cd86b636798 Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Thu, 27 Oct 2011 07:07:03 +0000
Subject: [PATCH] *Hopefully fixed LQ nonSet Pic downloading.(Moved ImageName
 into CardCharacteristics) *Add LQ pic URL to Nezumi Shortfang / Stabwhisker
 the Odious

---
 .../n/nezumi_shortfang_stabwhisker_the_odious.txt | 12 +++++++++---
 src/main/java/forge/Card.java                     |  8 ++++----
 src/main/java/forge/Gui_DownloadPictures_LQ.java  |  3 +++
 src/main/java/forge/card/CardCharacteristics.java | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt b/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
index c31c65d9e21..56aa980219b 100644
--- a/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
+++ b/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
@@ -7,8 +7,13 @@ A:AB$Discard | Cost$ 1 B T | ValidTgts$ Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:DBFlip:DB$Flip | Defined$ Self | CheckSVar$ X | SVarCompare$ EQ0
 SVar:X:Count$InOppHand
 SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_shortfang.jpg
 AlternateMode:Flip
+SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/131.jpg
+Oracle:{1}{B}, {T}: Target opponent discards a card. Then if that player has no cards in hand, flip Nezumi Shortfang.
+
 ALTERNATE
+
 Name:Stabwhisker the Odious
 ManaCost:1 B
 Colors:black
@@ -17,10 +22,11 @@ Text:no text
 PT:4/2
 T:Mode$Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in his or her hand.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ X
-SVar:X:SVar$Y/Minus.Z
+SVar:X:SVar$Z/Minus.Y
 SVar:Y:Count$InOppHand
 SVar:Z:Number$3
 SVar:Rarity:Rare
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/131.jpg
-Oracle:{1}{B}, {T}: Target opponent discards a card. Then if that player has no cards in hand, flip Nezumi Shortfang.\n----\nStabwhisker the Odious\nLegendary Creature - Rat Shaman\n3/3\nAt the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in his or her hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stabwhisker_the_odious.jpg
+SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/312.jpg
+Oracle:At the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in his or her hand.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index dee4ad15a5d..1192936b05c 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -286,7 +286,7 @@ public class Card extends GameEntity implements Comparable<Card> {
 
     private Player owner = null;
     private ArrayList<Object> controllerObjects = new ArrayList<Object>();
-    private String imageName = "";
+    
     // private String rarity = "";
     private String text = "";
     private String echoCost = "";
@@ -3427,7 +3427,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      *            a {@link java.lang.String} object.
      */
     public final void setImageName(final String s) {
-        imageName = s;
+        getCharacteristics().setImageName(s);
     }
 
     /**
@@ -3438,8 +3438,8 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @return a {@link java.lang.String} object.
      */
     public final String getImageName() {
-        if (!imageName.equals("")) {
-            return imageName;
+        if (!getCharacteristics().getImageName().equals("")) {
+            return getCharacteristics().getImageName();
         }
         return getName();
     }
diff --git a/src/main/java/forge/Gui_DownloadPictures_LQ.java b/src/main/java/forge/Gui_DownloadPictures_LQ.java
index 5d9e669ac2a..b02402cb920 100644
--- a/src/main/java/forge/Gui_DownloadPictures_LQ.java
+++ b/src/main/java/forge/Gui_DownloadPictures_LQ.java
@@ -46,6 +46,9 @@ public class Gui_DownloadPictures_LQ extends GuiDownloader {
 
         String base = ForgeProps.getFile(IMAGE_BASE).getPath();
         for (Card c : AllZone.getCardFactory()) {
+            if(c.getName().equals("Gatstaf Shepherd")) {
+                System.out.println("Heyo!");
+            }
             cList.addAll(createDLObjects(c, base));
             if (c.hasAlternateState()) {
                 c.changeState();
diff --git a/src/main/java/forge/card/CardCharacteristics.java b/src/main/java/forge/card/CardCharacteristics.java
index 7d0ce3b74d6..4d55acba677 100644
--- a/src/main/java/forge/card/CardCharacteristics.java
+++ b/src/main/java/forge/card/CardCharacteristics.java
@@ -32,6 +32,7 @@ public class CardCharacteristics {
     private ArrayList<StaticAbility> staticAbilities = new ArrayList<StaticAbility>();
     private ArrayList<String> staticAbilityStrings = new ArrayList<String>();
     private String ImageFilename = "";
+    private String imageName = "";
     private Map<String, String> sVars = new TreeMap<String, String>();
     private ArrayList<SetInfo> Sets = new ArrayList<SetInfo>();
 
@@ -371,4 +372,18 @@ public class CardCharacteristics {
         this.staticAbilityStrings = staticAbilityStrings0; // TODO: Add 0 to
                                                            // parameter's name.
     }
+
+    /**
+     * @return the imageName
+     */
+    public String getImageName() {
+        return imageName;
+    }
+
+    /**
+     * @param imageName0 the imageName to set
+     */
+    public void setImageName(String imageName0) {
+        this.imageName = imageName0; // TODO: Add 0 to parameter's name.
+    }
 }