Add additional hint to all remaining non-variable additional-cost cards

And also adds a couple more test scenarios.

Author: matoro

Mage.Sets/src/mage/cards/a/AbhorrentOculus.java

@@ -30,7 +30,7 @@ public AbhorrentOculus(UUID ownerId, CardSetInfo setInfo) {
         // As an additional cost to cast this spell, exile six cards from your graveyard.
         this.getSpellAbility().addCost(new ExileFromGraveCost(
                 new TargetCardInYourGraveyard(6, StaticFilters.FILTER_CARDS_FROM_YOUR_GRAVEYARD)
-        ));
+        ).setAdditional(true));
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());

Mage.Sets/src/mage/cards/a/Abjure.java

@@ -11,7 +11,6 @@
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.target.TargetSpell;
-import mage.target.common.TargetControlledPermanent;
 
 /**
  *
@@ -29,7 +28,7 @@ public Abjure(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
 
         // As an additional cost to cast Abjure, sacrifice a blue permanent.
-        this.getSpellAbility().addCost(new SacrificeTargetCost(filter));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(filter).setAdditional(true));
 
         // Counter target spell.
         this.getSpellAbility().addEffect(new CounterTargetEffect());

Mage.Sets/src/mage/cards/a/AcceptableLosses.java

@@ -20,7 +20,7 @@ public AcceptableLosses(UUID ownerId, CardSetInfo setInfo) {
 
 
         // As an additional cost to cast Acceptable Losses, discard a card at random.
-        this.getSpellAbility().addCost(new DiscardCardCost(true));
+        this.getSpellAbility().addCost(new DiscardCardCost(true).setAdditional(true));
         // Acceptable Losses deals 5 damage to target creature.
         this.getSpellAbility().addEffect(new DamageTargetEffect(5));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/a/AltarOfBone.java

@@ -8,7 +8,6 @@
 import mage.constants.CardType;
 import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInLibrary;
-import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
  *
@@ -20,7 +19,7 @@ public AltarOfBone(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{G}{W}");
 
         // As an additional cost to cast Altar of Bone, sacrifice a creature.
-        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE).setAdditional(true));
         // Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library.
         this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true));
     }

Mage.Sets/src/mage/cards/a/AltarsReap.java

@@ -8,7 +8,6 @@
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.StaticFilters;
-import mage.target.common.TargetControlledCreaturePermanent;
 
 /**
  *
@@ -21,7 +20,7 @@ public AltarsReap(UUID ownerId, CardSetInfo setInfo) {
 
 
         // As an additional cost to cast Altar's Reap, sacrifice a creature.
-        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE).setAdditional(true));
         // Draw two cards.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2));
     }

Mage.Sets/src/mage/cards/a/AnchorToReality.java

@@ -31,7 +31,7 @@ public AnchorToReality(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}{U}");
 
         // As an additional cost to cast this spell, sacrifice an artifact or creature.
-        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE).setAdditional(true));
 
         // Search your library for an Equipment or Vehicle card, put that card onto the battlefield, then shuffle. If it has mana value less than the sacrificed permanent's mana value, scry 2.
         this.getSpellAbility().addEffect(new AnchorToRealityEffect());

Mage.Sets/src/mage/cards/a/AngelicPurge.java

@@ -8,10 +8,8 @@
 import mage.constants.CardType;
 import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
 import mage.target.TargetPermanent;
-import mage.target.common.TargetControlledPermanent;
 
 /**
  *
@@ -31,7 +29,7 @@ public AngelicPurge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}");
 
         // As an additional cost to cast Angelic Purge, sacrifice a permanent.
-        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT).setAdditional(true));
 
         // Exile target artifact, creature, or enchantment.
         this.getSpellAbility().addEffect(new ExileTargetEffect());

Mage.Sets/src/mage/cards/a/AnnihilatingGlare.java

@@ -1,6 +1,5 @@
 package mage.cards.a;
 
-import mage.abilities.costs.Cost;
 import mage.abilities.costs.OrCost;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.GenericManaCost;
@@ -9,7 +8,6 @@
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.filter.StaticFilters;
-import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreatureOrPlaneswalker;
 
 import java.util.UUID;
@@ -27,7 +25,7 @@ public AnnihilatingGlare(UUID ownerId, CardSetInfo setInfo) {
         // As an additional cost to cast this spell, pay {4} or sacrifice an artifact or creature.
         this.getSpellAbility().addCost(new OrCost("pay {4} or sacrifice an artifact or creature",
                 new GenericManaCost(4),
-                new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE)
+                new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE).setAdditional(true)
         ));
         // Destroy target creature or planeswalker.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());

Mage.Sets/src/mage/cards/a/ArbiterOfWoe.java

@@ -31,7 +31,7 @@ public ArbiterOfWoe(UUID ownerId, CardSetInfo setInfo) {
         this.toughness = new MageInt(4);
 
         // As an additional cost to cast this spell, sacrifice a creature.
-        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE).setAdditional(true));
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());

Mage.Sets/src/mage/cards/a/Artillerize.java

@@ -8,7 +8,6 @@
 import mage.constants.CardType;
 import mage.filter.StaticFilters;
 import mage.target.common.TargetAnyTarget;
-import mage.target.common.TargetControlledPermanent;
 
 import java.util.UUID;
 
@@ -20,7 +19,7 @@ public final class Artillerize extends CardImpl {
     public Artillerize(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
 
-        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE));
+        this.getSpellAbility().addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE).setAdditional(true));
         this.getSpellAbility().addTarget(new TargetAnyTarget());
         this.getSpellAbility().addEffect(new DamageTargetEffect(5));
     }