From e21c33e2438d886bb7a81ebc068e97d31855993f Mon Sep 17 00:00:00 2001 From: squee1968 Date: Thu, 23 Jun 2022 21:54:08 -0500 Subject: [PATCH 01/12] 5moresqueecards -closes #804 -closes #544 -closes #805 -closes #806 -closes #866 --- .../upcoming/ghost_lantern_bind_spirit.txt | 15 +++++++++++++++ .../res/cardsfolder/upcoming/githzerai_monk.txt | 10 ++++++++++ .../res/cardsfolder/upcoming/green_slime.txt | 10 ++++++++++ .../cardsfolder/upcoming/hammers_of_moradin.txt | 9 +++++++++ 4 files changed, 44 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/green_slime.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt new file mode 100644 index 00000000000..df5aabde9cf --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt @@ -0,0 +1,15 @@ +Name:Ghost Lantern +ManaCost:B +Types:Artifact Equipment +K:Equip:1 +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainCounter | TriggerDescription$ Whenever a creature you control dies, put a +1/+1 counter on equipped creature. +SVar:TrigGainCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1 +Oracle:Whenever a creature you control dies, put a +1/+1 counter on equipped creature.\nEquip {1} + +ALTERNATE + +Name:Bind Spirit +ManaCost:1 B +Types:Instant Adventure +A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand +Oracle:Return target creature card from your graveyard to your hand. diff --git a/forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt b/forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt new file mode 100644 index 00000000000..f4cf7c0b658 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt @@ -0,0 +1,10 @@ +Name:Githzerai Monk +ManaCost:4 W +Types:Creature Gith Monk +PT:3/2 +K:Flash +K:Flying +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTapAll | TriggerDescription$ Psychic Defense — When CARDNAME enters the battlefield, tap all creatures you don't control. +SVar:TrigTapAll:DB$ TapAll | ValidCards$ Creature.YouDontCtrl +SVar:PlayMain1:TRUE +Oracle:Flash\nFlying\nPsychic Defense — When Githzerai Monk enters the battlefield, tap all creatures you don't control. diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt new file mode 100644 index 00000000000..b8e75dbc627 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt @@ -0,0 +1,10 @@ +Name:Green Slime +ManaCost:2 G +Types:Creature Ooze +PT:2/2 +K:Flash +K:Foretell G +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent. +SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source. | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True +AI:RemoveDeck:All +Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G} diff --git a/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt new file mode 100644 index 00000000000..58e1767a30c --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt @@ -0,0 +1,9 @@ +Name:Hammers of Moradin +ManaCost:2 W +Types:Creature Dwarf Cleric +PT:3/3 +K:Myriad +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TapOneEach | TriggerDescription$ Whenever CARDNAME attacks, for each opponent, tap up to one target creature that player controls. +SVar:TapOneEach:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose one target creature that each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True +SVar:OneEach:PlayerCountOpponents$Amount +Oracle:Myriad\nWhenever Hammers of Moradin attacks, for each opponent, tap up to one target creature that player controls. From e5edd3e9a085056a1627d2a7b21c8230dfcba9f8 Mon Sep 17 00:00:00 2001 From: squee1968 Date: Thu, 23 Jun 2022 22:02:23 -0500 Subject: [PATCH 02/12] Create grell_philosopher.txt --- .../res/cardsfolder/upcoming/grell_philosopher.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt new file mode 100644 index 00000000000..71c3f987817 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt @@ -0,0 +1,12 @@ +Name:Grell Philosopher +ManaCost:2 U +Types:Creature Horror Wizard +PT:1/4 +K:ManaConvert:U->AnyColor:You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. +SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | RememberObjects$ Targeted +SVar:STSteal:Mode$ Continuous | Affected$ Creature.Horror+YouCtrl | EffectZone$ Command | GainsAbilitiesOfDefined$ RememberedLKI +AI:RemoveDeck:All +DeckHints:Type$Horror +Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities. From 9735a56737ca9c78d09c3b9feb529ff95d8ffa14 Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Thu, 23 Jun 2022 22:37:39 -0500 Subject: [PATCH 03/12] Update ghost_lantern_bind_spirit.txt --- forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt index df5aabde9cf..013edf4e70c 100644 --- a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt +++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt @@ -4,6 +4,7 @@ Types:Artifact Equipment K:Equip:1 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainCounter | TriggerDescription$ Whenever a creature you control dies, put a +1/+1 counter on equipped creature. SVar:TrigGainCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1 +DeckHas:Ability$Counters Oracle:Whenever a creature you control dies, put a +1/+1 counter on equipped creature.\nEquip {1} ALTERNATE From 770719908dbd4d6a3a27614a65158771c4b258a5 Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Thu, 23 Jun 2022 22:39:53 -0500 Subject: [PATCH 04/12] Update grell_philosopher.txt --- forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt index 71c3f987817..d616117de32 100644 --- a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt +++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt @@ -1,4 +1,4 @@ -Name:Grell Philosopher +Name:Grell Philosopher ManaCost:2 U Types:Creature Horror Wizard PT:1/4 From 03993e3aa06bc8f1a5b270c74fc9523cbdd3f676 Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Fri, 24 Jun 2022 05:35:35 -0500 Subject: [PATCH 05/12] Update grell_philosopher.txt --- forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt index d616117de32..a602139d791 100644 --- a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt +++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt @@ -5,8 +5,8 @@ PT:1/4 K:ManaConvert:U->AnyColor:You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. -SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | RememberObjects$ Targeted -SVar:STSteal:Mode$ Continuous | Affected$ Creature.Horror+YouCtrl | EffectZone$ Command | GainsAbilitiesOfDefined$ RememberedLKI +SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | ImprintCards$ Targeted | RememberObjects$ Valid Creature.Horror+YouCtrl | ForgetOnMoved$ Battlefield +SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI AI:RemoveDeck:All DeckHints:Type$Horror Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities. From bda561f97a441566bb10bf2abb096a619b254c20 Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Fri, 24 Jun 2022 18:26:03 -0500 Subject: [PATCH 06/12] Update ghost_lantern_bind_spirit.txt --- forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt index 013edf4e70c..3d3222acb40 100644 --- a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt +++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt @@ -14,3 +14,4 @@ ManaCost:1 B Types:Instant Adventure A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand Oracle:Return target creature card from your graveyard to your hand. +DeckHas:Ability$Graveyard From b5be71b1439ece26473975ea120e829e88db558d Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Fri, 24 Jun 2022 18:29:03 -0500 Subject: [PATCH 07/12] Update green_slime.txt --- forge-gui/res/cardsfolder/upcoming/green_slime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt index b8e75dbc627..80daa8855a1 100644 --- a/forge-gui/res/cardsfolder/upcoming/green_slime.txt +++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt @@ -3,7 +3,7 @@ ManaCost:2 G Types:Creature Ooze PT:2/2 K:Flash -K:Foretell G +K:Foretell: G T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent. SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source. | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True AI:RemoveDeck:All From 6a35b738394984e68092b66dacd50bff7a826638 Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Fri, 24 Jun 2022 18:29:55 -0500 Subject: [PATCH 08/12] Update green_slime.txt --- forge-gui/res/cardsfolder/upcoming/green_slime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt index 80daa8855a1..98f2fcdf8f0 100644 --- a/forge-gui/res/cardsfolder/upcoming/green_slime.txt +++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt @@ -5,6 +5,6 @@ PT:2/2 K:Flash K:Foretell: G T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent. -SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source. | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True +SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True AI:RemoveDeck:All Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G} From 8765ab646e953e17474a7bd938b30b891e599597 Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Fri, 24 Jun 2022 18:31:50 -0500 Subject: [PATCH 09/12] Update hammers_of_moradin.txt --- forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt index 58e1767a30c..2644a7e25c7 100644 --- a/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt +++ b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt @@ -6,4 +6,5 @@ K:Myriad T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TapOneEach | TriggerDescription$ Whenever CARDNAME attacks, for each opponent, tap up to one target creature that player controls. SVar:TapOneEach:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose one target creature that each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True SVar:OneEach:PlayerCountOpponents$Amount +SVar:HasAttackEffect:TRUE Oracle:Myriad\nWhenever Hammers of Moradin attacks, for each opponent, tap up to one target creature that player controls. From b5fb0a4cc1a7d16fab3422b991df874abbaf85ef Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Fri, 24 Jun 2022 21:04:28 -0500 Subject: [PATCH 10/12] Update ghost_lantern_bind_spirit.txt --- .../res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt index 3d3222acb40..8b5f166becb 100644 --- a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt +++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt @@ -13,5 +13,5 @@ Name:Bind Spirit ManaCost:1 B Types:Instant Adventure A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand -Oracle:Return target creature card from your graveyard to your hand. DeckHas:Ability$Graveyard +Oracle:Return target creature card from your graveyard to your hand. From c93487e0484784f3f29dbb985f04c5ff627dfa8f Mon Sep 17 00:00:00 2001 From: TRT <> Date: Sat, 25 Jun 2022 21:01:59 +0200 Subject: [PATCH 11/12] Support for Grell --- .../forge/game/staticability/StaticAbilityContinuous.java | 2 +- forge-gui/res/cardsfolder/s/scheming_fence.txt | 2 +- forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt | 7 +++---- .../src/main/java/forge/player/HumanPlaySpellAbility.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 1a32a81b354..b9f957a509f 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -843,7 +843,7 @@ public final class StaticAbilityContinuous { newSA.getRestrictions().setLimitToCheck(params.get("GainsAbilitiesLimitPerTurn")); } if (params.containsKey("GainsAbilitiesActivateIgnoreColor")) { - newSA.putParam("ActivateIgnoreColor","True"); + newSA.putParam("ActivateIgnoreColor", params.get("GainsAbilitiesActivateIgnoreColor")); } newSA.setOriginalAbility(sa); // need to be set to get the Once Per turn Clause correct newSA.setGrantorStatic(stAb); diff --git a/forge-gui/res/cardsfolder/s/scheming_fence.txt b/forge-gui/res/cardsfolder/s/scheming_fence.txt index 00662c7831a..49b7ec45357 100644 --- a/forge-gui/res/cardsfolder/s/scheming_fence.txt +++ b/forge-gui/res/cardsfolder/s/scheming_fence.txt @@ -5,7 +5,7 @@ PT:2/3 K:ETBReplacement:Other:ChooseCard SVar:ChooseCard:DB$ ChooseCard | Choices$ Permanent.nonLand | MinAmount$ 0 | ChoiceTitle$ You may choose a nonland permanent | AILogic$ OppPreferred | SpellDescription$ As CARDNAME enters the battlefield, you may choose a nonland permanent. S:Mode$ Continuous | Affected$ Card.ChosenCard | AddHiddenKeyword$ CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of the chosen permanent can't be activated. -S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.nonLoyalty | GainsAbilitiesActivateIgnoreColor$ True | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities. +S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.nonLoyalty | GainsAbilitiesActivateIgnoreColor$ AnyType->AnyColor | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.ChosenCard | Execute$ TrigCleanup SVar:TrigCleanup:DB$ Cleanup | ClearChosenCard$ True Oracle:As Scheming Fence enters the battlefield, you may choose a nonland permanent.\nActivated abilities of the chosen permanent can't be activated.\nScheming Fence has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities. diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt index a602139d791..faae3e8fef4 100644 --- a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt +++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt @@ -2,11 +2,10 @@ Name:Grell Philosopher ManaCost:2 U Types:Creature Horror Wizard PT:1/4 -K:ManaConvert:U->AnyColor:You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities. -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities. SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | ImprintCards$ Targeted | RememberObjects$ Valid Creature.Horror+YouCtrl | ForgetOnMoved$ Battlefield -SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI +SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI | GainsAbilitiesActivateIgnoreColor$ U->AnyColor AI:RemoveDeck:All DeckHints:Type$Horror Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities. diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java index bf5eebeeea2..74fa086002a 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java +++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java @@ -139,11 +139,11 @@ public class HumanPlaySpellAbility { } } if (ability.hasParam("ActivateIgnoreColor")) { - AbilityUtils.applyManaColorConversion(payment, MagicColor.Constant.ANY_COLOR_CONVERSION); + params.put("ManaConversion", ability.getParam("ActivateIgnoreColor")); manaColorConversion = true; } - if (keywordColor) { + if (keywordColor || manaColorConversion) { AbilityUtils.applyManaColorConversion(payment, params); } } From aade9289c1c8a0a576f219873e6275b21820ad2c Mon Sep 17 00:00:00 2001 From: squee1968 <105706641+squee1968@users.noreply.github.com> Date: Sun, 26 Jun 2022 07:03:55 -0500 Subject: [PATCH 12/12] Update green_slime.txt --- forge-gui/res/cardsfolder/upcoming/green_slime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt index 98f2fcdf8f0..0d33e2c3a2d 100644 --- a/forge-gui/res/cardsfolder/upcoming/green_slime.txt +++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt @@ -6,5 +6,5 @@ K:Flash K:Foretell: G T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent. SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True -AI:RemoveDeck:All +AI:RemoveDeck:Random Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G}