diff --git a/res/cardsfolder/c/clockwork_hydra.txt b/res/cardsfolder/c/clockwork_hydra.txt index 57e5c9aa645..2ad3d21ae4d 100644 --- a/res/cardsfolder/c/clockwork_hydra.txt +++ b/res/cardsfolder/c/clockwork_hydra.txt @@ -9,7 +9,7 @@ SVar:TrigClockworkRemoveCounter:AB$ RemoveCounter | Cost$ 0 | CounterType$ P1P1 SVar:DBClockworkDamage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | ConditionCheckSVar$ ClockworkX | ConditionSVarCompare$ GE1 | SubAbility$ DBClockworkCleanup A:AB$ PutCounter | Cost$ T | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME. SVar:DBClockworkCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:ClockworkX:Count$RememberedSize +SVar:ClockworkX:Remembered$Amount SVar:Picture:http://www.wizards.com/global/images/magic/general/clockwork_hydra.jpg Oracle:Clockwork Hydra enters the battlefield with four +1/+1 counters on it.\nWhenever Clockwork Hydra attacks or blocks, remove a +1/+1 counter from it. If you do, Clockwork Hydra deals 1 damage to target creature or player.\n{T}: Put a +1/+1 counter on Clockwork Hydra. SetInfo:DDF Uncommon diff --git a/res/cardsfolder/c/coalition_relic.txt b/res/cardsfolder/c/coalition_relic.txt index c2d1f35e180..33b24eb03b6 100644 --- a/res/cardsfolder/c/coalition_relic.txt +++ b/res/cardsfolder/c/coalition_relic.txt @@ -7,7 +7,7 @@ T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Ex SVar:TrigRemove:AB$ RemoveCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ All | RememberRemoved$ True | SubAbility$ TrigGetMana SVar:TrigGetMana:DB$ Mana | Produced$ Combo Any | Amount$ NumRemoved | References$ NumRemoved | AILogic$ MostProminentInComputerHand | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:NumRemoved:Count$RememberedSize +SVar:NumRemoved:Remembered$Amount SVar:Picture:http://www.wizards.com/global/images/magic/general/coalition_relic.jpg Oracle:{T}: Add one mana of any color to your mana pool.\n{T}: Put a charge counter on Coalition Relic.\nAt the beginning of your precombat main phase, remove all charge counters from Coalition Relic. Add one mana of any color to your mana pool for each charge counter removed this way. SetInfo:FUT Rare diff --git a/res/cardsfolder/c/covenant_of_minds.txt b/res/cardsfolder/c/covenant_of_minds.txt index 454e77ce876..0a63ad89bbd 100644 --- a/res/cardsfolder/c/covenant_of_minds.txt +++ b/res/cardsfolder/c/covenant_of_minds.txt @@ -6,7 +6,7 @@ SVar:DBChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ CovenantDraw,Co SVar:CovenantDraw:DB$ Draw | Defined$ SourceController | NumCards$ X | References$ X | ChoiceDescription$ You may choose to put those cards into that player's hand. SVar:CovenantMillDraw:DB$ Mill | Defined$ SourceController | NumCards$ X | References$ X | SubAbility$ DBDraw | ChoiceDescription$ If you don't, put those cards into that player's graveyard and that player draws five cards. SVar:DBDraw:DB$ Draw | Defined$ SourceController | NumCards$ 5 -SVar:X:Count$RememberedSize +SVar:X:Remembered$Amount SVar:Picture:http://www.wizards.com/global/images/magic/general/covenant_of_minds.jpg Oracle:Reveal the top three cards of your library. Target opponent may choose to put those cards into your hand. If he or she doesn't, put those cards into your graveyard and draw five cards. SetInfo:ALA Rare \ No newline at end of file diff --git a/res/cardsfolder/d/delaying_shield.txt b/res/cardsfolder/d/delaying_shield.txt index c90927fa52f..255c02deab2 100644 --- a/res/cardsfolder/d/delaying_shield.txt +++ b/res/cardsfolder/d/delaying_shield.txt @@ -9,7 +9,7 @@ SVar:RemoveCounters:AB$ RemoveCounter | Cost$ 0 | CounterType$ DELAY | CounterNu SVar:RepeatOnUpkeep:DB$ Repeat | MaxRepeat$ NumRemoved | References$ NumRemoved | RepeatSubAbility$ DBLoseLife | SubAbility$ DBCleanup SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 | Defined$ You | UnlessCost$ 1 W | UnlessPayer$ You SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:NumRemoved:Count$RememberedSize +SVar:NumRemoved:Remembered$Amount SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/delaying_shield.jpg Oracle:If damage would be dealt to you, put that many delay counters on Delaying Shield instead.\nAt the beginning of your upkeep, remove all delay counters from Delaying Shield. For each delay counter removed this way, you lose 1 life unless you pay {1}{W}. diff --git a/res/cardsfolder/h/hex_parasite.txt b/res/cardsfolder/h/hex_parasite.txt index dac8494b273..d884e033458 100644 --- a/res/cardsfolder/h/hex_parasite.txt +++ b/res/cardsfolder/h/hex_parasite.txt @@ -6,7 +6,7 @@ A:AB$ RemoveCounter | Cost$ X PB | ValidTgts$ Permanent | TgtPrompt$ Select targ SVar:DBPump:DB$Pump | NumAtt$ +Y | Defined$ Self | SubAbility$ DBCleanup | References$ Y SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Count$xPaid -SVar:Y:Count$RememberedSize +SVar:Y:Remembered$Amount SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/hex_parasite.jpg Oracle:{X}{B/P}: Remove up to X counters from target permanent. For each counter removed this way, Hex Parasite gets +1/+0 until end of turn. ({B/P} can be paid with either {B} or 2 life.) diff --git a/res/cardsfolder/j/jaces_archivist.txt b/res/cardsfolder/j/jaces_archivist.txt index 6e470612929..a68d1a75f2a 100644 --- a/res/cardsfolder/j/jaces_archivist.txt +++ b/res/cardsfolder/j/jaces_archivist.txt @@ -9,7 +9,7 @@ SVar:DBOppDiscard2:DB$ Discard | Cost$ 0 | Defined$ Opponent | ConditionCheckSVa SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBOppDraw | References$ X SVar:DBOppDraw:DB$ Draw | Defined$ Opponent | NumCards$ X | SubAbility$ DBCleanup | References$ X SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$RememberedSize +SVar:X:Remembered$Amount SVar:HandSizeTest:Count$CardsInOppHand/Minus.X SVar:Picture:http://www.wizards.com/global/images/magic/general/jaces_archivist.jpg Oracle:{U}, {T}: Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way. diff --git a/res/cardsfolder/m/magmasaur.txt b/res/cardsfolder/m/magmasaur.txt index 6c4b99a2010..ef7307a7e15 100644 --- a/res/cardsfolder/m/magmasaur.txt +++ b/res/cardsfolder/m/magmasaur.txt @@ -9,7 +9,7 @@ SVar:Shrink:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ SVar:SelfDestruct:DB$ Sacrifice | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ LetEmHaveIt | ChoiceDescription$ Sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player. SVar:LetEmHaveIt:DB$ DamageAll | ValidCards$ Creature.withoutFlying | ValidPlayers$ Each | NumDmg$ Y | References$ Y | SubAbility$ DBCleanup | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$RememberedSize +SVar:X:Remembered$Amount SVar:Y:Count$CardCounters.P1P1 SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/magmasaur.jpg diff --git a/res/cardsfolder/r/reviving_vapors.txt b/res/cardsfolder/r/reviving_vapors.txt index 7e61aa057b5..df5741a7ddc 100644 --- a/res/cardsfolder/r/reviving_vapors.txt +++ b/res/cardsfolder/r/reviving_vapors.txt @@ -6,7 +6,7 @@ SVar:DBimprint:DB$ Pump | ImprintCards$ ValidHand Card.IsRemembered | StackDescr SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | References$ X | SubAbility$ DBMill | StackDescription$ None SVar:X:Imprinted$CardManaCost SVar:DBMill:DB$ Mill | NumCards$ Y | References$ Y | SubAbility$ DBCleanup | StackDescription$ None -SVar:Y:Count$RememberedSize/Minus.1 +SVar:Y:Remembered$Amount/Minus.1 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/reviving_vapors.jpg Oracle:Reveal the top three cards of your library and put one of them into your hand. You gain life equal to that card's converted mana cost. Put all other cards revealed this way into your graveyard. diff --git a/res/cardsfolder/w/whispering_madness.txt b/res/cardsfolder/w/whispering_madness.txt index 780e8fc5b82..7adb8a68d76 100644 --- a/res/cardsfolder/w/whispering_madness.txt +++ b/res/cardsfolder/w/whispering_madness.txt @@ -9,7 +9,7 @@ SVar:MadnessDraw:DB$ Draw | Defined$ Each | NumCards$ MaxDiscard | SubAbility$ M SVar:MadnessReset:DB$ StoreSVar | SVar$ MaxDiscard | Type$ Number | Expression$ 0 | SubAbility$ Cipher SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0 SVar:IsEncoded:Number$0 -SVar:NumDiscard:Count$RememberedSize/Minus.1 +SVar:NumDiscard:Remembered$Amount/Minus.1 SVar:MaxDiscard:Number$0 SVar:RemAIDeck:True SVar:RemRandomDeck:True diff --git a/res/cardsfolder/w/windfall.txt b/res/cardsfolder/w/windfall.txt index 0276d2f6cee..87c5269baf8 100644 --- a/res/cardsfolder/w/windfall.txt +++ b/res/cardsfolder/w/windfall.txt @@ -7,7 +7,7 @@ SVar:WindfallSaveAmount:DB$ StoreSVar | SVar$ MaxDiscard | Type$ CountSVar | Exp SVar:WindfallCleanUp:DB$ Cleanup | ClearRemembered$ True SVar:WindfallDraw:DB$ Draw | Defined$ Each | NumCards$ MaxDiscard | SubAbility$ WindfallReset SVar:WindfallReset:DB$ StoreSVar | SVar$ MaxDiscard | Type$ Number | Expression$ 0 -SVar:NumDiscard:Count$RememberedSize/Minus.1 +SVar:NumDiscard:Remembered$Amount/Minus.1 SVar:MaxDiscard:Number$0 SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/windfall.jpg diff --git a/res/cardsfolder/w/woeleecher.txt b/res/cardsfolder/w/woeleecher.txt index 9f06ad77bf4..65196ef62bf 100644 --- a/res/cardsfolder/w/woeleecher.txt +++ b/res/cardsfolder/w/woeleecher.txt @@ -5,7 +5,7 @@ PT:3/5 A:AB$ RemoveCounter | Cost$ W T | ValidTgts$ Creature.counters_GE1_M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | RememberRemoved$ True | SubAbility$ DBGainLife | SpellDescription$ Remove a -1/-1 counter from target creature. If you do, you gain 2 life. SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 | ConditionCheckSVar$ X | ConditonSVarCompare$ GE1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$RememberedSize +SVar:X:Remembered$Amount SVar:RemAIDeck:True SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/woeleecher.jpg diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index ac1e8a4becb..5fee5e71a09 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -1448,10 +1448,6 @@ public class CardFactoryUtil { return crdname.size(); } - if (l[0].startsWith("RememberedSize")) { - return CardFactoryUtil.doXMath(c.getRemembered().size(), m, c); - } - // Count$CountersAdded if (l[0].startsWith("CountersAdded")) { final String[] components = l[0].split(" ", 3);