diff --git a/forge-gui/res/cardsfolder/i/isleback_spawn.txt b/forge-gui/res/cardsfolder/i/isleback_spawn.txt index 9cb1c59cb54..9442ad42d44 100644 --- a/forge-gui/res/cardsfolder/i/isleback_spawn.txt +++ b/forge-gui/res/cardsfolder/i/isleback_spawn.txt @@ -3,8 +3,7 @@ ManaCost:5 U U Types:Creature Kraken PT:4/8 K:Shroud -S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 8 | CheckSVar$ X | SVarCompare$ LEY | Description$ CARDNAME gets +4/+8 as long as a library has twenty or fewer cards in it. -SVar:Y:Number$20 -SVar:X:Count$LowestLibrary +S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 8 | CheckSVar$ X | SVarCompare$ LE20 | Description$ CARDNAME gets +4/+8 as long as a library has twenty or fewer cards in it. +SVar:X:PlayerCountPlayers$LowestValidLibrary Card.YouOwn SVar:Picture:http://www.wizards.com/global/images/magic/general/isleback_spawn.jpg Oracle:Shroud\nIsleback Spawn gets +4/+8 as long as a library has twenty or fewer cards in it. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/s/shelldock_isle.txt b/forge-gui/res/cardsfolder/s/shelldock_isle.txt index 81edbae0fd8..fe9751cf17b 100644 --- a/forge-gui/res/cardsfolder/s/shelldock_isle.txt +++ b/forge-gui/res/cardsfolder/s/shelldock_isle.txt @@ -5,9 +5,8 @@ K:Hideaway T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library. SVar:TrigDig:AB$ Dig | Cost$ 0 | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | RememberChanged$ True A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool. -A:AB$ Play | Cost$ U T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LEY | ForgetRemembered$ True | References$ X,Y | SpellDescription$ You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it. -SVar:Y:Number$20 -SVar:X:Count$LowestLibrary +A:AB$ Play | Cost$ U T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LE20 | ForgetRemembered$ True | References$ X | SpellDescription$ You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it. +SVar:X:PlayerCountPlayers$LowestValidLibrary Card.YouOwn SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/shelldock_isle.jpg Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {U} to your mana pool.\n{U}, {T}: You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it. \ No newline at end of file diff --git a/forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java index 349b93d615a..09747c534e8 100644 --- a/forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1173,11 +1173,6 @@ public class CardFactoryUtil { } return enchantedControllerInPlay.size(); } - - // Count$LowestLibrary - if (sq[0].contains("LowestLibrary")) { - return Aggregates.min(cc.getGame().getPlayers(), Player.Accessors.countCardsInZone(ZoneType.Library)); - } // Count$MonstrosityMagnitude if (sq[0].contains("MonstrosityMagnitude")) { diff --git a/forge-gui/src/main/java/forge/game/player/Player.java b/forge-gui/src/main/java/forge/game/player/Player.java index ffbb3f34244..cf0dc69bc9a 100644 --- a/forge-gui/src/main/java/forge/game/player/Player.java +++ b/forge-gui/src/main/java/forge/game/player/Player.java @@ -2745,14 +2745,6 @@ public class Player extends GameEntity implements Comparable { } }; - public static Function countCardsInZone(final ZoneType zone) { - return new Function() { - @Override - public Integer apply(Player input) { - return input.getZone(zone).size(); - } - }; - } } /**