Merge branch 'efreet' into 'master'

Fix Fickle Efreet duplicating itself when dead before flip resolves

See merge request core-developers/forge!5925
This commit is contained in:
Michael Kamensky
2021-12-09 18:52:49 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -6,6 +6,6 @@ T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Del
T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DelayTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
SVar:DelayTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigFlip | TriggerDescription$ flip a coin at end of combat. If you lose the flip, an opponent gains control of CARDNAME.
SVar:TrigFlip:DB$ FlipACoin | LoseSubAbility$ DBGiveControl
SVar:DBGiveControl:DB$ GainControl | Defined$ Self | NewController$ Opponent | Duration$ Permanent
SVar:DBGiveControl:DB$ GainControl | Defined$ CorrectedSelf | NewController$ Opponent
SVar:Picture:http://www.wizards.com/global/images/magic/general/fickle_efreet.jpg
Oracle:Whenever Fickle Efreet attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of Fickle Efreet.

View File

@@ -4,7 +4,7 @@ Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Curse
T:Mode$ BecomesTarget | ValidTarget$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever enchanted creature becomes the target of a spell or ability, that spell or ability's controller gains control of that creature. (This effect lasts indefinitely.)
SVar:TrigGainControl:DB$ GainControl | Defined$ Enchanted | NewController$ TriggeredSourceController | Duration$ Permanent
SVar:TrigGainControl:DB$ GainControl | Defined$ Enchanted | NewController$ TriggeredSourceController
AI:RemoveDeck:Random
SVar:Picture:http://www.wizards.com/global/images/magic/general/fractured_loyalty.jpg
Oracle:Enchant creature\nWhenever enchanted creature becomes the target of a spell or ability, that spell or ability's controller gains control of that creature. (This effect lasts indefinitely.)