From b17858d9109bbdb42a86721c14202d303e416e84 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 3 Jun 2018 10:18:30 +0200 Subject: [PATCH] Some fixes to "Remove license headers" (#4998). --- .gitignore | 296 +++++++++--------- Mage.Sets/src/mage/cards/a/AncientOoze.java | 2 - Mage.Sets/src/mage/cards/c/Crocanura.java | 8 +- Mage.Sets/src/mage/cards/c/CryptGhast.java | 9 +- .../src/mage/cards/d/DeathpactAngel.java | 2 - Mage.Sets/src/mage/cards/e/ExperimentOne.java | 6 +- Mage.Sets/src/mage/cards/f/FathomMage.java | 4 +- .../src/mage/cards/f/FirefistStriker.java | 7 +- .../src/mage/cards/f/FoundryChampion.java | 12 +- Mage.Sets/src/mage/cards/g/GyreSage.java | 26 +- .../src/mage/cards/h/HellraiserGoblin.java | 10 +- .../src/mage/cards/h/HighPriestOfPenance.java | 6 +- .../src/mage/cards/l/LegionLoyalist.java | 14 +- .../src/mage/cards/l/LeylinePhantom.java | 6 +- Mage.Sets/src/mage/cards/l/LordOfTheVoid.java | 6 +- .../src/mage/cards/o/ObzedatGhostCouncil.java | 2 - .../src/mage/cards/p/PrimeSpeakerZegana.java | 2 - .../src/mage/cards/s/SunhomeGuildmage.java | 6 +- .../src/mage/cards/t/TruefirePaladin.java | 9 +- .../src/mage/cards/u/UndercityInformer.java | 2 - .../src/mage/cards/u/UrbanEvolution.java | 10 +- .../src/mage/cards/v/VizkopaGuildmage.java | 30 +- .../enters/ValakutTheMoltenPinnacleTest.java | 5 +- .../abilities/costs/AdjustingSourceCosts.java | 11 +- 24 files changed, 219 insertions(+), 272 deletions(-) diff --git a/.gitignore b/.gitignore index b3ee8129b7..39a0d76c16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,147 +1,149 @@ -syntax: glob - -# Mage.Client -Mage.Client/*.dck -Mage.Client/db -Mage.Client/gamelogs -Mage.Client/gamelogsJson -Mage.Client/*.log -Mage.Client/plugins/images -Mage.Client/plugins/plugin.data -Mage.Client/target -Mage.Common/target -/db -/gamelogs -/mageclient.log - -# Mage.Plugins -Mage.Plugins/Mage.Card.Plugin/target -Mage.Plugins/Mage.Counter.Plugin/target -Mage.Plugins/Mage.Theme.Plugin/target -Mage.Plugins/Mage.Rating.Plugin/target - -# Mage.Server -Mage.Server/config/init.txt -Mage.Server/saved -Mage.Server/target -Mage.Server/db -Mage.Server/cache -Mage.Server/mageserver.log -Mage.Server/magediag.log -Mage.Server/extensions -/saved -/db -/cache -/mageserver.log -/magediag.log -/extensions - -Mage.Server.Console/target/ -Mage.Server.Console/mageadmin.log -Mage.Server.Plugins/Mage.Deck.Constructed/target -Mage.Server.Plugins/Mage.Deck.Limited/target -Mage.Server.Plugins/Mage.Game.BrawlDuel/target/ -Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/target/ -Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/target -Mage.Server.Plugins/Mage.Game.CommanderDuel/target -Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/target/ -Mage.Server.Plugins/Mage.Game.FreeForAll/target -Mage.Server.Plugins/Mage.Game.MomirDuel/target -Mage.Server.Plugins/Mage.Game.MomirGame/target/ -Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/target -Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/target/ -Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/target -Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/target -Mage.Server.Plugins/Mage.Player.AI.DraftBot/target -Mage.Server.Plugins/Mage.Player.AI.MA/target -Mage.Server.Plugins/Mage.Player.AI/target -Mage.Server.Plugins/Mage.Player.AIMCTS/target -Mage.Server.Plugins/Mage.Player.AIMinimax/target -Mage.Server.Plugins/Mage.Player.Human/target -Mage.Server.Plugins/Mage.Tournament.BoosterDraft/target -Mage.Server.Plugins/Mage.Tournament.Constructed/target -Mage.Server.Plugins/Mage.Tournament.Sealed/target - -# Mage.Sets -Mage.Sets/target - -# Mage.Stats -Mage.Stats/server.log -Mage.Stats/mageserver.log -Mage.Stats/magediag.log - -# Mage.Tests -Mage.Tests/target -Mage.Tests/cache -Mage.Tests/db -Mage.Tests/Mage.log -Mage.Tests/watchdog.log - -# Mage -Mage/target - -# Mage.Updater -Mage.Updater/target -mage.updater.client/target - -# Mage.Verify -Mage.Verify/target -Mage.Verify/mageclient.log -Mage.Verify/AllCards.json.zip -Mage.Verify/AllSets.json.zip -Mage.Verify/AllCards.json -Mage.Verify/AllSets.json - -releases -Utils/author.txt -.DS_Store -.metadata -.project -.settings -.idea -syntax: regexp -\.class -\.jar -\.iml -\.ipr -\.iws -\.log -nbactions.xml -nbactions-*.xml -nb-configuration.xml -glob:Mage.Client/cheat.dck -glob:Mage.Client/test.dck -mage-bundle.zip -mage-stats-ws.war - -Mage.Server.Plugins/Mage.Draft.8PlayerBooster/target -\.orig\..*$ -\.orig$ -\.chg\..*$ -\.rej$ -\.conflict\~$ -/Mage.Server.Plugins/Mage.Player.AIMCTS/target/ - -*.classpath -*.iml -hs_err*.log -/submitted - -/Mage.Server/config/ai.please.cast.this.txt -/Mage.Stats/target/ -/Utils/*_unimplemented.txt -*.netbeans_automatic_build -Mage.Client/serverlist.txt -/bin/ -/out/ -/target/ - -client_secrets.json - -dependency-reduced-pom.xml -mage-bundle -/Mage.Client/game-*.json - -# build-tools config and log files when building client/server with Atom -.build-tools.cson -build-output.log +syntax: glob + +# Mage.Client +Mage.Client/*.dck +Mage.Client/db +Mage.Client/gamelogs +Mage.Client/gamelogsJson +Mage.Client/*.log +Mage.Client/plugins/images +Mage.Client/plugins/plugin.data +Mage.Client/target +Mage.Common/target +/db +/gamelogs +/mageclient.log + +# Mage.Plugins +Mage.Plugins/Mage.Card.Plugin/target +Mage.Plugins/Mage.Counter.Plugin/target +Mage.Plugins/Mage.Theme.Plugin/target +Mage.Plugins/Mage.Rating.Plugin/target + +# Mage.Server +Mage.Server/config/init.txt +Mage.Server/saved +Mage.Server/target +Mage.Server/db +Mage.Server/cache +Mage.Server/mageserver.log +Mage.Server/magediag.log +Mage.Server/extensions +/saved +/db +/cache +/mageserver.log +/magediag.log +/extensions + +Mage.Server.Console/target/ +Mage.Server.Console/mageadmin.log +Mage.Server.Plugins/Mage.Deck.Constructed/target +Mage.Server.Plugins/Mage.Deck.Limited/target +Mage.Server.Plugins/Mage.Game.BrawlDuel/target/ +Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/target/ +Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/target +Mage.Server.Plugins/Mage.Game.CommanderDuel/target +Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/target/ +Mage.Server.Plugins/Mage.Game.FreeForAll/target +Mage.Server.Plugins/Mage.Game.MomirDuel/target +Mage.Server.Plugins/Mage.Game.MomirGame/target/ +Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/target +Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/target/ +Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/target +Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/target +Mage.Server.Plugins/Mage.Player.AI.DraftBot/target +Mage.Server.Plugins/Mage.Player.AI.MA/target +Mage.Server.Plugins/Mage.Player.AI/target +Mage.Server.Plugins/Mage.Player.AIMCTS/target +Mage.Server.Plugins/Mage.Player.AIMinimax/target +Mage.Server.Plugins/Mage.Player.Human/target +Mage.Server.Plugins/Mage.Tournament.BoosterDraft/target +Mage.Server.Plugins/Mage.Tournament.Constructed/target +Mage.Server.Plugins/Mage.Tournament.Sealed/target + +# Mage.Sets +Mage.Sets/target + +# Mage.Stats +Mage.Stats/server.log +Mage.Stats/mageserver.log +Mage.Stats/magediag.log + +# Mage.Tests +Mage.Tests/target +Mage.Tests/cache +Mage.Tests/db +Mage.Tests/Mage.log +Mage.Tests/watchdog.log + +# Mage +Mage/target + +# Mage.Updater +Mage.Updater/target +mage.updater.client/target + +# Mage.Verify +Mage.Verify/target +Mage.Verify/mageclient.log +Mage.Verify/AllCards.json.zip +Mage.Verify/AllSets.json.zip +Mage.Verify/AllCards.json +Mage.Verify/AllSets.json + +releases +Utils/author.txt +Utils/*_tracker.txt +Utils/*implemented.txt +.DS_Store +.metadata +.project +.settings +.idea +syntax: regexp +\.class +\.jar +\.iml +\.ipr +\.iws +\.log +nbactions.xml +nbactions-*.xml +nb-configuration.xml +glob:Mage.Client/cheat.dck +glob:Mage.Client/test.dck +mage-bundle.zip +mage-stats-ws.war + +Mage.Server.Plugins/Mage.Draft.8PlayerBooster/target +\.orig\..*$ +\.orig$ +\.chg\..*$ +\.rej$ +\.conflict\~$ +/Mage.Server.Plugins/Mage.Player.AIMCTS/target/ + +*.classpath +*.iml +hs_err*.log +/submitted + +/Mage.Server/config/ai.please.cast.this.txt +/Mage.Stats/target/ +/Utils/*_unimplemented.txt +*.netbeans_automatic_build +Mage.Client/serverlist.txt +/bin/ +/out/ +/target/ + +client_secrets.json + +dependency-reduced-pom.xml +mage-bundle +/Mage.Client/game-*.json + +# build-tools config and log files when building client/server with Atom +.build-tools.cson +build-output.log diff --git a/Mage.Sets/src/mage/cards/a/AncientOoze.java b/Mage.Sets/src/mage/cards/a/AncientOoze.java index 5ffe03a1b0..dc5572d1ed 100644 --- a/Mage.Sets/src/mage/cards/a/AncientOoze.java +++ b/Mage.Sets/src/mage/cards/a/AncientOoze.java @@ -1,5 +1,3 @@ -/* - package mage.cards.a; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/Crocanura.java b/Mage.Sets/src/mage/cards/c/Crocanura.java index 72330d9961..a1ff1591cd 100644 --- a/Mage.Sets/src/mage/cards/c/Crocanura.java +++ b/Mage.Sets/src/mage/cards/c/Crocanura.java @@ -1,5 +1,3 @@ -/* - package mage.cards.c; import java.util.UUID; @@ -18,7 +16,7 @@ import mage.constants.SubType; public final class Crocanura extends CardImpl { public Crocanura(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.subtype.add(SubType.CROCODILE); this.subtype.add(SubType.FROG); @@ -27,11 +25,11 @@ public final class Crocanura extends CardImpl { //Reach this.addAbility(ReachAbility.getInstance()); - + // Evolve (Whenever a creature enters the battlefield under your control, if that creature // has greater power or toughness than this creature, put a +1/+1 counter on this creature.) this.addAbility(new EvolveAbility()); - + } public Crocanura(final Crocanura card) { diff --git a/Mage.Sets/src/mage/cards/c/CryptGhast.java b/Mage.Sets/src/mage/cards/c/CryptGhast.java index 0fee79b3e3..99e75eaaea 100644 --- a/Mage.Sets/src/mage/cards/c/CryptGhast.java +++ b/Mage.Sets/src/mage/cards/c/CryptGhast.java @@ -1,5 +1,3 @@ -/* - package mage.cards.c; import java.util.UUID; @@ -27,7 +25,7 @@ import mage.game.permanent.Permanent; public final class CryptGhast extends CardImpl { public CryptGhast(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.subtype.add(SubType.SPIRIT); this.power = new MageInt(2); @@ -50,10 +48,11 @@ public final class CryptGhast extends CardImpl { } class CryptGhastTriggeredAbility extends TriggeredManaAbility { - + private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp"); + static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public CryptGhastTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java index ed0c31af03..ebcca304ea 100644 --- a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java @@ -1,5 +1,3 @@ -/* - package mage.cards.d; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/e/ExperimentOne.java b/Mage.Sets/src/mage/cards/e/ExperimentOne.java index f1e549aabf..0b072740a5 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentOne.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentOne.java @@ -1,5 +1,3 @@ -/* - package mage.cards.e; import java.util.UUID; @@ -22,7 +20,7 @@ import mage.counters.CounterType; public final class ExperimentOne extends CardImpl { public ExperimentOne(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.OOZE); @@ -32,7 +30,7 @@ public final class ExperimentOne extends CardImpl { // Evolve (Whenever a creature enters the battlefield under your control, if that creature // has greater power or toughness than this creature, put a +1/+1 counter on this creature.) this.addAbility(new EvolveAbility()); - + //Remove two +1/+1 counters from Experiment One: Regenerate Experiment One. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } diff --git a/Mage.Sets/src/mage/cards/f/FathomMage.java b/Mage.Sets/src/mage/cards/f/FathomMage.java index 617134a5a7..b0ece2265e 100644 --- a/Mage.Sets/src/mage/cards/f/FathomMage.java +++ b/Mage.Sets/src/mage/cards/f/FathomMage.java @@ -1,5 +1,3 @@ -/* - package mage.cards.f; import java.util.UUID; @@ -24,7 +22,7 @@ import mage.game.events.GameEvent.EventType; public final class FathomMage extends CardImpl { public FathomMage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.WIZARD); diff --git a/Mage.Sets/src/mage/cards/f/FirefistStriker.java b/Mage.Sets/src/mage/cards/f/FirefistStriker.java index 32b740d194..272ee0c584 100644 --- a/Mage.Sets/src/mage/cards/f/FirefistStriker.java +++ b/Mage.Sets/src/mage/cards/f/FirefistStriker.java @@ -1,5 +1,3 @@ -/* - package mage.cards.f; import java.util.UUID; @@ -10,8 +8,8 @@ import mage.abilities.keyword.BattalionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; /** @@ -21,11 +19,10 @@ import mage.target.common.TargetCreaturePermanent; public final class FirefistStriker extends CardImpl { public FirefistStriker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.SOLDIER); - this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index 51b66a227a..235f269014 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -1,5 +1,3 @@ -/* - package mage.cards.f; import java.util.UUID; @@ -14,8 +12,8 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; @@ -27,11 +25,10 @@ import mage.target.common.TargetAnyTarget; public final class FoundryChampion extends CardImpl { public FoundryChampion(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{W}"); this.subtype.add(SubType.ELEMENTAL); this.subtype.add(SubType.SOLDIER); - this.power = new MageInt(4); this.toughness = new MageInt(4); @@ -39,10 +36,10 @@ public final class FoundryChampion extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - + //{R}: Foundry Champion gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); - + //{W}: Foundry Champion gets +0/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}"))); } @@ -56,4 +53,3 @@ public final class FoundryChampion extends CardImpl { return new FoundryChampion(this); } } - diff --git a/Mage.Sets/src/mage/cards/g/GyreSage.java b/Mage.Sets/src/mage/cards/g/GyreSage.java index 020a2be7e3..8be933e998 100644 --- a/Mage.Sets/src/mage/cards/g/GyreSage.java +++ b/Mage.Sets/src/mage/cards/g/GyreSage.java @@ -1,18 +1,16 @@ - /* - package mage.cards.g; - import java.util.UUID; - import mage.MageInt; - import mage.Mana; - import mage.abilities.dynamicvalue.common.CountersSourceCount; - import mage.abilities.keyword.EvolveAbility; - import mage.abilities.mana.DynamicManaAbility; - import mage.cards.CardImpl; - import mage.cards.CardSetInfo; - import mage.constants.CardType; +import java.util.UUID; +import mage.MageInt; +import mage.Mana; +import mage.abilities.dynamicvalue.common.CountersSourceCount; +import mage.abilities.keyword.EvolveAbility; +import mage.abilities.mana.DynamicManaAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.SubType; - import mage.counters.CounterType; +import mage.counters.CounterType; /** * @@ -21,7 +19,7 @@ import mage.constants.SubType; public final class GyreSage extends CardImpl { public GyreSage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.subtype.add(SubType.ELF); this.subtype.add(SubType.DRUID); @@ -31,7 +29,7 @@ public final class GyreSage extends CardImpl { // Evolve (Whenever a creature enters the battlefield under your control, if that creature // has greater power or toughness than this creature, put a +1/+1 counter on this creature.) this.addAbility(new EvolveAbility()); - + //{T} : Add {G} for each +1/+1 counter on Gyre Sage. this.addAbility(new DynamicManaAbility(Mana.GreenMana(1), new CountersSourceCount(CounterType.P1P1))); } diff --git a/Mage.Sets/src/mage/cards/h/HellraiserGoblin.java b/Mage.Sets/src/mage/cards/h/HellraiserGoblin.java index 0adba21d2c..e09d46a113 100644 --- a/Mage.Sets/src/mage/cards/h/HellraiserGoblin.java +++ b/Mage.Sets/src/mage/cards/h/HellraiserGoblin.java @@ -1,5 +1,3 @@ -/* - package mage.cards.h; import java.util.UUID; @@ -14,8 +12,8 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; @@ -29,11 +27,10 @@ import mage.game.permanent.Permanent; public final class HellraiserGoblin extends CardImpl { public HellraiserGoblin(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.BERSERKER); - this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -68,7 +65,6 @@ class AttacksIfAbleAllEffect extends RequirementEffect { this.filter = filter; } - public AttacksIfAbleAllEffect(final AttacksIfAbleAllEffect effect) { super(effect); this.filter = effect.filter; @@ -102,4 +98,4 @@ class AttacksIfAbleAllEffect extends RequirementEffect { return filter.getMessage() + " attack each combat if able"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/h/HighPriestOfPenance.java b/Mage.Sets/src/mage/cards/h/HighPriestOfPenance.java index 73dd832f3c..0cc988f870 100644 --- a/Mage.Sets/src/mage/cards/h/HighPriestOfPenance.java +++ b/Mage.Sets/src/mage/cards/h/HighPriestOfPenance.java @@ -1,5 +1,3 @@ -/* - package mage.cards.h; import java.util.UUID; @@ -23,11 +21,10 @@ import mage.target.common.TargetNonlandPermanent; public final class HighPriestOfPenance extends CardImpl { public HighPriestOfPenance(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{B}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.CLERIC); - this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -47,7 +44,6 @@ public final class HighPriestOfPenance extends CardImpl { class HighPriestOfPenanceTriggeredAbility extends TriggeredAbilityImpl { - public HighPriestOfPenanceTriggeredAbility() { super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true); this.addTarget(new TargetNonlandPermanent()); diff --git a/Mage.Sets/src/mage/cards/l/LegionLoyalist.java b/Mage.Sets/src/mage/cards/l/LegionLoyalist.java index d4c150ff22..ca675bf756 100644 --- a/Mage.Sets/src/mage/cards/l/LegionLoyalist.java +++ b/Mage.Sets/src/mage/cards/l/LegionLoyalist.java @@ -1,5 +1,3 @@ -/* - package mage.cards.l; import java.util.UUID; @@ -15,8 +13,8 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,17 +27,16 @@ import mage.game.permanent.PermanentToken; public final class LegionLoyalist extends CardImpl { public LegionLoyalist(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.SOLDIER); - this.power = new MageInt(1); this.toughness = new MageInt(1); //Haste this.addAbility(HasteAbility.getInstance()); - //Battalion - Whenever Legion Loyalist and at least two other creatures attack, + //Battalion - Whenever Legion Loyalist and at least two other creatures attack, //creatures you control gain first strike and trample until end of turn and can't be blocked by tokens this turn. Ability ability = new BattalionAbility(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent())); ability.addEffect(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent())); @@ -67,11 +64,11 @@ class CantBeBlockedByTokenEffect extends RestrictionEffect { public CantBeBlockedByTokenEffect(final CantBeBlockedByTokenEffect effect) { super(effect); } - + @Override public void init(Ability source, Game game) { affectedObjectsSet = true; - for (Permanent perm: game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), source.getControllerId(), source.getSourceId(), game)) { + for (Permanent perm : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), source.getControllerId(), source.getSourceId(), game)) { affectedObjectList.add(new MageObjectReference(perm, game)); } } @@ -97,4 +94,3 @@ class CantBeBlockedByTokenEffect extends RestrictionEffect { return new CantBeBlockedByTokenEffect(this); } } - diff --git a/Mage.Sets/src/mage/cards/l/LeylinePhantom.java b/Mage.Sets/src/mage/cards/l/LeylinePhantom.java index 0ca46415fb..50f8cb929f 100644 --- a/Mage.Sets/src/mage/cards/l/LeylinePhantom.java +++ b/Mage.Sets/src/mage/cards/l/LeylinePhantom.java @@ -1,5 +1,3 @@ -/* - package mage.cards.l; import java.util.UUID; @@ -23,10 +21,9 @@ import mage.game.events.GameEvent.EventType; public final class LeylinePhantom extends CardImpl { public LeylinePhantom(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.subtype.add(SubType.ILLUSION); - this.power = new MageInt(5); this.toughness = new MageInt(5); @@ -44,7 +41,6 @@ public final class LeylinePhantom extends CardImpl { } } - class LeylinePhantomTriggeredAbility extends TriggeredAbilityImpl { public LeylinePhantomTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java b/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java index b33dcf4c68..be1fe956e5 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheVoid.java @@ -1,5 +1,3 @@ -/* - package mage.cards.l; import java.util.UUID; @@ -14,8 +12,8 @@ import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; @@ -29,7 +27,7 @@ import mage.target.TargetCard; public final class LordOfTheVoid extends CardImpl { public LordOfTheVoid(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}{B}"); this.subtype.add(SubType.DEMON); this.power = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java index c80afed2f1..b0ea8280e2 100644 --- a/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java +++ b/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java @@ -1,5 +1,3 @@ -/* - package mage.cards.o; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java b/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java index d1837f7b94..aedc5ad22b 100644 --- a/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java +++ b/Mage.Sets/src/mage/cards/p/PrimeSpeakerZegana.java @@ -1,5 +1,3 @@ -/* - package mage.cards.p; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java index dbcd1df1a2..f6e096e6eb 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java @@ -1,5 +1,3 @@ -/* - package mage.cards.s; import java.util.UUID; @@ -11,8 +9,8 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.permanent.token.SoldierTokenWithHaste; @@ -23,7 +21,7 @@ import mage.game.permanent.token.SoldierTokenWithHaste; public final class SunhomeGuildmage extends CardImpl { public SunhomeGuildmage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.WIZARD); diff --git a/Mage.Sets/src/mage/cards/t/TruefirePaladin.java b/Mage.Sets/src/mage/cards/t/TruefirePaladin.java index adbfccf6f2..7876625af1 100644 --- a/Mage.Sets/src/mage/cards/t/TruefirePaladin.java +++ b/Mage.Sets/src/mage/cards/t/TruefirePaladin.java @@ -1,5 +1,3 @@ -/* - package mage.cards.t; import java.util.UUID; @@ -13,8 +11,8 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; /** @@ -24,12 +22,11 @@ import mage.constants.Zone; public final class TruefirePaladin extends CardImpl { public TruefirePaladin(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.KNIGHT); - this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -37,7 +34,7 @@ public final class TruefirePaladin extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {R}{W}: Truefire Paladin gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,0, Duration.EndOfTurn), new ManaCostsImpl("{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}{W}"))); // {R}{W}: Truefire Paladin gets first strike until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}{W}"))); diff --git a/Mage.Sets/src/mage/cards/u/UndercityInformer.java b/Mage.Sets/src/mage/cards/u/UndercityInformer.java index 1122338d12..b763a9b4df 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityInformer.java +++ b/Mage.Sets/src/mage/cards/u/UndercityInformer.java @@ -1,5 +1,3 @@ -/* - package mage.cards.u; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/u/UrbanEvolution.java b/Mage.Sets/src/mage/cards/u/UrbanEvolution.java index b032da0609..e7527a0cff 100644 --- a/Mage.Sets/src/mage/cards/u/UrbanEvolution.java +++ b/Mage.Sets/src/mage/cards/u/UrbanEvolution.java @@ -1,5 +1,3 @@ -/* - package mage.cards.u; import java.util.UUID; @@ -17,11 +15,11 @@ import mage.constants.Duration; public final class UrbanEvolution extends CardImpl { public UrbanEvolution(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}{U}"); - //Draw three cards. + //Draw three cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); - + //You may play an additional land this turn. this.getSpellAbility().addEffect(new PlayAdditionalLandsControllerEffect(1, Duration.EndOfTurn)); } @@ -34,4 +32,4 @@ public final class UrbanEvolution extends CardImpl { public UrbanEvolution copy() { return new UrbanEvolution(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java b/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java index 784e1e8e2a..956949d553 100644 --- a/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java +++ b/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java @@ -1,5 +1,3 @@ -/* - package mage.cards.v; import java.util.UUID; @@ -15,9 +13,9 @@ import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -26,32 +24,32 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; /** - * Gatecrash FAQ (01.2013) - * Multiple instances of lifelink are redundant. Giving the same creature lifelink - * more than once won't cause you to gain additional life. + * Gatecrash FAQ (01.2013) Multiple instances of lifelink are redundant. Giving + * the same creature lifelink more than once won't cause you to gain additional + * life. * - * Each time the second ability resolves, a delayed triggered ability is created. - * Whenever you gain life that turn, each of those abilities will trigger. For - * example, if you activate the second ability twice (and let those abilities resolve) - * and then you gain 2 life, each opponent will lose a total of 4 life. Each instance - * will cause two abilities to trigger, each causing that player to lose 2 life. + * Each time the second ability resolves, a delayed triggered ability is + * created. Whenever you gain life that turn, each of those abilities will + * trigger. For example, if you activate the second ability twice (and let those + * abilities resolve) and then you gain 2 life, each opponent will lose a total + * of 4 life. Each instance will cause two abilities to trigger, each causing + * that player to lose 2 life. * * @author LevelX2 */ public final class VizkopaGuildmage extends CardImpl { public VizkopaGuildmage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{B}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.WIZARD); - this.power = new MageInt(2); this.toughness = new MageInt(2); // 1{W}{B}: Target creature gains lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{1}{W}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -124,8 +122,8 @@ class OpponentsLoseLifeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Integer amountLifeGained = (Integer) this.getValue("amountLifeGained"); - if (amountLifeGained != null ) { - for (UUID opponentId: game.getOpponents(source.getControllerId())) { + if (amountLifeGained != null) { + for (UUID opponentId : game.getOpponents(source.getControllerId())) { Player opponent = game.getPlayer(opponentId); if (opponent != null) { opponent.loseLife(amountLifeGained, game, false); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java index f12afd4b02..fa1a9a80fc 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/ValakutTheMoltenPinnacleTest.java @@ -1,5 +1,3 @@ -/* - package org.mage.test.cards.abilities.enters; import mage.constants.PhaseStep; @@ -17,8 +15,7 @@ public class ValakutTheMoltenPinnacleTest extends CardTestPlayerBase { * Valakut, the Molten Pinnacle Land Valakut, the Molten Pinnacle enters the * battlefield tapped. Whenever a Mountain enters the battlefield under your * control, if you control at least five other Mountains, you may have - * Valakut, the Molten Pinnacle deal 3 damage to any target. - * {T}: Add {R}. + * Valakut, the Molten Pinnacle deal 3 damage to any target. {T}: Add {R}. */ @Test public void onlyFourMountainsNoDamage() { diff --git a/Mage/src/main/java/mage/abilities/costs/AdjustingSourceCosts.java b/Mage/src/main/java/mage/abilities/costs/AdjustingSourceCosts.java index e76230bfa3..e1723c5b46 100644 --- a/Mage/src/main/java/mage/abilities/costs/AdjustingSourceCosts.java +++ b/Mage/src/main/java/mage/abilities/costs/AdjustingSourceCosts.java @@ -1,19 +1,20 @@ -/* - package mage.abilities.costs; import mage.abilities.Ability; import mage.game.Game; /** - * Interface for abilities that adjust source and only source costs. - * For the cases when some permanent adjusts costs of other spells use {@link mage.abilities.effects.CostModificationEffect}. + * Interface for abilities that adjust source and only source costs. For the + * cases when some permanent adjusts costs of other spells use + * {@link mage.abilities.effects.CostModificationEffect}. * - * Example of such source costs adjusting: {@link mage.abilities.keyword.AffinityForArtifactsAbility} + * Example of such source costs adjusting: + * {@link mage.abilities.keyword.AffinityForArtifactsAbility} * * @author nantuko */ @FunctionalInterface public interface AdjustingSourceCosts { + void adjustCosts(Ability ability, Game game); }