Implement adventures.

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

@@ -43,16 +43,16 @@ public AnimatingFaerie(UUID ownerId, CardSetInfo setInfo) {
 
         // Bring to Life
         // Target noncreature artifact you control becomes a 0/0 artifact creature. Put four +1/+1 counters on it.
-        this.getAdventureSpellAbility().addEffect(new AddCardTypeTargetEffect(
+        this.getSpellCard().getSpellAbility().addEffect(new AddCardTypeTargetEffect(
                 Duration.EndOfGame, CardType.ARTIFACT, CardType.CREATURE
         ).setText("Target noncreature artifact you control becomes"));
-        this.getAdventureSpellAbility().addEffect(new SetPowerToughnessTargetEffect(
+        this.getSpellCard().getSpellAbility().addEffect(new SetPowerToughnessTargetEffect(
                 0, 0, Duration.EndOfGame
         ).setText("a 0/0 artifact creature."));
-        this.getAdventureSpellAbility().addEffect(new AddCountersTargetEffect(
+        this.getSpellCard().getSpellAbility().addEffect(new AddCountersTargetEffect(
                 CounterType.P1P1.createInstance(4)
         ).setText("Put four +1/+1 counters on it."));
-        this.getAdventureSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetPermanent(filter));
     }
 
     private AnimatingFaerie(final AnimatingFaerie card) {

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

@@ -29,8 +29,8 @@ public ArdenvaleTactician(UUID ownerId, CardSetInfo setInfo) {
 
         // Dizzying Swoop
         // Tap up to two target creatures.
-        this.getAdventureSpellAbility().addEffect(new TapTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent(0, 2));
+        this.getSpellCard().getSpellAbility().addEffect(new TapTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2));
     }
 
     private ArdenvaleTactician(final ArdenvaleTactician card) {

Mage.Sets/src/mage/cards/b/BeanstalkGiant.java

@@ -37,7 +37,7 @@ public BeanstalkGiant(UUID ownerId, CardSetInfo setInfo) {
 
         // Fertile Footsteps
         // Search your library for a basic land card, put it onto the battlefield, then shuffle your library.
-        this.getAdventureSpellAbility().addEffect(
+        this.getSpellCard().getSpellAbility().addEffect(
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND))
         );
     }

Mage.Sets/src/mage/cards/b/BonecrusherGiant.java

@@ -34,9 +34,9 @@ public BonecrusherGiant(UUID ownerId, CardSetInfo setInfo) {
 
         // Stomp
         // Damage can’t be prevented this turn. Stomp deals 2 damage to any target.
-        this.getAdventureSpellAbility().addEffect(new StompEffect());
-        this.getAdventureSpellAbility().addEffect(new DamageTargetEffect(2));
-        this.getAdventureSpellAbility().addTarget(new TargetAnyTarget());
+        this.getSpellCard().getSpellAbility().addEffect(new StompEffect());
+        this.getSpellCard().getSpellAbility().addEffect(new DamageTargetEffect(2));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetAnyTarget());
     }
 
     private BonecrusherGiant(final BonecrusherGiant card) {

Mage.Sets/src/mage/cards/b/BrazenBorrower.java

@@ -48,8 +48,8 @@ public BrazenBorrower(UUID ownerId, CardSetInfo setInfo) {
 
         // Petty Theft
         // Return target nonland permanent an opponent controls to its owner's hand.
-        this.getAdventureSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellCard().getSpellAbility().addEffect(new ReturnToHandTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetPermanent(filter));
     }
 
     private BrazenBorrower(final BrazenBorrower card) {

Mage.Sets/src/mage/cards/c/CuriousPair.java

@@ -25,7 +25,7 @@ public CuriousPair(UUID ownerId, CardSetInfo setInfo) {
 
         // Treats to Share
         // Create a Food token.
-        this.getAdventureSpellAbility().addEffect(new CreateTokenEffect(new FoodToken()));
+        this.getSpellCard().getSpellAbility().addEffect(new CreateTokenEffect(new FoodToken()));
     }
 
     private CuriousPair(final CuriousPair card) {

Mage.Sets/src/mage/cards/e/EmberethShieldbreaker.java

@@ -25,8 +25,8 @@ public EmberethShieldbreaker(UUID ownerId, CardSetInfo setInfo) {
 
         // Battle Display
         // Destroy target artifact.
-        this.getAdventureSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetArtifactPermanent());
+        this.getSpellCard().getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetArtifactPermanent());
     }
 
     private EmberethShieldbreaker(final EmberethShieldbreaker card) {

Mage.Sets/src/mage/cards/f/FaeOfWishes.java

@@ -42,7 +42,7 @@ public FaeOfWishes(UUID ownerId, CardSetInfo setInfo) {
 
         // Granted
         // You may choose a noncreature card you own from outside the game, reveal it, and put it into your hand.
-        this.getAdventureSpellAbility().addEffect(new WishEffect(StaticFilters.FILTER_CARD_A_NON_LAND));
+        this.getSpellCard().getSpellAbility().addEffect(new WishEffect(StaticFilters.FILTER_CARD_A_NON_LAND));
     }
 
     private FaeOfWishes(final FaeOfWishes card) {

Mage.Sets/src/mage/cards/f/FaerieGuidemother.java

@@ -30,13 +30,13 @@ public FaerieGuidemother(UUID ownerId, CardSetInfo setInfo) {
 
         // Gift of the Fae
         // Target creature gets +2/+1 and gains flying until end of turn.
-        this.getAdventureSpellAbility().addEffect(new BoostTargetEffect(
+        this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(
                 2, 1, Duration.EndOfTurn
         ).setText("Target creature gets +2/+1"));
-        this.getAdventureSpellAbility().addEffect(new GainAbilityTargetEffect(
+        this.getSpellCard().getSpellAbility().addEffect(new GainAbilityTargetEffect(
                 FlyingAbility.getInstance(), Duration.EndOfTurn
         ).setText("and gains flying until end of turn"));
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     private FaerieGuidemother(final FaerieGuidemother card) {

Mage.Sets/src/mage/cards/f/FlaxenIntruder.java

@@ -44,7 +44,7 @@ public FlaxenIntruder(UUID ownerId, CardSetInfo setInfo) {
 
         // Welcome Home
         // Create three 2/2 green Bear creature tokens.
-        this.getAdventureSpellAbility().addEffect(new CreateTokenEffect(new BearToken(), 3));
+        this.getSpellCard().getSpellAbility().addEffect(new CreateTokenEffect(new BearToken(), 3));
     }
 
     private FlaxenIntruder(final FlaxenIntruder card) {

Mage.Sets/src/mage/cards/f/FoulmireKnight.java

@@ -29,8 +29,8 @@ public FoulmireKnight(UUID ownerId, CardSetInfo setInfo) {
 
         // Profane Insight
         // You draw a card and you lose 1 life.
-        this.getAdventureSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("You draw a card and"));
-        this.getAdventureSpellAbility().addEffect(new LoseLifeSourceControllerEffect(1));
+        this.getSpellCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).setText("You draw a card and"));
+        this.getSpellCard().getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(1));
     }
 
     private FoulmireKnight(final FoulmireKnight card) {

Mage.Sets/src/mage/cards/g/GarenbrigCarver.java

@@ -26,8 +26,8 @@ public GarenbrigCarver(UUID ownerId, CardSetInfo setInfo) {
 
         // Shield's Might
         // Target creature gets +2/+2 until end of turn.
-        this.getAdventureSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     private GarenbrigCarver(final GarenbrigCarver card) {

Mage.Sets/src/mage/cards/g/GiantKiller.java

@@ -47,8 +47,8 @@ public GiantKiller(UUID ownerId, CardSetInfo setInfo) {
 
         // Chop Down
         // Destroy target creature with power 4 or greater.
-        this.getAdventureSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellCard().getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetPermanent(filter));
     }
 
     private GiantKiller(final GiantKiller card) {

Mage.Sets/src/mage/cards/h/HypnoticSprite.java

@@ -37,8 +37,8 @@ public HypnoticSprite(UUID ownerId, CardSetInfo setInfo) {
 
         // Mesmeric Glare
         // Counter target spell with converted mana cost 3 or less.
-        this.getAdventureSpellAbility().addEffect(new CounterTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetSpell(filter));
+        this.getSpellCard().getSpellAbility().addEffect(new CounterTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetSpell(filter));
     }
 
     private HypnoticSprite(final HypnoticSprite card) {

Mage.Sets/src/mage/cards/l/LonesomeUnicorn.java

@@ -28,7 +28,7 @@ public LonesomeUnicorn(UUID ownerId, CardSetInfo setInfo) {
 
         // Rider in Need
         // Create a 2/2 white Knight creature token with vigilance.
-        this.getAdventureSpellAbility().addEffect(new CreateTokenEffect(new KnightToken()));
+        this.getSpellCard().getSpellAbility().addEffect(new CreateTokenEffect(new KnightToken()));
     }
 
     private LonesomeUnicorn(final LonesomeUnicorn card) {

Mage.Sets/src/mage/cards/l/LovestruckBeast.java

@@ -39,7 +39,7 @@ public LovestruckBeast(UUID ownerId, CardSetInfo setInfo) {
 
         // Heart's Desire
         // Create a 1/1 white Human creature token.
-        this.getAdventureSpellAbility().addEffect(new CreateTokenEffect(new HumanToken()));
+        this.getSpellCard().getSpellAbility().addEffect(new CreateTokenEffect(new HumanToken()));
     }
 
     private LovestruckBeast(final LovestruckBeast card) {

Mage.Sets/src/mage/cards/m/MerchantOfTheVale.java

@@ -36,7 +36,7 @@ public MerchantOfTheVale(UUID ownerId, CardSetInfo setInfo) {
 
         // Haggle
         // You may discard a card. If you do, draw a card.
-        this.getAdventureSpellAbility().addEffect(new DoIfCostPaid(
+        this.getSpellCard().getSpellAbility().addEffect(new DoIfCostPaid(
                 new DrawCardSourceControllerEffect(1), new DiscardCardCost()
         ));
     }

Mage.Sets/src/mage/cards/m/MerfolkSecretkeeper.java

@@ -25,8 +25,8 @@ public MerfolkSecretkeeper(UUID ownerId, CardSetInfo setInfo) {
 
         // Venture Deeper
         // Target player puts the top four cards of their library into their graveyard.
-        this.getAdventureSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4));
-        this.getAdventureSpellAbility().addTarget(new TargetPlayer());
+        this.getSpellCard().getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetPlayer());
     }
 
     private MerfolkSecretkeeper(final MerfolkSecretkeeper card) {

Mage.Sets/src/mage/cards/m/MurderousRider.java

@@ -37,11 +37,11 @@ public MurderousRider(UUID ownerId, CardSetInfo setInfo) {
 
         // Swift End
         // Destroy target creature or planeswalker. You lose 2 life.
-        this.getAdventureSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getAdventureSpellAbility().addEffect(
+        this.getSpellCard().getSpellAbility().addEffect(new DestroyTargetEffect());
+        this.getSpellCard().getSpellAbility().addEffect(
                 new LoseLifeSourceControllerEffect(2).setText("You lose 2 life.")
         );
-        this.getAdventureSpellAbility().addTarget(new TargetCreatureOrPlaneswalker());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreatureOrPlaneswalker());
     }
 
     private MurderousRider(final MurderousRider card) {

Mage.Sets/src/mage/cards/o/OakhameRanger.java

@@ -34,7 +34,7 @@ public OakhameRanger(UUID ownerId, CardSetInfo setInfo) {
 
         // Bring Back
         // Create two 1/1 white Human creature tokens.
-        this.getAdventureSpellAbility().addEffect(new CreateTokenEffect(new HumanToken(), 2));
+        this.getSpellCard().getSpellAbility().addEffect(new CreateTokenEffect(new HumanToken(), 2));
     }
 
     private OakhameRanger(final OakhameRanger card) {

Mage.Sets/src/mage/cards/o/OrderOfMidnight.java

@@ -34,8 +34,8 @@ public OrderOfMidnight(UUID ownerId, CardSetInfo setInfo) {
 
         // Alter Fate
         // Return target creature card from your graveyard to your hand.
-        this.getAdventureSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
+        this.getSpellCard().getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
     }
 
     private OrderOfMidnight(final OrderOfMidnight card) {

Mage.Sets/src/mage/cards/q/QueenOfIce.java

@@ -39,10 +39,10 @@ public QueenOfIce(UUID ownerId, CardSetInfo setInfo) {
 
         // Rage of Winter
         // Tap target creature. It doesn’t untap during its controller’s next untap step.
-        this.getAdventureSpellAbility().addEffect(new TapTargetEffect());
-        this.getAdventureSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect()
+        this.getSpellCard().getSpellAbility().addEffect(new TapTargetEffect());
+        this.getSpellCard().getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect()
                 .setText("It doesn't untap during its controller's next untap step"));
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     private QueenOfIce(final QueenOfIce card) {

Mage.Sets/src/mage/cards/r/RealmCloakedGiant.java

@@ -37,7 +37,7 @@ public RealmCloakedGiant(UUID ownerId, CardSetInfo setInfo) {
 
         // Cast Off
         // Destroy all non-Giant creatures.
-        this.getAdventureSpellAbility().addEffect(new DestroyAllEffect(filter));
+        this.getSpellCard().getSpellAbility().addEffect(new DestroyAllEffect(filter));
     }
 
     private RealmCloakedGiant(final RealmCloakedGiant card) {

Mage.Sets/src/mage/cards/r/ReaperOfNight.java

@@ -41,8 +41,8 @@ public ReaperOfNight(UUID ownerId, CardSetInfo setInfo) {
 
         // Harvest Fear
         // Target opponent discards two cards.
-        this.getAdventureSpellAbility().addEffect(new DiscardTargetEffect(2));
-        this.getAdventureSpellAbility().addTarget(new TargetOpponent());
+        this.getSpellCard().getSpellAbility().addEffect(new DiscardTargetEffect(2));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetOpponent());
     }
 
     private ReaperOfNight(final ReaperOfNight card) {

Mage.Sets/src/mage/cards/r/RimrockKnight.java

@@ -30,8 +30,8 @@ public RimrockKnight(UUID ownerId, CardSetInfo setInfo) {
 
         // Boulder Rush
         // Target creature gets +2/+0 until end of turn.
-        this.getAdventureSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn));
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     private RimrockKnight(final RimrockKnight card) {

Mage.Sets/src/mage/cards/r/RosethornAcolyte.java

@@ -28,7 +28,7 @@ public RosethornAcolyte(UUID ownerId, CardSetInfo setInfo) {
 
         // Seasonal Ritual
         // Add one mana of any color.
-        this.getAdventureSpellAbility().addEffect(new AddManaOfAnyColorEffect());
+        this.getSpellCard().getSpellAbility().addEffect(new AddManaOfAnyColorEffect());
     }
 
     private RosethornAcolyte(final RosethornAcolyte card) {

Mage.Sets/src/mage/cards/s/ShepherdOfTheFlock.java

@@ -25,8 +25,8 @@ public ShepherdOfTheFlock(UUID ownerId, CardSetInfo setInfo) {
 
         // Usher to Safety
         // Return target permanent you control to its owner’s hand.
-        this.getAdventureSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getAdventureSpellAbility().addTarget(new TargetControlledPermanent());
+        this.getSpellCard().getSpellAbility().addEffect(new ReturnToHandTargetEffect());
+        this.getSpellCard().getSpellAbility().addTarget(new TargetControlledPermanent());
     }
 
     private ShepherdOfTheFlock(final ShepherdOfTheFlock card) {

Mage.Sets/src/mage/cards/s/SilverflameSquire.java

@@ -27,9 +27,9 @@ public SilverflameSquire(UUID ownerId, CardSetInfo setInfo) {
 
         // On Alert
         // Target creature gets +2/+2 until end of turn. Untap it.
-        this.getAdventureSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
-        this.getAdventureSpellAbility().addEffect(new UntapTargetEffect().setText("Untap it"));
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
+        this.getSpellCard().getSpellAbility().addEffect(new UntapTargetEffect().setText("Untap it"));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     private SilverflameSquire(final SilverflameSquire card) {

Mage.Sets/src/mage/cards/s/SmittenSwordmaster.java

@@ -33,7 +33,7 @@ public SmittenSwordmaster(UUID ownerId, CardSetInfo setInfo) {
 
         // Curry Favor
         // You gain X life and each opponent loses X life, where X is the number of Knights you control.
-        this.getAdventureSpellAbility().addEffect(new CurryFavorEffect());
+        this.getSpellCard().getSpellAbility().addEffect(new CurryFavorEffect());
     }
 
     private SmittenSwordmaster(final SmittenSwordmaster card) {

Mage.Sets/src/mage/cards/t/TuinvaleTreefolk.java

@@ -26,8 +26,8 @@ public TuinvaleTreefolk(UUID ownerId, CardSetInfo setInfo) {
 
         // Oaken Boon
         // Put two +1/+1 counters on target creature.
-        this.getAdventureSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)));
-        this.getAdventureSpellAbility().addTarget(new TargetCreaturePermanent());
+        this.getSpellCard().getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)));
+        this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     private TuinvaleTreefolk(final TuinvaleTreefolk card) {

Mage.Sets/src/mage/sets/ThroneOfEldraine.java

@@ -327,8 +327,5 @@ private ThroneOfEldraine() {
         cards.add(new SetCardInfo("Worthy Knight", 36, Rarity.RARE, mage.cards.w.WorthyKnight.class));
         cards.add(new SetCardInfo("Yorvo, Lord of Garenbrig", 185, Rarity.RARE, mage.cards.y.YorvoLordOfGarenbrig.class));
         cards.add(new SetCardInfo("Youthful Knight", 37, Rarity.COMMON, mage.cards.y.YouthfulKnight.class));
-
-        // This is here to prevent the incomplete adventure implementation from causing problems and will be removed
-        cards.removeIf(setCardInfo -> AdventureCard.class.isAssignableFrom(setCardInfo.getCardClass()));
     }
 }

Mage.Sets/src/mage/sets/ThroneOfEldraineCollectorsEdition.java

@@ -111,8 +111,5 @@ private ThroneOfEldraineCollectorsEdition() {
         cards.add(new SetCardInfo("Witch's Vengeance", 358, Rarity.RARE, mage.cards.w.WitchsVengeance.class));
         cards.add(new SetCardInfo("Worthy Knight", 341, Rarity.RARE, mage.cards.w.WorthyKnight.class));
         cards.add(new SetCardInfo("Yorvo, Lord of Garenbrig", 376, Rarity.RARE, mage.cards.y.YorvoLordOfGarenbrig.class));
-
-        // This is here to prevent the incomplete adventure implementation from causing problems and will be removed
-        cards.removeIf(setCardInfo -> AdventureCard.class.isAssignableFrom(setCardInfo.getCardClass()));
     }
 }