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

A few changes to all CardArtPreferences names and set value

Browse Source 
Setting the value of card art preference from string now is more reliable, and it falls back automatically to the default
(Latest Art All editions).
This is to allow setting the enum value from Forge Preference Labels.
This commit is contained in:
leriomaggio
2021-07-06 08:19:31 +01:00
parent ebc47cf1ec
commit 6adfa8b7a7
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,10 +53,10 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
private List<String> filtered; private List<String> filtered;
public enum CardArtPreference { public enum CardArtPreference {
LatestPrint(false, true), LatestArtAllEditions(false, true),
LatestPrintNoPromoNoOnline(true, true), LatestArtExcludedPromoAndOnlineEditions(true, true),
OldPrint(false, false), OldArtAllEditions(false, false),
OldPrintNoPromoNoOnline(true, false); OldArtExcludedPromoAndOnlineEditions(true, false);
final boolean filterSets; final boolean filterSets;
final boolean latestFirst; final boolean latestFirst;
@@ -70,6 +70,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
if (ed == null) return false; if (ed == null) return false;
return !filterSets || ed.getType() == Type.CORE || ed.getType() == Type.EXPANSION || ed.getType() == Type.REPRINT; return !filterSets || ed.getType() == Type.CORE || ed.getType() == Type.EXPANSION || ed.getType() == Type.REPRINT;
} }
public static String[] getPreferences(){
return new String[]{"Latest Art (All Editions)",
"Latest Art (Excluded Promo And Online Editions)",
"Old Art (All Editions)",
"Old Art (Excluded Promo And Online Editions)"};
}
} }
// Placeholder to setup default art Preference - to be moved from Static Data! // Placeholder to setup default art Preference - to be moved from Static Data!
@@ -213,11 +220,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
} }
} }
} }
try{ setCardArtPreference(preferredCardArt);
this.defaultCardArtPreference = CardArtPreference.valueOf(preferredCardArt);
} catch (IllegalArgumentException ex){
this.defaultCardArtPreference = CardArtPreference.LatestPrint;
}
} }
private void addSetCard(CardEdition e, CardInSet cis, CardRules cr) { private void addSetCard(CardEdition e, CardInSet cis, CardRules cr) {
@@ -382,10 +385,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
public CardArtPreference getCardArtPreference(){ return this.defaultCardArtPreference; } public CardArtPreference getCardArtPreference(){ return this.defaultCardArtPreference; }
public void setCardArtPreference(String artPreference){ public void setCardArtPreference(String artPreference){
artPreference = artPreference.replaceAll("[\\s\\(\\)]", "");
CardArtPreference cardArtPreference = null; CardArtPreference cardArtPreference = null;
try{ try{
cardArtPreference = CardArtPreference.valueOf(artPreference); cardArtPreference = CardArtPreference.valueOf(artPreference);
} catch (IllegalArgumentException ex){} } catch (IllegalArgumentException ex){
cardArtPreference = CardArtPreference.LatestArtAllEditions; // default
}
finally { finally {
if (cardArtPreference != null) if (cardArtPreference != null)
this.defaultCardArtPreference = cardArtPreference; this.defaultCardArtPreference = cardArtPreference;
@@ -860,13 +866,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
return sb; return sb;
} }
public PaperCard createUnsupportedCard(String cardName) { public PaperCard createUnsupportedCard(String cardRequest) {
CardRequest request = CardRequest.fromString(cardName); CardRequest request = CardRequest.fromString(cardRequest);
CardEdition cardEdition = CardEdition.UNKNOWN; CardEdition cardEdition = CardEdition.UNKNOWN;
CardRarity cardRarity = CardRarity.Unknown; CardRarity cardRarity = CardRarity.Unknown;
// May iterate over editions and find out if there is any card named 'cardName' but not implemented with Forge script. // May iterate over editions and find out if there is any card named 'cardRequest' but not implemented with Forge script.
if (StringUtils.isBlank(request.edition)) { if (StringUtils.isBlank(request.edition)) {
for (CardEdition edition : editions) { for (CardEdition edition : editions) {
for (CardInSet cardInSet : edition.getAllCardsInSet()) { for (CardInSet cardInSet : edition.getAllCardsInSet()) {
@@ -894,10 +900,11 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
} }
} }
// Note for myself: no localisation needed here as this goes in logs
if (cardRarity == CardRarity.Unknown) { if (cardRarity == CardRarity.Unknown) {
System.err.println("Forge does not know of such a card's existence. Have you mistyped the card name?"); System.err.println("Forge could not find this card in the Database. Any chance you might have mistyped the card name?");
} else { } else {
System.err.println("We're sorry, but you cannot use this card yet."); System.err.println("We're sorry, but this card is not supported yet.");
} }
return new PaperCard(CardRules.getUnsupportedCardNamed(request.cardName), cardEdition.getCode(), cardRarity); return new PaperCard(CardRules.getUnsupportedCardNamed(request.cardName), cardEdition.getCode(), cardRarity);