diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index 58589224b8a..3adf5aba1fb 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -1348,6 +1348,10 @@ public class CardProperty { if (!card.isToken() && !card.isTokenCard()) { return false; } + // copied spell don't count + if (property.contains("Created") && card.getCastSA() != null) { + return false; + } } else if (property.startsWith("nonToken")) { if (card.isToken() || card.isTokenCard()) { return false; diff --git a/forge-gui/res/cardsfolder/e/esix_fractal_bloom.txt b/forge-gui/res/cardsfolder/e/esix_fractal_bloom.txt index 0cd511ace14..0276698777e 100644 --- a/forge-gui/res/cardsfolder/e/esix_fractal_bloom.txt +++ b/forge-gui/res/cardsfolder/e/esix_fractal_bloom.txt @@ -5,7 +5,7 @@ PT:4/4 K:Flying R:Event$ CreateToken | ActiveZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ0 | ValidPlayer$ You | PlayerTurn$ True | Optional$ True | ReplaceWith$ DBCopy | Description$ The first time you would create one or more tokens during each of your turns, you may instead choose a creature other than CARDNAME and create that many tokens that are copies of that creature. SVar:DBCopy:DB$ ReplaceToken | Type$ ReplaceToken | ValidChoices$ Creature.Other | TokenScript$ Chosen -SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+YouOwn +SVar:X:Count$ThisTurnEntered_Battlefield_Card.tokenCreated+YouOwn DeckHas:Ability$Token AI:RemoveDeck:All Oracle:Flying\nThe first time you would create one or more tokens during each of your turns, you may instead choose a creature other than Esix, Fractal Bloom and create that many tokens that are copies of that creature. diff --git a/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt b/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt index e5ffdc508ba..ca3b2a3c2a2 100644 --- a/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt +++ b/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt @@ -2,6 +2,6 @@ Name:Idol of Oblivion ManaCost:2 Types:Artifact A:AB$ Draw | Cost$ T | NumCards$ 1 | CheckSVar$ X | SpellDescription$ Draw a card. Activate only if you created a token this turn. -SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+YouCtrl +SVar:X:Count$ThisTurnEntered_Battlefield_Card.tokenCreated+YouCtrl A:AB$ Token | Cost$ 8 T Sac<1/CARDNAME> | TokenAmount$ 1 | TokenScript$ c_10_10_eldrazi | TokenOwner$ You | SpellDescription$ Create a 10/10 colorless Eldrazi creature token. Oracle:{T}: Draw a card. Activate only if you created a token this turn.\n{8}, {T}, Sacrifice Idol of Oblivion: Create a 10/10 colorless Eldrazi creature token. diff --git a/forge-gui/res/cardsfolder/t/thalisse_reverent_medium.txt b/forge-gui/res/cardsfolder/t/thalisse_reverent_medium.txt index ffb2374223a..b8a3d5f459e 100644 --- a/forge-gui/res/cardsfolder/t/thalisse_reverent_medium.txt +++ b/forge-gui/res/cardsfolder/t/thalisse_reverent_medium.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Human Cleric PT:3/4 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each end step, create X 1/1 white Spirit creature tokens with flying, where X is the number of tokens you created this turn. SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You -SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+YouOwn +SVar:X:Count$ThisTurnEntered_Battlefield_Card.tokenCreated+YouOwn DeckHas:Ability$Token & Type$Spirit DeckNeeds:Ability$Token Oracle:At the beginning of each end step, create X 1/1 white Spirit creature tokens with flying, where X is the number of tokens you created this turn. diff --git a/forge-gui/res/cardsfolder/v/vazi_keen_negotiator.txt b/forge-gui/res/cardsfolder/v/vazi_keen_negotiator.txt index 7fba4839474..62e4c754c01 100644 --- a/forge-gui/res/cardsfolder/v/vazi_keen_negotiator.txt +++ b/forge-gui/res/cardsfolder/v/vazi_keen_negotiator.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Human Advisor PT:3/3 K:Haste A:AB$ Token | Cost$ T | ValidTgts$ Opponent | TokenAmount$ X | TokenScript$ c_a_treasure_sac | TokenOwner$ Targeted | SpellDescription$ Target opponent creates X Treasure tokens, where X is the number of Treasure tokens you created this turn. -SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+Treasure+YouOwn +SVar:X:Count$ThisTurnEntered_Battlefield_Card.tokenCreated+Treasure+YouOwn T:Mode$ SpellAbilityCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | ManaFrom$ Treasure | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a spell or activates an ability, if mana from a Treasure was spent to cast or activate it, put a +1/+1 counter on target creature, then draw a card. SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | SubAbility$ DBDraw SVar:DBDraw:DB$ Draw