From 9fd43746390bf2e2dd01089963941b85cf39cd40 Mon Sep 17 00:00:00 2001 From: theelk801 Date: Mon, 2 Jun 2025 17:26:49 -0400 Subject: [PATCH] merge fix --- Mage.Sets/src/mage/cards/e/ExtraplanarLens.java | 7 +++++-- Mage.Sets/src/mage/cards/i/InvasiveSurgery.java | 1 - Mage.Sets/src/mage/cards/m/MechanizedProduction.java | 10 ++-------- Mage.Sets/src/mage/cards/r/Remembrance.java | 5 ----- Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java | 4 ++-- Mage.Sets/src/mage/cards/t/TibaltsTrickery.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantSuccession.java | 5 ----- 7 files changed, 10 insertions(+), 24 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java index b6477c278f1..575d1efcf1c 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java +++ b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java @@ -9,8 +9,11 @@ import mage.abilities.mana.TriggeredManaAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; -import mage.filter.common.FilterLandPermanent; +import mage.constants.AbilityWord; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.filter.StaticFilters; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ManaEvent; diff --git a/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java b/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java index 3b916b8f8dc..0d3ab6078b8 100644 --- a/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java +++ b/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.dynamicvalue.common.CardTypesInGraveyardCount; import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect; -import mage.abilities.hint.common.CardTypesInGraveyardHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/cards/m/MechanizedProduction.java b/Mage.Sets/src/mage/cards/m/MechanizedProduction.java index 1d91dda2413..0be812f239b 100644 --- a/Mage.Sets/src/mage/cards/m/MechanizedProduction.java +++ b/Mage.Sets/src/mage/cards/m/MechanizedProduction.java @@ -1,24 +1,20 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CreateTokenCopyTargetEffect; import mage.abilities.effects.common.WinGameSourceControllerEffect; import mage.abilities.keyword.EnchantAbility; +import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; -import mage.filter.common.FilterArtifactPermanent; -import mage.filter.common.FilterControlledArtifactPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -47,9 +43,7 @@ public final class MechanizedProduction extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of your upkeep, create a token that's a copy of enchanted artifact. Then if you control eight or more artifacts with the same name as one another, you win the game. - Ability ability = new BeginningOfUpkeepTriggeredAbility( - new MechanizedProductionEffect(), TargetController.YOU, false - ); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new MechanizedProductionEffect(), false); ability.addEffect(new ConditionalOneShotEffect( new WinGameSourceControllerEffect(), MechanizedProductionCondition.instance, "Then if you control eight or more artifacts with the same name as one another, you win the game" diff --git a/Mage.Sets/src/mage/cards/r/Remembrance.java b/Mage.Sets/src/mage/cards/r/Remembrance.java index bc5c7ce2480..b2db20db709 100644 --- a/Mage.Sets/src/mage/cards/r/Remembrance.java +++ b/Mage.Sets/src/mage/cards/r/Remembrance.java @@ -70,9 +70,4 @@ class RemembranceEffect extends OneShotEffect { filter.add(new SharesNamePredicate(permanent)); return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source); } - - @Override - public boolean isInUseableZone(Game game, MageObject sourceObject, GameEvent event) { - return TriggeredAbilityImpl.isInUseableZoneDiesTrigger(this, sourceObject, event, game); - } } diff --git a/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java b/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java index 0024e992022..07e9d5a48c4 100644 --- a/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java +++ b/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java @@ -2,13 +2,13 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.keyword.BolsterEffect; import mage.abilities.hint.Hint; import mage.abilities.hint.ValueHint; import mage.abilities.keyword.TrampleAbility; +import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -39,7 +39,7 @@ public final class SandsteppeWarRiders extends CardImpl { // At the beginning of combat on your turn, bolster X, where X is the number of differently named artifact tokens you control. this.addAbility(new BeginningOfCombatTriggeredAbility( - new BolsterEffect(SandsteppeWarRidersValue.instance), TargetController.YOU, false + new BolsterEffect(SandsteppeWarRidersValue.instance) ).addHint(SandsteppeWarRidersValue.getHint())); } diff --git a/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java b/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java index c47280b3593..5de86a84a1b 100644 --- a/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java +++ b/Mage.Sets/src/mage/cards/t/TibaltsTrickery.java @@ -89,7 +89,7 @@ class TibaltsTrickeryEffect extends OneShotEffect { } } controller.moveCardsToExile(cardsToExile, source, game, true, source.getSourceId(), - CardUtil.createObjectRealtedWindowTitle(source, game, null)); + CardUtil.createObjectRelatedWindowTitle(source, game, null)); if (cardToCast != null) { if (controller.chooseUse(Outcome.PlayForFree, "Cast " + cardToCast.getLogName() + " for free?", source, game)) { game.getState().setValue("PlayFromNotOwnHandZone" + cardToCast.getId(), Boolean.TRUE); diff --git a/Mage.Sets/src/mage/cards/v/VerdantSuccession.java b/Mage.Sets/src/mage/cards/v/VerdantSuccession.java index e6a709c83a7..cbccf48b3eb 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantSuccession.java +++ b/Mage.Sets/src/mage/cards/v/VerdantSuccession.java @@ -50,11 +50,6 @@ public final class VerdantSuccession extends CardImpl { public VerdantSuccession copy() { return new VerdantSuccession(this); } - - @Override - public boolean isInUseableZone(Game game, MageObject sourceObject, GameEvent event) { - return TriggeredAbilityImpl.isInUseableZoneDiesTrigger(this, sourceObject, event, game); - } } class VerdantSuccessionEffect extends OneShotEffect {