diff --git a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java index 820230bbe8e..d3c5ab0bc4c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java @@ -53,12 +53,14 @@ public class DelayedTriggerEffect extends SpellAbilityEffect { } if (triggerRemembered != null) { - for (final Object o : AbilityUtils.getDefinedObjects(sa.getHostCard(), triggerRemembered, sa)) { - if (o instanceof SpellAbility) { - // "RememberObjects$ Remembered" don't remember spellability - continue; + for (final String rem : triggerRemembered.split(",")) { + for (final Object o : AbilityUtils.getDefinedObjects(sa.getHostCard(), rem, sa)) { + if (o instanceof SpellAbility) { + // "RememberObjects$ Remembered" don't remember spellability + continue; + } + delTrig.addRemembered(o); } - delTrig.addRemembered(o); } } diff --git a/forge-gui/res/cardsfolder/r/rescue_from_the_underworld.txt b/forge-gui/res/cardsfolder/r/rescue_from_the_underworld.txt index ffb44ed812a..1f8f1bcab6d 100644 --- a/forge-gui/res/cardsfolder/r/rescue_from_the_underworld.txt +++ b/forge-gui/res/cardsfolder/r/rescue_from_the_underworld.txt @@ -1,11 +1,9 @@ Name:Rescue from the Underworld ManaCost:4 B Types:Instant -A:SP$ Effect | Cost$ 4 B Sac<1/Creature> | RememberCostCards$ True | ValidTgts$ Creature.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Choose target creature card in your graveyard | RememberTargets$ True | ImprintCards$ Remembered | Triggers$ TrigReturn,OutOfSight | SVars$ MoveToPlay,ForgetCard | SubAbility$ DBExile | Duration$ Permanent | SpellDescription$ Choose target creature card in your graveyard. Return that card and the sacrificed card to the battlefield under your control at the beginning of your next upkeep. Exile CARDNAME. -SVar:TrigReturn:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ MoveToPlay | OneOff$ True | TriggerDescription$ Return that card and the sacrificed card to the battlefield under your control at the beginning of your next upkeep. -SVar:MoveToPlay:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Imprinted | GainControl$ True -SVar:OutOfSight:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ ForgetCard | Static$ True -SVar:ForgetCard:DB$ Pump | ForgetImprinted$ TriggeredCard +A:SP$ Pump | Cost$ 4 B Sac<1/Creature> | RememberCostCards$ True | ValidTgts$ Creature.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Choose target creature card in your graveyard | SubAbility$ DBDelTrig | SpellDescription$ Choose target creature card in your graveyard. Return that card and the sacrificed card to the battlefield under your control at the beginning of your next upkeep. Exile CARDNAME. +SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ MoveToPlay | TriggerDescription$ Return that card and the sacrificed card to the battlefield under your control at the beginning of your next upkeep. | RememberObjects$ Targeted,Remembered | SubAbility$ DBExile +SVar:MoveToPlay:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ DelayTriggerRemembered | GainControl$ True SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Exile | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True