From 75f03f1fd1b0e77f6fc50921ed194e89095f89a4 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 7 Apr 2021 10:30:01 -0400 Subject: [PATCH] support for SumCMCGraveyard (Inferno Project) --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 3de33d2fae0..03d951c7b19 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1286,9 +1286,13 @@ public class CardFactoryUtil { } // Count$SumCMC_valid if (sq[0].contains("SumCMC")) { + ZoneType zone = ZoneType.Battlefield; + //graveyard support for Inferno Project (may need other zones or multi-zone in future) + if (sq[0].contains("Graveyard")) + zone = ZoneType.Graveyard; final String[] restrictions = l[0].split("_"); final String[] rest = restrictions[1].split(","); - CardCollectionView cardsonbattlefield = game.getCardsIn(ZoneType.Battlefield); + CardCollectionView cardsonbattlefield = game.getCardsIn(zone); CardCollection filteredCards = CardLists.getValidCards(cardsonbattlefield, rest, cc, c, null); return Aggregates.sum(filteredCards, CardPredicates.Accessors.fnGetCmc); }