Merge branch 'card-fixes' into 'master'

Card fixes

Closes #1763

See merge request core-developers/forge!4142

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -1616,12 +1616,6 @@ public class AbilityUtils {
                         return CardFactoryUtil.doXMath(root.getXManaCostPaid(), expr, c);
                     }
 
-                    // If the chosen creature has X in its mana cost, that X is considered to be 0.
-                    // The value of X in Altered Ego’s last ability will be whatever value was chosen for X while casting Altered Ego.
-                    if (sa.isCopiedTrait() || !sa.getHostCard().equals(c)) {
-                        return CardFactoryUtil.doXMath(0, expr, c);
-                    }
-
                     if (root.isTrigger()) {
                         Trigger t = root.getTrigger();
                         if (t == null) {
@@ -1662,6 +1656,12 @@ public class AbilityUtils {
                         }
                     }
 
+                    // If the chosen creature has X in its mana cost, that X is considered to be 0.
+                    // The value of X in Altered Ego’s last ability will be whatever value was chosen for X while casting Altered Ego.
+                    if (sa.isCopiedTrait() || !sa.getHostCard().equals(c)) {
+                        return CardFactoryUtil.doXMath(0, expr, c);
+                    }
+
                     if (root.isReplacementAbility()) {
                         if (sa.hasParam("ETB")) {
                             return CardFactoryUtil.doXMath(c.getXManaCostPaid(), expr, c);

forge-gui/res/cardsfolder/d/dungeon_master.txt

@@ -6,7 +6,7 @@ K:ETBReplacement:Other:RollLoyal
 SVar:RollLoyal:DB$ RollDice | Sides$ 4 | ResultSVar$ Result | SubAbility$ DBLoyalty | SpellDescription$ Add 1d4 loyalty counters to CARDNAME
 SVar:DBLoyalty:DB$ PutCounter | Defined$ Self | CounterType$ LOYALTY | CounterNum$ Result | ETB$ True
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Opponent | TokenOwner$ Targeted | TokenScript$ b_1_1_skeleton_opp_life | Planeswalker$ True | SpellDescription$ Target opponent creates a 1/1 black Skeleton creature token with "When this creature dies, each opponent gains 2 life.""
-A:AB$ RollDice | Cost$ AddCounter<1/LOYALTY> | Sides$ 2 | On1$ DBSkipTurn | ResultSVar$ Result | Planeswalker$ True | SubAbility$ DBDraw | SpellDescription$ Roll a d20. If you roll a 1, skip your next turn. If you roll a 12 or higher, draw a card.
+A:AB$ RollDice | Cost$ AddCounter<1/LOYALTY> | Sides$ 20 | On1$ DBSkipTurn | ResultSVar$ Result | Planeswalker$ True | SubAbility$ DBDraw | SpellDescription$ Roll a d20. If you roll a 1, skip your next turn. If you roll a 12 or higher, draw a card.
 SVar:DBSkipTurn:DB$ SkipTurn | Defined$ You | NumTurns$ 1
 SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ Result | ConditionSVarCompare$ GE12
 A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | TokenScript$ r_3_3_fighter_first_strike | SubAbility$ DBCleric | SpellDescription$ You get an adventuring party. (Your party is a 3/3 red Fighter with first strike, a 1/1 white Cleric with lifelink, a 2/2 black Rogue with hexproof, and a 1/1 blue Wizard with flying.)

forge-gui/res/cardsfolder/s/strength_of_the_tajuru.txt

@@ -2,7 +2,7 @@ Name:Strength of the Tajuru
 ManaCost:X G G
 Types:Instant
 K:Multikicker:1
-A:SP$ PutCounter | CounterType$ P1P1 | CounterNum$ X | Cost$ X G G | Announce$ Multikicker,X | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ TargetsNum | TargetMax$ TargetsNum,TargetsNum | SpellDescription$ Choose target creature, then choose another target creature for each time this spell was kicked. Put X +1/+1 counters on each of them.
+A:SP$ PutCounter | CounterType$ P1P1 | CounterNum$ X | Cost$ X G G | Announce$ Multikicker,X | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ TargetsNum | TargetMax$ TargetsNum | SpellDescription$ Choose target creature, then choose another target creature for each time this spell was kicked. Put X +1/+1 counters on each of them.
 SVar:X:Count$xPaid
 SVar:TargetsNum:Count$TimesKicked/Plus.1
 DeckHas:Ability$Counters