Fix alternative costs from static abilities

forge-game/src/main/java/forge/game/GameActionUtil.java

@@ -17,6 +17,7 @@
  */
 package forge.game;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
@@ -52,6 +53,8 @@
 import forge.game.zone.ZoneType;
 import forge.util.Lang;
 import forge.util.TextUtil;
+import forge.util.collect.FCollection;
+import forge.util.collect.FCollectionView;
 
 
 /**
@@ -269,35 +272,6 @@ public static final List<SpellAbility> getAlternativeCosts(final SpellAbility sa
                     foretold.putParam("AfterDescription", "(Foretold)");
                     alternatives.add(foretold);
                 }
-
-                // some needs to check after ability was put on the stack
-                // Currently this is only checked for Toolbox and that only cares about creature spells
-                if (source.isCreature() && game.getAction().hasStaticAbilityAffectingZone(ZoneType.Stack, StaticAbilityLayer.ABILITIES)) {
-                    Zone oldZone = source.getLastKnownZone();
-                    Card blitzCopy = source;
-                    if (!source.isLKI()) {
-                        blitzCopy = CardUtil.getLKICopy(source);
-                    }
-                    blitzCopy.setLastKnownZone(game.getStackZone());
-                    lkicheck = true;
-
-                    blitzCopy.clearStaticChangedCardKeywords(false);
-                    CardCollection preList = new CardCollection(blitzCopy);
-                    game.getAction().checkStaticAbilities(false, Sets.newHashSet(blitzCopy), preList);
-
-                    // currently only for Keyword BLitz, but should affect Dash probably too
-                    for (final KeywordInterface inst : blitzCopy.getKeywords(Keyword.BLITZ)) {
-                        // TODO with mana value 4 or greater has blitz.
-                        for (SpellAbility iSa : inst.getAbilities()) {
-                            // do only non intrinsic
-                            if (!iSa.isIntrinsic()) {
-                                alternatives.add(iSa);
-                            }
-                        }
-                    }
-                    // need to reset to Old Zone, or canPlay would fail
-                    blitzCopy.setLastKnownZone(oldZone);
-                }
             }
 
             // reset static abilities
@@ -377,6 +351,72 @@ public static final List<SpellAbility> getAlternativeCosts(final SpellAbility sa
         }
         return alternatives;
     }
+
+    /**
+     * Checks a card to see if it qualifies to receive keywords from static
+     * abilities that grant alternative casting costs to spells on the stack, for
+     * example, Toolbox's ability that gives blitz to creature spells with mana
+     * value 4 or greater, and Hunting Velociraptor's ability that gives prowl to
+     * Dinosaur spells.
+     * 
+     * @param source The card to check eligibility for.
+     * @return Zero or more spell abilities, each representing an alternative
+     *         casting cost.
+     */
+    public static final FCollectionView<SpellAbility> getAlternativeCostsGrantedByStaticAbilities(Card source) {
+        final FCollection<SpellAbility> alternatives = new FCollection<SpellAbility>();
+        final Game game = source.getGame();
+
+        if (!game.getAction().hasStaticAbilityAffectingZone(ZoneType.Stack, StaticAbilityLayer.ABILITIES)) {
+            return alternatives;
+        }
+
+        // double freeze tracker, so it doesn't update view
+        game.getTracker().freeze();
+
+        Zone oldZone = source.getLastKnownZone();
+        Card creatureCandidate = source; // Candidate to receive keyword.
+
+        if (!source.isLKI()) {
+            creatureCandidate = CardUtil.getLKICopy(source);
+        }
+
+        creatureCandidate.setLastKnownZone(game.getStackZone());
+        creatureCandidate.clearStaticChangedCardKeywords(false);
+        CardCollection preList = new CardCollection(creatureCandidate);
+        game.getAction().checkStaticAbilities(false, Sets.newHashSet(creatureCandidate), preList);
+
+        for (final KeywordInterface keywordInterface : creatureCandidate.getUnhiddenKeywords()) {
+            try {
+                // Try to find the keyword in the list of alternative cost keywords.
+                // If the operation doesn't throw an IllegalArgumentException, the keyword
+                // is an alternative cost.
+                AlternativeCost.valueOf(keywordInterface.getKeyword().toString());
+
+                for (SpellAbility iSa : keywordInterface.getAbilities()) {
+                    // do only non intrinsic
+                    if (!iSa.isIntrinsic()) {
+                        iSa.setHostCard(source);
+                        alternatives.add(iSa);
+                    }
+                }
+            } catch (IllegalArgumentException e) {
+                // The keyword interface isn't for an alternative cost keyword.
+                continue;
+            }
+        }
+
+        // need to reset to Old Zone, or canPlay fails.
+        creatureCandidate.setLastKnownZone(oldZone);
+
+        game.getAction().checkStaticAbilities(false);
+        // clear delayed changes, this check should not have updated the view.
+        game.getTracker().clearDelayed();
+        // need to unfreeze tracker.
+        game.getTracker().unfreeze();
+
+        return alternatives;
+    }
 
     public static List<OptionalCostValue> getOptionalCostValues(final SpellAbility sa) {
         final List<OptionalCostValue> costs = Lists.newArrayList();

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

@@ -7153,7 +7153,8 @@ public Game getGame() {
     public List<SpellAbility> getAllPossibleAbilities(final Player player, final boolean removeUnplayable) {
         CardState oState = getState(CardStateName.Original);
         final List<SpellAbility> abilities = Lists.newArrayList();
-        for (SpellAbility sa : getSpellAbilities()) {
+        FCollectionView<SpellAbility> spellAbilitiesFromStaticAbilities = GameActionUtil.getAlternativeCostsGrantedByStaticAbilities(this);
+        for (SpellAbility sa : Iterables.concat(getSpellAbilities(), spellAbilitiesFromStaticAbilities)) {
             //adventure spell check
             if (isAdventureCard() && sa.isAdventure()) {
                 if (getExiledWith() != null && getExiledWith().equals(this) && CardStateName.Adventure.equals(getExiledWith().getCurrentStateName()))

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

@@ -2,7 +2,7 @@ Name:Henzie "Toolbox" Torre
 ManaCost:B R G
 Types: Legendary Creature Devil Rogue
 PT:3/3
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Stack | AddKeyword$ Blitz:CardManaCost:Spell.Creature+cmcGE4 | Description$ Each creature spell you cast with mana value 4 or greater has blitz. The blitz cost is equal to its mana cost. (You may choose to cast that spell for its blitz cost. If you do, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+cmcGE4 | AffectedZone$ Stack | AddKeyword$ Blitz:CardManaCost:Spell.Creature | Description$ Each creature spell you cast with mana value 4 or greater has blitz. The blitz cost is equal to its mana cost. (You may choose to cast that spell for its blitz cost. If you do, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
 S:Mode$ ReduceCost | ValidCard$ Card | ValidSpell$ Spell.Blitz | Activator$ You | Amount$ X | Description$ Blitz costs you pay cost {1} less for each time you've cast your commander from the command zone this game.
 SVar:X:Count$TotalCommanderCastFromCommandZone
 Oracle:Each creature spell you cast with mana value 4 or greater has blitz. The blitz cost is equal to its mana cost. (You may choose to cast that spell for its blitz cost. If you do, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)\nBlitz costs you pay cost {1} less for each time you've cast your commander from the command zone this game.

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

@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Creature Dinosaur
 PT:3/2
 K:First Strike
-S:Mode$ Continuous | Affected$ Dinosaur.YouCtrl | AddKeyword$ Prowl:2 R | AffectedZone$ Hand | Description$ Dinosaur spells you cast have prowl {2}{R}. (You may cast a spell for its prowl cost if you dealt combat damage to a player this turn with a creature with any of its creature types.)
+S:Mode$ Continuous | Affected$ Dinosaur.YouCtrl | AddKeyword$ Prowl:2 R | AffectedZone$ Stack | Description$ Dinosaur spells you cast have prowl {2}{R}. (You may cast a spell for its prowl cost if you dealt combat damage to a player this turn with a creature with any of its creature types.)
 DeckHints:Type$Dinosaur
 Oracle:First strike\nDinosaur spells you cast have prowl {2}{R}. (You may cast a spell for its prowl cost if you dealt combat damage to a player this turn with a creature with any of its creature types.)