external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Hopefully fixed LQ nonSet Pic downloading.(Moved ImageName into CardCharacteristics)

Browse Source 
*Add LQ pic URL to Nezumi Shortfang / Stabwhisker the Odious
This commit is contained in:
Hellfish
2011-10-27 07:07:03 +00:00
parent 08acbc369c
commit 0fa11cb668
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/Card.java
View File

@@ -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();
}

3
src/main/java/forge/Gui_DownloadPictures_LQ.java
View File

@@ -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();

15
src/main/java/forge/card/CardCharacteristics.java
View File

@@ -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.
}
}