diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java index 8d4e8483f4b..c940e25f161 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java @@ -139,6 +139,9 @@ public class TriggerSpellAbilityCastOrCopy extends Trigger { if (!matchesValidParam("ValidSA", spellAbility)) { return false; } + if (!matchesValidParam("ValidSAonCard", spellAbility, cast)) { + return false; + } if (hasParam("TargetsValid")) { SpellAbility sa = spellAbility; diff --git a/forge-gui/res/cardsfolder/b/because_i_have_willed_it.txt b/forge-gui/res/cardsfolder/b/because_i_have_willed_it.txt index 34594559395..9f325fd1283 100644 --- a/forge-gui/res/cardsfolder/b/because_i_have_willed_it.txt +++ b/forge-gui/res/cardsfolder/b/because_i_have_willed_it.txt @@ -4,5 +4,5 @@ Types:Ongoing Scheme S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Card | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Spells you cast cost {1} less to cast. T:Mode$ Phase | Phase$ End Of Turn | ValidPlayer$ Player.Opponent | Execute$ Abandon | TriggerZones$ Command | CheckSVar$ X | SVarCompare$ GE4 | TriggerDescription$ At the beginning of your opponents' end step, if they cast four or more spells this turn, abandon this scheme. SVar:Abandon:DB$ Abandon -SVar:X:Count$ThisTurnCast_Card.YouDontCtrl +SVar:X:Count$ThisTurnCast_Card.ActivePlayerCtrl Oracle:(An ongoing scheme remains face up until it's abandoned.)\nSpells you cast cost {1} less to cast.\nAt the beginning of your opponents' end step, if they cast four or more spells this turn, abandon this scheme. diff --git a/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt b/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt new file mode 100644 index 00000000000..ee0474b1a97 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/ancient_cellarspawn.txt @@ -0,0 +1,11 @@ +Name:Ancient Cellarspawn +ManaCost:1 B B +Types:Enchantment Creature Horror +PT:3/3 +S:Mode$ ReduceCost | ValidCard$ Demon,Horror,Nightmare | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Each spell you cast that's a Demon, Horror, or Nightmare costs {1} less to cast. +T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | ValidSAonCard$ Spell.ManaSpent LTX | TriggerDescription$ Whenever you cast a spell, if the amount of mana spent to cast it was less than its mana value, target opponent loses life equal to the difference. +SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ SVar$Y/Minus.Z +SVar:X:Count$CardManaCost +SVar:Y:TriggeredCard$CardManaCost +SVar:Z:TriggeredCard$CastTotalManaSpent +Oracle:Each spell you cast that's a Demon, Horror, or Nightmare costs {1} less to cast.\nWhenever you cast a spell, if the amount of mana spent to cast it was less than its mana value, target opponent loses life equal to the difference. \ No newline at end of file