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 67b7be1714d..b1263b4c971 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -126,8 +126,9 @@ public class AbilityUtils { } else if (defined.startsWith("Triggered") && (sa != null)) { final SpellAbility root = sa.getRootAbility(); - if (defined.contains("LKICopy")) { //TriggeredCardLKICopy - final Object crd = root.getTriggeringObject(defined.substring(9, 13)); + if (defined.contains("LKICopy")) { //Triggered*LKICopy + int lkiPosition = defined.indexOf("LKICopy"); + final Object crd = root.getTriggeringObject(defined.substring(9, lkiPosition)); if (crd instanceof Card) { c = (Card) crd; } diff --git a/forge-gui/res/cardsfolder/f/fiend_hunter.txt b/forge-gui/res/cardsfolder/f/fiend_hunter.txt index 96038739968..dadd19a028c 100644 --- a/forge-gui/res/cardsfolder/f/fiend_hunter.txt +++ b/forge-gui/res/cardsfolder/f/fiend_hunter.txt @@ -5,7 +5,7 @@ PT:1/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may exile another target creature. SVar:TrigExile:DB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True | ValidTgts$ Creature.Other | TgtPrompt$ Select target creature T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control. -SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered +SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ DirectRemembered SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/fiend_hunter.jpg Oracle:When Fiend Hunter enters the battlefield, you may exile another target creature.\nWhen Fiend Hunter leaves the battlefield, return the exiled card to the battlefield under its owner's control. diff --git a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt b/forge-gui/res/cardsfolder/g/gorgon_recluse.txt index 2ba968966ba..6c42e5ec31a 100644 --- a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt +++ b/forge-gui/res/cardsfolder/g/gorgon_recluse.txt @@ -6,8 +6,8 @@ T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat. SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat. SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat. -SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker -SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker +SVar:TrigDestroyBlocked:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttackerLKICopy +SVar:TrigDestroyBlocker:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlockerLKICopy K:Madness:B B SVar:Picture:http://www.wizards.com/global/images/magic/general/gorgon_recluse.jpg Oracle:Whenever Gorgon Recluse blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.\nMadness {B}{B} (If you discard this card, you may cast it for its madness cost instead of putting it into your graveyard.)