mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-15 18:28:00 +00:00
Allow for eternal cards to not be filtered out by funny filter (#5505)
This commit is contained in:
@@ -92,7 +92,11 @@ public class StaticData {
|
|||||||
if (!loadNonLegalCards) {
|
if (!loadNonLegalCards) {
|
||||||
for (CardEdition e : editions) {
|
for (CardEdition e : editions) {
|
||||||
if (e.getType() == CardEdition.Type.FUNNY || e.getBorderColor() == CardEdition.BorderColor.SILVER) {
|
if (e.getType() == CardEdition.Type.FUNNY || e.getBorderColor() == CardEdition.BorderColor.SILVER) {
|
||||||
|
List<CardEdition.CardInSet> eternalCards = e.getFunnyEternalCards();
|
||||||
|
|
||||||
for (CardEdition.CardInSet cis : e.getAllCardsInSet()) {
|
for (CardEdition.CardInSet cis : e.getAllCardsInSet()) {
|
||||||
|
if (eternalCards.contains(cis))
|
||||||
|
continue;
|
||||||
funnyCards.add(cis.name);
|
funnyCards.add(cis.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -141,7 +141,8 @@ public final class CardEdition implements Comparable<CardEdition> {
|
|||||||
BOX_TOPPER("box topper"),
|
BOX_TOPPER("box topper"),
|
||||||
DUNGEONS("dungeons"),
|
DUNGEONS("dungeons"),
|
||||||
JUMPSTART("jumpstart"),
|
JUMPSTART("jumpstart"),
|
||||||
REBALANCED("rebalanced");
|
REBALANCED("rebalanced"),
|
||||||
|
ETERNAL("eternal");
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
@@ -383,6 +384,7 @@ public final class CardEdition implements Comparable<CardEdition> {
|
|||||||
|
|
||||||
public List<CardInSet> getCards() { return cardMap.get(EditionSectionWithCollectorNumbers.CARDS.getName()); }
|
public List<CardInSet> getCards() { return cardMap.get(EditionSectionWithCollectorNumbers.CARDS.getName()); }
|
||||||
public List<CardInSet> getRebalancedCards() { return cardMap.get(EditionSectionWithCollectorNumbers.REBALANCED.getName()); }
|
public List<CardInSet> getRebalancedCards() { return cardMap.get(EditionSectionWithCollectorNumbers.REBALANCED.getName()); }
|
||||||
|
public List<CardInSet> getFunnyEternalCards() { return cardMap.get(EditionSectionWithCollectorNumbers.ETERNAL.getName()); }
|
||||||
public List<CardInSet> getAllCardsInSet() {
|
public List<CardInSet> getAllCardsInSet() {
|
||||||
return cardsInSet;
|
return cardsInSet;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,10 @@ ScryfallCode=PCEL
|
|||||||
5 R Fraternal Exaltation @Susan Garfield
|
5 R Fraternal Exaltation @Susan Garfield
|
||||||
6 M Robot Chicken @Robot Chicken
|
6 M Robot Chicken @Robot Chicken
|
||||||
7 M Phoenix Heart @Drew Tucker
|
7 M Phoenix Heart @Drew Tucker
|
||||||
8 R Zur the Enchanter @Chase Stone
|
|
||||||
9 M Deb Thomas @Kieran Yanner
|
9 M Deb Thomas @Kieran Yanner
|
||||||
|
|
||||||
|
[eternal]
|
||||||
|
8 R Zur the Enchanter @Chase Stone
|
||||||
|
|
||||||
[tokens]
|
[tokens]
|
||||||
r_1_1_employee
|
r_1_1_employee
|
||||||
|
|||||||
Reference in New Issue
Block a user