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

Merge branch 'c21_7' into 'master'

Browse Source 
C21 - 7 April

See merge request core-developers/forge!4422
This commit is contained in:
Michael Kamensky
2021-04-08 04:10:42 +00:00
parent b0890ad4bf e807d9a3e7
commit b44c1478b8
11 changed files with 129 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -392,6 +392,14 @@ public class CardFactoryUtil {
int n = 0;
if (l[0].startsWith("TotalCommanderCastFromCommandZone")) {
int totCast = 0;
for (Player p : players) {
totCast += p.getTotalCommanderCast();
}
return doXMath(totCast, m, source);
}
// methods for getting the highest/lowest playerXCount from a range of players
if (l[0].startsWith("Highest")) {
for (final Player player : players) {
@@ -1286,9 +1294,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);
}