diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 2e5f5c76da7..d2d681d2eb5 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -92,7 +92,11 @@ public class StaticData { if (!loadNonLegalCards) { for (CardEdition e : editions) { if (e.getType() == CardEdition.Type.FUNNY || e.getBorderColor() == CardEdition.BorderColor.SILVER) { + List eternalCards = e.getFunnyEternalCards(); + for (CardEdition.CardInSet cis : e.getAllCardsInSet()) { + if (eternalCards.contains(cis)) + continue; funnyCards.add(cis.name); } } diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 3ae67fddc5d..4c4346c62ba 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -141,7 +141,8 @@ public final class CardEdition implements Comparable { BOX_TOPPER("box topper"), DUNGEONS("dungeons"), JUMPSTART("jumpstart"), - REBALANCED("rebalanced"); + REBALANCED("rebalanced"), + ETERNAL("eternal"); private final String name; @@ -383,6 +384,7 @@ public final class CardEdition implements Comparable { public List getCards() { return cardMap.get(EditionSectionWithCollectorNumbers.CARDS.getName()); } public List getRebalancedCards() { return cardMap.get(EditionSectionWithCollectorNumbers.REBALANCED.getName()); } + public List getFunnyEternalCards() { return cardMap.get(EditionSectionWithCollectorNumbers.ETERNAL.getName()); } public List getAllCardsInSet() { return cardsInSet; } diff --git a/forge-gui/res/editions/Celebration Cards.txt b/forge-gui/res/editions/Celebration Cards.txt index 7371ba5796c..59b50d8d363 100644 --- a/forge-gui/res/editions/Celebration Cards.txt +++ b/forge-gui/res/editions/Celebration Cards.txt @@ -13,8 +13,10 @@ ScryfallCode=PCEL 5 R Fraternal Exaltation @Susan Garfield 6 M Robot Chicken @Robot Chicken 7 M Phoenix Heart @Drew Tucker -8 R Zur the Enchanter @Chase Stone 9 M Deb Thomas @Kieran Yanner +[eternal] +8 R Zur the Enchanter @Chase Stone + [tokens] r_1_1_employee