diff --git a/Mage.Sets/src/mage/cards/a/AtraxaGrandUnifier.java b/Mage.Sets/src/mage/cards/a/AtraxaGrandUnifier.java index b6710862350..837621b7e46 100644 --- a/Mage.Sets/src/mage/cards/a/AtraxaGrandUnifier.java +++ b/Mage.Sets/src/mage/cards/a/AtraxaGrandUnifier.java @@ -6,7 +6,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.dynamicvalue.common.CardTypeAssignment; +import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/c/Conflux.java b/Mage.Sets/src/mage/cards/c/Conflux.java index 72e1ec7587d..9cf21141482 100644 --- a/Mage.Sets/src/mage/cards/c/Conflux.java +++ b/Mage.Sets/src/mage/cards/c/Conflux.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.ColorAssignment; +import mage.abilities.assignment.common.ColorAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.*; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java index 7178035273c..4922b6c9280 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java @@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.*; import mage.constants.CardType; @@ -16,7 +16,6 @@ import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; import mage.game.Game; import mage.target.common.TargetCardInLibrary; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DruidicRitual.java b/Mage.Sets/src/mage/cards/d/DruidicRitual.java index 78408d472ac..83df3b1514f 100644 --- a/Mage.Sets/src/mage/cards/d/DruidicRitual.java +++ b/Mage.Sets/src/mage/cards/d/DruidicRitual.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.CardTypeAssignment; +import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/cards/g/GaeasBalance.java b/Mage.Sets/src/mage/cards/g/GaeasBalance.java index 917d5378174..746d30e8e68 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBalance.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBalance.java @@ -2,20 +2,17 @@ package mage.cards.g; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.*; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; import mage.game.Game; import mage.target.common.TargetCardInLibrary; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/g/GemOfBecoming.java b/Mage.Sets/src/mage/cards/g/GemOfBecoming.java index 9873bfba026..45a5fd739f4 100644 --- a/Mage.Sets/src/mage/cards/g/GemOfBecoming.java +++ b/Mage.Sets/src/mage/cards/g/GemOfBecoming.java @@ -5,7 +5,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.*; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/cards/g/GrimeGorger.java b/Mage.Sets/src/mage/cards/g/GrimeGorger.java index 899fbd973c4..2f55fa76495 100644 --- a/Mage.Sets/src/mage/cards/g/GrimeGorger.java +++ b/Mage.Sets/src/mage/cards/g/GrimeGorger.java @@ -3,7 +3,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.dynamicvalue.common.CardTypeAssignment; +import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.MenaceAbility; import mage.cards.*; diff --git a/Mage.Sets/src/mage/cards/h/HarperRecruiter.java b/Mage.Sets/src/mage/cards/h/HarperRecruiter.java index 6d5d55b9c56..80a0cf61b61 100644 --- a/Mage.Sets/src/mage/cards/h/HarperRecruiter.java +++ b/Mage.Sets/src/mage/cards/h/HarperRecruiter.java @@ -3,7 +3,7 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.*; diff --git a/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java b/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java index 8d3e68622d3..5f871409ed4 100644 --- a/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java +++ b/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; -import mage.abilities.dynamicvalue.common.CardTypeAssignment; +import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/k/KrosanVerge.java b/Mage.Sets/src/mage/cards/k/KrosanVerge.java index a4a3b32e07c..6b67665124d 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanVerge.java +++ b/Mage.Sets/src/mage/cards/k/KrosanVerge.java @@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.*; diff --git a/Mage.Sets/src/mage/cards/r/RevivalExperiment.java b/Mage.Sets/src/mage/cards/r/RevivalExperiment.java index c0d3324f46b..bf79a994bd5 100644 --- a/Mage.Sets/src/mage/cards/r/RevivalExperiment.java +++ b/Mage.Sets/src/mage/cards/r/RevivalExperiment.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.CardTypeAssignment; +import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; import mage.cards.*; diff --git a/Mage.Sets/src/mage/cards/r/RoguesGallery.java b/Mage.Sets/src/mage/cards/r/RoguesGallery.java index bd5d8195134..e7769a5831e 100644 --- a/Mage.Sets/src/mage/cards/r/RoguesGallery.java +++ b/Mage.Sets/src/mage/cards/r/RoguesGallery.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.ColorAssignment; +import mage.abilities.assignment.common.ColorAssignment; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.*; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/cards/s/ShardConvergence.java b/Mage.Sets/src/mage/cards/s/ShardConvergence.java index 02af1d610ca..df8d7689c49 100644 --- a/Mage.Sets/src/mage/cards/s/ShardConvergence.java +++ b/Mage.Sets/src/mage/cards/s/ShardConvergence.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.*; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/cards/s/StickTogether.java b/Mage.Sets/src/mage/cards/s/StickTogether.java index 50306a36717..50f8d9b917c 100644 --- a/Mage.Sets/src/mage/cards/s/StickTogether.java +++ b/Mage.Sets/src/mage/cards/s/StickTogether.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfTheGrimCaptain.java b/Mage.Sets/src/mage/cards/t/ThroneOfTheGrimCaptain.java index 5fd6c80368a..9a668ec3be6 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfTheGrimCaptain.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfTheGrimCaptain.java @@ -4,7 +4,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.MillCardsControllerEffect; import mage.abilities.keyword.CraftAbility; import mage.cards.Card; diff --git a/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java b/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java index 9823feef4eb..6f5f5a44238 100644 --- a/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java +++ b/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java @@ -7,7 +7,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.dynamicvalue.common.SubTypeAssignment; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.*; import mage.constants.*; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/RoleAssignment.java b/Mage/src/main/java/mage/abilities/assignment/RoleAssignment.java similarity index 98% rename from Mage/src/main/java/mage/abilities/dynamicvalue/RoleAssignment.java rename to Mage/src/main/java/mage/abilities/assignment/RoleAssignment.java index 3620fd613d7..91f126952ca 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/RoleAssignment.java +++ b/Mage/src/main/java/mage/abilities/assignment/RoleAssignment.java @@ -1,4 +1,4 @@ -package mage.abilities.dynamicvalue; +package mage.abilities.assignment; import mage.cards.Card; import mage.cards.Cards; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypeAssignment.java b/Mage/src/main/java/mage/abilities/assignment/common/CardTypeAssignment.java similarity index 85% rename from Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypeAssignment.java rename to Mage/src/main/java/mage/abilities/assignment/common/CardTypeAssignment.java index 0541f1db85b..8140a98b1b6 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardTypeAssignment.java +++ b/Mage/src/main/java/mage/abilities/assignment/common/CardTypeAssignment.java @@ -1,6 +1,6 @@ -package mage.abilities.dynamicvalue.common; +package mage.abilities.assignment.common; -import mage.abilities.dynamicvalue.RoleAssignment; +import mage.abilities.assignment.RoleAssignment; import mage.cards.Card; import mage.constants.CardType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorAssignment.java b/Mage/src/main/java/mage/abilities/assignment/common/ColorAssignment.java similarity index 84% rename from Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorAssignment.java rename to Mage/src/main/java/mage/abilities/assignment/common/ColorAssignment.java index b915b236d67..10b5bd95913 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorAssignment.java +++ b/Mage/src/main/java/mage/abilities/assignment/common/ColorAssignment.java @@ -1,6 +1,6 @@ -package mage.abilities.dynamicvalue.common; +package mage.abilities.assignment.common; -import mage.abilities.dynamicvalue.RoleAssignment; +import mage.abilities.assignment.RoleAssignment; import mage.cards.Card; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PredicateCardAssignment.java b/Mage/src/main/java/mage/abilities/assignment/common/PredicateCardAssignment.java similarity index 86% rename from Mage/src/main/java/mage/abilities/dynamicvalue/common/PredicateCardAssignment.java rename to Mage/src/main/java/mage/abilities/assignment/common/PredicateCardAssignment.java index af55119b3f1..73c4c1d273a 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PredicateCardAssignment.java +++ b/Mage/src/main/java/mage/abilities/assignment/common/PredicateCardAssignment.java @@ -1,6 +1,6 @@ -package mage.abilities.dynamicvalue.common; +package mage.abilities.assignment.common; -import mage.abilities.dynamicvalue.RoleAssignment; +import mage.abilities.assignment.RoleAssignment; import mage.cards.Card; import mage.filter.predicate.Predicate; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SubTypeAssignment.java b/Mage/src/main/java/mage/abilities/assignment/common/SubTypeAssignment.java similarity index 84% rename from Mage/src/main/java/mage/abilities/dynamicvalue/common/SubTypeAssignment.java rename to Mage/src/main/java/mage/abilities/assignment/common/SubTypeAssignment.java index b35177725cc..766a10f389c 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/SubTypeAssignment.java +++ b/Mage/src/main/java/mage/abilities/assignment/common/SubTypeAssignment.java @@ -1,6 +1,6 @@ -package mage.abilities.dynamicvalue.common; +package mage.abilities.assignment.common; -import mage.abilities.dynamicvalue.RoleAssignment; +import mage.abilities.assignment.RoleAssignment; import mage.cards.Card; import mage.constants.SubType; import mage.game.Game; diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PartyCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PartyCount.java index d4d6b7af37d..97173b79caf 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/PartyCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PartyCount.java @@ -1,6 +1,7 @@ package mage.abilities.dynamicvalue.common; import mage.abilities.Ability; +import mage.abilities.assignment.common.SubTypeAssignment; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.cards.Cards; diff --git a/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java b/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java index c8760325509..be2c988301b 100644 --- a/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java +++ b/Mage/src/main/java/mage/game/command/dungeons/TombOfAnnihilationDungeon.java @@ -1,7 +1,7 @@ package mage.game.command.dungeons; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.CardTypeAssignment; +import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; @@ -20,7 +20,6 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.TheAtropalToken; import mage.players.Player; import mage.target.TargetPermanent; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetDiscard; import mage.target.common.TargetSacrifice; diff --git a/Mage/src/main/java/mage/target/common/TargetCardAndOrCard.java b/Mage/src/main/java/mage/target/common/TargetCardAndOrCard.java index ddbecf60876..9b6160a1f4d 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardAndOrCard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardAndOrCard.java @@ -1,7 +1,7 @@ package mage.target.common; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.PredicateCardAssignment; +import mage.abilities.assignment.common.PredicateCardAssignment; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; diff --git a/Mage/src/main/java/mage/target/common/TargetCardAndOrCardInLibrary.java b/Mage/src/main/java/mage/target/common/TargetCardAndOrCardInLibrary.java index 43ac05bde77..ff4235ce33f 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardAndOrCardInLibrary.java +++ b/Mage/src/main/java/mage/target/common/TargetCardAndOrCardInLibrary.java @@ -1,7 +1,7 @@ package mage.target.common; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.PredicateCardAssignment; +import mage.abilities.assignment.common.PredicateCardAssignment; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; diff --git a/Mage/src/main/java/mage/target/common/TargetSacrificeCreatureEachColor.java b/Mage/src/main/java/mage/target/common/TargetSacrificeCreatureEachColor.java index 76b1ef0edf5..b5b633c4e5e 100644 --- a/Mage/src/main/java/mage/target/common/TargetSacrificeCreatureEachColor.java +++ b/Mage/src/main/java/mage/target/common/TargetSacrificeCreatureEachColor.java @@ -2,7 +2,7 @@ package mage.target.common; import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.dynamicvalue.common.ColorAssignment; +import mage.abilities.assignment.common.ColorAssignment; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.filter.common.FilterControlledCreaturePermanent;