diff --git a/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java b/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java index 64e04ba52dc..87244ec49bb 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java b/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java index 6f076ca6896..fb2f33afd39 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java @@ -30,7 +30,7 @@ package mage.sets.avacynrestored; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java index bffcdba4f22..b2777d9192c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java @@ -37,7 +37,7 @@ import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java index c46c61d58d7..b30b7184d4a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java @@ -44,7 +44,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java index 45ba5f46164..bb82bd72d2a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java @@ -33,7 +33,7 @@ import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.ControlsBiggestOrTiedCreatureCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.TargetController; import mage.target.Target; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java index 0bbac5c07c5..94bb8fb4183 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OkibaGangShinobi.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java index eb7a3fdc9af..9f75e1d3ec9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java @@ -30,7 +30,7 @@ package mage.sets.betrayersofkamigawa; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AshioksAdept.java b/Mage.Sets/src/mage/sets/bornofthegods/AshioksAdept.java index 29933e631d1..04ca5f81245 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/AshioksAdept.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/AshioksAdept.java @@ -29,7 +29,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.MageInt; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheSilentSong.java b/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheSilentSong.java index c42d0ce6ac9..5fcf1ff8ace 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheSilentSong.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheSilentSong.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InspiredAbility; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index 59f6d791575..55edaef0df3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java index 4f2cdddb775..8c9e2652ff4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GutwrencherOni.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.constants.TargetController; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java index 00198cad9ef..3fec4407504 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java @@ -33,7 +33,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.ReturnToHandSpellEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java index fb511e46707..dccc44af87e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java index 5d70cbaf189..c17aeee279a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java index f3e97dbd22e..1033fc85e05 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java @@ -42,7 +42,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.FlipSourceEffect; import mage.cards.CardImpl; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java index 43634aec21a..3c48ff15abb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SiftThroughSands.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java index ca2c27be00a..02ce4a1eff6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java @@ -31,7 +31,7 @@ package mage.sets.championsofkamigawa; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/conflux/ElderMastery.java b/Mage.Sets/src/mage/sets/conflux/ElderMastery.java index 2ded5918dae..e38d5e8e2e7 100644 --- a/Mage.Sets/src/mage/sets/conflux/ElderMastery.java +++ b/Mage.Sets/src/mage/sets/conflux/ElderMastery.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; diff --git a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java index 95dfebcaf14..02e75261576 100644 --- a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java +++ b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java @@ -35,7 +35,7 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; diff --git a/Mage.Sets/src/mage/sets/conflux/RottingRats.java b/Mage.Sets/src/mage/sets/conflux/RottingRats.java index 1476d0cd7d4..d062cef914b 100644 --- a/Mage.Sets/src/mage/sets/conflux/RottingRats.java +++ b/Mage.Sets/src/mage/sets/conflux/RottingRats.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java index 4287871f1a8..492eba7b0f3 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java @@ -36,7 +36,7 @@ import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java b/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java index 62165f4a6ce..103a4a0b987 100644 --- a/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java +++ b/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.DomainValue; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/darkascension/BlackCat.java b/Mage.Sets/src/mage/sets/darkascension/BlackCat.java index f6ba7012de4..f5a2510ff99 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BlackCat.java +++ b/Mage.Sets/src/mage/sets/darkascension/BlackCat.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java b/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java index cf4fcd8c076..865ccb6de9a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java +++ b/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java b/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java index ce37b551a60..35a34a3dc12 100644 --- a/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java +++ b/Mage.Sets/src/mage/sets/dissension/DeliriumSkeins.java @@ -30,7 +30,7 @@ package mage.sets.dissension; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java b/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java index 86f434f7794..19a2c44ead1 100644 --- a/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java +++ b/Mage.Sets/src/mage/sets/dissension/RixMaadiDungeonPalace.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java index 9806eb5443e..dff5b211cb8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java @@ -31,7 +31,7 @@ package mage.sets.dragonsmaze; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.SplitCard; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java index ae27ee53b83..164798a8376 100644 --- a/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java +++ b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java @@ -34,7 +34,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.condition.common.ControlsPermanentCondition.CountType; import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java index 51bdb49bfc1..20e284e037d 100644 --- a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java +++ b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.RetraceAbility; import mage.cards.CardImpl; import mage.constants.TimingRule; diff --git a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java index 4788342b1e6..cf44be54299 100644 --- a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java +++ b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java index 019c94e69b0..4f6469f92d6 100644 --- a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java +++ b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java @@ -37,7 +37,7 @@ import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java index 0f2afa0db6b..9202e6218d8 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java +++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java @@ -30,7 +30,7 @@ package mage.sets.fallenempires; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java b/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java index 594e7a27d38..3185c6b6e06 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AbyssalSpecter.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java b/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java index 7006f1bc6d8..f7270a79bfd 100644 --- a/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java +++ b/Mage.Sets/src/mage/sets/futuresight/StrongholdRats.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.ShadowAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java index 9cb595eb275..a59a4a25d10 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java index 69412e91dee..2b0bb898498 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java @@ -30,7 +30,7 @@ package mage.sets.gatecrash; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java index c0db8ed28f5..00100b4ac38 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.CipherEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java index 7f81ddcdd6a..3f49e16afec 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java index 727b6c3fe19..1fcc6de619e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java +++ b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java index ddde523d739..14c144c6926 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java +++ b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java b/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java index 254dba79227..ef297999231 100644 --- a/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java +++ b/Mage.Sets/src/mage/sets/invasion/BlazingSpecter.java @@ -30,7 +30,7 @@ package mage.sets.invasion; import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java b/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java index 587a7c236ad..7cb09809db6 100644 --- a/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java +++ b/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java @@ -30,7 +30,7 @@ package mage.sets.invasion; import java.util.UUID; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java b/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java index b9bf2e3238c..23e4e0c3a30 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ThoughtrenderLamia.java @@ -30,8 +30,8 @@ package mage.sets.journeyintonyx; import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; -import mage.abilities.effects.common.DiscardEachPlayerEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java b/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java index 764cd1da1cd..220581306b9 100644 --- a/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java +++ b/Mage.Sets/src/mage/sets/judgment/EarsplittingRats.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java index b4e58caa225..4ffca027680 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java b/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java index b5f2ffd2a52..02f556997f8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java @@ -34,7 +34,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.DiscardsACardOpponentTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java index ae0ab17210f..1c6f607366c 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java @@ -29,7 +29,7 @@ package mage.sets.magic2010; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java b/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java index cc96a8254cc..681c1231225 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2010/HypnoticSpecter.java @@ -31,7 +31,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DealsDamageToOpponentTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index 20ea6dee38c..a5eaaa2eb3b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java @@ -37,7 +37,7 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java index 33ce3e09433..b0c5ffe031b 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasSpecter.java @@ -33,7 +33,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/magic2012/Smallpox.java b/Mage.Sets/src/mage/sets/magic2012/Smallpox.java index 43e46f3ecec..d2a9f6c4073 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Smallpox.java +++ b/Mage.Sets/src/mage/sets/magic2012/Smallpox.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java b/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java index faec6c6517c..25ab6386d7c 100644 --- a/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java +++ b/Mage.Sets/src/mage/sets/magic2014/LilianasReaver.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java index e3a9279b7d3..dc4413b40a6 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; import mage.game.Game; diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java index f545fe1a329..db6487323e7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java @@ -36,7 +36,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.ColoredManaSymbol; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java index 762145e3782..cfd3b4a7da1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java @@ -30,7 +30,7 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java index 5bfc87ec563..901ad146773 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java index eb948643088..9025efc60de 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java @@ -39,7 +39,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostEquippedEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.UntapAllLandsControllerEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java b/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java index d19f8d7bba7..0f0b97a95f5 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DeathCloud.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/modernmasters/PyromancersSwath.java b/Mage.Sets/src/mage/sets/modernmasters/PyromancersSwath.java index a1d1805084e..752b082873e 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/PyromancersSwath.java +++ b/Mage.Sets/src/mage/sets/modernmasters/PyromancersSwath.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; -import mage.abilities.effects.common.DiscardHandControllerEffect; +import mage.abilities.effects.common.discard.DiscardHandControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java index fc9c388ba54..d5b65466365 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java index 51984bb9018..01b59808b72 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java @@ -30,7 +30,7 @@ package mage.sets.newphyrexia; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java index 60a1bc6630b..fa391833648 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java @@ -41,7 +41,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.CountersCount; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java index 569e4cf7ff3..99cc0b61ecd 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java +++ b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java @@ -39,7 +39,7 @@ import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.EffectType; diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java b/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java index 3db7620d9f8..11695fae2e7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java @@ -35,7 +35,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.DrawDiscardTargetEffect; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java b/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java index a4e34dc5546..1290a655b70 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java +++ b/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java index 36705074102..1443f86a555 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java +++ b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java @@ -29,7 +29,7 @@ package mage.sets.odyssey; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java b/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java index 6347f52ebe9..7059307bd1c 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java +++ b/Mage.Sets/src/mage/sets/planechase2012/NoggleRansacker.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java b/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java index 6b42aa86af5..d703923d5aa 100644 --- a/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java +++ b/Mage.Sets/src/mage/sets/planeshift/UrzasGuilt.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.effects.Effect; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java index 1b96d601eb8..201f5878651 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.common.MyTurnBeforeAttackersDeclaredCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java b/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java index c79c818a9ff..1a906fc7517 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java +++ b/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Mode; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java index 338db201b65..fefceb7030a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java b/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java index 72db5a847ee..0d59340a75c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java +++ b/Mage.Sets/src/mage/sets/ravnika/LoreBroker.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.DrawCardAllEffect; import mage.cards.CardImpl; import mage.constants.Zone; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java index 20447e1860c..3e106a4206b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java index 2192587bde2..cafc4e98475 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosRingleader.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java index fc0c9ab58af..a3c7cfede17 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java index be1359e908d..ea9bd11974a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java @@ -32,7 +32,7 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.SweepNumber; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.SweepEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java index 11413abfacc..5205daf44ae 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java @@ -34,7 +34,7 @@ import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.ChannelAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java index 652eacb0067..479909b4db4 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/IdeasUnbound.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index 6111056c94e..d62622cd5e8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java @@ -34,7 +34,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.filter.common.FilterSpiritOrArcaneCard; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java index 1c62a4cd10b..7aa1b11da21 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java @@ -30,7 +30,7 @@ package mage.sets.saviorsofkamigawa; import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.SweepNumber; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.SweepEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java index 707c054de60..16469889daa 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java +++ b/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java @@ -36,7 +36,7 @@ import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java b/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java index 4a77ac5e8c9..7c7ce90c752 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.costs.common.PutCountersSourceCost; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java index cc7eb65ec65..15ed02e207f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.EnchantedCreatureColorCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java index 84e48908b53..ee9e4e6aa2f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java @@ -30,7 +30,7 @@ package mage.sets.shardsofalara; import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java index 3713cfcbd07..49a6da738e9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java @@ -27,6 +27,7 @@ */ package mage.sets.shardsofalara; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import java.util.UUID; import mage.constants.CardType; import mage.constants.Outcome; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java b/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java index 8e2930c763c..f7a40bcfac9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CunningLethemancer.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.OnEventTriggeredAbility; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.game.events.GameEvent.EventType; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java index f39d163cb5b..332f1a5b9a8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java index ab39977c355..5264fd5067a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java b/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java index 852de036723..f7922df0612 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SedraxisSpecter.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java index 25f1933c50a..1b0bfd7428c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DevouredCreaturesCount; import mage.abilities.effects.common.DevourEffect.DevourFactor; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.DevourAbility; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/tenth/MindRot.java b/Mage.Sets/src/mage/sets/tenth/MindRot.java index 5497883a6a2..dcee31539b4 100644 --- a/Mage.Sets/src/mage/sets/tenth/MindRot.java +++ b/Mage.Sets/src/mage/sets/tenth/MindRot.java @@ -31,7 +31,7 @@ package mage.sets.tenth; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/tenth/RavenousRats.java b/Mage.Sets/src/mage/sets/tenth/RavenousRats.java index e4fd95273cd..dd89d701091 100644 --- a/Mage.Sets/src/mage/sets/tenth/RavenousRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RavenousRats.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/tenth/Sift.java b/Mage.Sets/src/mage/sets/tenth/Sift.java index 5a6f4fa78fb..d529b486d52 100644 --- a/Mage.Sets/src/mage/sets/tenth/Sift.java +++ b/Mage.Sets/src/mage/sets/tenth/Sift.java @@ -30,7 +30,7 @@ package mage.sets.tenth; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java index 8fc459d18cf..790d360d59a 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java @@ -34,7 +34,7 @@ import mage.abilities.common.SacrificeSourceTriggeredAbility; import mage.abilities.condition.common.AttachedToCounterCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.counter.AddCountersAttachedEffect; import mage.abilities.keyword.EnchantAbility; diff --git a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java index 317bd67bb60..96a55ce01ca 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Mode; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.SwampwalkAbility; diff --git a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java index d615321d7bd..d4302503551 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java @@ -30,7 +30,7 @@ package mage.sets.timeshifted; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java b/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java index 4826caac1de..7aa666a5fdc 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/MindlashSliver.java @@ -38,7 +38,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.effects.common.continious.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java index 1b22807048b..9306e6f4b97 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java +++ b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java index 65490f014c9..bdb1618d51f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Attunement.java b/Mage.Sets/src/mage/sets/urzassaga/Attunement.java index c32818ba61e..b5e9fab80b8 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Attunement.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Attunement.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandSourceCost; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java b/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java index 3a705206ebe..496e93e19b1 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java b/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java index 21d6fc29b21..cbfbda37795 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CacklingFiend.java @@ -36,7 +36,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardEachPlayerEffect; +import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.TargetController; diff --git a/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java b/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java index 5bd1ca79d6a..a548685f66d 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java +++ b/Mage.Sets/src/mage/sets/urzassaga/OrderOfYawgmoth.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java index b6d544c7e37..83d93e94a58 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java +++ b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java @@ -37,7 +37,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java index df62a9e1e1b..653a15f0139 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java +++ b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; diff --git a/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java b/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java index 76cc8bde208..4a60f15b46d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java +++ b/Mage.Sets/src/mage/sets/zendikar/GuulDrazSpecter.java @@ -39,7 +39,7 @@ import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java index ad7d8abfcb3..3c47e4bc8b3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; diff --git a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java index de128cbcea6..06343d471bf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java +++ b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DiscardTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java index 6ce8bfb9aef..ad3ce6d414a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfLostTruths.java @@ -36,7 +36,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; import mage.abilities.condition.InvertCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DiscardControllerEffect; +import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.KickerAbility; diff --git a/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java b/Mage/src/mage/abilities/effects/common/discard/DiscardControllerEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java rename to Mage/src/mage/abilities/effects/common/discard/DiscardControllerEffect.java index 465087b4797..46b8fa263ca 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/discard/DiscardControllerEffect.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.discard; import mage.constants.Outcome; import mage.abilities.Ability; diff --git a/Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java b/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java similarity index 96% rename from Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java rename to Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java index 147107a0caf..8c3c02df3a5 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardEachPlayerEffect.java +++ b/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java @@ -1,4 +1,4 @@ -package mage.abilities.effects.common; +package mage.abilities.effects.common.discard; import java.util.HashMap; import java.util.UUID; diff --git a/Mage/src/mage/abilities/effects/common/DiscardHandControllerEffect.java b/Mage/src/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java similarity index 95% rename from Mage/src/mage/abilities/effects/common/DiscardHandControllerEffect.java rename to Mage/src/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java index 5698b0004e6..70233f288b4 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardHandControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.discard; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/DiscardTargetEffect.java b/Mage/src/mage/abilities/effects/common/discard/DiscardTargetEffect.java similarity index 98% rename from Mage/src/mage/abilities/effects/common/DiscardTargetEffect.java rename to Mage/src/mage/abilities/effects/common/discard/DiscardTargetEffect.java index c671e9df6bf..0c7ba61c374 100644 --- a/Mage/src/mage/abilities/effects/common/DiscardTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/discard/DiscardTargetEffect.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.common.discard; import mage.constants.Outcome; import mage.abilities.Ability;