Fix custom cards messing things up (Card-Forge#11615)

Author: tool4ever

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

@@ -2791,7 +2791,7 @@ public static int xCount(Card c, final String s, final CardTraitBase ctb) {
                     activated++;
                 }
             }
-            return doXMath(activated, s, c, ctb);
+            return doXMath(activated, expr, c, ctb);
         }
 
         // Count$ThisTurnEntered <ZoneDestination> [from <ZoneOrigin>] <Valid>

forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java

@@ -264,8 +264,7 @@ public static void drawCardImage(Graphics2D g, CardView card, boolean altState,
                 g.rotate(Math.PI);
             }
             drawFlipCardImage(g, state, text, flipState, flipText, width, height - heightAdjust, art);
-        } else if (card.hasSecondaryState() ||
-                (card.hasAlternateState() && card.getAlternateState().getState() == CardStateName.PreparedSpell)) {
+        } else if (card.hasSecondaryState() || card.hasPreparedSpell()) {
             boolean needTranslation = !card.isToken() || card.getCloneOrigin() != null;
             final CardStateView state = card.getState(false);
             final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state) : null);

forge-gui/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt

@@ -3,8 +3,8 @@ ManaCost:4 R R
 Types:Legendary Creature Human Monk
 PT:4/4
 S:Mode$ CantBlock | ValidCard$ Card.Self | Description$ CARDNAME can't block.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, return it to the battlefield flipped.
-SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | RememberChanged$ True | SubAbility$ TrigFlip
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When NICKNAME dies, return it to the battlefield flipped.
+SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | RememberChanged$ True | SubAbility$ TrigFlip
 SVar:TrigFlip:DB$ SetState | Defined$ Remembered | Mode$ Flip | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AlternateMode:Flip

forge-gui/res/cardsfolder/v/vincent_valentine_galian_beast.txt

@@ -22,5 +22,5 @@ PT:3/2
 K:Trample
 K:Lifelink
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, return it to the battlefield tapped (front face up).
-SVar:TrigChangeZone:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
+SVar:TrigChangeZone:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | GainControl$ True
 Oracle:Trample, lifelink\nWhen Galian Beast dies, return it to the battlefield tapped (front face up).