From 4f38f5a3899e7a8f4c49d77b096413b01c7623c5 Mon Sep 17 00:00:00 2001 From: Bug Hunter Date: Mon, 10 May 2021 16:51:06 +0000 Subject: [PATCH] Fix Grindstone & Painter's Servant interaction --- forge-gui/res/cardsfolder/c/coerced_confession.txt | 2 +- forge-gui/res/cardsfolder/d/dread_summons.txt | 2 +- forge-gui/res/cardsfolder/g/grindstone.txt | 2 +- forge-gui/res/cardsfolder/s/sphinxs_tutelage.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-gui/res/cardsfolder/c/coerced_confession.txt b/forge-gui/res/cardsfolder/c/coerced_confession.txt index b22b5f7da8f..47c791278a3 100644 --- a/forge-gui/res/cardsfolder/c/coerced_confession.txt +++ b/forge-gui/res/cardsfolder/c/coerced_confession.txt @@ -4,5 +4,5 @@ Types:Sorcery A:SP$ Mill | Cost$ 4 UB | NumCards$ 4 | ValidTgts$ Player | TgtPrompt$ Choose a player | RememberMilled$ True | SubAbility$ DBDraw | SpellDescription$ Target player mills four cards. You draw a card for each creature card put into a graveyard this way. SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Remembered$Valid Creature +SVar:X:Remembered$Valid Creature.inZoneGraveyard Oracle:Target player mills four cards. You draw a card for each creature card put into their graveyard this way. diff --git a/forge-gui/res/cardsfolder/d/dread_summons.txt b/forge-gui/res/cardsfolder/d/dread_summons.txt index 99123619e97..fb1f2f33e94 100644 --- a/forge-gui/res/cardsfolder/d/dread_summons.txt +++ b/forge-gui/res/cardsfolder/d/dread_summons.txt @@ -5,6 +5,6 @@ A:SP$ Mill | Cost$ X B B | NumCards$ X | Defined$ Player | RememberMilled$ True SVar:DBToken:DB$ Token | TokenAmount$ Y | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenTapped$ True | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Count$xPaid -SVar:Y:Count$ValidGraveyard Creature.IsRemembered +SVar:Y:Remembered$Valid Creature.inZoneGraveyard DeckHas:Ability$Token Oracle:Each player mills X cards. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token. diff --git a/forge-gui/res/cardsfolder/g/grindstone.txt b/forge-gui/res/cardsfolder/g/grindstone.txt index 1774500fc09..b0d11a982e4 100644 --- a/forge-gui/res/cardsfolder/g/grindstone.txt +++ b/forge-gui/res/cardsfolder/g/grindstone.txt @@ -5,6 +5,6 @@ A:AB$ Repeat | Cost$ 3 T | ValidTgts$ Player | RepeatSubAbility$ DBCleanAndGrind SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | NoReveal$ True | RememberMilled$ True SVar:MaxRepeats:TargetedPlayer$CardsInLibrary -SVar:MilledSharesColor:RememberedLKI$Valid Card.SharesColorWithOther Remembered +SVar:MilledSharesColor:Remembered$Valid Card.SharesColorWithOther Remembered SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True Oracle:{3}, {T}: Target player mills two cards. If two cards that share a color were milled this way, repeat this process. diff --git a/forge-gui/res/cardsfolder/s/sphinxs_tutelage.txt b/forge-gui/res/cardsfolder/s/sphinxs_tutelage.txt index 1bd9874d597..5d3212eee38 100644 --- a/forge-gui/res/cardsfolder/s/sphinxs_tutelage.txt +++ b/forge-gui/res/cardsfolder/s/sphinxs_tutelage.txt @@ -6,7 +6,7 @@ SVar:TrigMill:DB$ Repeat | ValidTgts$ Opponent | IsCurse$ True | RepeatSubAbilit SVar:DBCleanAndGrind:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBGrind SVar:DBGrind:DB$ Mill | NumCards$ 2 | Defined$ Targeted | NoReveal$ True | RememberMilled$ True SVar:MaxRepeats:TargetedPlayer$CardsInLibrary -SVar:MilledSharesColor:RememberedLKI$Valid Card.nonLand+SharesColorWithOther Remembered +SVar:MilledSharesColor:Remembered$Valid Card.nonLand+SharesColorWithOther Remembered SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True A:AB$ Draw | Cost$ 5 U | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose