From 58252f5b5f5d2dc14f9fbb25848bc15b8d16cc32 Mon Sep 17 00:00:00 2001 From: JOAC69 Date: Thu, 29 Sep 2016 19:47:26 -0500 Subject: [PATCH] Refactor - Move Born of the Gods tokens to shared area --- Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/Gild.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/PheresBandRaiders.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/VanguardOfBrimaz.java | 2 +- .../src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java | 2 +- .../mage/game/permanent/token}/CatSoldierCreatureToken.java | 2 +- .../game/permanent/token}/CentaurEnchantmentCreatureToken.java | 2 +- .../src/main/java/mage/game/permanent/token}/GoldToken.java | 3 +-- 9 files changed, 9 insertions(+), 10 deletions(-) rename {Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters => Mage/src/main/java/mage/game/permanent/token}/CatSoldierCreatureToken.java (97%) rename {Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters => Mage/src/main/java/mage/game/permanent/token}/CentaurEnchantmentCreatureToken.java (97%) rename {Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters => Mage/src/main/java/mage/game/permanent/token}/GoldToken.java (96%) diff --git a/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java b/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java index 9942531b9d9..e36820ad531 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/BrimazKingOfOreskos.java @@ -44,7 +44,7 @@ import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; -import mage.sets.bornofthegods.TokenAndCounters.CatSoldierCreatureToken; +import mage.game.permanent.token.CatSoldierCreatureToken; /** * diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java index 7551b5c0314..576bcbe1fe1 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedIntervention.java @@ -35,7 +35,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.sets.bornofthegods.TokenAndCounters.CentaurEnchantmentCreatureToken; +import mage.game.permanent.token.CentaurEnchantmentCreatureToken; /** * diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Gild.java b/Mage.Sets/src/mage/sets/bornofthegods/Gild.java index 7ab2d50350d..6ab3cfd14bb 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Gild.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Gild.java @@ -34,7 +34,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.sets.bornofthegods.TokenAndCounters.GoldToken; +import mage.game.permanent.token.GoldToken; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/sets/bornofthegods/PheresBandRaiders.java b/Mage.Sets/src/mage/sets/bornofthegods/PheresBandRaiders.java index 0d4d4c161bb..c35bf3b12e8 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/PheresBandRaiders.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/PheresBandRaiders.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.InspiredAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.sets.bornofthegods.TokenAndCounters.CentaurEnchantmentCreatureToken; +import mage.game.permanent.token.CentaurEnchantmentCreatureToken; /** * diff --git a/Mage.Sets/src/mage/sets/bornofthegods/VanguardOfBrimaz.java b/Mage.Sets/src/mage/sets/bornofthegods/VanguardOfBrimaz.java index 16e871125ef..530c2705309 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/VanguardOfBrimaz.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/VanguardOfBrimaz.java @@ -33,7 +33,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HeroicAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; -import mage.sets.bornofthegods.TokenAndCounters.CatSoldierCreatureToken; +import mage.game.permanent.token.CatSoldierCreatureToken; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java b/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java index b26369fbe3c..4a02d585c81 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.InspiredAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.sets.bornofthegods.TokenAndCounters.GoldToken; +import mage.game.permanent.token.GoldToken; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java similarity index 97% rename from Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java rename to Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java index 5c6e574ab64..566146bd280 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CatSoldierCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.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.sets.bornofthegods.TokenAndCounters; +package mage.game.permanent.token; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java similarity index 97% rename from Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java rename to Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java index 741445b2cd7..0fb16414053 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/CentaurEnchantmentCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.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.sets.bornofthegods.TokenAndCounters; +package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java similarity index 96% rename from Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java rename to Mage/src/main/java/mage/game/permanent/token/GoldToken.java index cfb620594f3..a2bd1071ff5 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -26,14 +26,13 @@ * or implied, of BetaSteward_at_googlemail.com. */ -package mage.sets.bornofthegods.TokenAndCounters; +package mage.game.permanent.token; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; import mage.abilities.mana.SimpleManaAbility; import mage.constants.CardType; import mage.constants.Zone; -import mage.game.permanent.token.Token; /** *