Miscellaneous fixes and adjustments

forge-game/src/main/java/forge/game/ability/effects/ActivateAbilityEffect.java

@@ -29,7 +29,7 @@ public class ActivateAbilityEffect extends SpellAbilityEffect {
         sb.append(" activates ");
         sb.append(Lang.nounWithAmount(1, sa.hasParam("ManaAbility") ? "mana ability" : "ability"));
         sb.append(" of each ").append(sa.getParamOrDefault("Type", "Card"));
-        sb.append(" he or she controls.");
+        sb.append(" they control.");
 
         return sb.toString();
     }

forge-game/src/main/java/forge/game/card/CardFactory.java

@@ -670,6 +670,11 @@ public class CardFactory {
                 state.setBaseLoyalty(String.valueOf(sa.getParam("SetLoyalty")));
             }
 
+            // Planning a Vizier of Many Faces rework; always might come in handy
+            if (sa.hasParam("RemoveCost")) {
+                state.setManaCost(ManaCost.NO_COST);
+            }
+
             // SVars to add to clone
             if (sa.hasParam("AddSVars") || sa.hasParam("GainTextSVars")) {
                 final String str = sa.getParamOrDefault("GainTextSVars", sa.getParam("AddSVars"));

forge-gui/res/cardsfolder/a/aethersnipe.txt

@@ -4,7 +4,6 @@ Types:Creature Elemental
 PT:4/4
 K:Evoke:1 U U
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return target nonland permanent to its owner's hand.
-SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent. | Origin$ Battlefield | Destination$ Hand
+SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Hand
 SVar:NeedsToPlayEvoked:Card.nonLand+OppCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/aethersnipe.jpg
 Oracle:When Aethersnipe enters the battlefield, return target nonland permanent to its owner's hand.\nEvoke {1}{U}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)

forge-gui/res/cardsfolder/c/countersquall.txt

@@ -1,7 +1,6 @@
 Name:Countersquall
 ManaCost:U B
 Types:Instant
-A:SP$ Counter | Cost$ U B | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target nonCreature spell | SubAbility$ DBDrain | SpellDescription$ Counter target noncreature spell. Its controller loses 2 life.
+A:SP$ Counter | Cost$ U B | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target noncreature spell | SubAbility$ DBDrain | SpellDescription$ Counter target noncreature spell. Its controller loses 2 life.
 SVar:DBDrain:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/countersquall.jpg
 Oracle:Counter target noncreature spell. Its controller loses 2 life.

forge-gui/res/cardsfolder/c/crux_of_fate.txt

@@ -3,6 +3,5 @@ ManaCost:3 B B
 Types:Sorcery
 A:SP$ Charm | Cost$ 3 B B | Choices$ DBDestroyAll,DBDestroyAll2
 SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.Dragon | SpellDescription$ Destroy all Dragon creatures.
-SVar:DBDestroyAll2:DB$ DestroyAll | ValidCards$ Creature.nonDragon | SpellDescription$ Destoy all non-Dragon creatures.
+SVar:DBDestroyAll2:DB$ DestroyAll | ValidCards$ Creature.nonDragon | SpellDescription$ Destroy all non-Dragon creatures.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crux_of_fate.jpg
 Oracle:Choose one —\n• Destroy all Dragon creatures.\n• Destroy all non-Dragon creatures.

forge-gui/res/cardsfolder/d/dovins_veto.txt

@@ -2,5 +2,5 @@ Name:Dovin's Veto
 ManaCost:W U
 Types:Instant
 K:CARDNAME can't be countered.
-A:SP$ Counter | Cost$ W U | TargetType$ Spell | TgtPrompt$ Select target nonCreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:SP$ Counter | Cost$ W U | TargetType$ Spell | TgtPrompt$ Select target noncreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
 Oracle:This spell can't be countered.\nCounter target noncreature spell.

forge-gui/res/cardsfolder/f/fierce_guardianship.txt

@@ -2,5 +2,5 @@ Name:Fierce Guardianship
 ManaCost:2 U
 Types:Instant
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
-A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target nonCreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target noncreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nCounter target noncreature spell.

forge-gui/res/cardsfolder/g/glen_elendra_archmage.txt

@@ -3,7 +3,6 @@ ManaCost:3 U
 Types:Creature Faerie Wizard
 PT:2/2
 K:Flying
-A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
 K:Persist
-SVar:Picture:http://www.wizards.com/global/images/magic/general/glen_elendra_archmage.jpg
 Oracle:Flying\n{U}, Sacrifice Glen Elendra Archmage: Counter target noncreature spell.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)

forge-gui/res/cardsfolder/h/heart_of_light.txt

