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

Using IPaperCard constants for ArtIndex instead of hard coded values when adding cards to pool

Browse Source
This commit is contained in:
leriomaggio
2021-06-09 17:44:07 +01:00
parent 22b1abece5
commit 87257f0413
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-core/src/main/java/forge/deck/CardPool.java
View File

@@ -86,17 +86,17 @@ public class CardPool extends ItemPool<PaperCard> {
} }
} }
int artCount = 1; int artCount = IPaperCard.DEFAULT_ART_INDEX;
if (paperCard != null) { if (paperCard != null) {
setCode = paperCard.getEdition(); setCode = paperCard.getEdition();
cardName = paperCard.getName(); cardName = paperCard.getName();
artCount = isCommonCard ? StaticData.instance().getCommonCards().getArtCount(cardName, setCode) : 1; artCount = isCommonCard ? StaticData.instance().getCommonCards().getArtCount(cardName, setCode) : IPaperCard.DEFAULT_ART_INDEX;
} else { } else {
System.err.print("An unsupported card was requested: \"" + cardName + "\" from \"" + setCode + "\". "); System.err.print("An unsupported card was requested: \"" + cardName + "\" from \"" + setCode + "\". ");
paperCard = StaticData.instance().getCommonCards().createUnsupportedCard(cardName); paperCard = StaticData.instance().getCommonCards().createUnsupportedCard(cardName);
} }
boolean artIndexExplicitlySet = artIndex > 0 || Character.isDigit(cardName.charAt(cardName.length() - 1)) && cardName.charAt(cardName.length() - 2) == CardDb.NameSetSeparator; boolean artIndexExplicitlySet = artIndex > IPaperCard.NO_ART_INDEX || Character.isDigit(cardName.charAt(cardName.length() - 1)) && cardName.charAt(cardName.length() - 2) == CardDb.NameSetSeparator;
if (artIndexExplicitlySet || artCount <= 1) { if (artIndexExplicitlySet || artCount <= 1) {
// either a specific art index is specified, or there is only one art, so just add the card // either a specific art index is specified, or there is only one art, so just add the card