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

Prevent randomly selecting version of a card that doesn't have art available when there's another version where art is available

Browse Source
This commit is contained in:
drdev
2014-10-16 18:22:48 +00:00
parent 5ba5b70f1f
commit 1859fd1c4f
17 changed files with 474 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@@ -222,6 +222,7 @@ forge-core/src/main/java/forge/item/SealedProduct.java -text
forge-core/src/main/java/forge/item/TournamentPack.java -text
forge-core/src/main/java/forge/item/package-info.java -text
forge-core/src/main/java/forge/util/Aggregates.java -text
forge-core/src/main/java/forge/util/Base64Coder.java -text
forge-core/src/main/java/forge/util/BinaryUtil.java -text
forge-core/src/main/java/forge/util/BuildInfo.java -text
forge-core/src/main/java/forge/util/CollectionSuppliers.java -text
@@ -235,6 +236,7 @@ forge-core/src/main/java/forge/util/IHasName.java -text
forge-core/src/main/java/forge/util/IItemReader.java -text
forge-core/src/main/java/forge/util/IItemSerializer.java -text
forge-core/src/main/java/forge/util/ITriggerEvent.java -text
forge-core/src/main/java/forge/util/ImageUtil.java -text
forge-core/src/main/java/forge/util/ItemPool.java -text
forge-core/src/main/java/forge/util/ItemPoolSorter.java -text
forge-core/src/main/java/forge/util/Lang.java -text
@@ -16958,7 +16960,6 @@ forge-gui/src/main/java/forge/achievement/TotalMatchWins.java -text
forge-gui/src/main/java/forge/achievement/VariantWins.java -text
forge-gui/src/main/java/forge/assets/FSkinProp.java -text
forge-gui/src/main/java/forge/assets/ISkinImage.java -text
forge-gui/src/main/java/forge/assets/ImageUtil.java -text
forge-gui/src/main/java/forge/card/CardDetailUtil.java -text
forge-gui/src/main/java/forge/card/CardPreferences.java -text
forge-gui/src/main/java/forge/card/CardReaderExperiments.java -text
@@ -17142,7 +17143,6 @@ forge-gui/src/main/java/forge/sound/MusicPlaylist.java -text
forge-gui/src/main/java/forge/sound/NoSoundClip.java -text
forge-gui/src/main/java/forge/sound/SoundEffectType.java -text
forge-gui/src/main/java/forge/sound/SoundSystem.java -text
forge-gui/src/main/java/forge/util/Base64Coder.java svneol=native#text/plain
forge-gui/src/main/java/forge/util/Callback.java -text
forge-gui/src/main/java/forge/util/Evaluator.java -text
forge-gui/src/main/java/forge/util/GuiDisplayUtil.java -text

27
forge-core/src/main/java/forge/ImageKeys.java
View File