@@ -3,7 +3,6 @@ ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Curse
-R:Event$ DamageDone | Prevent$ True | ValidTarget$ Creature.EnchantedBy | Description$ Prevent all combat damage that would be dealt to and dealt by enchanted creature.
+R:Event$ DamageDone | Prevent$ True | ValidTarget$ Creature.EnchantedBy | Description$ Prevent all damage that would be dealt to and dealt by enchanted creature.
-R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.EnchantedBy | Secondary$ True | Description$ Prevent all combat damage that would be dealt to and dealt by enchanted creature.
+R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.EnchantedBy | Secondary$ True | Description$ Prevent all damage that would be dealt to and dealt by enchanted creature.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/heart_of_light.jpg
 Oracle:Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)\nPrevent all damage that would be dealt to and dealt by enchanted creature.

forge-gui/res/cardsfolder/k/kheru_bloodsucker.txt

@@ -2,9 +2,8 @@ Name:Kheru Bloodsucker
 ManaCost:2 B
 Types:Creature Vampire
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+toughnessGE4 | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creture you control with toughness 4 or greater dies, each opponent loses 2 life and you gain 2 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+toughnessGE4 | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature you control with toughness 4 or greater dies, each opponent loses 2 life and you gain 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 A:AB$ PutCounter | Cost$ 2 B Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kheru_bloodsucker.jpg
 Oracle:Whenever a creature you control with toughness 4 or greater dies, each opponent loses 2 life and you gain 2 life.\n{2}{B}, Sacrifice another creature: Put a +1/+1 counter on Kheru Bloodsucker.

forge-gui/res/cardsfolder/n/negate.txt

@@ -1,6 +1,5 @@
 Name:Negate
 ManaCost:1 U
 Types:Instant
-A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target nonCreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target noncreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/negate.jpg
 Oracle:Counter target noncreature spell.

forge-gui/res/cardsfolder/n/nevermaker.txt

@@ -5,7 +5,6 @@ PT:2/3
 K:Flying
 K:Evoke:3 U
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, put target nonland permanent on top of its owner's library.
-SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0
+SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0
 SVar:NeedsToPlayEvoked:Card.nonLand+OppCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nevermaker.jpg
 Oracle:Flying\nWhen Nevermaker leaves the battlefield, put target nonland permanent on top of its owner's library.\nEvoke {3}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)

forge-gui/res/cardsfolder/n/null_brooch.txt

@@ -1,7 +1,6 @@
 Name:Null Brooch
 ManaCost:4
 Types:Artifact
-A:AB$ Counter | Cost$ 2 T Discard<0/Hand> | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | AILogic$ NullBrooch | SpellDescription$ Counter target noncreature spell.
+A:AB$ Counter | Cost$ 2 T Discard<0/Hand> | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | AILogic$ NullBrooch | SpellDescription$ Counter target noncreature spell.
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/null_brooch.jpg
 Oracle:{2}, {T}, Discard your hand: Counter target noncreature spell.

forge-gui/res/cardsfolder/s/scatter_arc.txt

@@ -1,7 +1,6 @@
 Name:Scatter Arc
 ManaCost:3 U
 Types:Instant
-A:SP$ Counter | Cost$ 3 U | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target nonCreature spell | SubAbility$ DBDraw | SpellDescription$ Counter target noncreature spell. Draw a card.
+A:SP$ Counter | Cost$ 3 U | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target noncreature spell | SubAbility$ DBDraw | SpellDescription$ Counter target noncreature spell. Draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/scatter_arc.jpg
 Oracle:Counter target noncreature spell.\nDraw a card.

forge-gui/res/cardsfolder/s/single_combat.txt

@@ -2,7 +2,7 @@ Name:Single Combat
 ManaCost:3 W W
 Types:Sorcery
 A:SP$ RepeatEach | Cost$ 3 W W | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ SacAllOthers | SpellDescription$ Each player chooses a creature or planeswalker they control, then sacrifices the rest. Players can't cast creature or planeswalker spells until the end of your next turn.
-SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature,Planeswalker | TargetControls$ True | Mandantory$ True | RememberChosen$ True
+SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature,Planeswalker | TargetControls$ True | Mandatory$ True | RememberChosen$ True
 SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered,Planeswalker.IsNotRemembered | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | Name$ Single Combat Effect | StaticAbilities$ STCantBeCast | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True

forge-gui/res/cardsfolder/s/spell_pierce.txt

@@ -1,6 +1,5 @@
 Name:Spell Pierce
 ManaCost:U
 Types:Instant
