Merge branch 'm20' into 'master'

M20

See merge request core-developers/forge!1903

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -1113,7 +1113,7 @@ public class CardFactoryUtil {
         }
 
         if (sq[0].contains("CreatureType")) {
-            String[] sqparts = sq[0].split(" ", 2);
+            String[] sqparts = l[0].split(" ", 2);
             final String[] rest = sqparts[1].split(",");
 
             final CardCollectionView cardsInZones = sqparts[0].length() > 12
@@ -1130,6 +1130,23 @@ public class CardFactoryUtil {
             return doXMath(n, m, c);
         }
 
+        if (sq[0].contains("ExactManaCost")) {
+            String[] sqparts = l[0].split(" ", 2);
+            final String[] rest = sqparts[1].split(",");
+
+            final CardCollectionView cardsInZones = sqparts[0].length() > 13
+                ? game.getCardsIn(ZoneType.listValueOf(sqparts[0].substring(13)))
+                : game.getCardsIn(ZoneType.Battlefield);
+
+            CardCollection cards = CardLists.getValidCards(cardsInZones, rest, cc, c, null);
+            final Set<String> manaCost = Sets.newHashSet();
+
+            for (Card card : cards) {
+                manaCost.add(card.getManaCost().getShortString());
+            }
+
+            return doXMath(manaCost.size(), m, c);
+        }
 
         if (sq[0].contains("Hellbent")) {
             return doXMath(Integer.parseInt(sq[cc.hasHellbent() ? 1 : 2]), m, c);

forge-gui/res/cardsfolder/upcoming/embodiment_of_agonies.txt

@@ -0,0 +1,11 @@
+Name:Embodiment of Agonies
+ManaCost:1 B B
+Types:Creature Demon
+PT:0/0
+K:Flying
+K:Deathtouch
+K:etbCounter:P1P1:X:no condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each different mana cost among nonland cards in your graveyard.
+SVar:X:Count$ExactManaCostGraveyard Card.nonLand+YouOwn
+SVar:NeedsToPlayVar:X GT2
+DeckHas:Ability$Counters
+Oracle:Flying, deathtouch\nEmbodiment of Agonies enters the battlefield with a +1/+1 counter on it for each different mana cost among nonland cards in your graveyard. (For example, {2}{B} and {1}{B}{B} are different mana costs.)

forge-gui/res/cardsfolder/upcoming/loxodon_lifechanter.txt

@@ -0,0 +1,13 @@
+Name:Loxodon Lifechanter
+ManaCost:5 W
+Types:Creature Elephant Cleric
+PT:4/6
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may have your life total become the total toughness of creatures you control.
+SVar:TrigLife:DB$ PumpAll | ValidCards$ Creature.YouCtrl | RememberAllPumped$ True | SubAbility$ DBSetLife
+SVar:DBSetLife:DB$ SetLife | Defined$ You | LifeAmount$ Y | References$ Y | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Y:Remembered$CardToughness
+A:AB$ Pump | Cost$ 5 W | NumAtt$ X | NumDef$ X | References$ X | SpellDescription$ CARDNAME gets +X/+X until end of turn, where X is your life total.
+SVar:X:Count$YourLifeTotal
+AI:RemoveDeck:All
+Oracle:When Loxodon Lifechanter enters the battlefield, you may have your life total become the total toughness of creatures you control.\n{5}{W}: Loxodon Lifechanter gets +X/+X until end of turn, where X is your life total.

forge-gui/res/cardsfolder/upcoming/sorin_imperious_bloodlord.txt

@@ -9,7 +9,7 @@ SVar:TrigPayCost:DB$ ImmediateTrigger | Execute$ DBDmg | ConditionDefined$ Remem
 SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Vampire | ChangeNum$ 1 | SpellDescription$ You may put a vampire creature card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Vampire | ChangeNum$ 1 | SpellDescription$ You may put a vampire creature card from your hand onto the battlefield.
 SVar:PlayMain1:TRUE
 DeckHints:Type$Vampire
 Oracle:[+1]: Target creature you control gains deathtouch and lifelink until end of turn. If it's a Vampire, put a +1/+1 counter on it.\n[+1]: You may sacrifice a Vampire. When you do, Sorin, Imperious Bloodlord deals 3 damage to any target and you gain 3 life.\n[-3]: You may put a vampire creature card from your hand onto the battlefield.