diff --git a/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java b/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java index d0189c02da..4fe64b5370 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 4485c57513..15e38bbc0b 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 47f587a7dd..e6301de755 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 e3420323dc..fcb2d4e4c4 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 db7ab9dbef..9541ded991 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 af405740f8..c6c3575cb2 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 815f7eef04..5bfbafeb9c 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 438a7cde55..23e6cca2e6 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 9ce64356db..aaf7dd1679 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 ab8ddc8723..1c5ce7f913 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 6e23b841d6..01a613b175 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 91a51eb970..ce5ef91b36 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 3326b61922..d1d8fcd601 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 9ab4a7cb3b..3c43d333ed 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 0943427c0b..2f9d74fd27 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 1ac28ee220..2f076564b9 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 d93f2429cb..dc9b0804d7 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 502f512688..351af3057c 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 91925b1d4a..1942ad14b6 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 cd7765242d..8907b86017 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 7eb48a86b6..d6a297af54 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 6b92f3e2b8..0ab97adac0 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 5ba891030f..aef67810d0 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 fcaed25836..2f671251d3 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 4ff312c727..16a2367704 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 446a043ef8..51f537a5d9 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 232c6c564a..9717a5be78 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 c3c6cb2f9a..5e98ddcfe0 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 a0417d02bf..0166ff7a1a 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 2cd6eac14c..e63ace7851 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 94a5939954..37087fbd29 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 a4997efb39..8cc6bcc67c 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 03cd7c5bf4..f65e576fdf 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 8a85127e54..9839edf884 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 88778fd7d3..340e9b41fb 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 6e786ba03e..2a3002565d 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 d08217963e..e4372b4d70 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 1faf6ff833..29b0396bc8 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 c751606f76..b137184d57 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 70bd685d17..aad5a8323d 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 f0061d5680..209aaf039d 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 c93a682729..0afaee0609 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 202a208261..3eabd4590e 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 9dd5f76c8f..60265d2841 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 e51e9ab5bf..34de0a2bf4 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 62d98ad863..47446040cb 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 d7332ff700..2e6f8106aa 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 3c5d7740b4..5f5fee22c4 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 88cf1141ec..35208c15cc 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 9cf50190e0..57463f64bc 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 121c854c7e..22bfa9e951 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 89aa3b2865..65275b9de9 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 5fcce3bd2c..f2b138b34a 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 cbf6c82a98..ba84f9a58b 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 e869a9a93d..519928122b 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 78091c07ba..a01070cde4 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 6bb0983efd..77f18afc07 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 4bae89b5f9..0b15bba1cc 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 233a5e4515..64bc251055 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 1e16228eb2..4c89160be7 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 63f6689372..9b0ff9d6a9 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 24170ac704..85f5781aca 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 252683da20..84fd306c19 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 fe53b6703c..329511f08c 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 5725731233..88c623c5e3 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 7b91be3178..a922339dd1 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 f4924e09b5..ab116ff9a5 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 792ca52fa3..565104fb5a 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 78b9b50a60..b3723b179f 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 c01b32f639..7ca388c5c5 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 c72f83aed8..ad484699c1 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 3fd05bc2c3..31a17fd9f5 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 a1b71c3546..afefcc7027 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 0000000000..beb7165fb0 --- /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 429bbf93bf..2bcb26468a 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 8ffa2797eb..610facfb70 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 4a749081f6..17cba4e1d8 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,