-A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | UnlessCost$ 2 | SpellDescription$ Counter target noncreature spell unless its controller pays {2}.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | UnlessCost$ 2 | SpellDescription$ Counter target noncreature spell unless its controller pays {2}.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_pierce.jpg
 Oracle:Counter target noncreature spell unless its controller pays {2}.

forge-gui/res/cardsfolder/s/spite_malice.txt

@@ -2,8 +2,7 @@ Name:Spite
 ManaCost:3 U
 AlternateMode: Split
 Types:Instant
-A:SP$ Counter | Cost$ 3 U | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:SP$ Counter | Cost$ 3 U | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/spite_malice.jpg
 Oracle:Counter target noncreature spell.
 
 ALTERNATE

forge-gui/res/cardsfolder/s/stronghold_machinist.txt

@@ -2,7 +2,6 @@ Name:Stronghold Machinist
 ManaCost:2 U
 Types:Creature Human Spellshaper
 PT:1/1
-A:AB$ Counter | Cost$ U U T Discard<1/Card> | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:AB$ Counter | Cost$ U U T Discard<1/Card> | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_machinist.jpg
 Oracle:{U}{U}, {T}, Discard a card: Counter target noncreature spell.

forge-gui/res/cardsfolder/s/stubborn_denial.txt

@@ -1,7 +1,6 @@
 Name:Stubborn Denial
 ManaCost:U
 Types:Instant
-A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature | UnlessCost$ 1 | ConditionPresent$ Creature.YouCtrl+powerGE4 | ConditionCompare$ EQ0 | StackDescription$ SpellDescription | SubAbility$ DBCounter | SpellDescription$ Counter target noncreature spell unless its controller pays {1}. Ferocious — If you control a creature with power 4 or greater, counter that spell instead.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | UnlessCost$ 1 | ConditionPresent$ Creature.YouCtrl+powerGE4 | ConditionCompare$ EQ0 | StackDescription$ SpellDescription | SubAbility$ DBCounter | SpellDescription$ Counter target noncreature spell unless its controller pays {1}. Ferocious — If you control a creature with power 4 or greater, counter that spell instead.
 SVar:DBCounter:DB$ Counter | Defined$ Targeted | ConditionPresent$ Creature.YouCtrl+powerGE4 | ConditionCompare$ GE1 | StackDescription$ None
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stubborn_denial.jpg
 Oracle:Counter target noncreature spell unless its controller pays {1}.\nFerocious — If you control a creature with power 4 or greater, counter that spell instead.

forge-gui/res/cardsfolder/t/torrent_of_lava.txt

@@ -6,7 +6,6 @@ SVar:X:Count$xPaid
 S:Mode$ Continuous | Affected$ Creature | AddAbility$ DbPrevent | AddSVar$ TOLOutOfSight & TOLSTPrevent & TOLExileSelf | EffectZone$ Stack | Description$ As long as Torrent of Lava is on the stack, each creature has "{T}: Prevent the next 1 damage that would be dealt to this creature by CARDNAME this turn."
 SVar:DbPrevent:AB$ Effect | Cost$ T | RememberObjects$ OriginalHost | ImprintCards$ Self | Triggers$ TOLOutOfSight | SVars$ TOLExileSelf | StaticAbilities$ TOLSTPrevent | SpellDescription$ Prevent the next 1 damage that would be dealt to this creature by Torrent of Lava this turn. | StackDescription$ SpellDescription
 SVar:TOLSTPrevent:Mode$ PreventDamage | EffectZone$ Command | Amount$ 1 | Target$ Card.IsImprinted | Source$ Card.IsRemembered | Description$ Prevent the next 1 damage that would be dealt to this creature by remembered Card this turn.
-SVar:TOLOutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ ExileSelf | Static$ True
+SVar:TOLOutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ TOLExileSelf | Static$ True
 SVar:TOLExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:Picture:http://www.wizards.com/global/images/magic/general/torrent_of_lava.jpg
 Oracle:Torrent of Lava deals X damage to each creature without flying.\nAs long as Torrent of Lava is on the stack, each creature has "{T}: Prevent the next 1 damage that would be dealt to this creature by Torrent of Lava this turn."

forge-gui/res/cardsfolder/u/ulvenwald_observer.txt

@@ -2,7 +2,6 @@ Name:Ulvenwald Observer
 ManaCost:4 G G
 Types:Creature Treefolk
 PT:6/6
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+toughnessGE4 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creture you control with toughness 4 or greater dies, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+toughnessGE4 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control with toughness 4 or greater dies, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ulvenwald_observer.jpg
 Oracle:Whenever a creature you control with toughness 4 or greater dies, draw a card.