diff --git a/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java b/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java index d0189c02dab..4fe64b5370d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java @@ -29,7 +29,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ChorusOfTheTides.java b/Mage.Sets/src/mage/sets/bornofthegods/ChorusOfTheTides.java index 4485c57513c..15e38bbc0ba 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ChorusOfTheTides.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ChorusOfTheTides.java @@ -29,7 +29,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.MageInt; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/DrownInSorrow.java b/Mage.Sets/src/mage/sets/bornofthegods/DrownInSorrow.java index 47f587a7dd0..e6301de755e 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/DrownInSorrow.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/DrownInSorrow.java @@ -28,7 +28,7 @@ package mage.sets.bornofthegods; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedConflagration.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedConflagration.java index e3420323dce..fcb2d4e4c45 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedConflagration.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedConflagration.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java index db7ab9dbef6..9541ded9919 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java index af405740f81..c6c3575cb25 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedRetribution.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedRetribution.java index 815f7eef045..5bfbafeb9cd 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedRetribution.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedRetribution.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DestroyAllEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedReturn.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedReturn.java index 438a7cde55a..23e6cca2e67 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedReturn.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedReturn.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/GlimpseTheSunGod.java b/Mage.Sets/src/mage/sets/bornofthegods/GlimpseTheSunGod.java index 9ce64356db1..aaf7dd16794 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/GlimpseTheSunGod.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/GlimpseTheSunGod.java @@ -30,7 +30,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java b/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java index ab8ddc87231..1c5ce7f9130 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java @@ -35,7 +35,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Peregrination.java b/Mage.Sets/src/mage/sets/bornofthegods/Peregrination.java index 6e23b841d66..01a613b1759 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Peregrination.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Peregrination.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ScouringSands.java b/Mage.Sets/src/mage/sets/bornofthegods/ScouringSands.java index 91a51eb970b..ce5ef91b363 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ScouringSands.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ScouringSands.java @@ -30,7 +30,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Outcome; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/StormcallerOfKeranos.java b/Mage.Sets/src/mage/sets/bornofthegods/StormcallerOfKeranos.java index 3326b619228..d1d8fcd6015 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/StormcallerOfKeranos.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/StormcallerOfKeranos.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SuddenStorm.java b/Mage.Sets/src/mage/sets/bornofthegods/SuddenStorm.java index 9ab4a7cb3bd..3c43d333ed8 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SuddenStorm.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SuddenStorm.java @@ -28,7 +28,7 @@ package mage.sets.bornofthegods; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.SkipNextUntapTargetEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TempleOfEnlightenment.java b/Mage.Sets/src/mage/sets/bornofthegods/TempleOfEnlightenment.java index 0943427c0b0..2f9d74fd271 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TempleOfEnlightenment.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/TempleOfEnlightenment.java @@ -30,7 +30,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TempleOfMalice.java b/Mage.Sets/src/mage/sets/bornofthegods/TempleOfMalice.java index 1ac28ee2202..2f076564b91 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TempleOfMalice.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/TempleOfMalice.java @@ -30,7 +30,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TempleOfPlenty.java b/Mage.Sets/src/mage/sets/bornofthegods/TempleOfPlenty.java index d93f2429cb0..dc9b0804d7c 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TempleOfPlenty.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/TempleOfPlenty.java @@ -30,7 +30,7 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java b/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java index 502f512688f..351af3057cd 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/Condescend.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java b/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java index 91925b1d4ad..1942ad14b6a 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EyesOfTheWatcher.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java b/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java index cd7765242d6..8907b860177 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FerociousCharge.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java b/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java index 7eb48a86b69..d6a297af54b 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/FillWithFright.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java b/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java index 6b92f3e2b8d..0ab97adac0c 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/LoseHope.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java b/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java index 5ba891030fe..aef67810d0b 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/MagmaJet.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java b/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java index fcaed258365..2f671251d32 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SerumVisions.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java b/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java index 4ff312c727c..16a23677044 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java @@ -28,7 +28,7 @@ package mage.sets.fifthdawn; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java b/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java index 446a043ef8b..51f537a5d97 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/TelJiladJustice.java @@ -29,7 +29,7 @@ package mage.sets.fifthdawn; import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java b/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java index 232c6c564a8..9717a5be78b 100644 --- a/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java +++ b/Mage.Sets/src/mage/sets/futuresight/NewBenalia.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java b/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java index c3c6cb2f9a2..5e98ddcfe0e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/InterpretTheSigns.java @@ -30,7 +30,7 @@ package mage.sets.journeyintonyx; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java index a0417d02bff..0166ff7a1aa 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java index 2cd6eac14cc..e63ace78518 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiseOfEagles.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java index 94a59399548..37087fbd298 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledSkink.java @@ -30,7 +30,7 @@ package mage.sets.journeyintonyx; import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java index a4997efb39b..8cc6bcc67c2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SigiledStarfish.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java index 03cd7c5bf4f..f65e576fdfe 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java @@ -30,7 +30,7 @@ package mage.sets.journeyintonyx; import java.util.UUID; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java b/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java index 8a85127e54d..9839edf8845 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StormchaserChimera.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfEpiphany.java b/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfEpiphany.java index 88778fd7d34..340e9b41fb8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfEpiphany.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfEpiphany.java @@ -30,7 +30,7 @@ package mage.sets.journeyintonyx; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfMalady.java b/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfMalady.java index 6e786ba03e9..2a3002565d8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfMalady.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TempleOfMalady.java @@ -30,7 +30,7 @@ package mage.sets.journeyintonyx; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java index d08217963e7..e4372b4d70a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java +++ b/Mage.Sets/src/mage/sets/magic2011/AuguryOwl.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java index 1faf6ff8333..29b0396bc8f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java +++ b/Mage.Sets/src/mage/sets/magic2011/CrystalBall.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2011/Foresee.java b/Mage.Sets/src/mage/sets/magic2011/Foresee.java index c751606f765..b137184d579 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Foresee.java +++ b/Mage.Sets/src/mage/sets/magic2011/Foresee.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2011/Preordain.java b/Mage.Sets/src/mage/sets/magic2011/Preordain.java index 70bd685d17a..aad5a8323d3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Preordain.java +++ b/Mage.Sets/src/mage/sets/magic2011/Preordain.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; /** diff --git a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java index f0061d56804..209aaf039dc 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java +++ b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java @@ -35,7 +35,7 @@ import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java index c93a682729c..0afaee06091 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java @@ -33,7 +33,7 @@ import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.SweepNumber; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; -import mage.abilities.effects.common.SweepEffect; +import mage.abilities.effects.keyword.SweepEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java index 202a208261c..3eabd4590e4 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChargeAcrossTheAraba.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.SweepEffect; +import mage.abilities.effects.keyword.SweepEffect; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java index 9dd5f76c8fc..60265d28417 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.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.SweepEffect; +import mage.abilities.effects.keyword.SweepEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java index e51e9ab5bf6..34de0a2bf42 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.SweepNumber; import mage.abilities.effects.common.discard.DiscardTargetEffect; -import mage.abilities.effects.common.SweepEffect; +import mage.abilities.effects.keyword.SweepEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/AqueousForm.java b/Mage.Sets/src/mage/sets/theros/AqueousForm.java index 62d98ad863a..47446040cb9 100644 --- a/Mage.Sets/src/mage/sets/theros/AqueousForm.java +++ b/Mage.Sets/src/mage/sets/theros/AqueousForm.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.common.AttacksAttachedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.combat.UnblockableAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java index d7332ff7009..2e6f8106aad 100644 --- a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java +++ b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java b/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java index 3c5d7740b4f..5f5fee22c41 100644 --- a/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.java +++ b/Mage.Sets/src/mage/sets/theros/BattlewiseHoplite.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.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java b/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java index 88cf1141ec4..35208c15cc9 100644 --- a/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java +++ b/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java @@ -28,7 +28,7 @@ package mage.sets.theros; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/Dissolve.java b/Mage.Sets/src/mage/sets/theros/Dissolve.java index 9cf50190e02..57463f64bc5 100644 --- a/Mage.Sets/src/mage/sets/theros/Dissolve.java +++ b/Mage.Sets/src/mage/sets/theros/Dissolve.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.common.CounterTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/GodsWilling.java b/Mage.Sets/src/mage/sets/theros/GodsWilling.java index 121c854c7e5..22bfa9e9514 100644 --- a/Mage.Sets/src/mage/sets/theros/GodsWilling.java +++ b/Mage.Sets/src/mage/sets/theros/GodsWilling.java @@ -28,7 +28,7 @@ package mage.sets.theros; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/HorizonScholar.java b/Mage.Sets/src/mage/sets/theros/HorizonScholar.java index 89aa3b2865d..65275b9de94 100644 --- a/Mage.Sets/src/mage/sets/theros/HorizonScholar.java +++ b/Mage.Sets/src/mage/sets/theros/HorizonScholar.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java b/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java index 5fcce3bd2cd..f2b138b34a0 100644 --- a/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java +++ b/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java @@ -28,7 +28,7 @@ package mage.sets.theros; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/Omenspeaker.java b/Mage.Sets/src/mage/sets/theros/Omenspeaker.java index cbf6c82a984..ba84f9a58b7 100644 --- a/Mage.Sets/src/mage/sets/theros/Omenspeaker.java +++ b/Mage.Sets/src/mage/sets/theros/Omenspeaker.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java b/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java index e869a9a93de..519928122bb 100644 --- a/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java +++ b/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; diff --git a/Mage.Sets/src/mage/sets/theros/PrescientChimera.java b/Mage.Sets/src/mage/sets/theros/PrescientChimera.java index 78091c07baf..a01070cde4f 100644 --- a/Mage.Sets/src/mage/sets/theros/PrescientChimera.java +++ b/Mage.Sets/src/mage/sets/theros/PrescientChimera.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java b/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java index 6bb0983efd4..77f18afc074 100644 --- a/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java +++ b/Mage.Sets/src/mage/sets/theros/PrognosticSphinx.java @@ -34,7 +34,7 @@ import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java index 4bae89b5f93..0b15bba1cc2 100644 --- a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.ruleModifying.CantRegenerateTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/ReadTheBones.java b/Mage.Sets/src/mage/sets/theros/ReadTheBones.java index 233a5e4515f..64bc2510550 100644 --- a/Mage.Sets/src/mage/sets/theros/ReadTheBones.java +++ b/Mage.Sets/src/mage/sets/theros/ReadTheBones.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java b/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java index 1e16228eb2c..4c89160be79 100644 --- a/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java +++ b/Mage.Sets/src/mage/sets/theros/ReaperOfTheWilds.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.HexproofAbility; diff --git a/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java b/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java index 63f66893722..9b0ff9d6a9b 100644 --- a/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java +++ b/Mage.Sets/src/mage/sets/theros/SeaGodsRevenge.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/SparkJolt.java b/Mage.Sets/src/mage/sets/theros/SparkJolt.java index 24170ac704a..85f5781aca1 100644 --- a/Mage.Sets/src/mage/sets/theros/SparkJolt.java +++ b/Mage.Sets/src/mage/sets/theros/SparkJolt.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/StymiedHopes.java b/Mage.Sets/src/mage/sets/theros/StymiedHopes.java index 252683da200..84fd306c19a 100644 --- a/Mage.Sets/src/mage/sets/theros/StymiedHopes.java +++ b/Mage.Sets/src/mage/sets/theros/StymiedHopes.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/TempleOfAbandon.java b/Mage.Sets/src/mage/sets/theros/TempleOfAbandon.java index fe53b6703c6..329511f08c3 100644 --- a/Mage.Sets/src/mage/sets/theros/TempleOfAbandon.java +++ b/Mage.Sets/src/mage/sets/theros/TempleOfAbandon.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/TempleOfDeceit.java b/Mage.Sets/src/mage/sets/theros/TempleOfDeceit.java index 5725731233c..88c623c5e34 100644 --- a/Mage.Sets/src/mage/sets/theros/TempleOfDeceit.java +++ b/Mage.Sets/src/mage/sets/theros/TempleOfDeceit.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/TempleOfMystery.java b/Mage.Sets/src/mage/sets/theros/TempleOfMystery.java index 7b91be31786..a922339dd1c 100644 --- a/Mage.Sets/src/mage/sets/theros/TempleOfMystery.java +++ b/Mage.Sets/src/mage/sets/theros/TempleOfMystery.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/TempleOfSilence.java b/Mage.Sets/src/mage/sets/theros/TempleOfSilence.java index f4924e09b53..ab116ff9a5b 100644 --- a/Mage.Sets/src/mage/sets/theros/TempleOfSilence.java +++ b/Mage.Sets/src/mage/sets/theros/TempleOfSilence.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/TempleOfTriumph.java b/Mage.Sets/src/mage/sets/theros/TempleOfTriumph.java index 792ca52fa3c..565104fb5a1 100644 --- a/Mage.Sets/src/mage/sets/theros/TempleOfTriumph.java +++ b/Mage.Sets/src/mage/sets/theros/TempleOfTriumph.java @@ -30,7 +30,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java b/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java index 78b9b50a604..b3723b179f7 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java +++ b/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.abilities.effects.common.continious.LoseCreatureTypeSourceEffect; import mage.abilities.keyword.IndestructibleAbility; diff --git a/Mage.Sets/src/mage/sets/theros/TitansStrength.java b/Mage.Sets/src/mage/sets/theros/TitansStrength.java index c01b32f639e..7ca388c5c5d 100644 --- a/Mage.Sets/src/mage/sets/theros/TitansStrength.java +++ b/Mage.Sets/src/mage/sets/theros/TitansStrength.java @@ -28,7 +28,7 @@ package mage.sets.theros; import java.util.UUID; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java index c72f83aed8b..ad484699c15 100644 --- a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java +++ b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java b/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java index 3fd05bc2c37..31a17fd9f52 100644 --- a/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java +++ b/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.common.ReturnToHandTargetEffect; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/theros/WitchesEye.java b/Mage.Sets/src/mage/sets/theros/WitchesEye.java index a1b71c35461..afefcc70275 100644 --- a/Mage.Sets/src/mage/sets/theros/WitchesEye.java +++ b/Mage.Sets/src/mage/sets/theros/WitchesEye.java @@ -33,7 +33,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.ScryEffect; +import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; diff --git a/Mage/src/mage/abilities/effects/keyword/FatesealEffect.java b/Mage/src/mage/abilities/effects/keyword/FatesealEffect.java new file mode 100644 index 00000000000..beb7165fb05 --- /dev/null +++ b/Mage/src/mage/abilities/effects/keyword/FatesealEffect.java @@ -0,0 +1,130 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.abilities.effects.keyword; + +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.players.Player; +import mage.target.Target; +import mage.target.TargetCard; +import mage.target.common.TargetOpponent; +import mage.util.CardUtil; + +/** + * + * @author LevelX2 + */ + +public class FatesealEffect extends OneShotEffect { + + protected static FilterCard filter1 = new FilterCard("card to put on the bottom of opponent's library"); + + protected int fatesealNumber; + + public FatesealEffect(int fatesealNumber) { + super(Outcome.Benefit); + this.fatesealNumber = fatesealNumber; + this.setText(); + } + + public FatesealEffect(final FatesealEffect effect) { + super(effect); + this.fatesealNumber = effect.fatesealNumber; + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + Target target = new TargetOpponent(true); + if (controller.choose(outcome, target, source.getSourceId(), game)) { + Player opponent = game.getPlayer(target.getFirstTarget()); + if (opponent == null) { + return false; + } + boolean revealed = opponent.isTopCardRevealed(); // by looking at the cards with fateseal you have not to reveal the next card + opponent.setTopCardRevealed(false); + Cards cards = new CardsImpl(); + int count = Math.min(fatesealNumber, opponent.getLibrary().size()); + if (count == 0) { + return true; + } + for (int i = 0; i < count; i++) { + Card card = opponent.getLibrary().removeFromTop(game); + cards.add(card); + } + TargetCard target1 = new TargetCard(Zone.LIBRARY, filter1); + target1.setRequired(false); + // move cards to the bottom of the library + while (cards.size() > 0 && controller.choose(Outcome.Detriment, cards, target1, game)) { + if (!controller.isInGame() || !opponent.isInGame()) { + return false; + } + Card card = cards.get(target1.getFirstTarget(), game); + if (card != null) { + cards.remove(card); + controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.LIBRARY, false, false); + } + target1.clearChosen(); + } + // move cards to the top of the library + controller.putCardsOnTopOfLibrary(cards, game, source, true); + game.fireEvent(new GameEvent(GameEvent.EventType.FATESEAL, opponent.getId(), source.getSourceId(), source.getControllerId())); + controller.setTopCardRevealed(revealed); + return true; + } + + } + return false; + } + + @Override + public FatesealEffect copy() { + return new FatesealEffect(this); + } + + private void setText() { + StringBuilder sb = new StringBuilder("fateseal ").append(fatesealNumber); + if (fatesealNumber == 1) { + sb.append(". (To fateseal 1, its controller looks at the top card of an opponent's library, then he or she may put that card on the bottom of that library.)"); + } else { + sb.append(". (To fateseal "); + sb.append(CardUtil.numberToText(fatesealNumber)); + sb.append(", look at the top two cards of an opponent's library, then put any number of them on the bottom of that player's library and the rest on top in any order.)"); + } + staticText = sb.toString(); + } +} diff --git a/Mage/src/mage/abilities/effects/common/ScryEffect.java b/Mage/src/mage/abilities/effects/keyword/ScryEffect.java similarity index 99% rename from Mage/src/mage/abilities/effects/common/ScryEffect.java rename to Mage/src/mage/abilities/effects/keyword/ScryEffect.java index 429bbf93bf4..2bcb26468aa 100644 --- a/Mage/src/mage/abilities/effects/common/ScryEffect.java +++ b/Mage/src/mage/abilities/effects/keyword/ScryEffect.java @@ -26,7 +26,7 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.abilities.effects.common; +package mage.abilities.effects.keyword; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; diff --git a/Mage/src/mage/abilities/effects/common/SweepEffect.java b/Mage/src/mage/abilities/effects/keyword/SweepEffect.java similarity index 96% rename from Mage/src/mage/abilities/effects/common/SweepEffect.java rename to Mage/src/mage/abilities/effects/keyword/SweepEffect.java index 8ffa2797eb5..610facfb709 100644 --- a/Mage/src/mage/abilities/effects/common/SweepEffect.java +++ b/Mage/src/mage/abilities/effects/keyword/SweepEffect.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.keyword; import java.util.UUID; import mage.abilities.Ability; diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 4a749081f6d..17cba4e1d8b 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -107,7 +107,7 @@ public class GameEvent { SHUFFLE_LIBRARY, LIBRARY_SHUFFLED, ENCHANT_PLAYER, ENCHANTED_PLAYER, CAN_TAKE_MULLIGAN, - FLIP_COIN, SCRY, + FLIP_COIN, SCRY, FATESEAL, //permanent events ENTERS_THE_BATTLEFIELD,