@@ -1,11 +1,13 @@
package forge;
import java.io.File;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import forge.card.CardDb;
import forge.item.*;
import forge.util.ImageUtil;
public class ImageKeys {
public static final String CARD_PREFIX = "c:";
@@ -24,10 +26,12 @@ public class ImageKeys {
private static String CACHE_CARD_PICS_DIR, CACHE_TOKEN_PICS_DIR, CACHE_ICON_PICS_DIR, CACHE_BOOSTER_PICS_DIR,
CACHE_FATPACK_PICS_DIR, CACHE_BOOSTERBOX_PICS_DIR, CACHE_PRECON_PICS_DIR, CACHE_TOURNAMENTPACK_PICS_DIR;
private static Map<String, String> CACHE_CARD_PICS_SUBDIR;
public static void initializeDirs(String cards, String tokens, String icons, String boosters,
public static void initializeDirs(String cards, Map<String, String> cardsSub, String tokens, String icons, String boosters,
String fatPacks, String boosterBoxes, String precons, String tournamentPacks) {
CACHE_CARD_PICS_DIR = cards;
CACHE_CARD_PICS_SUBDIR = cardsSub;
CACHE_TOKEN_PICS_DIR = tokens;
CACHE_ICON_PICS_DIR = icons;
CACHE_BOOSTER_PICS_DIR = boosters;
@@ -115,12 +119,12 @@ public class ImageKeys {
File file = findFile(dir, filename);
// some S00 cards are really part of 6ED
/*if (file == null) { //TODO: Uncomment this
String s2kAlias = ImageUtil.getSetFolder("S00");
if (file == null) {
String s2kAlias = getSetFolder("S00");
if (filename.startsWith(s2kAlias)) {
file = findFile(dir, filename.replace(s2kAlias, ImageUtil.getSetFolder("6ED")));
file = findFile(dir, filename.replace(s2kAlias, getSetFolder("6ED")));
}
}*/
}
// try without set prefix
String setlessFilename = null;
@@ -141,6 +145,12 @@ public class ImageKeys {
return file;
}
public static String getSetFolder(String edition) {
return !CACHE_CARD_PICS_SUBDIR.containsKey(edition)
? StaticData.instance().getEditions().getCode2ByCode(edition) // by default 2-letter codes from MWS are used
: CACHE_CARD_PICS_SUBDIR.get(edition); // may use custom paths though
}
private static File findFile(String dir, String filename) {
for (String ext : FILE_EXTENSIONS) {
File file = new File(dir, filename + ext);
@@ -151,8 +161,9 @@ public class ImageKeys {
return null;
}
//shortcut for determine if a card image exists
public static boolean doesCardImageExist(String filename) {
return findFile(CACHE_CARD_PICS_DIR, filename) != null;
//shortcut for determining if a card image exists for a given card
//should only be called from PaperCard.hasImage()
public static boolean hasImage(PaperCard pc) {
return findFile(CACHE_CARD_PICS_DIR, ImageUtil.getImageKey(pc, false, true)) != null;
}
}

8
forge-core/src/main/java/forge/StaticData.java
View File

@@ -52,8 +52,12 @@ public class StaticData {
}
}
commonCards = new CardDb(regularCards, editions, false, false);
variantCards = new CardDb(variantsCards, editions, false, false);
commonCards = new CardDb(regularCards, editions);
variantCards = new CardDb(variantsCards, editions);
//muse initialize after establish field values for the sake of card image logic
commonCards.initialize(false, false);
variantCards.initialize(false, false);
this.boosters = new StorageBase<SealedProduct.Template>("Boosters", editions.getBoosterGenerator());
this.specialBoosters = new StorageBase<SealedProduct.Template>("Special boosters", new SealedProduct.Template.Reader(new File(blockDataFolder, "boosters-special.txt")));

28
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -111,9 +111,12 @@ public final class CardDb implements ICardDatabase {
}
}
public CardDb(Map<String, CardRules> rules, CardEdition.Collection editions0, boolean logMissingPerEdition, boolean logMissingSummary) {
public CardDb(Map<String, CardRules> rules, CardEdition.Collection editions0) {
this.rulesByName = rules;
this.editions = editions0;
}
public void initialize(boolean logMissingPerEdition, boolean logMissingSummary) {
Set<String> allMissingCards = new LinkedHashSet<String>();
List<String> missingCards = new ArrayList<String>();
for (CardEdition e : editions.getOrderedEditions()) {
@@ -176,11 +179,24 @@ public final class CardDb implements ICardDatabase {
uniqueCardsByName.clear();
allCards.clear();
for (Entry<String, Collection<PaperCard>> kv : allCardsByName.asMap().entrySet()) {
uniqueCardsByName.put(kv.getKey(), Iterables.getFirst(kv.getValue(), null));
uniqueCardsByName.put(kv.getKey(), getFirstWithImage(kv.getValue()));
allCards.addAll(kv.getValue());
}
}
private PaperCard getFirstWithImage(Collection<PaperCard> cards) {
//NOTE: this is written this way to avoid checking final card in list
Iterator<PaperCard> iterator = cards.iterator();
PaperCard pc = iterator.next();
while (iterator.hasNext()) {
if (pc.hasImage()) {
return pc;
}
pc = iterator.next();
}
return pc;
}
public boolean setPreferredArt(String cardName, String preferredArt) {
CardRequest request = CardRequest.fromString(cardName + NameSetSeparator + preferredArt);
PaperCard pc = tryGetCard(request);
@@ -236,7 +252,7 @@ public final class CardDb implements ICardDatabase {
if (request.artIndex <= 0) { // this stands for 'random art'
Collection<PaperCard> candidates;
if (reqEdition == null) {
candidates = cards;
candidates = new ArrayList<PaperCard>(cards);
}
else {
candidates = new ArrayList<PaperCard>();
@@ -250,6 +266,12 @@ public final class CardDb implements ICardDatabase {
return null;
}
result = Aggregates.random(candidates);
//if card image doesn't exist for chosen candidate, try another one if possible
while (candidates.size() > 1 && !result.hasImage()) {
candidates.remove(result);
result = Aggregates.random(candidates);
}
}
else {
for (PaperCard pc : cards) {

9
forge-core/src/main/java/forge/item/PaperCard.java
View File

@@ -19,6 +19,7 @@ package forge.item;
import com.google.common.base.Function;
import forge.ImageKeys;
import forge.card.CardRarity;
import forge.card.CardRules;
@@ -39,6 +40,7 @@ public final class PaperCard implements Comparable<IPaperCard>, InventoryItemFro
private final String edition;
private final int artIndex;
private final boolean foil;
private Boolean hasImage;
// Calculated fields are below:
private final transient CardRarity rarity; // rarity is given in ctor when set is assigned
@@ -88,6 +90,13 @@ public final class PaperCard implements Comparable<IPaperCard>, InventoryItemFro
return "Card";
}
public boolean hasImage() {
if (hasImage == null) { //cache value since it's not free to calculate
hasImage = ImageKeys.hasImage(this);
}
return hasImage;
}
/**
* Lambda to get rules for selects from list of printed cards.
*/

2
forge-gui/src/main/java/forge/util/Base64Coder.java → forge-core/src/main/java/forge/util/Base64Coder.java
View File

@@ -46,7 +46,7 @@ package forge.util;
* Multi-licensed: EPL / LGPL / GPL / AL / BSD.
*
* @author Forge
* @version $Id$
* @version $Id: Base64Coder.java 13541 2012-01-26 21:20:51Z Max mtg $
*/
public final class Base64Coder {

24
forge-gui/src/main/java/forge/assets/ImageUtil.java → forge-core/src/main/java/forge/util/ImageUtil.java
View File

@@ -1,15 +1,13 @@
package forge.assets;
package forge.util;
import org.apache.commons.lang3.StringUtils;
import forge.ImageKeys;
import forge.StaticData;
import forge.card.CardDb;
import forge.card.CardRules;
import forge.card.CardSplitType;
import forge.item.PaperCard;
import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences.FPref;
import forge.util.Base64Coder;
public class ImageUtil {
@@ -32,9 +30,9 @@ public class ImageUtil {
public static String getImageRelativePath(PaperCard cp, boolean backFace, boolean includeSet, boolean isDownloadUrl) {
final String nameToUse = cp == null ? null : getNameToUse(cp, backFace);
if ( null == nameToUse )
if (nameToUse == null) {
return null;
}
StringBuilder s = new StringBuilder();
CardRules card = cp.getRules();
@@ -43,7 +41,7 @@ public class ImageUtil {
final int cntPictures;
final boolean hasManyPictures;
final CardDb db = !card.isVariant() ? FModel.getMagicDb().getCommonCards() : FModel.getMagicDb().getVariantCards();
final CardDb db = !card.isVariant() ? StaticData.instance().getCommonCards() : StaticData.instance().getVariantCards();
if (includeSet) {
cntPictures = db.getPrintCount(card.getName(), edition);
hasManyPictures = cntPictures > 1;
@@ -78,28 +76,18 @@ public class ImageUtil {
}
if (includeSet) {
String editionAliased = isDownloadUrl ? FModel.getMagicDb().getEditions().getCode2ByCode(edition) : getSetFolder(edition);
String editionAliased = isDownloadUrl ? StaticData.instance().getEditions().getCode2ByCode(edition) : ImageKeys.getSetFolder(edition);
return String.format("%s/%s", editionAliased, fname);
} else {
return fname;
}
}
public static boolean mayEnlarge() {
return FModel.getPreferences().getPrefBoolean(FPref.UI_SCALE_LARGER);
}
public static boolean hasBackFacePicture(PaperCard cp) {
CardSplitType cst = cp.getRules().getSplitType();
return cst == CardSplitType.Transform || cst == CardSplitType.Flip;
}
public static String getSetFolder(String edition) {
return !ForgeConstants.CACHE_CARD_PICS_SUBDIR.containsKey(edition)
? FModel.getMagicDb().getEditions().getCode2ByCode(edition) // by default 2-letter codes from MWS are used
: ForgeConstants.CACHE_CARD_PICS_SUBDIR.get(edition); // may use custom paths though
}
public static String getNameToUse(PaperCard cp, boolean backFace) {
final CardRules card = cp.getRules();
if (backFace ) {

6
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -33,13 +33,15 @@ import com.google.common.cache.LoadingCache;
import com.mortennobel.imagescaling.ResampleOp;
import forge.assets.FSkinProp;
import forge.assets.ImageUtil;
import forge.game.card.CardView;
import forge.item.InventoryItem;
import forge.match.MatchUtil;
import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences.FPref;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinIcon;
import forge.util.ImageUtil;
/**
* This class stores ALL card images in a cache with soft values. this means
@@ -170,7 +172,7 @@ public class ImageCache {
double scaleX = (-1 == width ? 1 : (double)width / original.getWidth());
double scaleY = (-1 == height? 1 : (double)height / original.getHeight());
double bestFitScale = Math.min(scaleX, scaleY);
if ((bestFitScale > 1) && !ImageUtil.mayEnlarge()) {
if ((bestFitScale > 1) && !FModel.getPreferences().getPrefBoolean(FPref.UI_SCALE_LARGER)) {
bestFitScale = 1;
}

2
forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java
View File

@@ -20,7 +20,6 @@ package forge.gui;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.assets.ImageUtil;
import forge.card.CardEdition;
import forge.card.CardRules;
import forge.item.IPaperCard;
@@ -28,6 +27,7 @@ import forge.item.PaperCard;
import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.util.FileUtil;
import forge.util.ImageUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;

17
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -7,10 +7,11 @@ import forge.itemmanager.filters.*;
import forge.model.FModel;
import forge.quest.QuestWorld;
import forge.screens.home.quest.DialogChooseSets;
import javax.swing.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
/**
* ItemManager for cards
@@ -37,6 +38,20 @@ public class CardManager extends ItemManager<PaperCard> {
buildAddFilterMenu(menu, this);
}
@Override
protected Iterable<Entry<PaperCard, Integer>> getUnique(Iterable<Entry<PaperCard, Integer>> items) {
//use special technique for getting unique cards so that cards without art aren't shown
HashMap<String, Entry<PaperCard, Integer>> map = new HashMap<String, Entry<PaperCard, Integer>>();
for (Entry<PaperCard, Integer> item : items) {
final String key = item.getKey().getName();
final Entry<PaperCard, Integer> oldValue = map.get(key);
if (oldValue == null || !oldValue.getKey().hasImage()) { //only replace in map if old value doesn't have image
map.put(key, item);
}
}
return map.values();
}
/* Static overrides shared with SpellShopManager*/
public static void addDefaultFilters(final ItemManager<? super PaperCard> itemManager) {

8
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
View File

@@ -996,6 +996,10 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
this.updateView(true, this.getSelectedItems());
}
protected Iterable<Entry<T, Integer>> getUnique(Iterable<Entry<T, Integer>> items) {
return Aggregates.uniqueByLast(items, this.pool.FN_GET_NAME);
}
/**
*
* updateView.
@@ -1011,7 +1015,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
if (useFilter && this.wantUnique) {
Predicate<Entry<T, Integer>> filterForPool = Predicates.compose(this.filterPredicate, this.pool.FN_GET_KEY);
Iterable<Entry<T, Integer>> items = Aggregates.uniqueByLast(Iterables.filter(this.pool, filterForPool), this.pool.FN_GET_NAME);
Iterable<Entry<T, Integer>> items = getUnique(Iterables.filter(this.pool, filterForPool));
this.model.addItems(items);
}
else if (useFilter) {
@@ -1019,7 +1023,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
this.model.addItems(Iterables.filter(this.pool, pred));
}
else if (this.wantUnique) {
Iterable<Entry<T, Integer>> items = Aggregates.uniqueByLast(this.pool, this.pool.FN_GET_NAME);
Iterable<Entry<T, Integer>> items = getUnique(this.pool);
this.model.addItems(items);
}
else if (!useFilter && forceFilter) {

1
forge-gui-mobile/src/forge/assets/FSkinImage.java
View File

@@ -10,6 +10,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.Graphics;
import forge.properties.ForgeConstants;
import forge.util.ImageUtil;
/** Properties of various components that make up the skin.
* This interface allows all enums to be under the same roof.

1
forge-gui-mobile/src/forge/assets/ImageCache.java
View File

@@ -30,6 +30,7 @@ import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.match.MatchUtil;
import forge.properties.ForgeConstants;
import forge.util.ImageUtil;
import org.apache.commons.lang3.StringUtils;

2
forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java
View File

@@ -1,9 +1,9 @@
package forge.deck.io;
import forge.assets.ImageUtil;
import forge.deck.Deck;
import forge.item.PaperCard;
import forge.properties.ForgeConstants;
import forge.util.ImageUtil;
import freemarker.template.Configuration;
import freemarker.template.DefaultObjectWrapper;
import freemarker.template.Template;

2
forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
View File

@@ -17,11 +17,11 @@
*/
package forge.download;
import forge.assets.ImageUtil;
import forge.card.CardRules;
import forge.item.PaperCard;
import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.util.ImageUtil;
import org.apache.commons.lang3.StringUtils;

2
forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java
View File

@@ -19,11 +19,11 @@ package forge.download;
import com.google.common.collect.Iterables;
import forge.assets.ImageUtil;
import forge.card.CardEdition;
import forge.item.PaperCard;
import forge.model.FModel;
import forge.properties.ForgeConstants;
import forge.util.ImageUtil;
import org.apache.commons.lang3.StringUtils;

3
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -87,7 +87,8 @@ public class FModel {
private static GameFormat.Collection formats;
public static void initialize(final IProgressBar progressBar) {
ImageKeys.initializeDirs(ForgeConstants.CACHE_CARD_PICS_DIR,
ImageKeys.initializeDirs(
ForgeConstants.CACHE_CARD_PICS_DIR, ForgeConstants.CACHE_CARD_PICS_SUBDIR,
ForgeConstants.CACHE_TOKEN_PICS_DIR, ForgeConstants.CACHE_ICON_PICS_DIR,
ForgeConstants.CACHE_BOOSTER_PICS_DIR, ForgeConstants.CACHE_FATPACK_PICS_DIR,
ForgeConstants.CACHE_BOOSTERBOX_PICS_DIR, ForgeConstants.CACHE_PRECON_PICS_DIR,