From ed48bc027eaa1bfc8dcc43d71c291d1a171243ab Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Mon, 8 Aug 2022 12:48:38 +0200 Subject: [PATCH] Fix Emblem targeting --- forge-gui/res/cardsfolder/b/brokers_confluence.txt | 2 +- forge-gui/res/cardsfolder/d/disallow.txt | 2 +- forge-gui/res/cardsfolder/l/lithoform_engine.txt | 2 +- forge-gui/res/cardsfolder/n/nimble_obstructionist.txt | 2 +- forge-gui/res/cardsfolder/s/stifle.txt | 2 +- forge-gui/res/cardsfolder/s/strionic_resonator.txt | 2 +- forge-gui/res/cardsfolder/s/sublime_epiphany.txt | 2 +- forge-gui/res/cardsfolder/t/tales_end.txt | 2 +- forge-gui/res/cardsfolder/t/trickbind.txt | 2 +- .../res/cardsfolder/upcoming/emerald_dragon_dissonant_wave.txt | 2 +- forge-gui/res/cardsfolder/v/voidslime.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/forge-gui/res/cardsfolder/b/brokers_confluence.txt b/forge-gui/res/cardsfolder/b/brokers_confluence.txt index 9403ec36c53..eb6139b78a9 100644 --- a/forge-gui/res/cardsfolder/b/brokers_confluence.txt +++ b/forge-gui/res/cardsfolder/b/brokers_confluence.txt @@ -4,7 +4,7 @@ Types:Instant A:SP$ Charm | Choices$ Proliferate,PhaseOut,CounterAbility | CharmNum$ 3 | CanRepeatModes$ True SVar:Proliferate:DB$ Proliferate | SpellDescription$ Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.) SVar:PhaseOut:DB$ Phases | ValidTgts$ Creature | SpellDescription$ Target creature phases out. (Treat it and anything attached to it as though they don't exist until its controller's next turn.) -SVar:CounterAbility:DB$ Counter | TargetType$ Activated,Triggered | ValidTgts$ Card | TgtPrompt$ Select target activated or triggered ability | SpellDescription$ Counter target activated or triggered ability. +SVar:CounterAbility:DB$ Counter | TargetType$ Activated,Triggered | ValidTgts$ Card,Emblem | TgtPrompt$ Select target activated or triggered ability | SpellDescription$ Counter target activated or triggered ability. DeckHas:Ability$Proliferate DeckHints:Ability$Counters & Type$Planeswalker Oracle:Choose three. You may choose the same mode more than once.\n• Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)\n• Target creature phases out. (Treat it and anything attached to it as though they don't exist until its controller's next turn.)\n• Counter target activated or triggered ability. diff --git a/forge-gui/res/cardsfolder/d/disallow.txt b/forge-gui/res/cardsfolder/d/disallow.txt index e9849637477..b16f256938d 100644 --- a/forge-gui/res/cardsfolder/d/disallow.txt +++ b/forge-gui/res/cardsfolder/d/disallow.txt @@ -1,6 +1,6 @@ Name:Disallow ManaCost:1 U U Types:Instant -A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card | SpellDescription$ Counter target spell, activated ability, or triggered ability. +A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | SpellDescription$ Counter target spell, activated ability, or triggered ability. AI:RemoveDeck:All Oracle:Counter target spell, activated ability, or triggered ability. (Mana abilities can't be targeted.) diff --git a/forge-gui/res/cardsfolder/l/lithoform_engine.txt b/forge-gui/res/cardsfolder/l/lithoform_engine.txt index 90024364827..867b36d9a33 100644 --- a/forge-gui/res/cardsfolder/l/lithoform_engine.txt +++ b/forge-gui/res/cardsfolder/l/lithoform_engine.txt @@ -1,7 +1,7 @@ Name:Lithoform Engine ManaCost:4 Types:Legendary Artifact -A:AB$ CopySpellAbility | Cost$ 2 T | TgtPrompt$ Select target activated or triggered ability you control | TargetType$ Activated.YouCtrl,Triggered.YouCtrl | ValidTgts$ Card | MayChooseTarget$ True | StackDescription$ SpellDescription | SpellDescription$ Copy target activated or triggered ability you control. You may choose new targets for the copy. +A:AB$ CopySpellAbility | Cost$ 2 T | TgtPrompt$ Select target activated or triggered ability you control | TargetType$ Activated.YouCtrl,Triggered.YouCtrl | ValidTgts$ Card,Emblem | MayChooseTarget$ True | StackDescription$ SpellDescription | SpellDescription$ Copy target activated or triggered ability you control. You may choose new targets for the copy. A:AB$ CopySpellAbility | Cost$ 3 T | TgtPrompt$ Select target instant or sorcery spell you control | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TargetType$ Spell | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. A:AB$ CopySpellAbility | Cost$ 4 T | TgtPrompt$ Select target permanent spell you control | ValidTgts$ Permanent.YouCtrl | TargetType$ Spell | SpellDescription$ Copy target permanent spell you control. (The copy becomes a token.) Oracle:{2}, {T}: Copy target activated or triggered ability you control. You may choose new targets for the copy.\n{3}, {T}: Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n{4}, {T}: Copy target permanent spell you control. (The copy becomes a token.) diff --git a/forge-gui/res/cardsfolder/n/nimble_obstructionist.txt b/forge-gui/res/cardsfolder/n/nimble_obstructionist.txt index 3d0375d5168..d6c919952ca 100644 --- a/forge-gui/res/cardsfolder/n/nimble_obstructionist.txt +++ b/forge-gui/res/cardsfolder/n/nimble_obstructionist.txt @@ -6,5 +6,5 @@ K:Flash K:Flying K:Cycling:2 U T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigCounter | TriggerDescription$ When you cycle CARDNAME, counter target activated or triggered ability you don't control. -SVar:TrigCounter:DB$ Counter | TargetType$ Activated,Triggered | ValidTgts$ Card.YouDontCtrl +SVar:TrigCounter:DB$ Counter | TargetType$ Activated.YouDontCtrl,Triggered.YouDontCtrl | ValidTgts$ Card,Emblem Oracle:Flash\nFlying\nCycling {2}{U} ({2}{U}, Discard this card: Draw a card.)\nWhen you cycle Nimble Obstructionist, counter target activated or triggered ability you don't control. diff --git a/forge-gui/res/cardsfolder/s/stifle.txt b/forge-gui/res/cardsfolder/s/stifle.txt index 99c3cb0f5f8..48743b8a728 100644 --- a/forge-gui/res/cardsfolder/s/stifle.txt +++ b/forge-gui/res/cardsfolder/s/stifle.txt @@ -1,6 +1,6 @@ Name:Stifle ManaCost:U Types:Instant -A:SP$ Counter | Cost$ U | TgtPrompt$ Select target Activated or Triggered Ability | ValidTgts$ Card | TargetType$ Activated,Triggered | SpellDescription$ Counter target activated or triggered ability. +A:SP$ Counter | Cost$ U | TgtPrompt$ Select target Activated or Triggered Ability | ValidTgts$ Card,Emblem | TargetType$ Activated,Triggered | SpellDescription$ Counter target activated or triggered ability. AI:RemoveDeck:All Oracle:Counter target activated or triggered ability. (Mana abilities can't be targeted.) diff --git a/forge-gui/res/cardsfolder/s/strionic_resonator.txt b/forge-gui/res/cardsfolder/s/strionic_resonator.txt index b043b300c75..75a527332c0 100644 --- a/forge-gui/res/cardsfolder/s/strionic_resonator.txt +++ b/forge-gui/res/cardsfolder/s/strionic_resonator.txt @@ -1,7 +1,7 @@ Name:Strionic Resonator ManaCost:2 Types:Artifact -A:AB$ CopySpellAbility | Cost$ 2 T | TargetType$ Triggered.YouCtrl | ValidTgts$ Card | MayChooseTarget$ True | SpellDescription$ Copy target triggered ability you control. You may choose new targets for the copy. +A:AB$ CopySpellAbility | Cost$ 2 T | TargetType$ Triggered.YouCtrl | ValidTgts$ Card,Emblem | MayChooseTarget$ True | SpellDescription$ Copy target triggered ability you control. You may choose new targets for the copy. AI:RemoveDeck:All AI:RemoveDeck:Random Oracle:{2}, {T}: Copy target triggered ability you control. You may choose new targets for the copy. (A triggered ability uses the words "when," "whenever," or "at.") diff --git a/forge-gui/res/cardsfolder/s/sublime_epiphany.txt b/forge-gui/res/cardsfolder/s/sublime_epiphany.txt index 4b0f8db5915..7b667c50282 100644 --- a/forge-gui/res/cardsfolder/s/sublime_epiphany.txt +++ b/forge-gui/res/cardsfolder/s/sublime_epiphany.txt @@ -3,7 +3,7 @@ ManaCost:4 U U Types:Instant A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ 5 | Choices$ DBCounterSpell,DBCounterAbility,DBReturn,DBCopy,DBDraw SVar:DBCounterSpell:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | SpellDescription$ Counter target spell. -SVar:DBCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | ValidTgts$ Card | TgtPrompt$ Select target activated or triggered ability | SpellDescription$ Counter target activated or triggered ability. +SVar:DBCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | ValidTgts$ Card,Emblem | TgtPrompt$ Select target activated or triggered ability | SpellDescription$ Counter target activated or triggered ability. SVar:DBReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | AILogic$ Good | SpellDescription$ Return target nonland permanent to its owner's hand. SVar:DBCopy:DB$ CopyPermanent | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Create a token that's a copy of target creature you control. SVar:DBDraw:DB$ Draw | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Select target player | SpellDescription$ Target player draws a card. diff --git a/forge-gui/res/cardsfolder/t/tales_end.txt b/forge-gui/res/cardsfolder/t/tales_end.txt index 777a32f0f9e..86dcad5ccd9 100644 --- a/forge-gui/res/cardsfolder/t/tales_end.txt +++ b/forge-gui/res/cardsfolder/t/tales_end.txt @@ -1,6 +1,6 @@ Name:Tale's End ManaCost:1 U Types:Instant -A:SP$ Counter | Cost$ 1 U | TargetType$ Activated,Triggered,Spell.Legendary | TgtPrompt$ Select target activated ability, triggered ability, or legendary spell | ValidTgts$ Card | SpellDescription$ Counter target activated ability, triggered ability, or legendary spell. +A:SP$ Counter | Cost$ 1 U | TargetType$ Activated,Triggered,Spell.Legendary | TgtPrompt$ Select target activated ability, triggered ability, or legendary spell | ValidTgts$ Card,Emblem | SpellDescription$ Counter target activated ability, triggered ability, or legendary spell. AI:RemoveDeck:Random Oracle:Counter target activated ability, triggered ability, or legendary spell. diff --git a/forge-gui/res/cardsfolder/t/trickbind.txt b/forge-gui/res/cardsfolder/t/trickbind.txt index b5dea757921..c8f12275bf8 100644 --- a/forge-gui/res/cardsfolder/t/trickbind.txt +++ b/forge-gui/res/cardsfolder/t/trickbind.txt @@ -2,7 +2,7 @@ Name:Trickbind ManaCost:1 U Types:Instant K:Split second -A:SP$ Counter | Cost$ 1 U | TargetType$ Activated,Triggered | TgtPrompt$ Select target Activated or Triggered Ability | RememberCountered$ True | ValidTgts$ Card | SubAbility$ DBEffect | SpellDescription$ Counter target activated or triggered ability. If a permanent's ability is countered this way, activated abilities of that permanent can't be activated this turn. (Mana abilities can't be targeted.) +A:SP$ Counter | Cost$ 1 U | TargetType$ Activated,Triggered | TgtPrompt$ Select target Activated or Triggered Ability | RememberCountered$ True | ValidTgts$ Card,Emblem | SubAbility$ DBEffect | SpellDescription$ Counter target activated or triggered ability. If a permanent's ability is countered this way, activated abilities of that permanent can't be activated this turn. (Mana abilities can't be targeted.) SVar:DBEffect:DB$ Effect | StaticAbilities$ STCantBeActivated | RememberObjects$ Remembered | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ1 SVar:STCantBeActivated:Mode$ CantBeActivated | EffectZone$ Command | ValidCard$ Permanent.IsRemembered SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True diff --git a/forge-gui/res/cardsfolder/upcoming/emerald_dragon_dissonant_wave.txt b/forge-gui/res/cardsfolder/upcoming/emerald_dragon_dissonant_wave.txt index 573276475f5..a061dbb2380 100644 --- a/forge-gui/res/cardsfolder/upcoming/emerald_dragon_dissonant_wave.txt +++ b/forge-gui/res/cardsfolder/upcoming/emerald_dragon_dissonant_wave.txt @@ -12,5 +12,5 @@ ALTERNATE Name:Dissonant Wave ManaCost:2 G Types:Instant Adventure -A:SP$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from a noncreature source | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target activated or triggered ability from a noncreature source. (Then exile this card. You may cast the creature later from exile.) +A:SP$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from a noncreature source | ValidTgts$ Card.nonCreature,Emblem | SpellDescription$ Counter target activated or triggered ability from a noncreature source. (Then exile this card. You may cast the creature later from exile.) Oracle:Counter target activated or triggered ability from a noncreature source. (Then exile this card. You may cast the creature later from exile.) diff --git a/forge-gui/res/cardsfolder/v/voidslime.txt b/forge-gui/res/cardsfolder/v/voidslime.txt index 4aab2439325..36078b63ff7 100644 --- a/forge-gui/res/cardsfolder/v/voidslime.txt +++ b/forge-gui/res/cardsfolder/v/voidslime.txt @@ -1,6 +1,6 @@ Name:Voidslime ManaCost:G U U Types:Instant -A:SP$ Counter | Cost$ G U U | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card | SpellDescription$ Counter target spell, activated ability, or triggered ability. +A:SP$ Counter | Cost$ G U U | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | SpellDescription$ Counter target spell, activated ability, or triggered ability. AI:RemoveDeck:All Oracle:Counter target spell, activated ability, or triggered ability. (Mana abilities can't be targeted.)