diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index d4c29464b52..c5b73aead2b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -304,10 +304,6 @@ public class EffectEffect extends SpellAbilityEffect { eff.setChosenNumber(hostCard.getChosenNumber()); } - if (sa.hasParam("CopySVar")) { - eff.setSVar(sa.getParam("CopySVar"), hostCard.getSVar(sa.getParam("CopySVar"))); - } - // Copy text changes if (sa.isIntrinsic()) { eff.copyChangedTextFrom(hostCard); diff --git a/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt b/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt index 8b7f7c67db1..8799de32013 100644 --- a/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt +++ b/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt @@ -4,7 +4,7 @@ ManaCost:2 G W Types:Legendary Creature Human Monk PT:1/3 K:Reach -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+notattacking | Description$ Teleport — CARDNAME has hexproof unless he's attacking. +S:Mode$ Continuous | Affected$ Card.Self+notattacking | AddKeyword$ Hexproof | Description$ Teleport — CARDNAME has hexproof unless he's attacking. T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withReach | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat. SVar:TrigUntap:DB$ Untap | Defined$ TriggeredAttackerLKICopy | SubAbility$ DBEffect SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredAttacker | StaticAbilities$ CantBeBlockedPow | ForgetOnMoved$ Battlefield | Duration$ UntilEndOfCombat diff --git a/forge-gui/res/cardsfolder/f/freewind_equenaut.txt b/forge-gui/res/cardsfolder/f/freewind_equenaut.txt index 90e697e1784..12ae3108ffd 100644 --- a/forge-gui/res/cardsfolder/f/freewind_equenaut.txt +++ b/forge-gui/res/cardsfolder/f/freewind_equenaut.txt @@ -4,6 +4,6 @@ Types:Creature Human Archer PT:2/2 K:Flying S:Mode$ Continuous | Affected$ Card.Self+enchanted | AddAbility$ DealDamage | Description$ As long as CARDNAME is enchanted, it has "{T}: CARDNAME deals 2 damage to target attacking or blocking creature." -SVar:DealDamage:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | Secondary$ True | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature." +SVar:DealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking or blocking creature. SVar:EnchantMe:Once Oracle:Flying\nAs long as Freewind Equenaut is enchanted, it has "{T}: Freewind Equenaut deals 2 damage to target attacking or blocking creature." diff --git a/forge-gui/res/cardsfolder/f/futurist_operative.txt b/forge-gui/res/cardsfolder/f/futurist_operative.txt index fffbe54aa77..238b704008d 100644 --- a/forge-gui/res/cardsfolder/f/futurist_operative.txt +++ b/forge-gui/res/cardsfolder/f/futurist_operative.txt @@ -2,7 +2,7 @@ Name:Futurist Operative ManaCost:3 U Types:Creature Human Ninja PT:3/4 -S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddType$ Human & Citizen | RemoveCreatureTypes$ True | IsPresent$ Card.Self+tapped | Description$ As long as CARDNAME is tapped, it is a Human Citizen with base power and toughness 1/1 and it can't be blocked. +S:Mode$ Continuous | Affected$ Card.Self+tapped | SetPower$ 1 | SetToughness$ 1 | AddType$ Human & Citizen | RemoveCreatureTypes$ True | Description$ As long as CARDNAME is tapped, it is a Human Citizen with base power and toughness 1/1 and it can't be blocked. S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Card.Self+tapped A:AB$ Untap | Cost$ 2 U | SpellDescription$ Untap CARDNAME. DeckHas:Type$Citizen diff --git a/forge-gui/res/cardsfolder/r/ravenous_pursuit.txt b/forge-gui/res/cardsfolder/r/ravenous_pursuit.txt index 6b89f58f561..291814d42d1 100644 --- a/forge-gui/res/cardsfolder/r/ravenous_pursuit.txt +++ b/forge-gui/res/cardsfolder/r/ravenous_pursuit.txt @@ -5,7 +5,8 @@ A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | AILogic$ PowerDmg | NumDmg$ Y | ExcessSVar$ Excess | DamageSource$ ParentTarget | SubAbility$ DBChooseCard SVar:Y:ParentTargeted$CardPower SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Creature.YouOwn | ChoiceTitle$ Choose a creature card in your hand | Amount$ 1 | SubAbility$ DBEffect | SpellDescription$ Choose a creature card in your hand. | StackDescription$ SpellDescription -SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPXPX | CopySVar$ Excess | Name$ Ravenous Pursuit's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup | SpellDescription$ It perpetually gets +X/+X, where X is the amount of excess damage dealt this way. -SVar:PerpetualPXPX:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ Excess | AddToughness$ Excess | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +X/+X, where X is the amount of excess damage dealt. +SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualPXPX | SetChosenNumber$ Excess | Name$ Ravenous Pursuit's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup | SpellDescription$ It perpetually gets +X/+X, where X is the amount of excess damage dealt this way. +SVar:PerpetualPXPX:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ X | AddToughness$ X | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +X/+X, where X is the amount of excess damage dealt. SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True +SVar:X:Count$ChosenNumber Oracle:Target creature you control deals damage equal to its power to target creature you don't control. Choose a creature card in your hand. It perpetually gets +X/+X, where X is the amount of excess damage dealt this way. diff --git a/forge-gui/res/cardsfolder/t/tromokratis.txt b/forge-gui/res/cardsfolder/t/tromokratis.txt index 81a5ed7b69c..6f4a6583c21 100644 --- a/forge-gui/res/cardsfolder/t/tromokratis.txt +++ b/forge-gui/res/cardsfolder/t/tromokratis.txt @@ -2,6 +2,6 @@ Name:Tromokratis ManaCost:5 U U Types:Legendary Creature Kraken PT:8/8 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+notattacking+notblocking | Description$ CARDNAME has hexproof unless it's attacking or blocking. +S:Mode$ Continuous | Affected$ Card.Self+notattacking+notblocking | AddKeyword$ Hexproof | Description$ CARDNAME has hexproof unless it's attacking or blocking. K:CARDNAME can't be blocked unless all creatures defending player controls block it. Oracle:Tromokratis has hexproof unless it's attacking or blocking.\nTromokratis can't be blocked unless all creatures defending player controls block it. (If any creature that player controls doesn't block this creature, it can't be blocked.)