diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 1d4c80962ae..6d631bc86c0 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -663,7 +663,8 @@ public class AbilityUtils { } } else if (calcX[0].startsWith("Triggered")) { - list = getDefinedCards(card, calcX[0], sa); + final SpellAbility root = sa.getRootAbility(); + list = new CardCollection((Card) root.getTriggeringObject(calcX[0].substring(9))); } else if (calcX[0].startsWith("TriggerCount")) { // TriggerCount is similar to a regular Count, but just diff --git a/forge-gui/res/cardsfolder/s/scrap_trawler.txt b/forge-gui/res/cardsfolder/s/scrap_trawler.txt index c28340f11c3..a1d337f808d 100644 --- a/forge-gui/res/cardsfolder/s/scrap_trawler.txt +++ b/forge-gui/res/cardsfolder/s/scrap_trawler.txt @@ -4,7 +4,7 @@ Types:Artifact Creature Construct PT:3/2 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturnArti | TriggerDescription$ Whenever CARDNAME or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigReturnArti | TriggerDescription$ Whenever CARDNAME or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost. -SVar:TrigReturnArti:DB$ ChangeZone | ValidTgts$ Artifact.cmcLTX+YouCtrl | TgtPrompt$ Select target artifact with less converted mana cost | Origin$ Graveyard | Destination$ Hand | References$ X -SVar:X:TriggeredCardLKICopy$CardManaCost +SVar:TrigReturnArti:DB$ ChangeZone | ValidTgts$ Artifact.cmcLTX+YouCtrl | Origin$ Graveyard | Destination$ Hand | References$ X +SVar:X:TriggeredCard$CardManaCost SVar:Picture:http://www.wizards.com/global/images/magic/general/scrap_trawler.jpg Oracle:Whenever Scrap Trawler or another artifact you control is put into a graveyard from the battlefield, return to your hand target artifact card in your graveyard with lesser converted mana cost.