From 11976b5c89e40e840dc92f9214e68d2e1fb691ef Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 14 Jan 2020 09:15:33 +0400 Subject: [PATCH] Refactor: move player.damage params to default (same as permanent.damage); --- .../src/main/java/mage/utils/MageVersion.java | 8 +- .../java/mage/player/ai/ComputerPlayer.java | 2 +- .../src/mage/player/human/HumanPlayer.java | 2 +- .../src/mage/cards/a/AcolytesReward.java | 2 +- Mage.Sets/src/mage/cards/a/AkoumHellkite.java | 5 +- Mage.Sets/src/mage/cards/a/AnaBattlemage.java | 17 ++-- Mage.Sets/src/mage/cards/a/AngelsTrumpet.java | 7 +- .../mage/cards/a/AngrathMinotaurPirate.java | 7 +- Mage.Sets/src/mage/cards/a/AuraBarbs.java | 11 ++- .../src/mage/cards/a/AvacynThePurifier.java | 15 ++-- Mage.Sets/src/mage/cards/b/Backlash.java | 66 ++++++++-------- .../src/mage/cards/b/BarbarianBully.java | 12 +-- .../src/mage/cards/b/BellowingFiend.java | 20 ++--- Mage.Sets/src/mage/cards/b/BloodOath.java | 11 ++- Mage.Sets/src/mage/cards/b/BombSquad.java | 2 +- .../src/mage/cards/b/BorosFuryShield.java | 25 +++--- .../src/mage/cards/b/BottleOfSuleiman.java | 7 +- Mage.Sets/src/mage/cards/b/Brightflame.java | 11 ++- .../src/mage/cards/b/BronzeBombshell.java | 7 +- Mage.Sets/src/mage/cards/b/Bulwark.java | 25 +++--- Mage.Sets/src/mage/cards/b/BurnTheImpure.java | 9 +-- .../src/mage/cards/c/CerebralEruption.java | 9 +-- .../src/mage/cards/c/CerebralVortex.java | 22 +++--- .../src/mage/cards/c/ChainLightning.java | 9 +-- Mage.Sets/src/mage/cards/c/ChainOfPlasma.java | 7 +- Mage.Sets/src/mage/cards/c/ChandraAblaze.java | 9 +-- .../src/mage/cards/c/ChandraRoaringFlame.java | 13 ++-- .../src/mage/cards/c/ChandrasIgnition.java | 7 +- .../src/mage/cards/c/ChargingCinderhorn.java | 13 +--- Mage.Sets/src/mage/cards/c/CinderCloud.java | 3 +- Mage.Sets/src/mage/cards/c/CitadelOfPain.java | 7 +- Mage.Sets/src/mage/cards/c/CleansingBeam.java | 9 +-- .../src/mage/cards/c/CoalhaulerSwine.java | 9 +-- Mage.Sets/src/mage/cards/c/ColdSnap.java | 27 +++---- Mage.Sets/src/mage/cards/c/CometStorm.java | 6 +- Mage.Sets/src/mage/cards/c/Comeuppance.java | 16 ++-- Mage.Sets/src/mage/cards/c/CosmicHorror.java | 9 +-- .../src/mage/cards/c/CrimsonHonorGuard.java | 9 +-- .../mage/cards/c/CurseOfThePiercedHeart.java | 12 ++- .../src/mage/cards/d/DarigaazTheIgniter.java | 7 +- .../src/mage/cards/d/DeflectingPalm.java | 19 ++--- Mage.Sets/src/mage/cards/d/Delirium.java | 2 +- .../src/mage/cards/d/DemonlordBelzenlok.java | 13 +--- Mage.Sets/src/mage/cards/d/Desolation.java | 19 ++--- .../src/mage/cards/d/DestructiveRevelry.java | 6 +- Mage.Sets/src/mage/cards/d/DingusStaff.java | 8 +- Mage.Sets/src/mage/cards/d/Disorder.java | 19 +++-- .../src/mage/cards/d/DivineDeflection.java | 12 ++- .../src/mage/cards/d/DongZhouTheTyrant.java | 19 ++--- Mage.Sets/src/mage/cards/d/DraconicRoar.java | 3 +- Mage.Sets/src/mage/cards/d/DragonTempest.java | 7 +- .../mage/cards/d/DrakusethMawOfFlames.java | 5 +- .../src/mage/cards/d/DwarvenDriller.java | 9 +-- Mage.Sets/src/mage/cards/d/DwarvenShrine.java | 11 ++- Mage.Sets/src/mage/cards/e/ElderSpawn.java | 22 +++--- .../src/mage/cards/e/Electropotence.java | 17 ++-- Mage.Sets/src/mage/cards/e/Embersmith.java | 2 +- .../src/mage/cards/e/EnchantersBane.java | 6 +- Mage.Sets/src/mage/cards/e/Enslave.java | 15 ++-- .../src/mage/cards/e/ErraticExplosion.java | 7 +- .../src/mage/cards/e/EssenceBacklash.java | 7 +- .../src/mage/cards/e/ExplosiveRevelation.java | 7 +- Mage.Sets/src/mage/cards/e/EyeForAnEye.java | 9 +-- .../src/mage/cards/f/FeveredVisions.java | 11 ++- .../src/mage/cards/f/FieryBombardment.java | 13 ++-- Mage.Sets/src/mage/cards/f/Fireball.java | 3 +- .../src/mage/cards/f/FlameblastDragon.java | 2 +- .../mage/cards/f/FlayerOfTheHatebound.java | 2 +- Mage.Sets/src/mage/cards/f/FleshBlood.java | 7 +- Mage.Sets/src/mage/cards/f/FleshReaver.java | 9 +-- Mage.Sets/src/mage/cards/f/ForceDrain.java | 7 +- Mage.Sets/src/mage/cards/f/ForceOfNature.java | 11 ++- .../src/mage/cards/f/FormOfTheDinosaur.java | 7 +- Mage.Sets/src/mage/cards/f/FriendlyFire.java | 7 +- .../src/mage/cards/g/GargantuanGorilla.java | 2 +- Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java | 11 ++- .../src/mage/cards/g/GoblinBangchuckers.java | 11 ++- .../src/mage/cards/g/GoblinCharbelcher.java | 7 +- Mage.Sets/src/mage/cards/g/GoblinLyre.java | 2 +- .../src/mage/cards/g/GoblinPsychopath.java | 9 +-- Mage.Sets/src/mage/cards/g/GraviticPunch.java | 6 +- Mage.Sets/src/mage/cards/g/GreatbowDoyen.java | 8 +- .../src/mage/cards/g/GrenzosRuffians.java | 11 ++- Mage.Sets/src/mage/cards/h/Hankyu.java | 77 +++++++++---------- Mage.Sets/src/mage/cards/h/HarshJustice.java | 13 +--- Mage.Sets/src/mage/cards/h/HasranOgress.java | 14 ++-- Mage.Sets/src/mage/cards/h/HatchetBully.java | 11 ++- .../src/mage/cards/h/HeartOfBogardan.java | 7 +- .../src/mage/cards/h/HeartlessHidetsugu.java | 15 ++-- Mage.Sets/src/mage/cards/h/HellholeRats.java | 11 ++- .../src/mage/cards/h/HereticsPunishment.java | 9 +-- .../mage/cards/h/HidetsugusSecondRite.java | 9 +-- Mage.Sets/src/mage/cards/h/HitRun.java | 7 +- .../src/mage/cards/h/HonorablePassage.java | 15 ++-- Mage.Sets/src/mage/cards/h/HungryFlames.java | 6 +- Mage.Sets/src/mage/cards/h/HydraOmnivore.java | 15 ++-- Mage.Sets/src/mage/cards/i/Icequake.java | 15 ++-- .../src/mage/cards/i/IgniteMemories.java | 13 +--- Mage.Sets/src/mage/cards/i/InsultInjury.java | 6 +- Mage.Sets/src/mage/cards/i/Ionize.java | 7 +- Mage.Sets/src/mage/cards/j/JackalPup.java | 10 +-- Mage.Sets/src/mage/cards/j/JovialEvil.java | 15 ++-- Mage.Sets/src/mage/cards/j/Justice.java | 13 ++-- .../src/mage/cards/k/KaervekTheMerciless.java | 8 +- Mage.Sets/src/mage/cards/k/KaerveksPurge.java | 3 +- Mage.Sets/src/mage/cards/k/Karma.java | 31 ++++---- .../src/mage/cards/k/KayaOrzhovUsurper.java | 2 +- Mage.Sets/src/mage/cards/k/KhorvathsFury.java | 11 ++- Mage.Sets/src/mage/cards/l/LashOut.java | 9 +-- .../src/mage/cards/l/LastDitchEffort.java | 11 ++- Mage.Sets/src/mage/cards/l/LavaBlister.java | 7 +- Mage.Sets/src/mage/cards/l/Lavalanche.java | 9 +-- Mage.Sets/src/mage/cards/l/Leeches.java | 9 +-- Mage.Sets/src/mage/cards/l/LiegeOfThePit.java | 15 ++-- .../src/mage/cards/l/LightningReaver.java | 12 ++- Mage.Sets/src/mage/cards/l/LimDulsHex.java | 13 ++-- Mage.Sets/src/mage/cards/l/LiquidFire.java | 21 +++-- Mage.Sets/src/mage/cards/l/LobeLobber.java | 13 +--- .../src/mage/cards/l/LonghornFirebeast.java | 14 ++-- .../src/mage/cards/m/MadcapExperiment.java | 7 +- .../src/mage/cards/m/MagusOfTheScroll.java | 2 +- .../src/mage/cards/m/MalignantGrowth.java | 2 +- Mage.Sets/src/mage/cards/m/ManaClash.java | 19 +++-- Mage.Sets/src/mage/cards/m/ManaCrypt.java | 9 +-- .../src/mage/cards/m/MasterOfTheWildHunt.java | 15 ++-- Mage.Sets/src/mage/cards/m/Meglonoth.java | 9 +-- Mage.Sets/src/mage/cards/m/MindBomb.java | 3 +- Mage.Sets/src/mage/cards/m/Mindblaze.java | 11 ++- Mage.Sets/src/mage/cards/m/Mindsparker.java | 15 ++-- .../src/mage/cards/m/MindstormCrown.java | 6 +- Mage.Sets/src/mage/cards/m/Mindswipe.java | 9 +-- .../src/mage/cards/m/MinionOfLeshrac.java | 35 ++++----- Mage.Sets/src/mage/cards/m/Misfortune.java | 2 +- .../src/mage/cards/m/MishrasWarMachine.java | 27 ++++--- .../src/mage/cards/m/MogisGodOfSlaughter.java | 2 +- .../src/mage/cards/m/MoltenInfluence.java | 7 +- Mage.Sets/src/mage/cards/m/MoltenPsyche.java | 13 ++-- Mage.Sets/src/mage/cards/m/MoltenRain.java | 9 +-- Mage.Sets/src/mage/cards/m/Monsoon.java | 10 +-- Mage.Sets/src/mage/cards/m/MorgueBurst.java | 9 +-- .../src/mage/cards/m/MurderousRedcap.java | 11 ++- Mage.Sets/src/mage/cards/m/Mutiny.java | 7 +- Mage.Sets/src/mage/cards/o/OathOfMages.java | 2 +- Mage.Sets/src/mage/cards/o/OrimsThunder.java | 3 +- Mage.Sets/src/mage/cards/p/Pandemonium.java | 3 +- .../mage/cards/p/ParallectricFeedback.java | 7 +- .../src/mage/cards/p/PestilenceDemon.java | 11 ++- .../src/mage/cards/p/PiasRevolution.java | 7 +- .../src/mage/cards/p/PlaneswalkersFury.java | 15 ++-- Mage.Sets/src/mage/cards/p/PowerLeak.java | 14 +--- Mage.Sets/src/mage/cards/p/PowerSurge.java | 15 ++-- .../src/mage/cards/p/PriceOfKnowledge.java | 15 ++-- .../src/mage/cards/p/PriceOfProgress.java | 11 ++- Mage.Sets/src/mage/cards/p/PrimalOrder.java | 25 +++--- .../src/mage/cards/p/PrimordialOoze.java | 15 ++-- Mage.Sets/src/mage/cards/p/PsionicBlast.java | 9 +-- .../src/mage/cards/p/PsychicAllergy.java | 29 +++---- Mage.Sets/src/mage/cards/r/Rackling.java | 13 +--- Mage.Sets/src/mage/cards/r/RakdosCharm.java | 11 ++- .../src/mage/cards/r/RazorBoomerang.java | 7 +- Mage.Sets/src/mage/cards/r/RazorPendulum.java | 2 +- .../src/mage/cards/r/RefractionTrap.java | 9 +-- .../src/mage/cards/r/RefuseCooperate.java | 8 +- Mage.Sets/src/mage/cards/r/Repercussion.java | 33 ++++---- .../src/mage/cards/r/RiddleOfLightning.java | 7 +- Mage.Sets/src/mage/cards/r/RiskFactor.java | 6 +- .../src/mage/cards/r/RoilingTerrain.java | 9 +-- .../src/mage/cards/r/RumblingAftershocks.java | 13 ++-- Mage.Sets/src/mage/cards/r/RustElemental.java | 11 ++- .../src/mage/cards/s/SaskiaTheUnyielding.java | 13 +--- .../src/mage/cards/s/ScourgeOfValkas.java | 13 +--- Mage.Sets/src/mage/cards/s/SearingBlood.java | 13 ++-- Mage.Sets/src/mage/cards/s/Seizures.java | 23 +++--- Mage.Sets/src/mage/cards/s/SerendibDjinn.java | 6 +- Mage.Sets/src/mage/cards/s/SinProdder.java | 13 +--- Mage.Sets/src/mage/cards/s/SkullRend.java | 13 ++-- Mage.Sets/src/mage/cards/s/Skullcage.java | 17 ++-- Mage.Sets/src/mage/cards/s/Skullscorch.java | 20 +++-- Mage.Sets/src/mage/cards/s/SonicAssault.java | 6 +- Mage.Sets/src/mage/cards/s/SoulBarrier.java | 2 +- Mage.Sets/src/mage/cards/s/SoulBurn.java | 2 +- Mage.Sets/src/mage/cards/s/Soulblast.java | 7 +- Mage.Sets/src/mage/cards/s/SoulsFire.java | 11 ++- .../src/mage/cards/s/SpikeshotElder.java | 16 ++-- .../src/mage/cards/s/SpikeshotGoblin.java | 9 +-- .../src/mage/cards/s/SpitefulShadows.java | 17 ++-- Mage.Sets/src/mage/cards/s/Spitemare.java | 11 ++- Mage.Sets/src/mage/cards/s/Starfall.java | 9 +-- Mage.Sets/src/mage/cards/s/SteamVines.java | 2 +- Mage.Sets/src/mage/cards/s/StenchOfEvil.java | 6 +- Mage.Sets/src/mage/cards/s/StormWorld.java | 13 +--- .../src/mage/cards/s/StormbreathDragon.java | 13 ++-- Mage.Sets/src/mage/cards/s/StuffyDoll.java | 7 +- Mage.Sets/src/mage/cards/s/Subversion.java | 13 ++-- .../src/mage/cards/s/SwordOfTheAges.java | 19 +++-- .../src/mage/cards/s/SwordOfWarAndPeace.java | 13 +--- Mage.Sets/src/mage/cards/s/SyphonSoul.java | 9 +-- Mage.Sets/src/mage/cards/t/TheRack.java | 9 +-- Mage.Sets/src/mage/cards/t/ThelonsChant.java | 18 ++--- .../src/mage/cards/t/ThoughtHemorrhage.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtPrison.java | 11 ++- .../src/mage/cards/t/TortureChamber.java | 9 +-- Mage.Sets/src/mage/cards/t/TourachsChant.java | 18 ++--- Mage.Sets/src/mage/cards/t/TraitorsRoar.java | 7 +- .../src/mage/cards/t/TuktukScrapper.java | 19 ++--- .../src/mage/cards/v/VengefulRebirth.java | 18 ++--- Mage.Sets/src/mage/cards/v/VexingArcanix.java | 2 +- Mage.Sets/src/mage/cards/v/VexingDevil.java | 14 ++-- .../mage/cards/v/VialSmasherTheFierce.java | 15 ++-- .../src/mage/cards/v/ViashinoHeretic.java | 20 +++-- Mage.Sets/src/mage/cards/v/Viseling.java | 11 ++- Mage.Sets/src/mage/cards/v/VolatileRig.java | 15 ++-- .../src/mage/cards/v/VolcanicEruption.java | 8 +- Mage.Sets/src/mage/cards/w/WarstormSurge.java | 2 +- .../src/mage/cards/w/WerewolfRansacker.java | 19 ++--- Mage.Sets/src/mage/cards/w/WingStorm.java | 9 +-- Mage.Sets/src/mage/cards/w/WordsOfWar.java | 29 ++++--- .../src/mage/cards/w/WormsOfTheEarth.java | 4 +- Mage.Sets/src/mage/cards/y/YawgmothDemon.java | 15 ++-- .../org/mage/test/player/RandomPlayer.java | 2 +- .../DamageAttachedControllerEffect.java | 15 ++-- .../common/DamageEverythingEffect.java | 20 +++-- .../effects/common/DamageMultiEffect.java | 4 +- .../effects/common/DamagePlayersEffect.java | 20 +++-- ...WithPowerFromOneToAnotherTargetEffect.java | 2 +- ...hPowerFromSourceToAnotherTargetEffect.java | 2 +- .../mage/game/permanent/PermanentImpl.java | 2 +- .../permanent/token/BelzenlokDemonToken.java | 12 +-- 228 files changed, 1104 insertions(+), 1454 deletions(-) diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index 6f26eb4d348..20cb2ff5ce2 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -12,10 +12,10 @@ public class MageVersion implements Serializable, Comparable { public static final int MAGE_VERSION_MAJOR = 1; public static final int MAGE_VERSION_MINOR = 4; public static final int MAGE_VERSION_PATCH = 42; - public static final String MAGE_EDITION_INFO = ""; // set "-beta" for 1.4.32-betaV0 - public static final String MAGE_VERSION_MINOR_PATCH = "V0"; // default + public static final String MAGE_EDITION_INFO = "-beta5"; // set "-beta2" for 1.4.32V1-beta2 + public static final String MAGE_VERSION_MINOR_PATCH = "V1"; // default // strict mode - private static final boolean MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME = false; // set true on uncompatible github changes, set false after new major release (after MAGE_VERSION_PATCH changes) + private static final boolean MAGE_VERSION_MINOR_PATCH_MUST_BE_SAME = true; // set true on uncompatible github changes, set false after new major release (after MAGE_VERSION_PATCH changes) public static final boolean MAGE_VERSION_SHOW_BUILD_TIME = true; private final int major; @@ -58,7 +58,7 @@ public class MageVersion implements Serializable, Comparable { public String toString(boolean showBuildTime) { // 1.4.32-betaV0 (build: time) - String res = major + "." + minor + '.' + patch + editionInfo + minorPatch; + String res = major + "." + minor + '.' + patch + minorPatch + editionInfo; if (showBuildTime && !this.buildTime.isEmpty()) { res += " (build: " + this.buildTime + ")"; } diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index d357bc6636c..8749e8d363a 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -1951,7 +1951,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { public void assignDamage(int damage, List targets, String singleTargetName, UUID sourceId, Game game) { log.debug("assignDamage"); //TODO: improve this - game.getPermanent(targets.get(0)).damage(damage, sourceId, game, false, true); + game.getPermanent(targets.get(0)).damage(damage, sourceId, game); } @Override diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 5a4bef8c750..c45f81e8772 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -1779,7 +1779,7 @@ public class HumanPlayer extends PlayerImpl { } else { Player player = game.getPlayer(target.getFirstTarget()); if (player != null) { - player.damage(damageAmount, sourceId, game, false, true); + player.damage(damageAmount, sourceId, game); remainingDamage -= damageAmount; } } diff --git a/Mage.Sets/src/mage/cards/a/AcolytesReward.java b/Mage.Sets/src/mage/cards/a/AcolytesReward.java index 41394538689..61c892e4762 100644 --- a/Mage.Sets/src/mage/cards/a/AcolytesReward.java +++ b/Mage.Sets/src/mage/cards/a/AcolytesReward.java @@ -110,7 +110,7 @@ class AcolytesRewardEffect extends PreventionEffectImpl { Player targetPlayer = game.getPlayer(source.getTargets().get(1).getFirstTarget()); if (targetPlayer != null) { - targetPlayer.damage(toPrevent, source.getSourceId(), game, false, true); + targetPlayer.damage(toPrevent, source.getSourceId(), game); game.informPlayers("Acolyte's Reward deals " + toPrevent + " damage to " + targetPlayer.getLogName()); return result; } diff --git a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java index 9a512bb57c8..c37fcc26d5b 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java @@ -1,4 +1,3 @@ - package mage.cards.a; import mage.MageInt; @@ -120,9 +119,9 @@ class AkoumHellkiteDamageEffect extends OneShotEffect { Player player = game.getPlayer(source.getFirstTarget()); if (land != null && player != null) { if (land.hasSubtype(SubType.MOUNTAIN, game)) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } else { - player.damage(1, source.getSourceId(), game, false, true); + player.damage(1, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java index dbf3e6a8417..38d6c7af250 100644 --- a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java +++ b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java @@ -1,7 +1,5 @@ - package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -25,20 +23,21 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; -/** - * - * @author LoneFox +import java.util.UUID; +/** + * @author LoneFox */ public final class AnaBattlemage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature"); + static { filter.add(Predicates.not(TappedPredicate.instance)); } public AnaBattlemage(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.HUMAN); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); @@ -52,12 +51,12 @@ public final class AnaBattlemage extends CardImpl { TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(3)); ability.addTarget(new TargetOpponent()); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, new KickedCostCondition("{2}{U}"), - "When {this} enters the battlefield, if it was kicked with its {2}{U} kicker, target player discards three cards.")); + "When {this} enters the battlefield, if it was kicked with its {2}{U} kicker, target player discards three cards.")); // When Ana Battlemage enters the battlefield, if it was kicked with its {1}{B} kicker, tap target untapped creature and that creature deals damage equal to its power to its controller. ability = new EntersBattlefieldTriggeredAbility(new AnaBattlemageKickerEffect()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, new KickedCostCondition("{1}{B}"), - "When {this} enters the battlefield, if it was kicked with its {1}{B} kicker, tap target untapped creature and that creature deals damage equal to its power to its controller.")); + "When {this} enters the battlefield, if it was kicked with its {1}{B} kicker, tap target untapped creature and that creature deals damage equal to its power to its controller.")); } public AnaBattlemage(final AnaBattlemage card) { @@ -94,7 +93,7 @@ class AnaBattlemageKickerEffect extends OneShotEffect { applied = targetCreature.tap(game); Player controller = game.getPlayer(targetCreature.getControllerId()); if (controller != null) { - controller.damage(targetCreature.getPower().getValue(), source.getSourceId(), game, false, true); + controller.damage(targetCreature.getPower().getValue(), source.getSourceId(), game); applied = true; } } diff --git a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java index 5de5f29b030..6d66bd8e617 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java @@ -1,7 +1,5 @@ - package mage.cards.a; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -19,8 +17,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** - * * @author fireshoes */ public final class AngelsTrumpet extends CardImpl { @@ -81,7 +80,7 @@ class AngelsTrumpetTapEffect extends OneShotEffect { count++; } if (count > 0) { - player.damage(count, source.getSourceId(), game, false, true); + player.damage(count, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java b/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java index 03b13e6342b..2c5a6aef46a 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java +++ b/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java @@ -1,7 +1,5 @@ - package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility; @@ -27,8 +25,9 @@ import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponentOrPlaneswalker; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class AngrathMinotaurPirate extends CardImpl { @@ -100,7 +99,7 @@ class AngrathMinotaurPirateThirdAbilityEffect extends OneShotEffect { powerSum += permanent.getPower().getValue(); } game.applyEffects(); - targetOpponent.damage(powerSum, source.getSourceId(), game, false, true); + targetOpponent.damage(powerSum, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/a/AuraBarbs.java b/Mage.Sets/src/mage/cards/a/AuraBarbs.java index baadd4d356b..6f1df8e87c6 100644 --- a/Mage.Sets/src/mage/cards/a/AuraBarbs.java +++ b/Mage.Sets/src/mage/cards/a/AuraBarbs.java @@ -1,7 +1,5 @@ - package mage.cards.a; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,14 +12,15 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class AuraBarbs extends CardImpl { public AuraBarbs(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.subtype.add(SubType.ARCANE); @@ -40,7 +39,7 @@ public final class AuraBarbs extends CardImpl { private static class AuraBarbsEffect extends OneShotEffect { - public AuraBarbsEffect() { + public AuraBarbsEffect() { super(Outcome.Detriment); staticText = "Each enchantment deals 2 damage to its controller, then each Aura attached to a creature deals 2 damage to the creature it's attached to"; } @@ -58,7 +57,7 @@ public final class AuraBarbs extends CardImpl { for (Permanent permanent : game.getBattlefield().getActivePermanents(filterEnchantments, source.getControllerId(), source.getSourceId(), game)) { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { - controller.damage(2, permanent.getId(), game, false, true); + controller.damage(2, permanent.getId(), game); game.informPlayers("2 damage assigned to " + controller.getLogName() + " from " + permanent.getName()); } } diff --git a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java index 47dfa768b66..4a1d924f703 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java +++ b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java @@ -1,8 +1,5 @@ - package mage.cards.a; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -18,14 +15,16 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** - * * @author fireshoes */ public final class AvacynThePurifier extends CardImpl { public AvacynThePurifier(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, ""); addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); @@ -76,9 +75,7 @@ class AvacynThePurifierAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) { Permanent permanent = game.getPermanent(sourceId); - if (permanent != null && permanent.isTransformed()) { - return true; - } + return permanent != null && permanent.isTransformed(); } return false; } @@ -115,7 +112,7 @@ class AvacynThePurifierEffect extends OneShotEffect { for (UUID opponentId : game.getOpponents(source.getControllerId())) { Player opponent = game.getPlayer(opponentId); if (opponent != null) { - opponent.damage(3, source.getSourceId(), game, false, true); + opponent.damage(3, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/b/Backlash.java b/Mage.Sets/src/mage/cards/b/Backlash.java index b054f340c30..574f7593f13 100644 --- a/Mage.Sets/src/mage/cards/b/Backlash.java +++ b/Mage.Sets/src/mage/cards/b/Backlash.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -16,19 +14,21 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author michael.napoleon@gmail.com */ public final class Backlash extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature"); + static { filter.add(Predicates.not(TappedPredicate.instance)); } - + public Backlash(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}{R}"); // Tap target untapped creature. That creature deals damage equal to its power to its controller. this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); @@ -46,33 +46,33 @@ public final class Backlash extends CardImpl { } class BacklashEffect extends OneShotEffect { - - public BacklashEffect() { - super(Outcome.Detriment); - this.staticText = "Tap target untapped creature. That creature deals damage equal to its power to its controller."; - } - - public BacklashEffect(final BacklashEffect effect) { - super(effect); - } - - @Override - public BacklashEffect copy () { - return new BacklashEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - boolean applied = false; - Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); - if (targetCreature != null) { - applied = targetCreature.tap(game); - Player controller = game.getPlayer(targetCreature.getControllerId()); - if (controller != null) { - controller.damage(targetCreature.getPower().getValue(), source.getSourceId(), game, false, true); - applied = true; - } + + public BacklashEffect() { + super(Outcome.Detriment); + this.staticText = "Tap target untapped creature. That creature deals damage equal to its power to its controller."; + } + + public BacklashEffect(final BacklashEffect effect) { + super(effect); + } + + @Override + public BacklashEffect copy() { + return new BacklashEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + boolean applied = false; + Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source)); + if (targetCreature != null) { + applied = targetCreature.tap(game); + Player controller = game.getPlayer(targetCreature.getControllerId()); + if (controller != null) { + controller.damage(targetCreature.getPower().getValue(), source.getSourceId(), game); + applied = true; + } + } + return applied; } - return applied; - } } diff --git a/Mage.Sets/src/mage/cards/b/BarbarianBully.java b/Mage.Sets/src/mage/cards/b/BarbarianBully.java index 38853f5fec3..02a49107f4b 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianBully.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianBully.java @@ -1,25 +1,21 @@ package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class BarbarianBully extends CardImpl { @@ -76,7 +72,7 @@ class BarbarianBullyEffect extends OneShotEffect { continue; } if (player.chooseUse(Outcome.UnboostCreature, "Have " + permanent.getName() + " deal 4 damage to you?", source, game)) { - player.damage(4, permanent.getId(), game, false, true); + player.damage(4, permanent.getId(), game); costPaid = true; } } diff --git a/Mage.Sets/src/mage/cards/b/BellowingFiend.java b/Mage.Sets/src/mage/cards/b/BellowingFiend.java index 04fcc18b8fe..3dfc5ff9e84 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingFiend.java +++ b/Mage.Sets/src/mage/cards/b/BellowingFiend.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToACreatureTriggeredAbility; @@ -18,15 +16,15 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -/** - * - * @author LoneFox +import java.util.UUID; +/** + * @author LoneFox */ public final class BellowingFiend extends CardImpl { public BellowingFiend(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.subtype.add(SubType.SPIRIT); this.power = new MageInt(3); this.toughness = new MageInt(3); @@ -55,7 +53,8 @@ class BellowingFiendEffect extends OneShotEffect { public BellowingFiendEffect() { super(Outcome.Detriment); - this.staticText = "{this} deals 3 damage to that creature's controller"; } + this.staticText = "{this} deals 3 damage to that creature's controller"; + } public BellowingFiendEffect(final BellowingFiendEffect effect) { super(effect); @@ -70,10 +69,11 @@ class BellowingFiendEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { boolean applied = false; Permanent damagedCreature = game.getPermanentOrLKIBattlefield(targetPointer.getFirst(game, source)); - if(damagedCreature != null) { + if (damagedCreature != null) { Player controller = game.getPlayer(damagedCreature.getControllerId()); - if(controller != null) { - controller.damage(3, source.getSourceId(), game, false, true); applied = true; + if (controller != null) { + controller.damage(3, source.getSourceId(), game); + applied = true; } } return applied; diff --git a/Mage.Sets/src/mage/cards/b/BloodOath.java b/Mage.Sets/src/mage/cards/b/BloodOath.java index 0edc503b6b6..ad728ab74b9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodOath.java +++ b/Mage.Sets/src/mage/cards/b/BloodOath.java @@ -1,9 +1,5 @@ - package mage.cards.b; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -19,8 +15,11 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class BloodOath extends CardImpl { @@ -112,7 +111,7 @@ class BloodOathEffect extends OneShotEffect { } } game.informPlayers(sourceObject.getLogName() + " deals " + (damageToDeal == 0 ? "no" : "" + damageToDeal) + " damage to " + opponent.getLogName()); - opponent.damage(damageToDeal, source.getSourceId(), game, false, true); + opponent.damage(damageToDeal, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/b/BombSquad.java b/Mage.Sets/src/mage/cards/b/BombSquad.java index fdfb32772ff..4d7216ca2d0 100644 --- a/Mage.Sets/src/mage/cards/b/BombSquad.java +++ b/Mage.Sets/src/mage/cards/b/BombSquad.java @@ -138,7 +138,7 @@ class BombSquadDamgeEffect extends OneShotEffect { if (creature != null) { Player controller = game.getPlayer(creature.getControllerId()); if (controller != null) { - controller.damage(4, source.getSourceId(), game, false, true); + controller.damage(4, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/b/BorosFuryShield.java b/Mage.Sets/src/mage/cards/b/BorosFuryShield.java index 4b744fbe539..9f15ea62fc8 100644 --- a/Mage.Sets/src/mage/cards/b/BorosFuryShield.java +++ b/Mage.Sets/src/mage/cards/b/BorosFuryShield.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -20,20 +18,21 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author Dilnu */ public final class BorosFuryShield extends CardImpl { private static final FilterAttackingOrBlockingCreature filter = new FilterAttackingOrBlockingCreature(); public BorosFuryShield(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{W}"); // Prevent all combat damage that would be dealt by target attacking or blocking creature this turn. this.getSpellAbility().addEffect(new PreventDamageByTargetEffect(Duration.EndOfTurn, true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); - + // If {R} was spent to cast Boros Fury-Shield, it deals damage to that creature's controller equal to the creature's power. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new BorosFuryShieldDamageEffect(), @@ -48,7 +47,7 @@ public final class BorosFuryShield extends CardImpl { public BorosFuryShield copy() { return new BorosFuryShield(this); } - + static class BorosFuryShieldDamageEffect extends OneShotEffect { BorosFuryShieldDamageEffect() { super(Outcome.Damage); @@ -63,12 +62,12 @@ public final class BorosFuryShield extends CardImpl { public boolean apply(Game game, Ability source) { Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); if (target != null) { - Player player = game.getPlayer(target.getControllerId()); - if (player != null) { - int power = target.getPower().getValue(); - player.damage(power, source.getId(), game, false, true); - } - + Player player = game.getPlayer(target.getControllerId()); + if (player != null) { + int power = target.getPower().getValue(); + player.damage(power, source.getId(), game); + } + } return false; } @@ -77,6 +76,6 @@ public final class BorosFuryShield extends CardImpl { public Effect copy() { return new BorosFuryShieldDamageEffect(this); } - + } } diff --git a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java index 9d82fd071f8..e7cdc17ed60 100644 --- a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java +++ b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -16,8 +14,9 @@ import mage.game.Game; import mage.game.permanent.token.DjinnToken; import mage.players.Player; +import java.util.UUID; + /** - * * @author KholdFuzion */ public final class BottleOfSuleiman extends CardImpl { @@ -66,7 +65,7 @@ class BottleOfSuleimanEffect extends OneShotEffect { token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); return true; } else { - you.damage(5, source.getSourceId(), game, false, true); + you.damage(5, source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/b/Brightflame.java b/Mage.Sets/src/mage/cards/b/Brightflame.java index 2e4af587d9a..40ebc41836b 100644 --- a/Mage.Sets/src/mage/cards/b/Brightflame.java +++ b/Mage.Sets/src/mage/cards/b/Brightflame.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; @@ -18,14 +16,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author Dilnu */ public final class Brightflame extends CardImpl { public Brightflame(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}{R}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}{R}{W}{W}"); // Radiance - Brightflame deals X damage to target creature and each other creature that shares a color with it. You gain life equal to the damage dealt this way. this.getSpellAbility().addEffect(new BrightflameEffect(ManacostVariableValue.instance)); @@ -69,13 +68,13 @@ class BrightflameEffect extends OneShotEffect { int damageDealt = 0; if (target != null) { ObjectColor color = target.getColor(game); - damageDealt += target.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + damageDealt += target.damage(amount.calculate(game, source, this), source.getSourceId(), game); for (Permanent p : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (!target.getId().equals(p.getId()) && p.getColor(game).shares(color)) { damageDealt += p.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); } } - + Player you = game.getPlayer(source.getControllerId()); if (you != null && damageDealt > 0) { you.gainLife(damageDealt, game, source); diff --git a/Mage.Sets/src/mage/cards/b/BronzeBombshell.java b/Mage.Sets/src/mage/cards/b/BronzeBombshell.java index 297659b689b..7cf81f36a0f 100644 --- a/Mage.Sets/src/mage/cards/b/BronzeBombshell.java +++ b/Mage.Sets/src/mage/cards/b/BronzeBombshell.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -18,8 +16,9 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class BronzeBombshell extends CardImpl { @@ -107,7 +106,7 @@ class BronzeBombshellEffect extends OneShotEffect { Player newController = game.getPlayer(bronzeBombshell.getControllerId()); if (newController != null) { if (bronzeBombshell.sacrifice(source.getId(), game)) {//sacrificed by the new controlling player - newController.damage(7, source.getSourceId(), game, false, true);//bronze bombshell does 7 damage to the controller + newController.damage(7, source.getSourceId(), game);//bronze bombshell does 7 damage to the controller return true; } } diff --git a/Mage.Sets/src/mage/cards/b/Bulwark.java b/Mage.Sets/src/mage/cards/b/Bulwark.java index 310ccdcca5a..93ce1caf69d 100644 --- a/Mage.Sets/src/mage/cards/b/Bulwark.java +++ b/Mage.Sets/src/mage/cards/b/Bulwark.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -14,18 +12,19 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author Backfir3 */ public final class Bulwark extends CardImpl { public Bulwark(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); + - // At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is - // the number of cards in your hand minus the number of cards in that player's hand. + // the number of cards in your hand minus the number of cards in that player's hand. Ability ability = new BeginningOfUpkeepTriggeredAbility(new BulwarkDamageEffect(), TargetController.YOU, false); ability.addTarget(new TargetOpponent()); this.addAbility(ability); @@ -45,7 +44,7 @@ class BulwarkDamageEffect extends OneShotEffect { public BulwarkDamageEffect() { super(Outcome.Damage); - staticText = "Bulwark deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand"; + staticText = "Bulwark deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand"; } public BulwarkDamageEffect(final BulwarkDamageEffect effect) { @@ -60,13 +59,13 @@ class BulwarkDamageEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player opponent = game.getPlayer(targetPointer.getFirst(game, source)); - Player controller = game.getPlayer(source.getControllerId()); + Player controller = game.getPlayer(source.getControllerId()); if (opponent != null && controller != null) { - int amount = controller.getHand().size() - opponent.getHand().size(); - if(amount > 0) { - opponent.damage(amount, source.getSourceId(), game, false, true); - return true; - } + int amount = controller.getHand().size() - opponent.getHand().size(); + if (amount > 0) { + opponent.damage(amount, source.getSourceId(), game); + return true; + } } return false; } diff --git a/Mage.Sets/src/mage/cards/b/BurnTheImpure.java b/Mage.Sets/src/mage/cards/b/BurnTheImpure.java index 9c57bb8b0db..78c1d16a767 100644 --- a/Mage.Sets/src/mage/cards/b/BurnTheImpure.java +++ b/Mage.Sets/src/mage/cards/b/BurnTheImpure.java @@ -1,7 +1,5 @@ - package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.InfectAbility; @@ -14,14 +12,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author ayratn */ public final class BurnTheImpure extends CardImpl { public BurnTheImpure(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); // Burn the Impure deals 3 damage to target creature. If that creature has infect, Burn the Impure deals 3 damage to that creature’s controller. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -63,7 +62,7 @@ class BurnTheImpureEffect extends OneShotEffect { if (permanent.getAbilities().contains(InfectAbility.getInstance())) { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { - controller.damage(3, source.getSourceId(), game, false, true); + controller.damage(3, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/c/CerebralEruption.java b/Mage.Sets/src/mage/cards/c/CerebralEruption.java index 66a6ceba3c6..320126ce0fc 100644 --- a/Mage.Sets/src/mage/cards/c/CerebralEruption.java +++ b/Mage.Sets/src/mage/cards/c/CerebralEruption.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -15,14 +13,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public final class CerebralEruption extends CardImpl { public CerebralEruption(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); // Target opponent reveals the top card of their library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature they control. If a land card is revealed this way, return Cerebral Eruption to its owner's hand. this.getSpellAbility().addTarget(new TargetOpponent()); @@ -61,7 +60,7 @@ class CerebralEruptionEffect extends OneShotEffect { player.revealCards(sourceObject.getIdName(), cards, game); game.getState().setValue(source.getSourceId().toString(), card); int damage = card.getConvertedManaCost(); - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); for (Permanent perm : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURES, player.getId(), game)) { perm.damage(damage, source.getSourceId(), game, false, true); } diff --git a/Mage.Sets/src/mage/cards/c/CerebralVortex.java b/Mage.Sets/src/mage/cards/c/CerebralVortex.java index 45bbf41c7f3..307e8a9271c 100644 --- a/Mage.Sets/src/mage/cards/c/CerebralVortex.java +++ b/Mage.Sets/src/mage/cards/c/CerebralVortex.java @@ -1,10 +1,5 @@ - package mage.cards.c; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardTargetEffect; @@ -20,14 +15,17 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** - * * @author emerald000 */ public final class CerebralVortex extends CardImpl { public CerebralVortex(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}{R}"); // Target player draws two cards, then Cerebral Vortex deals damage to that player equal to the number of cards they have drawn this turn. this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); @@ -47,28 +45,28 @@ public final class CerebralVortex extends CardImpl { } class CerebralVortexEffect extends OneShotEffect { - + CerebralVortexEffect() { super(Outcome.Damage); this.staticText = ", then Cerebral Vortex deals damage to that player equal to the number of cards they have drawn this turn"; } - + CerebralVortexEffect(final CerebralVortexEffect effect) { super(effect); } - + @Override public CerebralVortexEffect copy() { return new CerebralVortexEffect(this); } - + @Override public boolean apply(Game game, Ability source) { Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { CerebralVortexWatcher watcher = game.getState().getWatcher(CerebralVortexWatcher.class); if (watcher != null) { - targetPlayer.damage(watcher.getDraws(targetPlayer.getId()), source.getSourceId(), game, false, true); + targetPlayer.damage(watcher.getDraws(targetPlayer.getId()), source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/c/ChainLightning.java b/Mage.Sets/src/mage/cards/c/ChainLightning.java index 123aa507a33..35b7eddc7cf 100644 --- a/Mage.Sets/src/mage/cards/c/ChainLightning.java +++ b/Mage.Sets/src/mage/cards/c/ChainLightning.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -16,14 +14,15 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author emerald000 */ public final class ChainLightning extends CardImpl { public ChainLightning(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{R}"); // Chain Lightning deals 3 damage to any target. Then that player or that creature's controller may pay {R}{R}. If the player does, they may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainLightningEffect()); @@ -64,7 +63,7 @@ class ChainLightningEffect extends OneShotEffect { Player affectedPlayer = null; Player player = game.getPlayer(targetId); if (player != null) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); affectedPlayer = player; } else { Permanent permanent = game.getPermanent(targetId); diff --git a/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java b/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java index b9db7d2a255..d9ae96d54de 100644 --- a/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java +++ b/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardCardCost; @@ -16,8 +14,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class ChainOfPlasma extends CardImpl { @@ -64,7 +63,7 @@ class ChainOfPlasmaEffect extends OneShotEffect { Player affectedPlayer = null; Player player = game.getPlayer(targetId); if (player != null) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); affectedPlayer = player; } else { Permanent permanent = game.getPermanent(targetId); diff --git a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java index f669cc5ef6a..803758c7035 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java @@ -1,8 +1,5 @@ - package mage.cards.c; -import java.util.Set; -import java.util.UUID; import mage.MageObjectReference; import mage.ObjectColor; import mage.abilities.Ability; @@ -29,8 +26,10 @@ import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetDiscard; +import java.util.Set; +import java.util.UUID; + /** - * * @author North */ public final class ChandraAblaze extends CardImpl { @@ -130,7 +129,7 @@ class ChandraAblazeEffect2 extends OneShotEffect { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - player.damage(4, source.getSourceId(), game, false, true); + player.damage(4, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java b/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java index 3f08437c979..f1fdc354327 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java +++ b/Mage.Sets/src/mage/cards/c/ChandraRoaringFlame.java @@ -1,9 +1,5 @@ - package mage.cards.c; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility; @@ -12,8 +8,8 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.SuperType; import mage.game.Game; import mage.game.command.emblems.ChandraRoaringFlameEmblem; @@ -21,8 +17,11 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class ChandraRoaringFlame extends CardImpl { @@ -87,7 +86,7 @@ class ChandraRoaringFlameEmblemEffect extends OneShotEffect { for (UUID playerId : game.getOpponents(controller.getId())) { Player opponent = game.getPlayer(playerId); if (opponent != null) { - if (opponent.damage(6, source.getSourceId(), game, false, true) > 0) { + if (opponent.damage(6, source.getSourceId(), game) > 0) { opponentsEmblem.add(opponent); } } diff --git a/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java b/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java index 8270d9ac041..55208af5e2c 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasIgnition.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,8 +12,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class ChandrasIgnition extends CardImpl { @@ -66,7 +65,7 @@ class ChandrasIgnitionEffect extends OneShotEffect { for (UUID opponentId : game.getOpponents(source.getControllerId())) { Player opponent = game.getPlayer(opponentId); if (opponent != null) { - opponent.damage(targetCreature.getPower().getValue(), targetCreature.getId(), game, false, true); + opponent.damage(targetCreature.getPower().getValue(), targetCreature.getId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java b/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java index 28603c5d0f2..725562f95d0 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java +++ b/Mage.Sets/src/mage/cards/c/ChargingCinderhorn.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -12,19 +10,16 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** - * * @author spjspj */ public final class ChargingCinderhorn extends CardImpl { @@ -102,7 +97,7 @@ class ChargingCinderhornDamageTargetEffect extends OneShotEffect { DynamicValue amount = new CountersSourceCount(CounterType.FURY); Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + player.damage(amount.calculate(game, source, this), source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/c/CinderCloud.java b/Mage.Sets/src/mage/cards/c/CinderCloud.java index 9cdc4082931..95a401befd3 100644 --- a/Mage.Sets/src/mage/cards/c/CinderCloud.java +++ b/Mage.Sets/src/mage/cards/c/CinderCloud.java @@ -1,4 +1,3 @@ - package mage.cards.c; import mage.ObjectColor; @@ -69,7 +68,7 @@ class CinderCloudEffect extends OneShotEffect { Player permanentController = game.getPlayer(permanent.getControllerId()); if (permanentController != null) { int damage = permanent.getPower().getValue(); - permanentController.damage(damage, source.getSourceId(), game, false, true); + permanentController.damage(damage, source.getSourceId(), game); } } return false; diff --git a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java index 6443ee7c354..8188522fdf1 100644 --- a/Mage.Sets/src/mage/cards/c/CitadelOfPain.java +++ b/Mage.Sets/src/mage/cards/c/CitadelOfPain.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.TriggeredAbility; @@ -20,8 +18,9 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** - * * @author Alexsandr0x */ public final class CitadelOfPain extends CardImpl { @@ -72,7 +71,7 @@ class CitadelOfPainEffect extends OneShotEffect { Player player = game.getPlayer(game.getActivePlayerId()); if (player != null) { int damage = game.getBattlefield().countAll(filter, game.getActivePlayerId(), game); - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/c/CleansingBeam.java b/Mage.Sets/src/mage/cards/c/CleansingBeam.java index 03f23c7b8f3..6f6c3c948c6 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingBeam.java +++ b/Mage.Sets/src/mage/cards/c/CleansingBeam.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -15,14 +13,15 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author fenhl */ public final class CleansingBeam extends CardImpl { public CleansingBeam(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{R}"); // Radiance — Cleansing Beam deals 2 damage to target creature and each other creature that shares a color with it. this.getSpellAbility().addEffect(new CleansingBeamEffect()); @@ -62,7 +61,7 @@ class CleansingBeamEffect extends OneShotEffect { Permanent target = game.getPermanent(targetPointer.getFirst(game, source)); if (target != null) { ObjectColor color = target.getColor(game); - target.damage(2, source.getSourceId(), game, false, true); + target.damage(2, source.getSourceId(), game); for (Permanent p : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (!target.getId().equals(p.getId()) && p.getColor(game).shares(color)) { p.damage(2, source.getSourceId(), game, false, true); diff --git a/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java b/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java index f100aaceb6f..f57f4e57242 100644 --- a/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java +++ b/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; @@ -9,13 +7,14 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author vereena42 */ public final class CoalhaulerSwine extends CardImpl { @@ -62,7 +61,7 @@ public final class CoalhaulerSwine extends CardImpl { for (UUID playerId : game.getPlayers().keySet()) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage((Integer) this.getValue("damage"), source.getSourceId(), game, false, true); + player.damage((Integer) this.getValue("damage"), source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/c/ColdSnap.java b/Mage.Sets/src/mage/cards/c/ColdSnap.java index dc1bae63316..ee062fe8e9a 100644 --- a/Mage.Sets/src/mage/cards/c/ColdSnap.java +++ b/Mage.Sets/src/mage/cards/c/ColdSnap.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -15,18 +13,19 @@ import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author fireshoes */ public final class ColdSnap extends CardImpl { public ColdSnap(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Cumulative upkeep {2} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{2}"))); - + // At the beginning of each player's upkeep, Cold Snap deals damage to that player equal to the number of snow lands they control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ColdSnapDamageTargetEffect(), TargetController.ANY, false, true)); } @@ -41,24 +40,22 @@ public final class ColdSnap extends CardImpl { } } -class ColdSnapDamageTargetEffect extends OneShotEffect{ - +class ColdSnapDamageTargetEffect extends OneShotEffect { + private static final FilterLandPermanent filter = new FilterLandPermanent("snow lands"); static { filter.add(SuperType.SNOW.getPredicate()); } - - public ColdSnapDamageTargetEffect() - { + + public ColdSnapDamageTargetEffect() { super(Outcome.Damage); } - - public ColdSnapDamageTargetEffect(ColdSnapDamageTargetEffect copy) - { + + public ColdSnapDamageTargetEffect(ColdSnapDamageTargetEffect copy) { super(copy); } - + @Override public String getText(Mode mode) { return "{this} deals damage to that player equal to the number of snow lands they control"; @@ -69,7 +66,7 @@ class ColdSnapDamageTargetEffect extends OneShotEffect{ Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { int damage = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game).size(); - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/c/CometStorm.java b/Mage.Sets/src/mage/cards/c/CometStorm.java index 41c3de1510c..4ec4f69d542 100644 --- a/Mage.Sets/src/mage/cards/c/CometStorm.java +++ b/Mage.Sets/src/mage/cards/c/CometStorm.java @@ -1,6 +1,5 @@ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.OneShotEffect; @@ -15,8 +14,9 @@ import mage.players.Player; import mage.target.common.TargetAnyTarget; import mage.target.targetadjustment.TargetAdjuster; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class CometStorm extends CardImpl { @@ -77,7 +77,7 @@ class CometStormEffect extends OneShotEffect { permanent.damage(damage, source.getSourceId(), game, false, true); } if (player != null) { - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/c/Comeuppance.java b/Mage.Sets/src/mage/cards/c/Comeuppance.java index 8d03fa51c8b..0f72194ba83 100644 --- a/Mage.Sets/src/mage/cards/c/Comeuppance.java +++ b/Mage.Sets/src/mage/cards/c/Comeuppance.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; @@ -19,14 +17,15 @@ import mage.game.stack.StackObject; import mage.players.Player; import org.apache.log4j.Logger; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Comeuppance extends CardImpl { public Comeuppance(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}"); // Prevent all damage that would be dealt to you and planeswalkers you control this turn by sources you don't control. If damage from a creature source is prevented this way, Comeuppance deals that much damage to that creature. If damage from a noncreature source is prevented this way, Comeuppance deals that much damage to the source's controller. @@ -43,6 +42,7 @@ public final class Comeuppance extends CardImpl { return new Comeuppance(this); } } + class ComeuppanceEffect extends PreventionEffectImpl { public ComeuppanceEffect() { @@ -72,7 +72,7 @@ class ComeuppanceEffect extends PreventionEffectImpl { UUID objectControllerId = null; if (damageDealingObject instanceof Permanent) { if (damageDealingObject.isCreature()) { - ((Permanent) damageDealingObject).damage(preventionData.getPreventedDamage(), source.getSourceId(), game, false, true); + ((Permanent) damageDealingObject).damage(preventionData.getPreventedDamage(), source.getSourceId(), game); } else { objectControllerId = ((Permanent) damageDealingObject).getControllerId(); } @@ -84,7 +84,7 @@ class ComeuppanceEffect extends PreventionEffectImpl { if (objectControllerId != null) { Player objectController = game.getPlayer(objectControllerId); if (objectController != null) { - objectController.damage(preventionData.getPreventedDamage(), source.getSourceId(), game, false, true); + objectController.damage(preventionData.getPreventedDamage(), source.getSourceId(), game); } } } @@ -94,7 +94,7 @@ class ComeuppanceEffect extends PreventionEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { if (!super.applies(event, source, game)) { - return false; + return false; } boolean catched = false; if (event.getTargetId().equals(source.getControllerId())) { @@ -116,7 +116,7 @@ class ComeuppanceEffect extends PreventionEffectImpl { } else if (damageSource instanceof Card) { return !((Card) damageSource).isOwnedBy(source.getControllerId()); } - Logger.getLogger(Comeuppance.class).error("Comeuppance: could not define source objects controller - " + (damageSource != null ? damageSource.getName(): "null")); + Logger.getLogger(Comeuppance.class).error("Comeuppance: could not define source objects controller - " + (damageSource != null ? damageSource.getName() : "null")); } return false; } diff --git a/Mage.Sets/src/mage/cards/c/CosmicHorror.java b/Mage.Sets/src/mage/cards/c/CosmicHorror.java index 8b093ded307..be3398fac5c 100644 --- a/Mage.Sets/src/mage/cards/c/CosmicHorror.java +++ b/Mage.Sets/src/mage/cards/c/CosmicHorror.java @@ -1,8 +1,5 @@ - package mage.cards.c; -import java.util.Locale; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -20,8 +17,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.Locale; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class CosmicHorror extends CardImpl { @@ -80,7 +79,7 @@ class CosmicHorrorEffect extends OneShotEffect { } } if (cosmicHorror.destroy(source.getSourceId(), game, false)) { - controller.damage(7, source.getSourceId(), game, false, true); + controller.damage(7, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java b/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java index d60d4622dbb..63cc4e30c50 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -12,16 +10,17 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.CommanderPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author spjspj */ public final class CrimsonHonorGuard extends CardImpl { @@ -74,7 +73,7 @@ class CrimsonHonorGuardEffect extends OneShotEffect { if (player != null) { int numCommanders = game.getBattlefield().getAllActivePermanents(filter, player.getId(), game).size(); if (numCommanders == 0) { - player.damage(4, source.getSourceId(), game, false, true); + player.damage(4, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java index 4975cf2c5e8..dcb248671ab 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java @@ -1,8 +1,8 @@ - package mage.cards.c; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -11,22 +11,20 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; +import mage.filter.common.FilterPlaneswalkerPermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; import java.util.UUID; -import mage.abilities.effects.OneShotEffect; -import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.target.TargetPermanent; /** - * * @author BetaSteward */ public final class CurseOfThePiercedHeart extends CardImpl { @@ -138,7 +136,7 @@ class CurseOfThePiercedHeartEffect extends OneShotEffect { } } } - opponent.damage(1, source.getSourceId(), game, false, true); + opponent.damage(1, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java index 1c475904eb9..26b63ea006e 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -21,8 +19,9 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author FenrisulfrX */ public final class DarigaazTheIgniter extends CardImpl { @@ -82,7 +81,7 @@ class DarigaazTheIgniterEffect extends OneShotEffect { filter.add(new ColorPredicate(choice.getColor())); int damage = damagedPlayer.getHand().count(filter, source.getSourceId(), source.getControllerId(), game); if (damage > 0) { - damagedPlayer.damage(damage, source.getSourceId(), game, false, true); + damagedPlayer.damage(damage, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/d/DeflectingPalm.java b/Mage.Sets/src/mage/cards/d/DeflectingPalm.java index 7ef8d3e68bf..f27994dd107 100644 --- a/Mage.Sets/src/mage/cards/d/DeflectingPalm.java +++ b/Mage.Sets/src/mage/cards/d/DeflectingPalm.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; @@ -18,14 +16,15 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSource; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class DeflectingPalm extends CardImpl { public DeflectingPalm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}{W}"); // The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller. this.getSpellAbility().addEffect(new DeflectingPalmEffect()); @@ -44,7 +43,7 @@ public final class DeflectingPalm extends CardImpl { class DeflectingPalmEffect extends PreventionEffectImpl { private final TargetSource target; - + public DeflectingPalmEffect() { super(Duration.EndOfTurn, Integer.MAX_VALUE, false, false); this.staticText = "The next time a source of your choice would deal damage to you this turn, prevent that damage. If damage is prevented this way, {this} deals that much damage to that source's controller"; @@ -68,7 +67,7 @@ class DeflectingPalmEffect extends PreventionEffectImpl { } @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { + public boolean replaceEvent(GameEvent event, Ability source, Game game) { PreventionEffectData preventionData = preventDamageAction(event, source, game); this.used = true; this.discard(); // only one use @@ -85,19 +84,17 @@ class DeflectingPalmEffect extends PreventionEffectImpl { if (objectControllerId != null) { Player objectController = game.getPlayer(objectControllerId); if (objectController != null) { - objectController.damage(preventionData.getPreventedDamage(), source.getSourceId(), game, false, true); + objectController.damage(preventionData.getPreventedDamage(), source.getSourceId(), game); } } - } + } return true; } @Override public boolean applies(GameEvent event, Ability source, Game game) { if (!this.used && super.applies(event, source, game)) { - if (event.getTargetId().equals(source.getControllerId()) && event.getSourceId().equals(target.getFirstTarget())) { - return true; - } + return event.getTargetId().equals(source.getControllerId()) && event.getSourceId().equals(target.getFirstTarget()); } return false; } diff --git a/Mage.Sets/src/mage/cards/d/Delirium.java b/Mage.Sets/src/mage/cards/d/Delirium.java index 982a39ebf80..4bf991de468 100644 --- a/Mage.Sets/src/mage/cards/d/Delirium.java +++ b/Mage.Sets/src/mage/cards/d/Delirium.java @@ -74,7 +74,7 @@ class DeliriumEffect extends OneShotEffect { int amount = creature.getPower().getValue(); Player controller = game.getPlayer(creature.getControllerId()); if (controller != null) { - controller.damage(amount, creature.getId(), game, false, true); + controller.damage(amount, creature.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java b/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java index 8cef14c88ce..39c97445def 100644 --- a/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java +++ b/Mage.Sets/src/mage/cards/d/DemonlordBelzenlok.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -11,17 +9,14 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class DemonlordBelzenlok extends CardImpl { @@ -90,7 +85,7 @@ class DemonlordBelzenlokEffect extends OneShotEffect { } } } - controller.damage(addedToHand, source.getSourceId(), game, false, true); + controller.damage(addedToHand, source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/d/Desolation.java b/Mage.Sets/src/mage/cards/d/Desolation.java index 5b386ab5af0..e0e13efc7aa 100644 --- a/Mage.Sets/src/mage/cards/d/Desolation.java +++ b/Mage.Sets/src/mage/cards/d/Desolation.java @@ -1,19 +1,11 @@ - package mage.cards.d; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.WatcherScope; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -24,8 +16,11 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** - * * @author L_J */ public final class Desolation extends CardImpl { @@ -82,7 +77,7 @@ class DesolationEffect extends OneShotEffect { if (permanent != null) { permanent.sacrifice(source.getSourceId(), game); if (filterPlains.match(permanent, game)) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } } } @@ -104,7 +99,7 @@ class DesolationWatcher extends Watcher { private final Set tappedForManaThisTurnPlayers = new HashSet<>(); public DesolationWatcher() { - super( WatcherScope.GAME); + super(WatcherScope.GAME); } diff --git a/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java b/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java index 411961c194b..1a53f9bc703 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveRevelry.java @@ -1,4 +1,3 @@ - package mage.cards.d; import mage.abilities.Ability; @@ -17,13 +16,12 @@ import mage.target.TargetPermanent; import java.util.UUID; /** - * * @author LevelX2 */ public final class DestructiveRevelry extends CardImpl { public DestructiveRevelry(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}{G}"); // Destroy target artifact or enchantment. Destructive Revelry deals 2 damage to that permanent's controller. this.getSpellAbility().addEffect(new DestructiveRevelryEffect()); @@ -64,7 +62,7 @@ class DestructiveRevelryEffect extends OneShotEffect { permanent.destroy(source.getSourceId(), game, false); Player permController = game.getPlayer(permanent.getControllerId()); if (permController != null) { - permController.damage(2, source.getSourceId(), game, false, true); + permController.damage(2, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/d/DingusStaff.java b/Mage.Sets/src/mage/cards/d/DingusStaff.java index 65ace9bc6c3..90e63d3803a 100644 --- a/Mage.Sets/src/mage/cards/d/DingusStaff.java +++ b/Mage.Sets/src/mage/cards/d/DingusStaff.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -14,8 +12,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author ciaccona007 */ public final class DingusStaff extends CardImpl { @@ -36,6 +35,7 @@ public final class DingusStaff extends CardImpl { return new DingusStaff(this); } } + class DingusStaffEffect extends OneShotEffect { public DingusStaffEffect() { @@ -58,7 +58,7 @@ class DingusStaffEffect extends OneShotEffect { if (permanent != null) { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { - controller.damage(2,source.getSourceId(), game, false, true); + controller.damage(2, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/d/Disorder.java b/Mage.Sets/src/mage/cards/d/Disorder.java index ce5db2939ef..7bf1665289c 100644 --- a/Mage.Sets/src/mage/cards/d/Disorder.java +++ b/Mage.Sets/src/mage/cards/d/Disorder.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -16,10 +14,10 @@ import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.players.Player; -/** - * - * @author LoneFox +import java.util.UUID; +/** + * @author LoneFox */ public final class Disorder extends CardImpl { @@ -30,7 +28,7 @@ public final class Disorder extends CardImpl { } public Disorder(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}"); // Disorder deals 2 damage to each white creature and each player who controls a white creature. this.getSpellAbility().addEffect(new DamageAllEffect(2, filter)); @@ -57,7 +55,8 @@ class DisorderEffect extends OneShotEffect { public DisorderEffect() { super(Outcome.Damage); - this.staticText = "and each player who controls a white creature"; } + this.staticText = "and each player who controls a white creature"; + } public DisorderEffect(final DisorderEffect effect) { super(effect); @@ -70,12 +69,12 @@ class DisorderEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for(Player player : game.getPlayers().values()) { + for (Player player : game.getPlayers().values()) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); filter.add(new ControllerIdPredicate(player.getId())); filter.add(new ColorPredicate(ObjectColor.WHITE)); - if(game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > 0) { - player.damage(2, source.getSourceId(), game, false, true); + if (game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > 0) { + player.damage(2, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/d/DivineDeflection.java b/Mage.Sets/src/mage/cards/d/DivineDeflection.java index 9044094c555..bcaa963f825 100644 --- a/Mage.Sets/src/mage/cards/d/DivineDeflection.java +++ b/Mage.Sets/src/mage/cards/d/DivineDeflection.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.PreventionEffectData; import mage.abilities.effects.PreventionEffectImpl; @@ -15,13 +13,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** * @author noxx */ public final class DivineDeflection extends CardImpl { public DivineDeflection(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{W}"); // Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, Divine Deflection deals that much damage to any target. @@ -103,7 +103,7 @@ class DivineDeflectionPreventDamageTargetEffect extends PreventionEffectImpl { Player player = game.getPlayer(dealDamageTo); if (player != null) { game.informPlayers("Dealing " + prevented + " to " + player.getLogName() + " instead"); - player.damage(prevented, source.getSourceId(), game, false, true); + player.damage(prevented, source.getSourceId(), game); } } return false; @@ -123,9 +123,7 @@ class DivineDeflectionPreventDamageTargetEffect extends PreventionEffectImpl { } } // check player - if (source.isControlledBy(event.getTargetId())) { - return true; - } + return source.isControlledBy(event.getTargetId()); } return false; } diff --git a/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java b/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java index 37ea103bab9..187a0fd88ae 100644 --- a/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java +++ b/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java @@ -1,30 +1,25 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author fireshoes */ public final class DongZhouTheTyrant extends CardImpl { - + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { @@ -32,8 +27,8 @@ public final class DongZhouTheTyrant extends CardImpl { } public DongZhouTheTyrant(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - addSuperType(SuperType.LEGENDARY); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}"); + addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); @@ -73,7 +68,7 @@ class DongZhouTheTyrantEffect extends OneShotEffect { int amount = creature.getPower().getValue(); Player controller = game.getPlayer(creature.getControllerId()); if (controller != null) { - controller.damage(amount, creature.getId(), game, false, true); + controller.damage(amount, creature.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/d/DraconicRoar.java b/Mage.Sets/src/mage/cards/d/DraconicRoar.java index fa049bd5e90..b9baa020cff 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicRoar.java +++ b/Mage.Sets/src/mage/cards/d/DraconicRoar.java @@ -1,4 +1,3 @@ - package mage.cards.d; import mage.abilities.Ability; @@ -97,7 +96,7 @@ class DraconicRoarEffect extends OneShotEffect { if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java index d4d998ad476..c2b1998436a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.Effect; @@ -20,8 +18,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class DragonTempest extends CardImpl { @@ -99,7 +98,7 @@ class DragonTempestDamageEffect extends OneShotEffect { } else { Player player = game.getPlayer(source.getTargets().getFirstTarget()); if (player != null) { - player.damage(amount, damageSource.getId(), game, false, true); + player.damage(amount, damageSource.getId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java b/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java index bf50bee430e..33999e3fcec 100644 --- a/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java +++ b/Mage.Sets/src/mage/cards/d/DrakusethMawOfFlames.java @@ -1,6 +1,5 @@ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -20,6 +19,8 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** * @author TheElk801 */ @@ -96,7 +97,7 @@ class DrakusethMawOfFlamesEffect extends OneShotEffect { } Player player = game.getPlayer(targetId); if (player != null) { - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenDriller.java b/Mage.Sets/src/mage/cards/d/DwarvenDriller.java index e956f5fa221..517a9938abb 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDriller.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDriller.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -10,16 +8,17 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** - * * @author Styxo */ public final class DwarvenDriller extends CardImpl { @@ -71,7 +70,7 @@ class DwarvenDrillerEffect extends OneShotEffect { if (player != null) { String message = "Have Dwarven Driller do 2 damage to you?"; if (player.chooseUse(Outcome.Damage, message, source, game)) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } else { permanent.destroy(source.getId(), game, false); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenShrine.java b/Mage.Sets/src/mage/cards/d/DwarvenShrine.java index 8aa1f05f064..33acbe2d655 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenShrine.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenShrine.java @@ -1,7 +1,5 @@ - package mage.cards.d; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -19,15 +17,16 @@ import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class DwarvenShrine extends CardImpl { public DwarvenShrine(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); - + // Whenever a player casts a spell, Dwarven Shrine deals X damage to that player, where X is twice the number of cards in all graveyards with the same name as that spell. this.addAbility(new DwarvenShrineTriggeredAbility()); @@ -90,7 +89,7 @@ class DwarvenShrineEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int count = 0; MageObject mageObject = game.getObject(source.getSourceId()); - if(mageObject != null) { + if (mageObject != null) { Spell spell = (Spell) game.getState().getValue("dwarvenShrine" + mageObject); if (spell != null) { Player controller = game.getPlayer(spell.getControllerId()); @@ -104,7 +103,7 @@ class DwarvenShrineEffect extends OneShotEffect { count += player.getGraveyard().count(filterCardName, game); } } - controller.damage(count * 2, mageObject.getId(), game, false, true); + controller.damage(count * 2, mageObject.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/e/ElderSpawn.java b/Mage.Sets/src/mage/cards/e/ElderSpawn.java index e7b65b8cbae..58bac1b7490 100644 --- a/Mage.Sets/src/mage/cards/e/ElderSpawn.java +++ b/Mage.Sets/src/mage/cards/e/ElderSpawn.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -12,11 +10,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; 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.TargetController; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -25,8 +19,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** - * * @author L_J */ public final class ElderSpawn extends CardImpl { @@ -36,7 +31,7 @@ public final class ElderSpawn extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.RED)); } - + public ElderSpawn(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}{U}"); this.subtype.add(SubType.SPAWN); @@ -49,11 +44,11 @@ public final class ElderSpawn extends CardImpl { // Elder Spawn can't be blocked by red creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); } - + public ElderSpawn(final ElderSpawn card) { super(card); } - + @Override public ElderSpawn copy() { return new ElderSpawn(this); @@ -63,10 +58,11 @@ public final class ElderSpawn extends CardImpl { class ElderSpawnEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an Island"); + static { filter.add(SubType.ISLAND.getPredicate()); } - + public ElderSpawnEffect() { super(Outcome.Sacrifice); staticText = "unless you sacrifice an Island, sacrifice {this} and it deals 6 damage to you"; @@ -92,7 +88,7 @@ class ElderSpawnEffect extends OneShotEffect { || !cost.canPay(source, source.getSourceId(), source.getControllerId(), game) || !cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) { sourcePermanent.sacrifice(source.getSourceId(), game); - controller.damage(6, sourcePermanent.getId(), game, false, true); + controller.damage(6, sourcePermanent.getId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/e/Electropotence.java b/Mage.Sets/src/mage/cards/e/Electropotence.java index ebaa86d2cfc..daed57257c4 100644 --- a/Mage.Sets/src/mage/cards/e/Electropotence.java +++ b/Mage.Sets/src/mage/cards/e/Electropotence.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCosts; @@ -19,14 +17,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author North */ public final class Electropotence extends CardImpl { public Electropotence(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to any target. @@ -65,7 +64,7 @@ class ElectropotenceTriggeredAbility extends TriggeredAbilityImpl { Permanent permanent = game.getPermanent(event.getTargetId()); if (permanent != null && permanent.isCreature() && permanent.isControlledBy(this.controllerId)) { - this.getEffects().get(0).setValue("damageSource", event.getTargetId()); + this.getEffects().get(0).setValue("damageSource", event.getTargetId()); return true; } return false; @@ -104,7 +103,7 @@ class ElectropotenceEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (creature != null && controller != null) { if (controller.chooseUse(Outcome.Damage, "Pay {2}{R} to do the damage?", source, game)) { - // if (controller.chooseUse(Outcome.Damage, "Pay {2}{R}? If you do, " + creature.getName() + " deals damage equal to its power to any target.", game)) { + // if (controller.chooseUse(Outcome.Damage, "Pay {2}{R}? If you do, " + creature.getName() + " deals damage equal to its power to any target.", game)) { ManaCosts manaCosts = new ManaCostsImpl("{2}{R}"); if (manaCosts.pay(source, game, source.getSourceId(), controller.getId(), false, null)) { int amount = creature.getPower().getValue(); @@ -115,12 +114,12 @@ class ElectropotenceEffect extends OneShotEffect { } else { Player player = game.getPlayer(target); if (player != null) { - player.damage(amount, creature.getId(), game, false, true); + player.damage(amount, creature.getId(), game); } } - + } - } + } return true; } return false; diff --git a/Mage.Sets/src/mage/cards/e/Embersmith.java b/Mage.Sets/src/mage/cards/e/Embersmith.java index 36d24f32ac6..31a73cb4fa4 100644 --- a/Mage.Sets/src/mage/cards/e/Embersmith.java +++ b/Mage.Sets/src/mage/cards/e/Embersmith.java @@ -68,7 +68,7 @@ class EmbersmithEffect extends OneShotEffect { } Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - player.damage(1, source.getSourceId(), game, false, true); + player.damage(1, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/e/EnchantersBane.java b/Mage.Sets/src/mage/cards/e/EnchantersBane.java index 1faac01ac74..b1fc39da9cd 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantersBane.java +++ b/Mage.Sets/src/mage/cards/e/EnchantersBane.java @@ -1,6 +1,5 @@ package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -14,8 +13,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetEnchantmentPermanent; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class EnchantersBane extends CardImpl { @@ -72,7 +72,7 @@ class EnchantersBaneEffect extends OneShotEffect { if (player.chooseUse(Outcome.GainLife, "Sacrifice " + permanent.getLogName() + "?", source, game)) { permanent.sacrifice(source.getSourceId(), game); } else { - player.damage(permanent.getConvertedManaCost(), permanent.getId(), game, false, true); + player.damage(permanent.getConvertedManaCost(), permanent.getId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/e/Enslave.java b/Mage.Sets/src/mage/cards/e/Enslave.java index 9f48e8510ee..042808dd418 100644 --- a/Mage.Sets/src/mage/cards/e/Enslave.java +++ b/Mage.Sets/src/mage/cards/e/Enslave.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -11,25 +9,22 @@ import mage.abilities.effects.common.continuous.ControlEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author Loki */ public final class Enslave extends CardImpl { public Enslave(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); this.subtype.add(SubType.AURA); // Enchant creature @@ -76,7 +71,7 @@ class EnslaveEffect extends OneShotEffect { if (attached != null) { Player owner = game.getPlayer(attached.getOwnerId()); if (owner != null) { - owner.damage(1, attached.getId(), game, false, true); + owner.damage(1, attached.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java index c0611971433..0476b314d67 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java +++ b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -15,8 +13,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author nigelzor */ public final class ErraticExplosion extends CardImpl { @@ -77,7 +76,7 @@ class ErraticExplosionEffect extends OneShotEffect { } else { Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(nonLandCard.getConvertedManaCost(), source.getSourceId(), game, false, true); + targetPlayer.damage(nonLandCard.getConvertedManaCost(), source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/e/EssenceBacklash.java b/Mage.Sets/src/mage/cards/e/EssenceBacklash.java index b7a7adaa7a4..0fcc6e2e702 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceBacklash.java +++ b/Mage.Sets/src/mage/cards/e/EssenceBacklash.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,8 +12,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class EssenceBacklash extends CardImpl { @@ -63,7 +62,7 @@ class EssenceBacklashEffect extends OneShotEffect { result = game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game); if (spellController != null) { - spellController.damage(spell.getPower().getValue(), source.getSourceId(), game, false, true); + spellController.damage(spell.getPower().getValue(), source.getSourceId(), game); } } return result; diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java index 81603a49a88..76139cd5219 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -18,8 +16,9 @@ import mage.players.Library; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class ExplosiveRevelation extends CardImpl { @@ -86,7 +85,7 @@ class ExplosiveRevelationEffect extends OneShotEffect { } else { Player targetedPlayer = game.getPlayer(targetId); if (targetedPlayer != null) { - targetedPlayer.damage(damage, source.getSourceId(), game, false, true); + targetedPlayer.damage(damage, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/e/EyeForAnEye.java b/Mage.Sets/src/mage/cards/e/EyeForAnEye.java index 615e355c799..15a8ad86f61 100644 --- a/Mage.Sets/src/mage/cards/e/EyeForAnEye.java +++ b/Mage.Sets/src/mage/cards/e/EyeForAnEye.java @@ -1,7 +1,5 @@ - package mage.cards.e; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.cards.CardImpl; @@ -15,14 +13,15 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.TargetSource; +import java.util.UUID; + /** - * * @author L_J */ public final class EyeForAnEye extends CardImpl { public EyeForAnEye(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W}{W}"); // The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and Eye for an Eye deals that much damage to that source's controller. this.getSpellAbility().addEffect(new EyeForAnEyeEffect()); @@ -84,7 +83,7 @@ class EyeForAnEyeEffect extends ReplacementEffectImpl { if (sourceControllerId != null) { Player sourceController = game.getPlayer(sourceControllerId); if (sourceController != null) { - sourceController.damage(damageEvent.getAmount(), source.getSourceId(), game, false, true); + sourceController.damage(damageEvent.getAmount(), source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/f/FeveredVisions.java b/Mage.Sets/src/mage/cards/f/FeveredVisions.java index 94ecdabea0f..f14b2a5262d 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredVisions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredVisions.java @@ -1,8 +1,5 @@ - package mage.cards.f; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -14,14 +11,16 @@ import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.Set; +import java.util.UUID; + /** - * * @author fireshoes */ public final class FeveredVisions extends CardImpl { public FeveredVisions(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}{R}"); // At the beginning of each player's end step, that player draws a card. If the player is your opponent and has four or more cards in hand, // Fevered Visions deals 2 damage to that player. @@ -58,7 +57,7 @@ class FeveredVisionsEffect extends OneShotEffect { player.drawCards(1, game); Set opponents = game.getOpponents(source.getControllerId()); if (opponents.contains(player.getId()) && player.getHand().size() > 3) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index 7b21f654f9a..e206de3669f 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -15,17 +13,18 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; -import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.UUID; + +import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; /** - * * @author jeffwadsworth - * */ public final class FieryBombardment extends CardImpl { @@ -83,7 +82,7 @@ class FieryBombardmentEffect extends OneShotEffect { if (damage > 0) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); } else { Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null) { diff --git a/Mage.Sets/src/mage/cards/f/Fireball.java b/Mage.Sets/src/mage/cards/f/Fireball.java index 7e56cf80172..314db59f661 100644 --- a/Mage.Sets/src/mage/cards/f/Fireball.java +++ b/Mage.Sets/src/mage/cards/f/Fireball.java @@ -1,4 +1,3 @@ - package mage.cards.f; import mage.abilities.Ability; @@ -78,7 +77,7 @@ class FireballEffect extends OneShotEffect { } else { Player player = game.getPlayer(targetId); if (player != null) { - player.damage(damagePer, source.getSourceId(), game, false, true); + player.damage(damagePer, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java index 3f109f300a5..fc4557b4d7d 100644 --- a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java +++ b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java @@ -78,7 +78,7 @@ class FlameblastDragonEffect extends OneShotEffect { } Player targetPlayer = game.getPlayer(source.getFirstTarget()); if (targetPlayer != null) { - targetPlayer.damage(costX, source.getSourceId(), game, false, true); + targetPlayer.damage(costX, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java index ec1d2b26cad..b22d7cd6892 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java +++ b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java @@ -125,7 +125,7 @@ class FlayerEffect extends OneShotEffect { } Player player = game.getPlayer(target); if (player != null) { - player.damage(amount, creature.getId(), game, false, true); + player.damage(amount, creature.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/f/FleshBlood.java b/Mage.Sets/src/mage/cards/f/FleshBlood.java index ba5e5ce89b2..87a841f2bd3 100644 --- a/Mage.Sets/src/mage/cards/f/FleshBlood.java +++ b/Mage.Sets/src/mage/cards/f/FleshBlood.java @@ -1,6 +1,5 @@ package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -16,11 +15,13 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetControlledCreaturePermanent; -import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + public final class FleshBlood extends SplitCard { public FleshBlood(UUID ownerId, CardSetInfo setInfo) { @@ -111,7 +112,7 @@ class BloodEffect extends OneShotEffect { } Player targetPlayer = game.getPlayer(source.getTargets().get(1).getFirstTarget()); if (sourcePermanent != null && targetPlayer != null) { - targetPlayer.damage(sourcePermanent.getPower().getValue(), sourcePermanent.getId(), game, false, true); + targetPlayer.damage(sourcePermanent.getPower().getValue(), sourcePermanent.getId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/f/FleshReaver.java b/Mage.Sets/src/mage/cards/f/FleshReaver.java index ab7e4ab7903..a702ab8cfe0 100644 --- a/Mage.Sets/src/mage/cards/f/FleshReaver.java +++ b/Mage.Sets/src/mage/cards/f/FleshReaver.java @@ -1,25 +1,24 @@ - package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class FleshReaver extends CardImpl { @@ -113,7 +112,7 @@ class FleshReaverEffect extends OneShotEffect { } int damageToDeal = (Integer) getValue("damage"); if (damageToDeal > 0) { - controller.damage(damageToDeal, source.getSourceId(), game, false, true); + controller.damage(damageToDeal, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/f/ForceDrain.java b/Mage.Sets/src/mage/cards/f/ForceDrain.java index 538529fcaed..aa7893390ab 100644 --- a/Mage.Sets/src/mage/cards/f/ForceDrain.java +++ b/Mage.Sets/src/mage/cards/f/ForceDrain.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.keyword.ScryEffect; @@ -14,8 +12,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author Styxo */ public final class ForceDrain extends CardImpl { @@ -69,7 +68,7 @@ class ForceDrainEffect extends OneShotEffect { Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - if (player.damage(2, source.getId(), game, false, true) > 0) { + if (player.damage(2, source.getId(), game) > 0) { controller.gainLife(2, game, source); } return true; diff --git a/Mage.Sets/src/mage/cards/f/ForceOfNature.java b/Mage.Sets/src/mage/cards/f/ForceOfNature.java index 95486df39e3..79c0fef32bf 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfNature.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfNature.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -12,20 +10,21 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class ForceOfNature extends CardImpl { public ForceOfNature(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{G}{G}"); this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(8); this.toughness = new MageInt(8); @@ -72,7 +71,7 @@ class ForceOfNatureEffect extends OneShotEffect { String message = "Would you like to pay {G}{G}{G}{G} to prevent taking 8 damage from {this}?"; if (!(controller.chooseUse(Outcome.Benefit, message, source, game) && cost.pay(source, game, source.getSourceId(), controller.getId(), false, null))) { - controller.damage(8, source.getSourceId(), game, false, true); + controller.damage(8, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDinosaur.java b/Mage.Sets/src/mage/cards/f/FormOfTheDinosaur.java index d61e44dbb0f..c226ad0eb99 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDinosaur.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDinosaur.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -17,8 +15,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponentsCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class FormOfTheDinosaur extends CardImpl { @@ -68,7 +67,7 @@ class FormOfTheDinosaurEffect extends OneShotEffect { Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (targetCreature != null) { targetCreature.damage(15, source.getSourceId(), game, false, true); - controller.damage(targetCreature.getPower().getValue(), targetCreature.getId(), game, false, true); + controller.damage(targetCreature.getPower().getValue(), targetCreature.getId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/f/FriendlyFire.java b/Mage.Sets/src/mage/cards/f/FriendlyFire.java index ca6ebfc24d0..76156eafe68 100644 --- a/Mage.Sets/src/mage/cards/f/FriendlyFire.java +++ b/Mage.Sets/src/mage/cards/f/FriendlyFire.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -13,8 +11,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class FriendlyFire extends CardImpl { @@ -70,7 +69,7 @@ class FriendlyFireEffect extends OneShotEffect { controllerOfTargetCreature.revealCards(sourceObject.getName(), cards, game); int damage = card.getConvertedManaCost(); targetCreature.damage(damage, source.getSourceId(), game, false, true); - controllerOfTargetCreature.damage(damage, source.getSourceId(), game, false, true); + controllerOfTargetCreature.damage(damage, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java index 0d0aaf7b2f8..868a6f42228 100644 --- a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java +++ b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java @@ -92,7 +92,7 @@ class GargantuanGorillaSacrificeEffect extends OneShotEffect { || !cost.canPay(source, source.getSourceId(), source.getControllerId(), game) || !cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) { sourcePermanent.sacrifice(source.getSourceId(), game); - controller.damage(7, sourcePermanent.getId(), game, false, true); + controller.damage(7, sourcePermanent.getId(), game); } else if (cost.isPaid()) { for (Permanent permanent : cost.getPermanents()) { if (filterSnow.match(permanent, game)) { diff --git a/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java b/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java index e2be2caca81..f5a732c6605 100644 --- a/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java +++ b/Mage.Sets/src/mage/cards/g/GazeOfAdamaro.java @@ -1,26 +1,25 @@ - package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class GazeOfAdamaro extends CardImpl { public GazeOfAdamaro(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}{R}"); this.subtype.add(SubType.ARCANE); @@ -59,7 +58,7 @@ class GazeOfAdamaroEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(targetPlayer.getHand().size(), source.getSourceId(), game, false, true); + targetPlayer.damage(targetPlayer.getHand().size(), source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java index ff27db96dae..35dd1da2e58 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java @@ -1,7 +1,5 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -10,22 +8,23 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author nantuko */ public final class GoblinBangchuckers extends CardImpl { public GoblinBangchuckers(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.WARRIOR); @@ -71,7 +70,7 @@ class GoblinBangchuckersEffect extends OneShotEffect { } Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); return true; } } else { diff --git a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java index 5cbcb406aea..e8d175ed61c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java @@ -1,7 +1,5 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -18,8 +16,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author Plopman */ public final class GoblinCharbelcher extends CardImpl { @@ -100,7 +99,7 @@ class GoblinCharbelcherEffect extends OneShotEffect { } else { Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(damage, source.getSourceId(), game, false, true); + targetPlayer.damage(damage, source.getSourceId(), game); } } controller.putCardsOnBottomOfLibrary(cards, game, source, true); diff --git a/Mage.Sets/src/mage/cards/g/GoblinLyre.java b/Mage.Sets/src/mage/cards/g/GoblinLyre.java index 822f0633d13..c73453bfbe8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLyre.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLyre.java @@ -70,7 +70,7 @@ class GoblinLyreEffect extends OneShotEffect { } } else { int damage = game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), opponent.getId(), game).size(); - return controller.damage(damage, source.getSourceId(), game, false, true) > 0; + return controller.damage(damage, source.getSourceId(), game) > 0; } } return false; diff --git a/Mage.Sets/src/mage/cards/g/GoblinPsychopath.java b/Mage.Sets/src/mage/cards/g/GoblinPsychopath.java index e2499125198..ac0d1cfa8e5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPsychopath.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPsychopath.java @@ -1,7 +1,5 @@ - package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -10,16 +8,17 @@ import mage.abilities.effects.ReplacementEffectImpl; 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.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; import mage.players.Player; +import java.util.UUID; + /** - * * @author L_J */ public final class GoblinPsychopath extends CardImpl { @@ -99,7 +98,7 @@ class GoblinPsychopathEffect extends ReplacementEffectImpl { return false; } // TODO: make this redirect damage from all blockers - controller.damage(event.getAmount(), source.getSourceId(), game, false, true); + controller.damage(event.getAmount(), source.getSourceId(), game); String sourceLogName = game.getObject(source.getSourceId()).getLogName() + ": "; game.informPlayers(sourceLogName + "Redirected " + event.getAmount() + " damage to " + controller.getLogName()); this.discard(); diff --git a/Mage.Sets/src/mage/cards/g/GraviticPunch.java b/Mage.Sets/src/mage/cards/g/GraviticPunch.java index cfd36819b70..41344214d22 100644 --- a/Mage.Sets/src/mage/cards/g/GraviticPunch.java +++ b/Mage.Sets/src/mage/cards/g/GraviticPunch.java @@ -1,6 +1,5 @@ package mage.cards.g; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.JumpStartAbility; @@ -14,8 +13,9 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class GraviticPunch extends CardImpl { @@ -67,7 +67,7 @@ class GraviticPunchEffect extends OneShotEffect { if (player == null || controlledCreature == null) { return false; } - player.damage(controlledCreature.getPower().getValue(), controlledCreature.getId(), game, false, true); + player.damage(controlledCreature.getPower().getValue(), controlledCreature.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index fa6bc464974..03a0a38b20b 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -1,4 +1,3 @@ - package mage.cards.g; import mage.MageInt; @@ -20,7 +19,6 @@ import mage.players.Player; import java.util.UUID; /** - * * @author jeffwadsworth */ public final class GreatbowDoyen extends CardImpl { @@ -33,7 +31,7 @@ public final class GreatbowDoyen extends CardImpl { } public GreatbowDoyen(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.subtype.add(SubType.ELF); this.subtype.add(SubType.ARCHER); @@ -81,7 +79,7 @@ class GreatbowDoyenTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { Permanent creature = game.getPermanent(event.getSourceId()); Permanent damagedCreature = game.getPermanent(event.getTargetId()); - if (creature != null && damagedCreature != null + if (creature != null && damagedCreature != null && creature.isCreature() && creature.hasSubtype(SubType.ARCHER, game) && creature.isControlledBy(controllerId)) { @@ -128,7 +126,7 @@ class GreatbowDoyenEffect extends OneShotEffect { if (permanent != null) { Player player = game.getPlayer(controllerId); if (player != null) { - player.damage(damageAmount, sourceOfDamage, game, false, true); + player.damage(damageAmount, sourceOfDamage, game); game.informPlayers(permanent.getName() + " deals " + damageAmount + " damage to " + player.getLogName()); return true; } diff --git a/Mage.Sets/src/mage/cards/g/GrenzosRuffians.java b/Mage.Sets/src/mage/cards/g/GrenzosRuffians.java index 21fcb04e996..35ab9843c99 100644 --- a/Mage.Sets/src/mage/cards/g/GrenzosRuffians.java +++ b/Mage.Sets/src/mage/cards/g/GrenzosRuffians.java @@ -1,24 +1,23 @@ - package mage.cards.g; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToOpponentTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.constants.SubType; import mage.abilities.keyword.MeleeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class GrenzosRuffians extends CardImpl { @@ -73,7 +72,7 @@ class GrenzosRuffiansEffect extends OneShotEffect { if (!Objects.equals(playerId, damagedOpponent)) { Player opponent = game.getPlayer(playerId); if (opponent != null) { - int dealtDamage = opponent.damage(amount, source.getSourceId(), game, false, true); + int dealtDamage = opponent.damage(amount, source.getSourceId(), game); game.informPlayers(object.getLogName() + " deals " + dealtDamage + " damage to " + opponent.getLogName()); } } diff --git a/Mage.Sets/src/mage/cards/h/Hankyu.java b/Mage.Sets/src/mage/cards/h/Hankyu.java index e8451eaa74d..e8ef8c1307e 100644 --- a/Mage.Sets/src/mage/cards/h/Hankyu.java +++ b/Mage.Sets/src/mage/cards/h/Hankyu.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -14,25 +12,22 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author North */ public final class Hankyu extends CardImpl { public Hankyu(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); this.subtype.add(SubType.EQUIPMENT); /* Equipped creature has "{T}: Put an aim counter on Hankyu" and */ @@ -40,8 +35,8 @@ public final class Hankyu extends CardImpl { ability1.setSourceId(this.getId()); // to know where to put the counters on this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.EQUIPMENT))); - /* "{T}, Remove all aim counters from Hankyu: This creature deals - * damage to any target equal to the number of + /* "{T}, Remove all aim counters from Hankyu: This creature deals + * damage to any target equal to the number of * aim counters removed this way." */ SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HankyuDealsDamageEffect(), new TapSourceCost()); ability2.addCost(new HankyuCountersSourceCost(this.getId())); @@ -64,7 +59,7 @@ public final class Hankyu extends CardImpl { class HankyuAddCounterEffect extends OneShotEffect { - private UUID effectGivingEquipmentId; + private UUID effectGivingEquipmentId; public HankyuAddCounterEffect(UUID effectGivingEquipmentId) { super(Outcome.Benefit); @@ -74,7 +69,7 @@ class HankyuAddCounterEffect extends OneShotEffect { public HankyuAddCounterEffect(final HankyuAddCounterEffect effect) { super(effect); - this.effectGivingEquipmentId = effect.effectGivingEquipmentId; + this.effectGivingEquipmentId = effect.effectGivingEquipmentId; } @Override @@ -119,14 +114,14 @@ class HankyuDealsDamageEffect extends OneShotEffect { int damageAmount = cost.getRemovedCounters(); if (damageAmount > 0) { - Permanent permanent = game.getPermanent(source.getFirstTarget()); - if (permanent != null) { - permanent.damage(damageAmount, source.getSourceId(), game, false, true); - } - Player player = game.getPlayer(source.getFirstTarget()); - if (player != null) { - player.damage(damageAmount, source.getSourceId(), game, false, true); - } + Permanent permanent = game.getPermanent(source.getFirstTarget()); + if (permanent != null) { + permanent.damage(damageAmount, source.getSourceId(), game, false, true); + } + Player player = game.getPlayer(source.getFirstTarget()); + if (player != null) { + player.damage(damageAmount, source.getSourceId(), game); + } } return true; } @@ -137,37 +132,37 @@ class HankyuDealsDamageEffect extends OneShotEffect { class HankyuCountersSourceCost extends CostImpl { - private int removedCounters; - private UUID effectGivingEquipmentId; + private int removedCounters; + private UUID effectGivingEquipmentId; - public HankyuCountersSourceCost(UUID effectGivingEquipmentId) { - super(); - this.removedCounters = 0; - this.effectGivingEquipmentId = effectGivingEquipmentId; - this.text = "Remove all aim counters from Hankyu"; + public HankyuCountersSourceCost(UUID effectGivingEquipmentId) { + super(); + this.removedCounters = 0; + this.effectGivingEquipmentId = effectGivingEquipmentId; + this.text = "Remove all aim counters from Hankyu"; } public HankyuCountersSourceCost(HankyuCountersSourceCost cost) { super(cost); - this.effectGivingEquipmentId = cost.effectGivingEquipmentId; - this.removedCounters = cost.removedCounters; + this.effectGivingEquipmentId = cost.effectGivingEquipmentId; + this.removedCounters = cost.removedCounters; } @Override public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { - return true; + return true; } @Override public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) { Permanent equipment = game.getPermanent(this.effectGivingEquipmentId); - if (equipment != null ) { - this.removedCounters = equipment.getCounters(game).getCount(CounterType.AIM); - if (this.removedCounters > 0) { - equipment.removeCounters("aim", this.removedCounters, game); - } - } - this.paid = true; + if (equipment != null) { + this.removedCounters = equipment.getCounters(game).getCount(CounterType.AIM); + if (this.removedCounters > 0) { + equipment.removeCounters("aim", this.removedCounters, game); + } + } + this.paid = true; return true; } @@ -176,7 +171,7 @@ class HankyuCountersSourceCost extends CostImpl { return new HankyuCountersSourceCost(this); } - public int getRemovedCounters() { - return this.removedCounters; - } + public int getRemovedCounters() { + return this.removedCounters; + } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/h/HarshJustice.java b/Mage.Sets/src/mage/cards/h/HarshJustice.java index b65e020c9bd..ab48a8d72a7 100644 --- a/Mage.Sets/src/mage/cards/h/HarshJustice.java +++ b/Mage.Sets/src/mage/cards/h/HarshJustice.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -12,11 +10,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.TurnPhase; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; @@ -27,8 +21,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.common.PlayerAttackedStepWatcher; +import java.util.UUID; + /** - * * @author LevelX2 & L_J */ public final class HarshJustice extends CardImpl { @@ -134,7 +129,7 @@ class HarshJusticeEffect extends OneShotEffect { Player controller = game.getPlayer(targetObject.getControllerId()); if (controller != null) { game.informPlayers(sourceObject.getLogName() + ": " + targetObject.getLogName() + " deals " + damage + " damage to " + controller.getLogName()); - controller.damage(damage, sourceId, game, false, true); + controller.damage(damage, sourceId, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/h/HasranOgress.java b/Mage.Sets/src/mage/cards/h/HasranOgress.java index 02272819cdd..8f284e00bd5 100644 --- a/Mage.Sets/src/mage/cards/h/HasranOgress.java +++ b/Mage.Sets/src/mage/cards/h/HasranOgress.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -11,20 +9,20 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; -/** - * - * @author LoneFox +import java.util.UUID; +/** + * @author LoneFox */ public final class HasranOgress extends CardImpl { public HasranOgress(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{B}"); this.subtype.add(SubType.OGRE); this.power = new MageInt(3); this.toughness = new MageInt(2); @@ -67,7 +65,7 @@ class HasranOgressEffect extends OneShotEffect { String message = "Would you like to pay {2} to prevent taking 3 damage from Hasran Ogress?"; if (!(controller.chooseUse(Outcome.Benefit, message, source, game) && cost.pay(source, game, source.getSourceId(), controller.getId(), false, null))) { - controller.damage(3, source.getSourceId(), game, false, true); + controller.damage(3, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/h/HatchetBully.java b/Mage.Sets/src/mage/cards/h/HatchetBully.java index dac43dcc534..5cb7b8624b9 100644 --- a/Mage.Sets/src/mage/cards/h/HatchetBully.java +++ b/Mage.Sets/src/mage/cards/h/HatchetBully.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -13,19 +11,20 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.UUID; /** - * * @author jeffwadsworth */ public final class HatchetBully extends CardImpl { @@ -115,7 +114,7 @@ class HatchetBullyEffect extends OneShotEffect { } Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/h/HeartOfBogardan.java b/Mage.Sets/src/mage/cards/h/HeartOfBogardan.java index a775fabb645..27cab590891 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfBogardan.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfBogardan.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; @@ -21,8 +19,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetPlayerOrPlaneswalker; +import java.util.UUID; + /** - * * @author emerald000 & L_J */ public final class HeartOfBogardan extends CardImpl { @@ -102,7 +101,7 @@ class HeartOfBogardanEffect extends OneShotEffect { if (player != null && sourcePermanent != null) { int damage = sourcePermanent.getCounters(game).getCount(CounterType.AGE) * 2 - 2; if (damage > 0) { - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); for (Permanent perm : game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), player.getId(), game)) { perm.damage(damage, source.getSourceId(), game, false, true); } diff --git a/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java b/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java index f854a7e0655..71b7fbbe004 100644 --- a/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java +++ b/Mage.Sets/src/mage/cards/h/HeartlessHidetsugu.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -9,22 +7,19 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class HeartlessHidetsugu extends CardImpl { public HeartlessHidetsugu(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.OGRE); this.subtype.add(SubType.SHAMAN); @@ -71,7 +66,7 @@ class HeartlessHidetsuguDamageEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { int damage = player.getLife() / 2; - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/h/HellholeRats.java b/Mage.Sets/src/mage/cards/h/HellholeRats.java index 20a87e28e3a..c7efd16e3ae 100644 --- a/Mage.Sets/src/mage/cards/h/HellholeRats.java +++ b/Mage.Sets/src/mage/cards/h/HellholeRats.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -12,20 +10,21 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class HellholeRats extends CardImpl { public HellholeRats(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{R}"); this.subtype.add(SubType.RAT); this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -76,7 +75,7 @@ class HellholeRatsEffect extends OneShotEffect { for (Card card : cards.getCards(game)) { damage = card.getConvertedManaCost(); } - targetPlayer.damage(damage, source.getSourceId(), game, false, true); + targetPlayer.damage(damage, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java index 37c44579532..71c4bbe179f 100644 --- a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java +++ b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java @@ -1,8 +1,5 @@ - package mage.cards.h; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -18,8 +15,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.Set; +import java.util.UUID; + /** - * * @author BetaSteward */ public final class HereticsPunishment extends CardImpl { @@ -74,7 +73,7 @@ class HereticsPunishmentEffect extends OneShotEffect { } Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(maxCost, source.getSourceId(), game, false, true); + targetPlayer.damage(maxCost, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java b/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java index 7217d428292..c9aa09e14e6 100644 --- a/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java +++ b/Mage.Sets/src/mage/cards/h/HidetsugusSecondRite.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -12,14 +10,15 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class HidetsugusSecondRite extends CardImpl { public HidetsugusSecondRite(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}"); // If target player has exactly 10 life, Hidetsugu's Second Rite deals 10 damage to that player. @@ -58,7 +57,7 @@ class HidetsugusSecondRiteEffect extends OneShotEffect { Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { if (targetPlayer.getLife() == 10) { - targetPlayer.damage(10, source.getSourceId(), game, false, true); + targetPlayer.damage(10, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/h/HitRun.java b/Mage.Sets/src/mage/cards/h/HitRun.java index 2bf1acd2cd9..9f6f37ab64b 100644 --- a/Mage.Sets/src/mage/cards/h/HitRun.java +++ b/Mage.Sets/src/mage/cards/h/HitRun.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -22,8 +20,9 @@ import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class HitRun extends SplitCard { @@ -85,7 +84,7 @@ class HitEffect extends OneShotEffect { permanent.sacrifice(source.getSourceId(), game); int damage = permanent.getConvertedManaCost(); if (damage > 0) { - targetPlayer.damage(damage, source.getSourceId(), game, false, true); + targetPlayer.damage(damage, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/h/HonorablePassage.java b/Mage.Sets/src/mage/cards/h/HonorablePassage.java index 795b7c0f935..93bd4984ff3 100644 --- a/Mage.Sets/src/mage/cards/h/HonorablePassage.java +++ b/Mage.Sets/src/mage/cards/h/HonorablePassage.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; @@ -16,14 +14,15 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author L_J */ public final class HonorablePassage extends CardImpl { public HonorablePassage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}"); // The next time a source of your choice would deal damage to any target this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller. this.getSpellAbility().addEffect(new HonorablePassageEffect()); @@ -41,15 +40,15 @@ public final class HonorablePassage extends CardImpl { } class HonorablePassageEffect extends PreventNextDamageFromChosenSourceToTargetEffect { - + public HonorablePassageEffect() { super(Duration.EndOfTurn); } - + public HonorablePassageEffect(final HonorablePassageEffect effect) { super(effect); } - + @Override public HonorablePassageEffect copy() { return new HonorablePassageEffect(this); @@ -66,7 +65,7 @@ class HonorablePassageEffect extends PreventNextDamageFromChosenSourceToTargetEf if (sourceControllerId != null) { Player sourceController = game.getPlayer(sourceControllerId); if (sourceController != null) { - sourceController.damage(damage, source.getSourceId(), game, false, true); + sourceController.damage(damage, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/h/HungryFlames.java b/Mage.Sets/src/mage/cards/h/HungryFlames.java index 57c1626f2c8..b6276bdb5c4 100644 --- a/Mage.Sets/src/mage/cards/h/HungryFlames.java +++ b/Mage.Sets/src/mage/cards/h/HungryFlames.java @@ -1,7 +1,5 @@ - package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,6 +12,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; +import java.util.UUID; + /** * @author JRHerlehy */ @@ -58,7 +58,7 @@ public final class HungryFlames extends CardImpl { } if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } return true; diff --git a/Mage.Sets/src/mage/cards/h/HydraOmnivore.java b/Mage.Sets/src/mage/cards/h/HydraOmnivore.java index 8ec2e68699a..f7616a521d8 100644 --- a/Mage.Sets/src/mage/cards/h/HydraOmnivore.java +++ b/Mage.Sets/src/mage/cards/h/HydraOmnivore.java @@ -1,8 +1,5 @@ - package mage.cards.h; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -11,19 +8,21 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class HydraOmnivore extends CardImpl { public HydraOmnivore(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.subtype.add(SubType.HYDRA); this.power = new MageInt(8); @@ -65,11 +64,11 @@ class HydraOmnivoreEffect extends OneShotEffect { int amount = (Integer) getValue("damage"); MageObject object = game.getObject(source.getSourceId()); if (object != null && amount > 0 && damagedOpponent != null) { - for (UUID playerId :game.getOpponents(source.getControllerId())) { + for (UUID playerId : game.getOpponents(source.getControllerId())) { if (!Objects.equals(playerId, damagedOpponent)) { Player opponent = game.getPlayer(playerId); if (opponent != null) { - int dealtDamage = opponent.damage(amount, source.getSourceId(), game, false, true); + int dealtDamage = opponent.damage(amount, source.getSourceId(), game); game.informPlayers(object.getLogName() + " deals " + dealtDamage + " damage to " + opponent.getLogName()); } } diff --git a/Mage.Sets/src/mage/cards/i/Icequake.java b/Mage.Sets/src/mage/cards/i/Icequake.java index 70399b40e7d..d14b68b7803 100644 --- a/Mage.Sets/src/mage/cards/i/Icequake.java +++ b/Mage.Sets/src/mage/cards/i/Icequake.java @@ -1,7 +1,5 @@ - package mage.cards.i; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -13,22 +11,23 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** - * * @author fireshoes */ public final class Icequake extends CardImpl { public Icequake(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); // Destroy target land. // If that land was a snow land, Icequake deals 1 damage to that land's controller. this.getSpellAbility().addEffect(new IcequakeEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); - - + + } public Icequake(final Icequake card) { @@ -62,10 +61,10 @@ class IcequakeEffect extends OneShotEffect { Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { Player controller = game.getPlayer(permanent.getControllerId()); - if(controller != null) { + if (controller != null) { permanent.destroy(source.getSourceId(), game, false); if (permanent.isSnow()) { - controller.damage(1, source.getSourceId(), game, false, true); + controller.damage(1, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/i/IgniteMemories.java b/Mage.Sets/src/mage/cards/i/IgniteMemories.java index f40dc712bd2..3bf82988617 100644 --- a/Mage.Sets/src/mage/cards/i/IgniteMemories.java +++ b/Mage.Sets/src/mage/cards/i/IgniteMemories.java @@ -1,24 +1,19 @@ - package mage.cards.i; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.StormAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author Plopman */ public final class IgniteMemories extends CardImpl { @@ -65,7 +60,7 @@ class IgniteMemoriesEffect extends OneShotEffect { if (card != null) { revealed.add(card); controller.revealCards(sourceObject.getIdName(), revealed, game); - controller.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); + controller.damage(card.getConvertedManaCost(), source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/i/InsultInjury.java b/Mage.Sets/src/mage/cards/i/InsultInjury.java index 5250fa9ba3d..14be28e21f3 100644 --- a/Mage.Sets/src/mage/cards/i/InsultInjury.java +++ b/Mage.Sets/src/mage/cards/i/InsultInjury.java @@ -1,12 +1,10 @@ package mage.cards.i; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.continuous.DamageCantBePreventedEffect; import mage.abilities.keyword.AftermathAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.SplitCard; import mage.constants.CardType; @@ -21,6 +19,8 @@ import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; import mage.util.CardUtil; +import java.util.UUID; + /** * @author Stravant */ @@ -115,7 +115,7 @@ class InjuryEffect extends OneShotEffect { } if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } return true; diff --git a/Mage.Sets/src/mage/cards/i/Ionize.java b/Mage.Sets/src/mage/cards/i/Ionize.java index ac7a6c3d469..15bd2d88dde 100644 --- a/Mage.Sets/src/mage/cards/i/Ionize.java +++ b/Mage.Sets/src/mage/cards/i/Ionize.java @@ -1,9 +1,7 @@ package mage.cards.i; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -13,8 +11,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class Ionize extends CardImpl { @@ -63,7 +62,7 @@ class IonizeEffect extends OneShotEffect { result = game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game); if (spellController != null) { - spellController.damage(2, source.getSourceId(), game, false, true); + spellController.damage(2, source.getSourceId(), game); } } return result; diff --git a/Mage.Sets/src/mage/cards/j/JackalPup.java b/Mage.Sets/src/mage/cards/j/JackalPup.java index 7f6dae19656..80b501499e3 100644 --- a/Mage.Sets/src/mage/cards/j/JackalPup.java +++ b/Mage.Sets/src/mage/cards/j/JackalPup.java @@ -1,7 +1,5 @@ - package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealtDamageToSourceTriggeredAbility; @@ -9,15 +7,15 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth - * */ public final class JackalPup extends CardImpl { @@ -63,7 +61,7 @@ class JackalPupEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); if (you != null) { - you.damage((Integer) this.getValue("damage"), source.getSourceId(), game, false, true); + you.damage((Integer) this.getValue("damage"), source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/j/JovialEvil.java b/Mage.Sets/src/mage/cards/j/JovialEvil.java index a5aa81d6103..5e9d61be64d 100644 --- a/Mage.Sets/src/mage/cards/j/JovialEvil.java +++ b/Mage.Sets/src/mage/cards/j/JovialEvil.java @@ -1,7 +1,5 @@ - package mage.cards.j; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -9,7 +7,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; @@ -17,14 +14,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author Backfir3 */ public final class JovialEvil extends CardImpl { public JovialEvil(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}"); // Jovial Evil deals X damage to target opponent, where X is twice the number of white creatures that player controls. this.getSpellAbility().addEffect(new JovialEvilEffect()); @@ -42,9 +40,10 @@ public final class JovialEvil extends CardImpl { } class JovialEvilEffect extends OneShotEffect { - + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); - static{ + + static { filter.add(new ColorPredicate(ObjectColor.WHITE)); } @@ -66,7 +65,7 @@ class JovialEvilEffect extends OneShotEffect { amount++; } if (amount > 0) { - opponent.damage(amount * 2, source.getSourceId(), game, false, true); + opponent.damage(amount * 2, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/j/Justice.java b/Mage.Sets/src/mage/cards/j/Justice.java index 9828d5340b7..1c9e6bcb49d 100644 --- a/Mage.Sets/src/mage/cards/j/Justice.java +++ b/Mage.Sets/src/mage/cards/j/Justice.java @@ -1,7 +1,5 @@ - package mage.cards.j; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -24,19 +22,20 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class Justice extends CardImpl { public Justice(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // At the beginning of your upkeep, sacrifice Justice unless you pay {W}{W}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{W}{W}")), TargetController.YOU, false)); - + // Whenever a red creature or spell deals damage, Justice deals that much damage to that creature's or spell's controller. this.addAbility(new JusticeTriggeredAbility(new JusticeEffect())); } @@ -115,8 +114,8 @@ class JusticeEffect extends OneShotEffect { if (damageAmount != null && targetId != null) { Player player = game.getPlayer(targetId); if (player != null) { - player.damage(damageAmount, targetId, game, false, true); - return true; + player.damage(damageAmount, targetId, game); + return true; } } return false; diff --git a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java index 60b8e087612..ea114ce099a 100644 --- a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java +++ b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java @@ -1,7 +1,5 @@ - package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastOpponentTriggeredAbility; @@ -16,10 +14,10 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author jeffwadsworth - * */ public final class KaervekTheMerciless extends CardImpl { @@ -72,7 +70,7 @@ class KaervekTheMercilessEffect extends OneShotEffect { int cost = spell.getConvertedManaCost(); Player target = game.getPlayer(source.getFirstTarget()); if (target != null) { - target.damage(cost, source.getSourceId(), game, false, true); + target.damage(cost, source.getSourceId(), game); return true; } Permanent targetCreature = game.getPermanent(source.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KaerveksPurge.java b/Mage.Sets/src/mage/cards/k/KaerveksPurge.java index 077111812ae..19b5c69c3ec 100644 --- a/Mage.Sets/src/mage/cards/k/KaerveksPurge.java +++ b/Mage.Sets/src/mage/cards/k/KaerveksPurge.java @@ -1,4 +1,3 @@ - package mage.cards.k; import mage.abilities.Ability; @@ -89,7 +88,7 @@ class KaerveksPurgeEffect extends OneShotEffect { Player creatureController = game.getPlayer(targetCreature.getControllerId()); int power = targetCreature.getPower().getValue(); if (creatureController != null) { - creatureController.damage(power, source.getSourceId(), game, false, true); + creatureController.damage(power, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/k/Karma.java b/Mage.Sets/src/mage/cards/k/Karma.java index 3efa30a82d0..52ff7f45297 100644 --- a/Mage.Sets/src/mage/cards/k/Karma.java +++ b/Mage.Sets/src/mage/cards/k/Karma.java @@ -1,7 +1,5 @@ - package mage.cards.k; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -17,16 +15,16 @@ import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author Plopman */ public final class Karma extends CardImpl { - public Karma(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps they control. @@ -43,23 +41,22 @@ public final class Karma extends CardImpl { } } -class KarmaDamageTargetEffect extends OneShotEffect{ - +class KarmaDamageTargetEffect extends OneShotEffect { + private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("Swamps"); - static{ + + static { filter.add(SubType.SWAMP.getPredicate()); } - - public KarmaDamageTargetEffect() - { + + public KarmaDamageTargetEffect() { super(Outcome.Damage); } - - public KarmaDamageTargetEffect(KarmaDamageTargetEffect copy) - { + + public KarmaDamageTargetEffect(KarmaDamageTargetEffect copy) { super(copy); } - + @Override public String getText(Mode mode) { return "{this} deals damage to that player equal to the number of Swamps they control"; @@ -69,8 +66,8 @@ class KarmaDamageTargetEffect extends OneShotEffect{ public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - int damage = game.getBattlefield().getAllActivePermanents(filter,targetPointer.getFirst(game, source) , game).size(); - player.damage(damage, source.getSourceId(), game, false, true); + int damage = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game).size(); + player.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java b/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java index 31b447b6e10..54fb78da7ec 100644 --- a/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java +++ b/Mage.Sets/src/mage/cards/k/KayaOrzhovUsurper.java @@ -138,7 +138,7 @@ class KayaOrzhovUsurperDamageEffect extends OneShotEffect { count += 1; } } - player.damage(count, source.getSourceId(), game, false, true); + player.damage(count, source.getSourceId(), game); controller.gainLife(count, game, source); return true; } diff --git a/Mage.Sets/src/mage/cards/k/KhorvathsFury.java b/Mage.Sets/src/mage/cards/k/KhorvathsFury.java index 699a9154f9b..208080a28d0 100644 --- a/Mage.Sets/src/mage/cards/k/KhorvathsFury.java +++ b/Mage.Sets/src/mage/cards/k/KhorvathsFury.java @@ -1,9 +1,5 @@ - package mage.cards.k; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,8 +10,11 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class KhorvathsFury extends CardImpl { @@ -81,7 +80,7 @@ class KhorvathsFuryEffect extends OneShotEffect { } for (Player player : choice.getFoes()) { if (player != null) { - player.damage(player.getHand().size(), source.getSourceId(), game, false, true); + player.damage(player.getHand().size(), source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/l/LashOut.java b/Mage.Sets/src/mage/cards/l/LashOut.java index 290ec1c747c..ecb8c5b55de 100644 --- a/Mage.Sets/src/mage/cards/l/LashOut.java +++ b/Mage.Sets/src/mage/cards/l/LashOut.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ClashEffect; @@ -14,14 +12,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class LashOut extends CardImpl { public LashOut(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); // Lash Out deals 3 damage to target creature. Clash with an opponent. If you win, Lash Out deals 3 damage to that creature's controller. @@ -64,7 +63,7 @@ class LashOutEffect extends OneShotEffect { if (ClashEffect.getInstance().apply(game, source)) { Player creaturesController = game.getPlayer(creature.getControllerId()); if (creaturesController != null) { - creaturesController.damage(3, source.getSourceId(), game, false, true); + creaturesController.damage(3, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/l/LastDitchEffort.java b/Mage.Sets/src/mage/cards/l/LastDitchEffort.java index 4c953574397..8c716344f63 100644 --- a/Mage.Sets/src/mage/cards/l/LastDitchEffort.java +++ b/Mage.Sets/src/mage/cards/l/LastDitchEffort.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -13,17 +11,18 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.UUID; /** - * * @author BursegSardaukar */ public final class LastDitchEffort extends CardImpl { public LastDitchEffort(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); // Sacrifice any number of creatures. Last-Ditch Effort deals that much damage to any target. this.getSpellAbility().addEffect(new LastDitchEffortEffect()); @@ -80,7 +79,7 @@ class LastDitchEffortEffect extends OneShotEffect { permanent.damage(damage, source.getSourceId(), game, false, true); } if (opponent != null) { - opponent.damage(damage, source.getSourceId(), game, false, true); + opponent.damage(damage, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/l/LavaBlister.java b/Mage.Sets/src/mage/cards/l/LavaBlister.java index 1ae8f345ef8..d2d90228ea5 100644 --- a/Mage.Sets/src/mage/cards/l/LavaBlister.java +++ b/Mage.Sets/src/mage/cards/l/LavaBlister.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -13,8 +11,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetNonBasicLandPermanent; +import java.util.UUID; + /** - * * @author Styxo */ public final class LavaBlister extends CardImpl { @@ -61,7 +60,7 @@ class LavaBlisterEffect extends OneShotEffect { if (player != null) { String message = "Have Lava Blister do 6 damage to you?"; if (player.chooseUse(Outcome.Damage, message, source, game)) { - player.damage(6, source.getSourceId(), game, false, true); + player.damage(6, source.getSourceId(), game); } else { permanent.destroy(source.getId(), game, false); } diff --git a/Mage.Sets/src/mage/cards/l/Lavalanche.java b/Mage.Sets/src/mage/cards/l/Lavalanche.java index 79a410bd9fb..1d07ef40830 100644 --- a/Mage.Sets/src/mage/cards/l/Lavalanche.java +++ b/Mage.Sets/src/mage/cards/l/Lavalanche.java @@ -1,8 +1,5 @@ - package mage.cards.l; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; @@ -18,8 +15,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetPlayerOrPlaneswalker; +import java.util.List; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class Lavalanche extends CardImpl { @@ -69,7 +68,7 @@ class LavalancheEffect extends OneShotEffect { if (targetPlayer == null) { return false; } - targetPlayer.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + targetPlayer.damage(amount.calculate(game, source, this), source.getSourceId(), game); FilterPermanent filter = new FilterPermanent("and each creature that player or that planeswalker's controller controls"); filter.add(CardType.CREATURE.getPredicate()); filter.add(new ControllerIdPredicate(targetPlayer.getId())); diff --git a/Mage.Sets/src/mage/cards/l/Leeches.java b/Mage.Sets/src/mage/cards/l/Leeches.java index 84dace11932..fb0c7945d41 100644 --- a/Mage.Sets/src/mage/cards/l/Leeches.java +++ b/Mage.Sets/src/mage/cards/l/Leeches.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -13,14 +11,15 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author spjspj */ public final class Leeches extends CardImpl { public Leeches(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{W}{W}"); // Target player loses all poison counters. Leeches deals that much damage to that player. this.getSpellAbility().addTarget(new TargetPlayer()); @@ -64,7 +63,7 @@ class LeechesEffect extends OneShotEffect { int countPoisonCounters = targetPlayer.getCounters().getCount(CounterType.POISON); if (countPoisonCounters > 0) { targetPlayer.removeCounters(CounterType.POISON.getName(), countPoisonCounters, source, game); - targetPlayer.damage(countPoisonCounters, source.getSourceId(), game, false, true); + targetPlayer.damage(countPoisonCounters, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java index 7e63ce8903c..4fc137814cb 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -12,11 +10,7 @@ import mage.abilities.keyword.MorphAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -25,14 +19,15 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** - * * @author djbrez */ public final class LiegeOfThePit extends CardImpl { public LiegeOfThePit(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}{B}"); this.subtype.add(SubType.DEMON); this.power = new MageInt(7); this.toughness = new MageInt(7); @@ -97,7 +92,7 @@ class LiegeOfThePitEffect extends OneShotEffect { return true; } } else { - player.damage(7, source.getSourceId(), game, false, true); + player.damage(7, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/l/LightningReaver.java b/Mage.Sets/src/mage/cards/l/LightningReaver.java index adae4e4911b..855ead32bad 100644 --- a/Mage.Sets/src/mage/cards/l/LightningReaver.java +++ b/Mage.Sets/src/mage/cards/l/LightningReaver.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; @@ -15,26 +13,26 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class LightningReaver extends CardImpl { public LightningReaver(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{R}"); this.subtype.add(SubType.ZOMBIE); this.subtype.add(SubType.BEAST); - this.power = new MageInt(3); this.toughness = new MageInt(3); @@ -76,7 +74,7 @@ class DamageOpponentsEffect extends OneShotEffect { for (UUID playerId : game.getOpponents(source.getControllerId())) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + player.damage(amount.calculate(game, source, this), source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/l/LimDulsHex.java b/Mage.Sets/src/mage/cards/l/LimDulsHex.java index 5d16a313a54..fcb84afacbf 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulsHex.java +++ b/Mage.Sets/src/mage/cards/l/LimDulsHex.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.OrCost; @@ -16,8 +14,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author L_J */ public final class LimDulsHex extends CardImpl { @@ -45,16 +44,16 @@ class LimDulsHexEffect extends OneShotEffect { super(Outcome.Damage); this.staticText = "for each player, {this} deals 1 damage to that player unless they pay {B} or {3}"; } - + public LimDulsHexEffect(final LimDulsHexEffect effect) { super(effect); } - + @Override public LimDulsHexEffect copy() { return new LimDulsHexEffect(this); } - + @Override public boolean apply(Game game, Ability source) { Permanent sourcePermanent = game.getPermanent(source.getSourceId()); @@ -67,7 +66,7 @@ class LimDulsHexEffect extends OneShotEffect { String message = "Would you like to pay " + costToPay.getText() + " to prevent 1 damage from " + sourcePermanent.getLogName() + "?"; if (!(player.chooseUse(Outcome.Benefit, message, source, game) && costToPay.pay(source, game, source.getSourceId(), player.getId(), false, null))) { game.informPlayers(player.getLogName() + " chooses not to pay " + costToPay.getText() + " to prevent 1 damage from " + sourcePermanent.getLogName()); - player.damage(1, sourcePermanent.getId(), game, false, true); + player.damage(1, sourcePermanent.getId(), game); } else { game.informPlayers(player.getLogName() + " chooses to pay " + costToPay.getText() + " to prevent 1 damage from " + sourcePermanent.getLogName()); } diff --git a/Mage.Sets/src/mage/cards/l/LiquidFire.java b/Mage.Sets/src/mage/cards/l/LiquidFire.java index 32737ce082b..59bd62d9023 100644 --- a/Mage.Sets/src/mage/cards/l/LiquidFire.java +++ b/Mage.Sets/src/mage/cards/l/LiquidFire.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.VariableCostImpl; @@ -18,14 +16,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author Dilnu */ public final class LiquidFire extends CardImpl { public LiquidFire(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); // As an additional cost to cast Liquid Fire, choose a number between 0 and 5. this.getSpellAbility().addCost(new LiquidFireCost()); @@ -33,7 +32,7 @@ public final class LiquidFire extends CardImpl { DynamicValue choiceValue = GetXValue.instance; this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new LiquidFireEffect(choiceValue)); - + } public LiquidFire(final LiquidFire card) { @@ -53,7 +52,7 @@ public final class LiquidFire extends CardImpl { this.staticText = "{this} deals X damage to target creature and 5 minus X damage to that creature's controller, where X is the chosen number."; this.choiceValue = choiceValue; } - + public LiquidFireEffect(LiquidFireEffect effect) { super(effect); this.choiceValue = effect.choiceValue; @@ -65,10 +64,10 @@ public final class LiquidFire extends CardImpl { int creatureDamage = choiceValue.calculate(game, source, this); int playerDamage = 5 - creatureDamage; if (target != null) { - target.damage(creatureDamage, source.getSourceId(), game, false, true); + target.damage(creatureDamage, source.getSourceId(), game); Player controller = game.getPlayer(target.getControllerId()); if (controller != null) { - controller.damage(playerDamage, source.getSourceId(), game, false, true); + controller.damage(playerDamage, source.getSourceId(), game); } return true; } @@ -80,13 +79,13 @@ public final class LiquidFire extends CardImpl { return new LiquidFireEffect(this); } } - + static class LiquidFireCost extends VariableCostImpl { public LiquidFireCost() { super("Choose a Number"); this.text = "as an additional cost to cast this spell, choose a number between 0 and 5"; } - + public LiquidFireCost(final LiquidFireCost cost) { super(cost); } @@ -100,7 +99,7 @@ public final class LiquidFire extends CardImpl { public Cost getFixedCostsFromAnnouncedValue(int xValue) { return null; } - + @Override public int getMaxValue(Ability source, Game game) { return 5; diff --git a/Mage.Sets/src/mage/cards/l/LobeLobber.java b/Mage.Sets/src/mage/cards/l/LobeLobber.java index 16bfab68a91..1291d059453 100644 --- a/Mage.Sets/src/mage/cards/l/LobeLobber.java +++ b/Mage.Sets/src/mage/cards/l/LobeLobber.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -14,18 +12,15 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author spjspj */ public final class LobeLobber extends CardImpl { @@ -77,7 +72,7 @@ class LobeLobberEffect extends OneShotEffect { Player player = game.getPlayer(source.getFirstTarget()); if (controller != null && equipment != null && player != null) { - player.damage(1, source.getSourceId(), game, false, true); + player.damage(1, source.getSourceId(), game); int amount = controller.rollDice(game, 6); if (amount >= 5) { new UntapSourceEffect().apply(game, source); diff --git a/Mage.Sets/src/mage/cards/l/LonghornFirebeast.java b/Mage.Sets/src/mage/cards/l/LonghornFirebeast.java index 7e836cf7346..766f8efbab2 100644 --- a/Mage.Sets/src/mage/cards/l/LonghornFirebeast.java +++ b/Mage.Sets/src/mage/cards/l/LonghornFirebeast.java @@ -1,7 +1,5 @@ - package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -9,21 +7,21 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -/** - * - * @author noxx & L_J +import java.util.UUID; +/** + * @author noxx & L_J */ public final class LonghornFirebeast extends CardImpl { public LonghornFirebeast(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.ELEMENTAL); this.subtype.add(SubType.OX); this.subtype.add(SubType.BEAST); @@ -65,7 +63,7 @@ class LonghornFirebeastEffect extends OneShotEffect { Player opponent = game.getPlayer(opponentUuid); if (opponent != null && opponent.chooseUse(Outcome.LoseLife, "Make " + permanent.getLogName() + " deal 5 damage to you?", source, game)) { game.informPlayers(opponent.getLogName() + " has chosen to receive 5 damage from " + permanent.getLogName()); - opponent.damage(5, permanent.getId(), game, false, true); + opponent.damage(5, permanent.getId(), game); permanent.sacrifice(source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/m/MadcapExperiment.java b/Mage.Sets/src/mage/cards/m/MadcapExperiment.java index 07c2a79fcfa..1c4673454ca 100644 --- a/Mage.Sets/src/mage/cards/m/MadcapExperiment.java +++ b/Mage.Sets/src/mage/cards/m/MadcapExperiment.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -14,8 +12,9 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class MadcapExperiment extends CardImpl { @@ -73,7 +72,7 @@ class MadcapExperimentEffect extends OneShotEffect { int damage = toReveal.size(); toReveal.remove(toBattlefield); controller.putCardsOnBottomOfLibrary(toReveal, game, source, false); - controller.damage(damage, source.getSourceId(), game, false, true); + controller.damage(damage, source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java index c5d0627c377..71f059afe6d 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java @@ -84,7 +84,7 @@ class MagusOfTheScrollEffect extends OneShotEffect { } Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/m/MalignantGrowth.java b/Mage.Sets/src/mage/cards/m/MalignantGrowth.java index 7fe69544524..3256638b3b9 100644 --- a/Mage.Sets/src/mage/cards/m/MalignantGrowth.java +++ b/Mage.Sets/src/mage/cards/m/MalignantGrowth.java @@ -80,6 +80,6 @@ class MalignantGrowthEffect extends OneShotEffect { if (counters == 0) { return true; } - return player.damage(player.drawCards(counters, game), source.getSourceId(), game, false, true) > 0; + return player.damage(player.drawCards(counters, game), source.getSourceId(), game) > 0; } } diff --git a/Mage.Sets/src/mage/cards/m/ManaClash.java b/Mage.Sets/src/mage/cards/m/ManaClash.java index af3dba45bca..ef946eb3979 100644 --- a/Mage.Sets/src/mage/cards/m/ManaClash.java +++ b/Mage.Sets/src/mage/cards/m/ManaClash.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -12,14 +10,15 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class ManaClash extends CardImpl { public ManaClash(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{R}"); // You and target opponent each flip a coin. Mana Clash deals 1 damage to each player whose coin comes up tails. Repeat this process until both players' coins come up heads on the same flip. this.getSpellAbility().addEffect(new ManaClashEffect()); @@ -37,21 +36,21 @@ public final class ManaClash extends CardImpl { } class ManaClashEffect extends OneShotEffect { - + public ManaClashEffect() { super(Outcome.Detriment); this.staticText = "You and target opponent each flip a coin. {this} deals 1 damage to each player whose coin comes up tails. Repeat this process until both players' coins come up heads on the same flip"; } - + public ManaClashEffect(final ManaClashEffect effect) { super(effect); } - + @Override public ManaClashEffect copy() { return new ManaClashEffect(this); } - + @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); @@ -68,10 +67,10 @@ class ManaClashEffect extends OneShotEffect { bothHeads = true; } if (!controllerFlip) { - controller.damage(1, source.getSourceId(), game, false, true); + controller.damage(1, source.getSourceId(), game); } if (!opponentFlip) { - targetOpponent.damage(1, source.getSourceId(), game, false, true); + targetOpponent.damage(1, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/m/ManaCrypt.java b/Mage.Sets/src/mage/cards/m/ManaCrypt.java index 51c09adc938..4adb41bbbd6 100644 --- a/Mage.Sets/src/mage/cards/m/ManaCrypt.java +++ b/Mage.Sets/src/mage/cards/m/ManaCrypt.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -17,14 +15,15 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class ManaCrypt extends CardImpl { public ManaCrypt(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}"); // At the beginning of your upkeep, flip a coin. If you lose the flip, Mana Crypt deals 3 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ManaCryptEffect(), TargetController.YOU, false)); @@ -59,7 +58,7 @@ class ManaCryptEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (player != null) { if (!player.flipCoin(source, game, true)) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java index 8752faef88f..6d4fb505041 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java @@ -1,9 +1,5 @@ - package mage.cards.m; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -27,8 +23,11 @@ import mage.game.permanent.token.WolfToken; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public final class MasterOfTheWildHunt extends CardImpl { @@ -36,7 +35,7 @@ public final class MasterOfTheWildHunt extends CardImpl { private static WolfToken wolfToken = new WolfToken(); public MasterOfTheWildHunt(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.SHAMAN); @@ -92,11 +91,11 @@ class MasterOfTheWildHuntEffect extends OneShotEffect { if (target != null && game.getBattlefield().countAll(filter, source.getControllerId(), game) > 0) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) { permanent.tap(game); - target.damage(permanent.getToughness().getValue(), permanent.getId(), game, false, true); + target.damage(permanent.getToughness().getValue(), permanent.getId(), game); wolves.add(permanent.getId()); } Player player = game.getPlayer(target.getControllerId()); - if(player != null) { + if (player != null) { player.assignDamage(target.getPower().getValue(), wolves, "Wolf", target.getId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/m/Meglonoth.java b/Mage.Sets/src/mage/cards/m/Meglonoth.java index 8fa2b41376f..b7ed9bca89c 100644 --- a/Mage.Sets/src/mage/cards/m/Meglonoth.java +++ b/Mage.Sets/src/mage/cards/m/Meglonoth.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BlocksTriggeredAbility; @@ -11,13 +9,14 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class Meglonoth extends CardImpl { @@ -71,7 +70,7 @@ class MeglonothEffect extends OneShotEffect { Permanent meglonoth = game.getPermanent(source.getSourceId()); Permanent blocked = game.getPermanent(targetPointer.getFirst(game, source)); if (blocked != null && meglonoth != null) { - game.getPlayer(blocked.getControllerId()).damage(meglonoth.getPower().getValue(), source.getSourceId(), game, false, true); + game.getPlayer(blocked.getControllerId()).damage(meglonoth.getPower().getValue(), source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/m/MindBomb.java b/Mage.Sets/src/mage/cards/m/MindBomb.java index f1d0a392b47..16074428a2e 100644 --- a/Mage.Sets/src/mage/cards/m/MindBomb.java +++ b/Mage.Sets/src/mage/cards/m/MindBomb.java @@ -1,4 +1,3 @@ - package mage.cards.m; import mage.MageObject; @@ -96,7 +95,7 @@ class MindBombEffect extends OneShotEffect { if (player != null) { Cards cardsPlayer = cardsToDiscard.get(playerId); if (cardsPlayer != null) { - player.damage(3 - cardsPlayer.size(), source.getId(), game, false, true); + player.damage(3 - cardsPlayer.size(), source.getId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/m/Mindblaze.java b/Mage.Sets/src/mage/cards/m/Mindblaze.java index 0a6e7cb652d..39afe4a1e2b 100644 --- a/Mage.Sets/src/mage/cards/m/Mindblaze.java +++ b/Mage.Sets/src/mage/cards/m/Mindblaze.java @@ -1,9 +1,5 @@ - package mage.cards.m; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -22,8 +18,11 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /** - * * @author Loki */ public final class Mindblaze extends CardImpl { @@ -94,7 +93,7 @@ class MindblazeEffect extends OneShotEffect { filter.add(new NamePredicate(cardChoice.getChoice())); int count = Integer.parseInt(numberChoice.getChoice()); if (player.getLibrary().count(filter, game) == count) { - player.damage(8, source.getSourceId(), game.copy(), false, true); + player.damage(8, source.getSourceId(), game.copy()); } player.shuffleLibrary(source, game); return true; diff --git a/Mage.Sets/src/mage/cards/m/Mindsparker.java b/Mage.Sets/src/mage/cards/m/Mindsparker.java index 4dd030386fd..82b25e6ede5 100644 --- a/Mage.Sets/src/mage/cards/m/Mindsparker.java +++ b/Mage.Sets/src/mage/cards/m/Mindsparker.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -10,19 +8,16 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class Mindsparker extends CardImpl { @@ -39,7 +34,7 @@ public final class Mindsparker extends CardImpl { } public Mindsparker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(3); @@ -83,7 +78,7 @@ class MindsparkerEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(2, source.getSourceId(), game, false, true); + targetPlayer.damage(2, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/m/MindstormCrown.java b/Mage.Sets/src/mage/cards/m/MindstormCrown.java index bb350724be4..d07e17dd1ce 100644 --- a/Mage.Sets/src/mage/cards/m/MindstormCrown.java +++ b/Mage.Sets/src/mage/cards/m/MindstormCrown.java @@ -1,6 +1,5 @@ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -16,8 +15,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class MindstormCrown extends CardImpl { @@ -68,7 +68,7 @@ class MindstormCrownEffect extends OneShotEffect { controller.drawCards(1, game); } else { if (permanent != null) { - controller.damage(1, permanent.getId(), game, false, true); + controller.damage(1, permanent.getId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/m/Mindswipe.java b/Mage.Sets/src/mage/cards/m/Mindswipe.java index 1650b14967c..b555dad5c82 100644 --- a/Mage.Sets/src/mage/cards/m/Mindswipe.java +++ b/Mage.Sets/src/mage/cards/m/Mindswipe.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.dynamicvalue.common.ManacostVariableValue; @@ -18,14 +16,15 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Mindswipe extends CardImpl { public Mindswipe(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{U}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}{R}"); // Counter target spell unless its controller pays {X}. Mindswipe deals X damage to that spell's controller. @@ -75,7 +74,7 @@ class MindswipeEffect extends OneShotEffect { Player spellController = game.getPlayer(spell.getControllerId()); if (spellController != null) { int damage = ManacostVariableValue.instance.calculate(game, source, this); - spellController.damage(damage, source.getSourceId(), game, false, true); + spellController.damage(damage, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java index a6130a8fb16..d670508085c 100644 --- a/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/m/MinionOfLeshrac.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -14,11 +12,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -29,21 +23,22 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class MinionOfLeshrac extends CardImpl { - + private static final FilterPermanent filterCreatureOrLand = new FilterPermanent("creature or land"); - + static { filterCreatureOrLand.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate())); } - + public MinionOfLeshrac(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}{B}"); - + this.subtype.add(SubType.DEMON); this.subtype.add(SubType.MINION); this.power = new MageInt(5); @@ -59,13 +54,13 @@ public final class MinionOfLeshrac extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filterCreatureOrLand)); this.addAbility(ability); - + } - + public MinionOfLeshrac(final MinionOfLeshrac card) { super(card); } - + @Override public MinionOfLeshrac copy() { return new MinionOfLeshrac(this); @@ -73,16 +68,16 @@ public final class MinionOfLeshrac extends CardImpl { } class MinionLeshracEffect extends OneShotEffect { - + public MinionLeshracEffect() { super(Outcome.Sacrifice); staticText = "{this} deals 5 damage to you unless you sacrifice a creature other than {this}. If {this} deals damage to you this way, tap it"; } - + public MinionLeshracEffect(final MinionLeshracEffect effect) { super(effect); } - + @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); @@ -99,14 +94,14 @@ class MinionLeshracEffect extends OneShotEffect { && cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) { return true; } - if (controller.damage(5, minionLeshrac.getId(), game, false, true) > 0) { + if (controller.damage(5, minionLeshrac.getId(), game) > 0) { minionLeshrac.tap(game); return true; } } return false; } - + @Override public MinionLeshracEffect copy() { return new MinionLeshracEffect(this); diff --git a/Mage.Sets/src/mage/cards/m/Misfortune.java b/Mage.Sets/src/mage/cards/m/Misfortune.java index ff672333e2c..a08781332fb 100644 --- a/Mage.Sets/src/mage/cards/m/Misfortune.java +++ b/Mage.Sets/src/mage/cards/m/Misfortune.java @@ -79,7 +79,7 @@ class MisfortuneEffect extends OneShotEffect { Effect putM1M1CounterOnEachOpponentCreature = new AddCountersAllEffect( CounterType.M1M1.createInstance(), filterOpponentCreatures); putM1M1CounterOnEachOpponentCreature.apply(game, source); - chosenOpponent.damage(4, source.getSourceId(), game, false, true); + chosenOpponent.damage(4, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java b/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java index 113c79c0c75..f40c0743fb1 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java +++ b/Mage.Sets/src/mage/cards/m/MishrasWarMachine.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -11,21 +9,22 @@ import mage.abilities.keyword.BandingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth & L_J */ public final class MishrasWarMachine extends CardImpl { - + public MishrasWarMachine(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}"); this.subtype.add(SubType.JUGGERNAUT); this.power = new MageInt(5); @@ -36,13 +35,13 @@ public final class MishrasWarMachine extends CardImpl { // At the beginning of your upkeep, Mishra's War Machine deals 3 damage to you unless you discard a card. If Mishra's War Machine deals damage to you this way, tap it. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new MishrasWarMachineEffect(), TargetController.YOU, false)); - + } - + public MishrasWarMachine(final MishrasWarMachine card) { super(card); } - + @Override public MishrasWarMachine copy() { return new MishrasWarMachine(this); @@ -50,16 +49,16 @@ public final class MishrasWarMachine extends CardImpl { } class MishrasWarMachineEffect extends OneShotEffect { - + public MishrasWarMachineEffect() { super(Outcome.Sacrifice); staticText = "{this} deals 3 damage to you unless you discard a card. If Mishra's War Machine deals damage to you this way, tap it"; } - + public MishrasWarMachineEffect(final MishrasWarMachineEffect effect) { super(effect); } - + @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); @@ -72,14 +71,14 @@ class MishrasWarMachineEffect extends OneShotEffect { && cost.pay(source, game, source.getSourceId(), source.getControllerId(), true)) { return true; } - if (controller.damage(3, sourcePermanent.getId(), game, false, true) > 0) { + if (controller.damage(3, sourcePermanent.getId(), game) > 0) { sourcePermanent.tap(game); return true; } } return false; } - + @Override public MishrasWarMachineEffect copy() { return new MishrasWarMachineEffect(this); diff --git a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java index a7ac30ea376..5f10ccb2a03 100644 --- a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java @@ -84,7 +84,7 @@ class MogisGodOfSlaughterEffect extends OneShotEffect { target.setNotTarget(true); if (!player.chooseUse(Outcome.Detriment, "Sacrifice a creature to prevent 2 damage?", source, game) || !player.choose(Outcome.Sacrifice, target, source.getSourceId(), game)) { - return player.damage(2, source.getSourceId(), game, false, true) > 0; + return player.damage(2, source.getSourceId(), game) > 0; } Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && permanent.sacrifice(source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/m/MoltenInfluence.java b/Mage.Sets/src/mage/cards/m/MoltenInfluence.java index c22c88ea996..eb3d93dc230 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenInfluence.java +++ b/Mage.Sets/src/mage/cards/m/MoltenInfluence.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,8 +12,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** - * * @author cbt33, LevelX2 (Quash) */ public final class MoltenInfluence extends CardImpl { @@ -62,7 +61,7 @@ class MoltenInfluenceEffect extends OneShotEffect { Player player = game.getPlayer(spell.getControllerId()); String message = "Have Molten Influence do 4 damage to you?"; if (player != null && player.chooseUse(Outcome.Damage, message, source, game)) { - player.damage(4, source.getSourceId(), game, false, true); + player.damage(4, source.getSourceId(), game); return true; } else { return game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/m/MoltenPsyche.java b/Mage.Sets/src/mage/cards/m/MoltenPsyche.java index 74a8fef6c59..cd0acb81ab6 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenPsyche.java +++ b/Mage.Sets/src/mage/cards/m/MoltenPsyche.java @@ -1,10 +1,5 @@ - package mage.cards.m; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.effects.OneShotEffect; @@ -19,8 +14,12 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public final class MoltenPsyche extends CardImpl { @@ -88,7 +87,7 @@ class MoltenPsycheEffect extends OneShotEffect { if (game.isOpponent(controller, playerId)) { Player player = game.getPlayer(playerId); if (player != null && watcher != null) { - player.damage(watcher.getDraws(playerId), source.getSourceId(), game, false, true); + player.damage(watcher.getDraws(playerId), source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/m/MoltenRain.java b/Mage.Sets/src/mage/cards/m/MoltenRain.java index 8d404d53ebc..770a025024a 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenRain.java +++ b/Mage.Sets/src/mage/cards/m/MoltenRain.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -15,14 +13,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** - * * @author North */ public final class MoltenRain extends CardImpl { public MoltenRain(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); // Destroy target land. @@ -64,7 +63,7 @@ class MoltenRainEffect extends OneShotEffect { if (permanent != null && !permanent.isBasic()) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/m/Monsoon.java b/Mage.Sets/src/mage/cards/m/Monsoon.java index d2f614ea092..26a9e548f7c 100644 --- a/Mage.Sets/src/mage/cards/m/Monsoon.java +++ b/Mage.Sets/src/mage/cards/m/Monsoon.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; @@ -10,8 +8,8 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -20,8 +18,9 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author L_J */ public final class Monsoon extends CardImpl { @@ -47,6 +46,7 @@ public final class Monsoon extends CardImpl { class MonsoonEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); + static { filter.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); @@ -70,7 +70,7 @@ class MonsoonEffect extends OneShotEffect { permanent.tap(game); damage++; } - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/m/MorgueBurst.java b/Mage.Sets/src/mage/cards/m/MorgueBurst.java index 6637ed626e5..10c005dc5a0 100644 --- a/Mage.Sets/src/mage/cards/m/MorgueBurst.java +++ b/Mage.Sets/src/mage/cards/m/MorgueBurst.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -15,11 +13,12 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetCardInYourGraveyard; + +import java.util.UUID; /** - * * @author jeffwadsworth */ public final class MorgueBurst extends CardImpl { @@ -73,7 +72,7 @@ class MorgueBurstEffect extends OneShotEffect { } Player targetPlayer = game.getPlayer(source.getTargets().get(1).getTargets().get(0)); if (targetPlayer != null) { - targetPlayer.damage(damage, source.getSourceId(), game, false, true); + targetPlayer.damage(damage, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/m/MurderousRedcap.java b/Mage.Sets/src/mage/cards/m/MurderousRedcap.java index 57bdd04ac61..4c6cf51cbb6 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousRedcap.java +++ b/Mage.Sets/src/mage/cards/m/MurderousRedcap.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -10,22 +8,23 @@ import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author jonubuu */ public final class MurderousRedcap extends CardImpl { public MurderousRedcap(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B/R}{B/R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B/R}{B/R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.ASSASSIN); @@ -74,7 +73,7 @@ class MurderousRedcapEffect extends OneShotEffect { } Player player = game.getPlayer(source.getFirstTarget()); if (sourcePermanent != null && player != null) { - player.damage(sourcePermanent.getPower().getValue(), sourcePermanent.getId(), game, false, true); + player.damage(sourcePermanent.getPower().getValue(), sourcePermanent.getId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/m/Mutiny.java b/Mage.Sets/src/mage/cards/m/Mutiny.java index 6e8e5b69eb7..7dca473cb15 100644 --- a/Mage.Sets/src/mage/cards/m/Mutiny.java +++ b/Mage.Sets/src/mage/cards/m/Mutiny.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -19,8 +17,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Mutiny extends CardImpl { @@ -74,7 +73,7 @@ class MutinyEffect extends OneShotEffect { int damage = firstTarget.getPower().getValue(); Permanent secondTarget = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (damage > 0 && secondTarget != null) { - secondTarget.damage(damage, firstTarget.getId(), game, false, true); + secondTarget.damage(damage, firstTarget.getId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/o/OathOfMages.java b/Mage.Sets/src/mage/cards/o/OathOfMages.java index 688ee7aaaf4..3aa5c46e5cf 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfMages.java +++ b/Mage.Sets/src/mage/cards/o/OathOfMages.java @@ -111,7 +111,7 @@ class OathOfMagesEffect extends OneShotEffect { return false; } if (firstPlayer.chooseUse(Outcome.Benefit, "Deal one damage to " + secondPlayer.getLogName() + "?", source, game)) { - secondPlayer.damage(1, source.getSourceId(), game, false, true); + secondPlayer.damage(1, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/o/OrimsThunder.java b/Mage.Sets/src/mage/cards/o/OrimsThunder.java index b1f8a47c077..a0efbc32e56 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsThunder.java +++ b/Mage.Sets/src/mage/cards/o/OrimsThunder.java @@ -1,4 +1,3 @@ - package mage.cards.o; import mage.MageObject; @@ -85,7 +84,7 @@ class OrimsThunderEffect2 extends OneShotEffect { } boolean kicked = KickedCondition.instance.apply(game, source); if (kicked && secondTarget != null) { - secondTarget.damage(damage, source.getSourceId(), game, false, true); + secondTarget.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/p/Pandemonium.java b/Mage.Sets/src/mage/cards/p/Pandemonium.java index 581cb03e134..a3b977b19c9 100644 --- a/Mage.Sets/src/mage/cards/p/Pandemonium.java +++ b/Mage.Sets/src/mage/cards/p/Pandemonium.java @@ -1,4 +1,3 @@ - package mage.cards.p; import mage.abilities.Ability; @@ -89,7 +88,7 @@ class PandemoniumEffect extends OneShotEffect { } else { Player targetPlayer = game.getPlayer(source.getTargets().getFirstTarget()); if (targetPlayer != null) { - targetPlayer.damage(enteringCreature.getPower().getValue(), enteringCreature.getId(), game, false, true); + targetPlayer.damage(enteringCreature.getPower().getValue(), enteringCreature.getId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java b/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java index 68c4eaf8278..ca1a3ab4cbc 100644 --- a/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java +++ b/Mage.Sets/src/mage/cards/p/ParallectricFeedback.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -13,8 +11,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** - * * @author Styxo */ public final class ParallectricFeedback extends CardImpl { @@ -62,7 +61,7 @@ class ParallectricFeedbackEffect extends OneShotEffect { if (spell != null) { Player spellController = game.getPlayer(spell.getControllerId()); if (spellController != null) { - spellController.damage(spell.getConvertedManaCost(), source.getSourceId(), game, false, true); + spellController.damage(spell.getConvertedManaCost(), source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/p/PestilenceDemon.java b/Mage.Sets/src/mage/cards/p/PestilenceDemon.java index 2bc915a9480..88fefa8fa1f 100644 --- a/Mage.Sets/src/mage/cards/p/PestilenceDemon.java +++ b/Mage.Sets/src/mage/cards/p/PestilenceDemon.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -11,21 +9,22 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author Loki */ public final class PestilenceDemon extends CardImpl { public PestilenceDemon(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}{B}"); this.subtype.add(SubType.DEMON); this.power = new MageInt(7); @@ -67,7 +66,7 @@ class PestilenceDemonEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player p = game.getPlayer(playerId); if (p != null) { - p.damage(1, source.getSourceId(), game, false, true); + p.damage(1, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/p/PiasRevolution.java b/Mage.Sets/src/mage/cards/p/PiasRevolution.java index d5c4454c437..fa399106133 100644 --- a/Mage.Sets/src/mage/cards/p/PiasRevolution.java +++ b/Mage.Sets/src/mage/cards/p/PiasRevolution.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; @@ -22,8 +20,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author Styxo */ public final class PiasRevolution extends CardImpl { @@ -75,7 +74,7 @@ class PiasRevolutionReturnEffect extends OneShotEffect { if (opponent.chooseUse(outcome, "Have Pia's Revolution deal 3 damage to you to prevent that " + permanent.getIdName() + " returns to " + controller.getName() + "'s hand?", source, game)) { - opponent.damage(3, source.getSourceId(), game, false, true); + opponent.damage(3, source.getSourceId(), game); } else if (game.getState().getZone(permanent.getId()) == Zone.GRAVEYARD) { controller.moveCards(game.getCard(permanentId), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java index 598edebd0ea..5bbcba5d683 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java @@ -1,16 +1,10 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -18,14 +12,15 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author fireshoes */ public final class PlaneswalkersFury extends CardImpl { public PlaneswalkersFury(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // {3}{R}: Target opponent reveals a card at random from their hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFuryEffect(), new ManaCostsImpl("{3}{R}")); @@ -63,7 +58,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect { if (card != null) { revealed.add(card); opponent.revealCards("Planeswalker's Fury", revealed, game); - opponent.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); + opponent.damage(card.getConvertedManaCost(), source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/p/PowerLeak.java b/Mage.Sets/src/mage/cards/p/PowerLeak.java index 131b27f2539..309ec4ec79e 100644 --- a/Mage.Sets/src/mage/cards/p/PowerLeak.java +++ b/Mage.Sets/src/mage/cards/p/PowerLeak.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -14,12 +12,7 @@ import mage.abilities.effects.common.PreventDamageByTargetEffect; import mage.abilities.keyword.EnchantAbility; 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.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -27,8 +20,9 @@ import mage.target.TargetPermanent; import mage.target.common.TargetEnchantmentPermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author L_J */ public final class PowerLeak extends CardImpl { @@ -100,7 +94,7 @@ class PowerLeakEffect extends OneShotEffect { effect.setTargetPointer(new FixedTarget(permanent.getId())); game.addEffect(effect, source); } - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); effect.discard(); return true; } diff --git a/Mage.Sets/src/mage/cards/p/PowerSurge.java b/Mage.Sets/src/mage/cards/p/PowerSurge.java index deb177e1b12..a2acb2a84ba 100644 --- a/Mage.Sets/src/mage/cards/p/PowerSurge.java +++ b/Mage.Sets/src/mage/cards/p/PowerSurge.java @@ -1,18 +1,12 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; @@ -22,8 +16,9 @@ import mage.game.events.GameEvent; import mage.players.Player; import mage.watchers.Watcher; +import java.util.UUID; + /** - * * @author MTGfan */ public final class PowerSurge extends CardImpl { @@ -65,9 +60,9 @@ class PowerSurgeDamageEffect extends OneShotEffect { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { PowerSurgeWatcher watcher = game.getState().getWatcher(PowerSurgeWatcher.class); - if(watcher != null) { + if (watcher != null) { int damage = watcher.getUntappedLandCount(); - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java index a588fdb2d64..9849ec51f9f 100644 --- a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -11,22 +9,19 @@ import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect.HandSizeModification; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class PriceOfKnowledge extends CardImpl { public PriceOfKnowledge(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{6}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{6}{B}"); // Players have no maximum hand size. @@ -65,7 +60,7 @@ class PriceOfKnowledgeEffect extends OneShotEffect { if (targetPlayer != null) { int xValue = targetPlayer.getHand().size(); if (xValue > 0) { - targetPlayer.damage(xValue, source.getSourceId(), game, false, true); + targetPlayer.damage(xValue, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/p/PriceOfProgress.java b/Mage.Sets/src/mage/cards/p/PriceOfProgress.java index 1502f3add39..f7e3d07e6ad 100644 --- a/Mage.Sets/src/mage/cards/p/PriceOfProgress.java +++ b/Mage.Sets/src/mage/cards/p/PriceOfProgress.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -12,14 +10,15 @@ import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class PriceOfProgress extends CardImpl { public PriceOfProgress(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); // Price of Progress deals damage to each player equal to twice the number of nonbasic lands that player controls. @@ -59,11 +58,11 @@ class PriceOfProgressEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { - int amount = game.getBattlefield().countAll(filter , playerId, game); + int amount = game.getBattlefield().countAll(filter, playerId, game); if (amount > 0) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(amount * 2, source.getSourceId(), game, false, true); + player.damage(amount * 2, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/p/PrimalOrder.java b/Mage.Sets/src/mage/cards/p/PrimalOrder.java index b3fe518483d..85d90ac8bc4 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalOrder.java +++ b/Mage.Sets/src/mage/cards/p/PrimalOrder.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -16,14 +14,15 @@ import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author fireshoes */ public final class PrimalOrder extends CardImpl { public PrimalOrder(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); // At the beginning of each player's upkeep, Primal Order deals damage to that player equal to the number of nonbasic lands they control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PrimalOrderDamageTargetEffect(), TargetController.ANY, false, true)); @@ -39,20 +38,18 @@ public final class PrimalOrder extends CardImpl { } } -class PrimalOrderDamageTargetEffect extends OneShotEffect{ - +class PrimalOrderDamageTargetEffect extends OneShotEffect { + private static final FilterLandPermanent filter = FilterLandPermanent.nonbasicLands(); - - public PrimalOrderDamageTargetEffect() - { + + public PrimalOrderDamageTargetEffect() { super(Outcome.Damage); } - - public PrimalOrderDamageTargetEffect(PrimalOrderDamageTargetEffect copy) - { + + public PrimalOrderDamageTargetEffect(PrimalOrderDamageTargetEffect copy) { super(copy); } - + @Override public String getText(Mode mode) { return "{this} deals damage to that player equal to the number of nonbasic lands they control"; @@ -63,7 +60,7 @@ class PrimalOrderDamageTargetEffect extends OneShotEffect{ Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { int damage = game.getBattlefield().getAllActivePermanents(filter, targetPointer.getFirst(game, source), game).size(); - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/p/PrimordialOoze.java b/Mage.Sets/src/mage/cards/p/PrimordialOoze.java index e5f0cab5feb..03291433bac 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialOoze.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialOoze.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksEachCombatStaticAbility; @@ -12,24 +10,21 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author L_J */ public final class PrimordialOoze extends CardImpl { public PrimordialOoze(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); this.subtype.add(SubType.OOZE); this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -78,7 +73,7 @@ class PrimordialOozeEffect extends OneShotEffect { if (!(controller.chooseUse(Outcome.Benefit, "Pay " + cost.getText() + " to prevent taking " + counter + " damage from " + sourceObject.getLogName() + "?", source, game) && cost.pay(source, game, source.getSourceId(), controller.getId(), false, null))) { sourceObject.tap(game); - controller.damage(counter, source.getSourceId(), game, false, true); + controller.damage(counter, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/p/PsionicBlast.java b/Mage.Sets/src/mage/cards/p/PsionicBlast.java index 74708ead859..0d6bfc7b287 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicBlast.java +++ b/Mage.Sets/src/mage/cards/p/PsionicBlast.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -13,14 +11,15 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author Loki */ public final class PsionicBlast extends CardImpl { public PsionicBlast(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}"); // Psionic Blast deals 4 damage to any target and 2 damage to you. @@ -53,7 +52,7 @@ class PsionicBlastEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java index 2bf251d0bac..7b2fe2cc392 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java +++ b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java @@ -1,7 +1,5 @@ - package mage.cards.p; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -13,11 +11,7 @@ import mage.abilities.effects.common.DestroySourceEffect; import mage.abilities.effects.common.DoUnlessControllerPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -27,8 +21,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** - * * @author L_J */ public final class PsychicAllergy extends CardImpl { @@ -40,7 +35,7 @@ public final class PsychicAllergy extends CardImpl { } public PsychicAllergy(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}{U}"); // As Psychic Allergy enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Damage))); @@ -49,11 +44,11 @@ public final class PsychicAllergy extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PsychicAllergyEffect(), TargetController.OPPONENT, false)); // At the beginning of your upkeep, destroy Psychic Allergy unless you sacrifice two Islands. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, - new DoUnlessControllerPaysEffect(new DestroySourceEffect(), - new SacrificeTargetCost(new TargetControlledPermanent(2, 2, filter, false))).setText("destroy {this} unless you sacrifice two Islands"), - TargetController.YOU, - false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, + new DoUnlessControllerPaysEffect(new DestroySourceEffect(), + new SacrificeTargetCost(new TargetControlledPermanent(2, 2, filter, false))).setText("destroy {this} unless you sacrifice two Islands"), + TargetController.YOU, + false)); } public PsychicAllergy(final PsychicAllergy card) { @@ -67,12 +62,12 @@ public final class PsychicAllergy extends CardImpl { } class PsychicAllergyEffect extends OneShotEffect { - + public PsychicAllergyEffect() { super(Outcome.Damage); this.staticText = "{this} deals X damage to that player, where X is the number of nontoken permanents of the chosen color they control"; } - + public PsychicAllergyEffect(PsychicAllergyEffect copy) { super(copy); } @@ -85,7 +80,7 @@ class PsychicAllergyEffect extends OneShotEffect { filter.add(new ColorPredicate((ObjectColor) game.getState().getValue(source.getSourceId() + "_color"))); filter.add(Predicates.not(TokenPredicate.instance)); int damage = game.getBattlefield().countAll(filter, player.getId(), game); - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/r/Rackling.java b/Mage.Sets/src/mage/cards/r/Rackling.java index d915121c81c..6dbfa34bd60 100644 --- a/Mage.Sets/src/mage/cards/r/Rackling.java +++ b/Mage.Sets/src/mage/cards/r/Rackling.java @@ -1,23 +1,18 @@ - package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class Rackling extends CardImpl { @@ -65,7 +60,7 @@ class RacklingEffect extends OneShotEffect { if (player != null) { int damage = 3 - player.getHand().size(); if (damage > 0) { - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/r/RakdosCharm.java b/Mage.Sets/src/mage/cards/r/RakdosCharm.java index 4ebe2b7e22f..2881609845a 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosCharm.java +++ b/Mage.Sets/src/mage/cards/r/RakdosCharm.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -18,14 +16,15 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class RakdosCharm extends CardImpl { public RakdosCharm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{B}{R}"); // Choose one — Exile all cards from target player's graveyard; this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); @@ -54,7 +53,7 @@ public final class RakdosCharm extends CardImpl { private static class RakdosCharmDamageEffect extends OneShotEffect { - public RakdosCharmDamageEffect() { + public RakdosCharmDamageEffect() { super(Outcome.Detriment); staticText = "each creature deals 1 damage to its controller"; } @@ -72,7 +71,7 @@ public final class RakdosCharm extends CardImpl { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { - controller.damage(1, permanent.getId(), game, false, true); + controller.damage(1, permanent.getId(), game); game.informPlayers("1 damage to " + controller.getLogName() + " from " + permanent.getName()); } } diff --git a/Mage.Sets/src/mage/cards/r/RazorBoomerang.java b/Mage.Sets/src/mage/cards/r/RazorBoomerang.java index 8cd44a27c7d..0541ef18cac 100644 --- a/Mage.Sets/src/mage/cards/r/RazorBoomerang.java +++ b/Mage.Sets/src/mage/cards/r/RazorBoomerang.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -19,8 +17,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class RazorBoomerang extends CardImpl { @@ -74,7 +73,7 @@ class RazorBoomerangEffect extends OneShotEffect { } Player player = game.getPlayer(target); if (player != null) { - player.damage(1, attachmentid, game, false, true); + player.damage(1, attachmentid, game); } } Permanent razor = game.getPermanent(attachmentid); diff --git a/Mage.Sets/src/mage/cards/r/RazorPendulum.java b/Mage.Sets/src/mage/cards/r/RazorPendulum.java index a9302078ed9..0c5d1f71514 100644 --- a/Mage.Sets/src/mage/cards/r/RazorPendulum.java +++ b/Mage.Sets/src/mage/cards/r/RazorPendulum.java @@ -64,7 +64,7 @@ class RazorPendulumEffect extends OneShotEffect { if (player == null) { return false; } - return player.damage(2, source.getSourceId(), game, false, true) > 0; + return player.damage(2, source.getSourceId(), game) > 0; } } diff --git a/Mage.Sets/src/mage/cards/r/RefractionTrap.java b/Mage.Sets/src/mage/cards/r/RefractionTrap.java index bea2ff1c967..0c05f22d29f 100644 --- a/Mage.Sets/src/mage/cards/r/RefractionTrap.java +++ b/Mage.Sets/src/mage/cards/r/RefractionTrap.java @@ -1,4 +1,3 @@ - package mage.cards.r; import mage.MageObject; @@ -131,7 +130,7 @@ class RefractionTrapPreventDamageEffect extends PreventionEffectImpl { Player player = game.getPlayer(damageTarget); if (player != null) { game.informPlayers("Dealing " + preventionData.getPreventedDamage() + " to " + player.getLogName()); - player.damage(preventionData.getPreventedDamage(), source.getSourceId(), game, false, true); + player.damage(preventionData.getPreventedDamage(), source.getSourceId(), game); } } @@ -166,10 +165,8 @@ class RefractionTrapPreventDamageEffect extends PreventionEffectImpl { // check player Player player = game.getPlayer(event.getTargetId()); if (player != null) { - if (player.getId().equals(source.getControllerId())) { - // it is you - return true; - } + // it is you + return player.getId().equals(source.getControllerId()); } } return false; diff --git a/Mage.Sets/src/mage/cards/r/RefuseCooperate.java b/Mage.Sets/src/mage/cards/r/RefuseCooperate.java index 431cf7745cf..acd6e1353ca 100644 --- a/Mage.Sets/src/mage/cards/r/RefuseCooperate.java +++ b/Mage.Sets/src/mage/cards/r/RefuseCooperate.java @@ -1,12 +1,9 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.abilities.keyword.AftermathAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.SplitCard; import mage.constants.CardType; @@ -18,8 +15,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class RefuseCooperate extends SplitCard { @@ -74,7 +72,7 @@ class RefuseEffect extends OneShotEffect { if (spell != null) { Player spellController = game.getPlayer(spell.getControllerId()); if (spellController != null) { - spellController.damage(spell.getConvertedManaCost(), source.getSourceId(), game, false, true); + spellController.damage(spell.getConvertedManaCost(), source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/r/Repercussion.java b/Mage.Sets/src/mage/cards/r/Repercussion.java index ed190e7bf43..adf5a149c8b 100644 --- a/Mage.Sets/src/mage/cards/r/Repercussion.java +++ b/Mage.Sets/src/mage/cards/r/Repercussion.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -18,14 +16,15 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author cbrianhill */ public final class Repercussion extends CardImpl { public Repercussion(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); // Whenever a creature is dealt damage, Repercussion deals that much damage to that creature's controller. this.addAbility(new RepercussionTriggeredAbility(new RepercussionEffect())); @@ -42,32 +41,32 @@ public final class Repercussion extends CardImpl { } class RepercussionTriggeredAbility extends TriggeredAbilityImpl { - + static final String PLAYER_DAMAGE_AMOUNT_KEY = "playerDamage"; static final String TRIGGERING_CREATURE_KEY = "triggeringCreature"; - + public RepercussionTriggeredAbility(Effect effect) { super(Zone.BATTLEFIELD, effect); } - + public RepercussionTriggeredAbility(final RepercussionTriggeredAbility ability) { super(ability); } - + @Override public boolean checkEventType(GameEvent event, Game game) { return event.getType() == GameEvent.EventType.DAMAGED_CREATURE; } - + @Override public boolean checkTrigger(GameEvent event, Game game) { - for(Effect effect : getEffects()) { + for (Effect effect : getEffects()) { effect.setValue(PLAYER_DAMAGE_AMOUNT_KEY, event.getAmount()); effect.setValue(TRIGGERING_CREATURE_KEY, new MageObjectReference(event.getTargetId(), game)); } return true; } - + @Override public String getRule() { return "Whenever a creature is dealt damage, {this} deals that much damage to that creature's controller."; @@ -80,25 +79,25 @@ class RepercussionTriggeredAbility extends TriggeredAbilityImpl { } class RepercussionEffect extends OneShotEffect { - + public RepercussionEffect() { super(Outcome.Damage); } - + public RepercussionEffect(final RepercussionEffect effect) { super(effect); } @Override public boolean apply(Game game, Ability source) { - Integer playerDamage = (Integer)this.getValue(RepercussionTriggeredAbility.PLAYER_DAMAGE_AMOUNT_KEY); - MageObjectReference mor = (MageObjectReference)this.getValue(RepercussionTriggeredAbility.TRIGGERING_CREATURE_KEY); + Integer playerDamage = (Integer) this.getValue(RepercussionTriggeredAbility.PLAYER_DAMAGE_AMOUNT_KEY); + MageObjectReference mor = (MageObjectReference) this.getValue(RepercussionTriggeredAbility.TRIGGERING_CREATURE_KEY); if (playerDamage != null && mor != null) { Permanent creature = mor.getPermanentOrLKIBattlefield(game); if (creature != null) { Player player = game.getPlayer(creature.getControllerId()); if (player != null) { - player.damage(playerDamage, source.getSourceId(), game, false, true); + player.damage(playerDamage, source.getSourceId(), game); } } return true; @@ -110,5 +109,5 @@ class RepercussionEffect extends OneShotEffect { public Effect copy() { return new RepercussionEffect(this); } - + } diff --git a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java index 4a68ff8aef7..3f4a34634be 100644 --- a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -17,8 +15,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class RiddleOfLightning extends CardImpl { @@ -75,7 +74,7 @@ class RiddleOfLightningEffect extends OneShotEffect { } Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); + targetPlayer.damage(card.getConvertedManaCost(), source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/r/RiskFactor.java b/Mage.Sets/src/mage/cards/r/RiskFactor.java index 593af6728f7..c9dd1373c04 100644 --- a/Mage.Sets/src/mage/cards/r/RiskFactor.java +++ b/Mage.Sets/src/mage/cards/r/RiskFactor.java @@ -1,6 +1,5 @@ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.JumpStartAbility; @@ -12,8 +11,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class RiskFactor extends CardImpl { @@ -65,7 +65,7 @@ class RiskFactorEffect extends OneShotEffect { return false; } if (opponent.chooseUse(outcome, "Do you choose to take the damage?", source, game)) { - opponent.damage(4, source.getSourceId(), game, false, true); + opponent.damage(4, source.getSourceId(), game); } else { controller.drawCards(3, game); } diff --git a/Mage.Sets/src/mage/cards/r/RoilingTerrain.java b/Mage.Sets/src/mage/cards/r/RoilingTerrain.java index a0aa0cff0c9..d5872537c29 100644 --- a/Mage.Sets/src/mage/cards/r/RoilingTerrain.java +++ b/Mage.Sets/src/mage/cards/r/RoilingTerrain.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -14,14 +12,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class RoilingTerrain extends CardImpl { public RoilingTerrain(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); // Destroy target land, then Roiling Terrain deals damage to that land's controller equal to the number of land cards in that player's graveyard. this.getSpellAbility().addEffect(new RoilingTerrainEffect()); @@ -62,7 +61,7 @@ class RoilingTerrainEffect extends OneShotEffect { Player targetController = game.getPlayer(targetedLand.getControllerId()); if (targetController != null) { int landsInGraveyard = targetController.getGraveyard().count(new FilterLandCard(), game); - targetController.damage(landsInGraveyard, source.getSourceId(), game, false, true); + targetController.damage(landsInGraveyard, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java index dec1585a750..9859f00ec22 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -21,8 +19,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class RumblingAftershocks extends CardImpl { @@ -34,7 +33,7 @@ public final class RumblingAftershocks extends CardImpl { } public RumblingAftershocks(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); // Whenever you cast a kicked spell, you may have Rumbling Aftershocks deal damage to any target equal to the number of times that spell was kicked. @@ -79,7 +78,7 @@ class RumblingAftershocksTriggeredAbility extends TriggeredAbilityImpl { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && spell.isControlledBy(controllerId)) { int damageAmount = 0; - for (Ability ability: spell.getAbilities()) { + for (Ability ability : spell.getAbilities()) { if (ability instanceof KickerAbility) { damageAmount += ((KickerAbility) ability).getKickedCounter(game, spell.getSpellAbility()); } @@ -121,8 +120,8 @@ class RumblingAftershocksDealDamageEffect extends OneShotEffect { if (player != null && damageAmount > 0) { Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(damageAmount, source.getSourceId(), game, false, true); - return true; + targetPlayer.damage(damageAmount, source.getSourceId(), game); + return true; } Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/r/RustElemental.java b/Mage.Sets/src/mage/cards/r/RustElemental.java index d6893f89802..046bf2aa758 100644 --- a/Mage.Sets/src/mage/cards/r/RustElemental.java +++ b/Mage.Sets/src/mage/cards/r/RustElemental.java @@ -1,7 +1,5 @@ - package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -10,8 +8,8 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -20,14 +18,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** - * * @author rollergo11 */ public final class RustElemental extends CardImpl { public RustElemental(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(4); this.toughness = new MageInt(4); @@ -88,7 +87,7 @@ class RustElementalEffect extends OneShotEffect { } } else { sourceObject.tap(game); - controller.damage(4, source.getSourceId(), game, false, true); + controller.damage(4, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java b/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java index f8231a08899..6105a5f1b1e 100644 --- a/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java +++ b/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -12,17 +10,14 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SaskiaTheUnyielding extends CardImpl { @@ -85,7 +80,7 @@ class SaskiaTheUnyieldingEffect extends OneShotEffect { Integer damage = (Integer) this.getValue("damage"); UUID sourceId = (UUID) this.getValue("sourceId"); if (sourceId != null && damage > 0) { - player.damage(damage, sourceId, game, false, true); + player.damage(damage, sourceId, game); } } return true; diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java index fb5b9849c78..c2332f8c6a0 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; @@ -12,11 +10,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -24,8 +18,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class ScourgeOfValkas extends CardImpl { @@ -101,7 +96,7 @@ class ScourgeOfValkasDamageEffect extends OneShotEffect { Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null && player.isInGame()) { - player.damage(dragons, enteringDragon.getId(), game, false, true); + player.damage(dragons, enteringDragon.getId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/s/SearingBlood.java b/Mage.Sets/src/mage/cards/s/SearingBlood.java index 2adff7cba2c..36ad3cf7c1a 100644 --- a/Mage.Sets/src/mage/cards/s/SearingBlood.java +++ b/Mage.Sets/src/mage/cards/s/SearingBlood.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -21,14 +19,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SearingBlood extends CardImpl { public SearingBlood(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}{R}"); // Searing Blood deals 2 damage to target creature. When that creature dies this turn, Searing Blood deals 3 damage to that creature's controller. this.getSpellAbility().addEffect(new SearingBloodEffect()); @@ -93,9 +92,7 @@ class SearingBloodDelayedTriggeredAbility extends DelayedTriggeredAbility { public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(target)) { ZoneChangeEvent zEvent = (ZoneChangeEvent) event; - if (zEvent.isDiesEvent()) { - return true; - } + return zEvent.isDiesEvent(); } return false; } @@ -137,7 +134,7 @@ class SearingBloodDelayedEffect extends OneShotEffect { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { MageObject sourceObject = source.getSourceObject(game); - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/Seizures.java b/Mage.Sets/src/mage/cards/s/Seizures.java index 107f49aa876..0d68e84c3b8 100644 --- a/Mage.Sets/src/mage/cards/s/Seizures.java +++ b/Mage.Sets/src/mage/cards/s/Seizures.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; import mage.abilities.costs.Cost; @@ -12,22 +10,23 @@ import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LoneFox */ public final class Seizures extends CardImpl { public Seizures(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.subtype.add(SubType.AURA); // Enchant creature @@ -70,24 +69,24 @@ class SeizuresEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent enchantment = game.getPermanentOrLKIBattlefield(source.getSourceId()); - if(enchantment == null) { + if (enchantment == null) { return false; } Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo()); - if(enchanted == null) { + if (enchanted == null) { return false; } Player player = game.getPlayer(enchanted.getControllerId()); - if(player != null) { + if (player != null) { Cost cost = new ManaCostsImpl("{3}"); - if(cost.canPay(source, source.getSourceId(), player.getId(), game) - && player.chooseUse(Outcome.Benefit, "Pay " + cost.getText() + " to avoid damage?", source, game)) { + if (cost.canPay(source, source.getSourceId(), player.getId(), game) + && player.chooseUse(Outcome.Benefit, "Pay " + cost.getText() + " to avoid damage?", source, game)) { cost.clearPaid(); - if(cost.pay(source, game, source.getSourceId(), player.getId(), false, null)) { + if (cost.pay(source, game, source.getSourceId(), player.getId(), false, null)) { return true; } } - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/s/SerendibDjinn.java b/Mage.Sets/src/mage/cards/s/SerendibDjinn.java index f722d7bcf30..5fbfcd2bf93 100644 --- a/Mage.Sets/src/mage/cards/s/SerendibDjinn.java +++ b/Mage.Sets/src/mage/cards/s/SerendibDjinn.java @@ -1,4 +1,3 @@ - package mage.cards.s; import mage.MageInt; @@ -22,13 +21,12 @@ import mage.target.common.TargetControlledPermanent; import java.util.UUID; /** - * * @author MarcoMarin */ public final class SerendibDjinn extends CardImpl { public SerendibDjinn(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.subtype.add(SubType.DJINN); this.power = new MageInt(5); this.toughness = new MageInt(6); @@ -80,7 +78,7 @@ class SerendibDjinnEffect extends OneShotEffect { if (permanent != null) { permanent.sacrifice(source.getSourceId(), game); if (permanent.hasSubtype(SubType.ISLAND, game)) { - controller.damage(3, source.getSourceId(), game, false, true); + controller.damage(3, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/s/SinProdder.java b/Mage.Sets/src/mage/cards/s/SinProdder.java index 3f38e177edd..100caa744e1 100644 --- a/Mage.Sets/src/mage/cards/s/SinProdder.java +++ b/Mage.Sets/src/mage/cards/s/SinProdder.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -11,16 +9,13 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author fireshoes */ public final class SinProdder extends CardImpl { @@ -79,7 +74,7 @@ class SinProdderEffect extends OneShotEffect { Player opponent = game.getPlayer(opponentUuid); if (opponent != null && !putInGraveyard && opponent.chooseUse(Outcome.Damage, message, source, game)) { putInGraveyard = true; - opponent.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true); + opponent.damage(card.getConvertedManaCost(), source.getSourceId(), game); // 4/8/2016: Each opponent in turn order, starting with the one after you in turn order, may choose to have you put that card into your graveyard. // Once a player does so, Sin Prodder deals damage equal to that card's converted mana cost to that player immediately // and Sin Prodder's trigger has no further action. diff --git a/Mage.Sets/src/mage/cards/s/SkullRend.java b/Mage.Sets/src/mage/cards/s/SkullRend.java index f8c83bccc88..9b521c87947 100644 --- a/Mage.Sets/src/mage/cards/s/SkullRend.java +++ b/Mage.Sets/src/mage/cards/s/SkullRend.java @@ -1,8 +1,5 @@ - package mage.cards.s; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -13,14 +10,16 @@ import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SkullRend extends CardImpl { public SkullRend(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{R}"); // Skull Rend deals 2 damage to each opponent. Those players each discard two cards at random. @@ -52,12 +51,12 @@ public final class SkullRend extends CardImpl { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - for (UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) { + for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { if (!Objects.equals(playerId, source.getControllerId())) { Player opponent = game.getPlayer(playerId); if (opponent != null) { // damage - opponent.damage(2, source.getSourceId(), game, false, true); + opponent.damage(2, source.getSourceId(), game); // discard 2 cards at random int amount = Math.min(2, opponent.getHand().size()); for (int i = 0; i < amount; i++) { diff --git a/Mage.Sets/src/mage/cards/s/Skullcage.java b/Mage.Sets/src/mage/cards/s/Skullcage.java index 5d66345294f..e479cc1721d 100644 --- a/Mage.Sets/src/mage/cards/s/Skullcage.java +++ b/Mage.Sets/src/mage/cards/s/Skullcage.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -14,19 +12,20 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author Plopman */ public final class Skullcage extends CardImpl { public Skullcage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // At the beginning of each opponent's upkeep, Skullcage deals 2 damage to that player unless they have exactly three or exactly four cards in hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SkullcageEffect(), TargetController.OPPONENT, false, true)); } - + public Skullcage(final Skullcage card) { super(card); } @@ -39,7 +38,7 @@ public final class Skullcage extends CardImpl { class SkullcageEffect extends OneShotEffect { - + public SkullcageEffect() { super(Outcome.Damage); staticText = "{source} deals 2 damage to that player unless they have exactly three or exactly four cards in hand"; @@ -58,11 +57,11 @@ class SkullcageEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { - if(player.getHand().size() != 3 && player.getHand().size() != 4){ - player.damage(2, source.getSourceId(), game, false, true); + if (player.getHand().size() != 3 && player.getHand().size() != 4) { + player.damage(2, source.getSourceId(), game); } } return false; } - + } diff --git a/Mage.Sets/src/mage/cards/s/Skullscorch.java b/Mage.Sets/src/mage/cards/s/Skullscorch.java index e0ec2a6fef3..3cc55ae6c6b 100644 --- a/Mage.Sets/src/mage/cards/s/Skullscorch.java +++ b/Mage.Sets/src/mage/cards/s/Skullscorch.java @@ -1,10 +1,7 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -15,14 +12,15 @@ import mage.game.stack.StackObject; import mage.players.Player; import mage.target.TargetPlayer; +import java.util.UUID; + /** - * * @author L_J (based on code by dustinconrad) */ public final class Skullscorch extends CardImpl { public Skullscorch(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{R}{R}"); // Target player discards two cards at random unless that player has Skullscorch deal 4 damage to them. this.getSpellAbility().addEffect(new SkullscorchDiscardEffect()); @@ -62,18 +60,18 @@ class SkullscorchDiscardEffect extends OneShotEffect { return false; } StackObject spell = null; - for(StackObject object : game.getStack()){ - if(object instanceof Spell && object.getSourceId().equals(source.getSourceId())){ + for (StackObject object : game.getStack()) { + if (object instanceof Spell && object.getSourceId().equals(source.getSourceId())) { spell = object; } } - if(spell != null){ + if (spell != null) { boolean discardCards = true; Player player = game.getPlayer(targetPointer.getFirst(game, source)); - if (player != null) { - if (player.chooseUse(Outcome.Detriment, "Have " + spell.getLogName() + " deal 4 damage to you?", source, game)){ + if (player != null) { + if (player.chooseUse(Outcome.Detriment, "Have " + spell.getLogName() + " deal 4 damage to you?", source, game)) { discardCards = false; - player.damage(4, source.getSourceId(), game, false, true); + player.damage(4, source.getSourceId(), game); game.informPlayers(player.getLogName() + " has " + spell.getLogName() + " deal 4 to them"); } if (discardCards) { diff --git a/Mage.Sets/src/mage/cards/s/SonicAssault.java b/Mage.Sets/src/mage/cards/s/SonicAssault.java index a7f408dcf3b..3564f429c81 100644 --- a/Mage.Sets/src/mage/cards/s/SonicAssault.java +++ b/Mage.Sets/src/mage/cards/s/SonicAssault.java @@ -1,6 +1,5 @@ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.JumpStartAbility; @@ -13,8 +12,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class SonicAssault extends CardImpl { @@ -68,7 +68,7 @@ class SonicAssaultEffect extends OneShotEffect { if (player == null) { return false; } - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/SoulBarrier.java b/Mage.Sets/src/mage/cards/s/SoulBarrier.java index 7b96f221c0a..7677d3c7e1d 100644 --- a/Mage.Sets/src/mage/cards/s/SoulBarrier.java +++ b/Mage.Sets/src/mage/cards/s/SoulBarrier.java @@ -67,7 +67,7 @@ class SoulBarrierEffect extends OneShotEffect { String message = "Would you like to pay {2} to prevent taking 2 damage from " + permanent.getLogName() + "?"; if (!(player.chooseUse(Outcome.Benefit, message, source, game) && cost.pay(source, game, source.getSourceId(), player.getId(), false, null))) { - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/s/SoulBurn.java b/Mage.Sets/src/mage/cards/s/SoulBurn.java index 28836c44462..728ee150ca7 100644 --- a/Mage.Sets/src/mage/cards/s/SoulBurn.java +++ b/Mage.Sets/src/mage/cards/s/SoulBurn.java @@ -151,7 +151,7 @@ class SoulBurnEffect extends OneShotEffect { return false; } lifetogain = Math.min(player.getLife(), lifetogain); - player.damage(totalXAmount, source.getSourceId(), game, false, true); + player.damage(totalXAmount, source.getSourceId(), game); } Player controller = game.getPlayer(source.getControllerId()); if (controller == null) { diff --git a/Mage.Sets/src/mage/cards/s/Soulblast.java b/Mage.Sets/src/mage/cards/s/Soulblast.java index 1a07153f425..d9adb505e9d 100644 --- a/Mage.Sets/src/mage/cards/s/Soulblast.java +++ b/Mage.Sets/src/mage/cards/s/Soulblast.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeAllCost; @@ -16,8 +14,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Soulblast extends CardImpl { @@ -72,7 +71,7 @@ class SoulblastEffect extends OneShotEffect { if (power > 0) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { - player.damage(power, source.getSourceId(), game, false, true); + player.damage(power, source.getSourceId(), game); } else { Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null) { diff --git a/Mage.Sets/src/mage/cards/s/SoulsFire.java b/Mage.Sets/src/mage/cards/s/SoulsFire.java index d7c7ddf3294..d100485ae46 100644 --- a/Mage.Sets/src/mage/cards/s/SoulsFire.java +++ b/Mage.Sets/src/mage/cards/s/SoulsFire.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -12,17 +10,18 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.UUID; /** - * * @author North */ public final class SoulsFire extends CardImpl { public SoulsFire(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}"); // Target creature you control on the battlefield deals damage equal to its power to any target. @@ -78,7 +77,7 @@ class SoulsFireEffect extends OneShotEffect { Player player = game.getPlayer(targetId); if (player != null) { - player.damage(damage, sourcePermanent.getId(), game, false, true); + player.damage(damage, sourcePermanent.getId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java index 5663a5b474a..85fed75ad6b 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java @@ -1,8 +1,5 @@ - - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -11,22 +8,23 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author Loki */ public final class SpikeshotElder extends CardImpl { - public SpikeshotElder (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); + public SpikeshotElder(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.SHAMAN); @@ -37,7 +35,7 @@ public final class SpikeshotElder extends CardImpl { this.addAbility(ability); } - public SpikeshotElder (final SpikeshotElder card) { + public SpikeshotElder(final SpikeshotElder card) { super(card); } @@ -76,7 +74,7 @@ class SpikeshotElderEffect extends OneShotEffect { } Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - player.damage(damage, sourcePermanent.getId(), game, false, true); + player.damage(damage, sourcePermanent.getId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java index ed672c4e05b..94618f17962 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -16,14 +14,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author Loki */ public final class SpikeshotGoblin extends CardImpl { public SpikeshotGoblin(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.SHAMAN); @@ -76,7 +75,7 @@ class SpikeshotGoblinEffect extends OneShotEffect { } Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - player.damage(damage, sourcePermanent.getId(), game, false, true); + player.damage(damage, sourcePermanent.getId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/s/SpitefulShadows.java b/Mage.Sets/src/mage/cards/s/SpitefulShadows.java index 92efb78b39d..16f3cc6923d 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulShadows.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulShadows.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealtDamageAttachedTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -9,11 +7,7 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -21,14 +15,15 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author North */ public final class SpitefulShadows extends CardImpl { public SpitefulShadows(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); this.subtype.add(SubType.AURA); // Enchant creature @@ -39,7 +34,7 @@ public final class SpitefulShadows extends CardImpl { // Whenever enchanted creature is dealt damage, it deals that much damage to its controller. this.addAbility(new DealtDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, new SpitefulShadowsEffect(), - false, SetTargetPointer.PERMANENT)); + false, SetTargetPointer.PERMANENT)); } public SpitefulShadows(final SpitefulShadows card) { @@ -80,7 +75,7 @@ class SpitefulShadowsEffect extends OneShotEffect { if (permanent != null) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { - player.damage(damageAmount, permanent.getId(), game, false, true); + player.damage(damageAmount, permanent.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/s/Spitemare.java b/Mage.Sets/src/mage/cards/s/Spitemare.java index 1ce88ea13d5..2fb6a6ad1cc 100644 --- a/Mage.Sets/src/mage/cards/s/Spitemare.java +++ b/Mage.Sets/src/mage/cards/s/Spitemare.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -9,8 +7,8 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -19,14 +17,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class Spitemare extends CardImpl { public Spitemare(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R/W}{R/W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R/W}{R/W}"); this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(3); @@ -104,7 +103,7 @@ class SpitemareEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getFirstTarget()); if (player != null) { - player.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game, false, true); + player.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game); return true; } Permanent permanent = game.getPermanent(source.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/Starfall.java b/Mage.Sets/src/mage/cards/s/Starfall.java index 7f6953aa47d..4bd0c27e373 100644 --- a/Mage.Sets/src/mage/cards/s/Starfall.java +++ b/Mage.Sets/src/mage/cards/s/Starfall.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -13,14 +11,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Starfall extends CardImpl { public Starfall(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{R}"); // Starfall deals 3 damage to target creature. If that creature is an enchantment, Starfall deals 3 damage to that creature's controller. @@ -63,7 +62,7 @@ class StarfallEffect extends OneShotEffect { if (permanent.isEnchantment()) { Player targetController = game.getPlayer(permanent.getControllerId()); if (targetController != null) { - targetController.damage(3, source.getSourceId(), game, false, true); + targetController.damage(3, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/s/SteamVines.java b/Mage.Sets/src/mage/cards/s/SteamVines.java index 317d2ba47b6..3e15311806e 100644 --- a/Mage.Sets/src/mage/cards/s/SteamVines.java +++ b/Mage.Sets/src/mage/cards/s/SteamVines.java @@ -84,7 +84,7 @@ class SteamVinesEffect extends OneShotEffect { if (game.getState().getZone(enchantedLand.getId()) == Zone.BATTLEFIELD) { // if 2 or more Steam Vines were on a land enchantedLand.destroy(source.getId(), game, false); if (landsController != null) { - landsController.damage(1, source.getSourceId(), game, false, true); + landsController.damage(1, source.getSourceId(), game); } } if (!game.getBattlefield().getAllActivePermanents(CardType.LAND).isEmpty()) { //lands are available on the battlefield diff --git a/Mage.Sets/src/mage/cards/s/StenchOfEvil.java b/Mage.Sets/src/mage/cards/s/StenchOfEvil.java index b3e390b20c2..b20a807469d 100644 --- a/Mage.Sets/src/mage/cards/s/StenchOfEvil.java +++ b/Mage.Sets/src/mage/cards/s/StenchOfEvil.java @@ -1,6 +1,5 @@ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -15,8 +14,9 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class StenchOfEvil extends CardImpl { @@ -71,7 +71,7 @@ class StenchOfEvilEffect extends OneShotEffect { if (landController != null && cost.canPay(source, source.getSourceId(), landControllerId, game) && !cost.pay(source, game, source.getSourceId(), landControllerId, false)) { - landController.damage(1, source.getSourceId(), game, false, true); + landController.damage(1, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/s/StormWorld.java b/Mage.Sets/src/mage/cards/s/StormWorld.java index 0ca780545d6..5ac8c1e118d 100644 --- a/Mage.Sets/src/mage/cards/s/StormWorld.java +++ b/Mage.Sets/src/mage/cards/s/StormWorld.java @@ -1,22 +1,17 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class StormWorld extends CardImpl { @@ -63,7 +58,7 @@ class StormWorldEffect extends OneShotEffect { if (player != null) { int damage = 4 - player.getHand().size(); if (damage > 0) { - player.damage(damage, source.getSourceId(), game, false, true); + player.damage(damage, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/s/StormbreathDragon.java b/Mage.Sets/src/mage/cards/s/StormbreathDragon.java index dcf45a7c15a..6fd9fb9fffc 100644 --- a/Mage.Sets/src/mage/cards/s/StormbreathDragon.java +++ b/Mage.Sets/src/mage/cards/s/StormbreathDragon.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -14,19 +12,20 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class StormbreathDragon extends CardImpl { public StormbreathDragon(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.subtype.add(SubType.DRAGON); this.power = new MageInt(4); @@ -39,7 +38,7 @@ public final class StormbreathDragon extends CardImpl { // protection from white this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {5}{R}{R}: Monstrosity 3. - this.addAbility(new MonstrosityAbility("{5}{R}{R}",3)); + this.addAbility(new MonstrosityAbility("{5}{R}{R}", 3)); // When Stormbreath Dragon becomes monstrous, it deals damage to each opponent equal to the number of cards in that player's hand. this.addAbility(new BecomesMonstrousSourceTriggeredAbility(new StormbreathDragonDamageEffect())); } @@ -77,7 +76,7 @@ class StormbreathDragonDamageEffect extends OneShotEffect { if (opponent != null) { int damage = opponent.getHand().size(); if (damage > 0) { - opponent.damage(damage, source.getSourceId(), game, false, true); + opponent.damage(damage, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/s/StuffyDoll.java b/Mage.Sets/src/mage/cards/s/StuffyDoll.java index fe0f64d556a..99a4dc654a8 100644 --- a/Mage.Sets/src/mage/cards/s/StuffyDoll.java +++ b/Mage.Sets/src/mage/cards/s/StuffyDoll.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -23,8 +21,9 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** - * * @author North */ public final class StuffyDoll extends CardImpl { @@ -111,7 +110,7 @@ class StuffyDollGainLifeEffect extends OneShotEffect { UUID playerId = (UUID) game.getState().getValue(source.getSourceId() + "_player"); Player player = game.getPlayer(playerId); if (player != null && player.canRespond()) { - player.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game, false, true); + player.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/s/Subversion.java b/Mage.Sets/src/mage/cards/s/Subversion.java index 8279a41ac06..8e20d24267f 100644 --- a/Mage.Sets/src/mage/cards/s/Subversion.java +++ b/Mage.Sets/src/mage/cards/s/Subversion.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -12,14 +10,15 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.game.Game; +import java.util.UUID; + /** - * * @author Plopman */ public final class Subversion extends CardImpl { public Subversion(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); // At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way. @@ -34,8 +33,8 @@ public final class Subversion extends CardImpl { public Subversion copy() { return new Subversion(this); } - - + + static class SubversionEffect extends OneShotEffect { public SubversionEffect() { @@ -51,7 +50,7 @@ public final class Subversion extends CardImpl { public boolean apply(Game game, Ability source) { int damage = 0; for (UUID opponentId : game.getOpponents(source.getControllerId())) { - damage += game.getPlayer(opponentId).damage(1, source.getSourceId(), game, false, true); + damage += game.getPlayer(opponentId).damage(1, source.getSourceId(), game); } game.getPlayer(source.getControllerId()).gainLife(damage, game, source); return true; diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java index 0ea5a2ce033..516e32af8c1 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java @@ -1,9 +1,5 @@ - package mage.cards.s; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -22,21 +18,24 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetControlledCreaturePermanent; + +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; /** - * * @author L_J */ public final class SwordOfTheAges extends CardImpl { public SwordOfTheAges(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); - + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); + // Sword of the Ages enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); - + // {T}, Sacrifice Sword of the Ages and any number of creatures you control: Sword of the Ages deals X damage to any target, where X is the total power of the creatures sacrificed this way, then exile Sword of the Ages and those creature cards. Cost cost = new SacrificeSourceCost(); cost.setText("Sacrifice {this} and any number of creatures you control"); @@ -100,7 +99,7 @@ class SwordOfTheAgesEffect extends OneShotEffect { if (totalPower > 0) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { - player.damage(totalPower, source.getSourceId(), game, false, true); + player.damage(totalPower, source.getSourceId(), game); } else { Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (creature != null) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java index 9968d14771f..f26e594936e 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -17,11 +15,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -30,8 +24,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author Loki */ public final class SwordOfWarAndPeace extends CardImpl { @@ -118,7 +113,7 @@ class SwordOfWarAndPeaceDamageEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(targetPlayer.getHand().size(), source.getSourceId(), game, false, true); + targetPlayer.damage(targetPlayer.getHand().size(), source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/s/SyphonSoul.java b/Mage.Sets/src/mage/cards/s/SyphonSoul.java index afc40fd1548..3ed9cc8bc8e 100644 --- a/Mage.Sets/src/mage/cards/s/SyphonSoul.java +++ b/Mage.Sets/src/mage/cards/s/SyphonSoul.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -10,14 +8,15 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; +import java.util.UUID; + /** - * * @author Loki */ public final class SyphonSoul extends CardImpl { public SyphonSoul(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}"); // Syphon Soul deals 2 damage to each other player. You gain life equal to the damage dealt this way. @@ -49,7 +48,7 @@ class SyphonSoulEffect extends OneShotEffect { int damageDealt = 0; for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { if (!playerId.equals(source.getControllerId())) { - damageDealt += game.getPlayer(playerId).damage(2, source.getSourceId(), game, false, true); + damageDealt += game.getPlayer(playerId).damage(2, source.getSourceId(), game); } } if (damageDealt > 0) { diff --git a/Mage.Sets/src/mage/cards/t/TheRack.java b/Mage.Sets/src/mage/cards/t/TheRack.java index 6b5ea4a93d9..6405b57eb27 100644 --- a/Mage.Sets/src/mage/cards/t/TheRack.java +++ b/Mage.Sets/src/mage/cards/t/TheRack.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -17,14 +15,15 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class TheRack extends CardImpl { public TheRack(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // As The Rack enters the battlefield, choose an opponent. this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponentEffect(Outcome.Detriment))); @@ -97,7 +96,7 @@ class TheRackEffect extends OneShotEffect { if (chosenPlayer != null) { int damage = 3 - chosenPlayer.getHand().size(); if (damage > 0) { - chosenPlayer.damage(damage, source.getSourceId(), game, false, true); + chosenPlayer.damage(damage, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/t/ThelonsChant.java b/Mage.Sets/src/mage/cards/t/ThelonsChant.java index 58c5c732588..3d53bd3ed31 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonsChant.java +++ b/Mage.Sets/src/mage/cards/t/ThelonsChant.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -10,12 +8,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.game.Game; @@ -23,15 +16,16 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** - * * @author L_J */ public final class ThelonsChant extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Swamp"); - static{ + static { filter.add(SubType.SWAMP.getPredicate()); } @@ -42,7 +36,7 @@ public final class ThelonsChant extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{G}")), TargetController.YOU, false)); // Whenever a player puts a Swamp onto the battlefield, Thelon's Chant deals 3 damage to that player unless they put a -1/-1 counter on a creature they control. - this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new ThelonsChantEffect(), filter, false, SetTargetPointer.PLAYER, + this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new ThelonsChantEffect(), filter, false, SetTargetPointer.PLAYER, "Whenever a player puts a Swamp onto the battlefield, {this} deals 3 damage to that player unless they put a -1/-1 counter on a creature they control.")); } @@ -89,7 +83,7 @@ class ThelonsChantEffect extends OneShotEffect { } } if (!paid) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java b/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java index 17f448a0ee1..6aa81b654d8 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java @@ -80,7 +80,7 @@ class ThoughtHemorrhageEffect extends OneShotEffect { } } if (cardsFound > 0) { - targetPlayer.damage(3 * cardsFound, source.getSourceId(), game, false, true); + targetPlayer.damage(3 * cardsFound, source.getSourceId(), game); } // Exile all cards with the same name // Building a card filter with the name diff --git a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java index 6fcdc24295a..aa76dd4462e 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java @@ -1,8 +1,5 @@ - package mage.cards.t; -import java.util.List; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -28,8 +25,10 @@ import mage.target.TargetCard; import mage.target.TargetPlayer; import mage.target.targetpointer.FixedTarget; +import java.util.List; +import java.util.UUID; + /** - * * @author spjspj */ public final class ThoughtPrison extends CardImpl { @@ -37,7 +36,7 @@ public final class ThoughtPrison extends CardImpl { private static final FilterSpell filter = new FilterSpell("spell cast"); public ThoughtPrison(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // Imprint - When Thought Prison enters the battlefield, you may have target player reveal their hand. If you do, choose a nonland card from it and exile that card. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ThoughtPrisonImprintEffect(), true, "Imprint — "); @@ -197,7 +196,7 @@ class ThoughtPrisonDamageEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (targetPlayer != null) { - targetPlayer.damage(2, source.getSourceId(), game, false, true); + targetPlayer.damage(2, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/t/TortureChamber.java b/Mage.Sets/src/mage/cards/t/TortureChamber.java index bb8f91c9071..30a60152cf3 100644 --- a/Mage.Sets/src/mage/cards/t/TortureChamber.java +++ b/Mage.Sets/src/mage/cards/t/TortureChamber.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; @@ -24,14 +22,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author North */ public final class TortureChamber extends CardImpl { public TortureChamber(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // At the beginning of your upkeep, put a pain counter on Torture Chamber. this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new AddCountersSourceEffect(CounterType.PAIN.createInstance()))); @@ -120,7 +119,7 @@ class TortureChamberEffect1 extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { int painCounters = permanent.getCounters(game).getCount(CounterType.PAIN); - player.damage(painCounters, source.getSourceId(), game, false, true); + player.damage(painCounters, source.getSourceId(), game); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/t/TourachsChant.java b/Mage.Sets/src/mage/cards/t/TourachsChant.java index 77c7710dfdc..a8eb5d7cbd2 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsChant.java +++ b/Mage.Sets/src/mage/cards/t/TourachsChant.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; @@ -10,12 +8,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.game.Game; @@ -23,15 +16,16 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** - * * @author L_J */ public final class TourachsChant extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Forest"); - static{ + static { filter.add(SubType.FOREST.getPredicate()); } @@ -42,7 +36,7 @@ public final class TourachsChant extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}")), TargetController.YOU, false)); // Whenever a player puts a Forest onto the battlefield, Tourach's Chant deals 3 damage to that player unless they put a -1/-1 counter on a creature they control. - this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new TourachsChantEffect(), filter, false, SetTargetPointer.PLAYER, + this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new TourachsChantEffect(), filter, false, SetTargetPointer.PLAYER, "Whenever a player puts a Forest onto the battlefield, {this} deals 3 damage to that player unless they put a -1/-1 counter on a creature they control.")); } @@ -89,7 +83,7 @@ class TourachsChantEffect extends OneShotEffect { } } if (!paid) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/t/TraitorsRoar.java b/Mage.Sets/src/mage/cards/t/TraitorsRoar.java index 2201993bec7..1fe6b5de136 100644 --- a/Mage.Sets/src/mage/cards/t/TraitorsRoar.java +++ b/Mage.Sets/src/mage/cards/t/TraitorsRoar.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ConspireAbility; @@ -17,8 +15,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class TraitorsRoar extends CardImpl { @@ -75,7 +74,7 @@ class TraitorsRoarEffect extends OneShotEffect { applied = targetCreature.tap(game); Player controller = game.getPlayer(targetCreature.getControllerId()); if (controller != null) { - controller.damage(targetCreature.getPower().getValue(), targetCreature.getId(), game, false, true); + controller.damage(targetCreature.getPower().getValue(), targetCreature.getId(), game); applied = true; } } diff --git a/Mage.Sets/src/mage/cards/t/TuktukScrapper.java b/Mage.Sets/src/mage/cards/t/TuktukScrapper.java index ec8a7144101..d1955ef7bc2 100644 --- a/Mage.Sets/src/mage/cards/t/TuktukScrapper.java +++ b/Mage.Sets/src/mage/cards/t/TuktukScrapper.java @@ -1,7 +1,5 @@ - package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -19,14 +17,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** - * * @author jeffwadsworth */ public final class TuktukScrapper extends CardImpl { public TuktukScrapper(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.subtype.add(SubType.GOBLIN); this.subtype.add(SubType.ARTIFICER); this.subtype.add(SubType.ALLY); @@ -76,21 +75,19 @@ class TuktukScrapperTriggeredAbility extends TriggeredAbilityImpl { if (permanent.getId().equals(this.getSourceId())) { return true; } - if (permanent.hasSubtype(SubType.ALLY, game) - && permanent.isControlledBy(this.getControllerId())) { - return true; - } + return permanent.hasSubtype(SubType.ALLY, game) + && permanent.isControlledBy(this.getControllerId()); } return false; } @Override public String getRule() { - + // originally returned fullText, user reported that because the trigger text is so lengthy, they cannot click Yes/No buttons //String fullText = "Whenever {this} or another Ally enters the battlefield under your control, you may destroy target artifact. If that artifact is put into a graveyard this way, {this} deals damage to that artifact's controller equal to the number of Allies you control."; String condensedText = "Whenever {this} or another Ally you enters the battlefield under your control, you may destroy target artifact. If you do, {this} deals damage to that controller equal to the number of Allies you control."; - + return condensedText; } } @@ -126,7 +123,7 @@ class TuktukScrapperEffect extends OneShotEffect { if (targetController != null && game.getState().getZone(targetArtifact.getId()) == Zone.GRAVEYARD) { int alliesControlled = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); if (alliesControlled > 0) { - targetController.damage(alliesControlled, source.getSourceId(), game, false, true); + targetController.damage(alliesControlled, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java index 1d3851fa520..4639c238528 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java @@ -1,8 +1,5 @@ - - package mage.cards.v; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSpellEffect; @@ -15,23 +12,24 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetAnyTarget; +import mage.target.common.TargetCardInYourGraveyard; + +import java.util.UUID; /** - * * @author BetaSteward_at_googlemail.com */ public final class VengefulRebirth extends CardImpl { public VengefulRebirth(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}{G}"); // Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to any target this.getSpellAbility().addTarget(new TargetCardInYourGraveyard()); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new VengefulRebirthEffect()); - + // Exile Vengeful Rebirth. this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); } @@ -65,18 +63,18 @@ class VengefulRebirthEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Card card = (Card)game.getObject(source.getFirstTarget()); + Card card = (Card) game.getObject(source.getFirstTarget()); if (controller != null && card != null && controller.removeFromGraveyard(card, game)) { controller.moveCards(card, Zone.HAND, source, game); if (!card.isLand()) { - int damage = card.getConvertedManaCost(); + int damage = card.getConvertedManaCost(); Permanent permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (permanent != null) { permanent.damage(damage, source.getSourceId(), game, false, true); } Player targetPlayer = game.getPlayer(source.getTargets().get(1).getFirstTarget()); if (targetPlayer != null) { - targetPlayer.damage(damage, source.getSourceId(), game, false, true); + targetPlayer.damage(damage, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/v/VexingArcanix.java b/Mage.Sets/src/mage/cards/v/VexingArcanix.java index 91e1525a0d7..7a77fc4238a 100644 --- a/Mage.Sets/src/mage/cards/v/VexingArcanix.java +++ b/Mage.Sets/src/mage/cards/v/VexingArcanix.java @@ -78,7 +78,7 @@ class VexingArcanixEffect extends OneShotEffect { player.moveCards(cards, Zone.HAND, source, game); } else { player.moveCards(cards, Zone.GRAVEYARD, source, game); - player.damage(2, source.getSourceId(), game, false, true); + player.damage(2, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/v/VexingDevil.java b/Mage.Sets/src/mage/cards/v/VexingDevil.java index 2c783d130d9..0d72c7dab8a 100644 --- a/Mage.Sets/src/mage/cards/v/VexingDevil.java +++ b/Mage.Sets/src/mage/cards/v/VexingDevil.java @@ -1,7 +1,5 @@ - package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -9,21 +7,21 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -/** - * - * @author noxx +import java.util.UUID; +/** + * @author noxx */ public final class VexingDevil extends CardImpl { public VexingDevil(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); this.subtype.add(SubType.DEVIL); this.power = new MageInt(4); @@ -63,7 +61,7 @@ class VexingDevilEffect extends OneShotEffect { Player opponent = game.getPlayer(opponentUuid); if (opponent != null && opponent.chooseUse(Outcome.LoseLife, "Make " + permanent.getLogName() + " deal 4 damage to you?", source, game)) { game.informPlayers(opponent.getLogName() + " has chosen to receive 4 damage from " + permanent.getLogName()); - opponent.damage(4, permanent.getId(), game, false, true); + opponent.damage(4, permanent.getId(), game); permanent.sacrifice(source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java b/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java index 14928db6afa..769c8aa4f72 100644 --- a/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java +++ b/Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java @@ -1,10 +1,5 @@ - package mage.cards.v; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; @@ -14,8 +9,8 @@ import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -28,8 +23,12 @@ import mage.target.TargetPermanent; import mage.util.RandomUtil; import mage.watchers.common.SpellsCastWatcher; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class VialSmasherTheFierce extends CardImpl { @@ -147,7 +146,7 @@ class VialSmasherTheFierceEffect extends OneShotEffect { } } } - opponent.damage(damage, source.getSourceId(), game, false, true); + opponent.damage(damage, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java index 8f563cad7c5..478d23a82a6 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java @@ -1,7 +1,5 @@ - package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; @@ -12,22 +10,23 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** - * * @author Plopman */ public final class ViashinoHeretic extends CardImpl { public ViashinoHeretic(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.VIASHINO); this.power = new MageInt(1); @@ -52,7 +51,7 @@ public final class ViashinoHeretic extends CardImpl { class ViashinoHereticEffect extends OneShotEffect { - + public ViashinoHereticEffect() { super(Outcome.DestroyPermanent); } @@ -68,15 +67,14 @@ class ViashinoHereticEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - + Permanent permanent = game.getPermanent(source.getFirstTarget()); - if(permanent != null) - { + if (permanent != null) { int couvertedManaCost = permanent.getConvertedManaCost(); Player player = game.getPlayer(permanent.getControllerId()); permanent.destroy(source.getSourceId(), game, false); - if(player != null){ - player.damage(couvertedManaCost, source.getSourceId(), game, false, true); + if (player != null) { + player.damage(couvertedManaCost, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/v/Viseling.java b/Mage.Sets/src/mage/cards/v/Viseling.java index 8a3a9ff5edd..3db0115bcb8 100644 --- a/Mage.Sets/src/mage/cards/v/Viseling.java +++ b/Mage.Sets/src/mage/cards/v/Viseling.java @@ -1,7 +1,5 @@ - package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -9,20 +7,21 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class Viseling extends CardImpl { public Viseling(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); @@ -65,7 +64,7 @@ class ViselingEffect extends OneShotEffect { if (opponent != null) { int xValue = opponent.getHand().size() - 4; if (xValue > 0) { - opponent.damage(xValue, source.getSourceId(), game, false, true); + opponent.damage(xValue, source.getSourceId(), game); } return true; } diff --git a/Mage.Sets/src/mage/cards/v/VolatileRig.java b/Mage.Sets/src/mage/cards/v/VolatileRig.java index ec5ba97d616..a3091c63a47 100644 --- a/Mage.Sets/src/mage/cards/v/VolatileRig.java +++ b/Mage.Sets/src/mage/cards/v/VolatileRig.java @@ -1,8 +1,5 @@ - package mage.cards.v; -import java.util.List; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -12,11 +9,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.PhaseStep; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.events.GameEvent; @@ -24,8 +17,10 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class VolatileRig extends CardImpl { @@ -170,7 +165,7 @@ class VolatileRigEffect2 extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(player.getId(), game)) { Player damageToPlayer = game.getPlayer(playerId); if (damageToPlayer != null) { - damageToPlayer.damage(4, source.getSourceId(), game, false, true); + damageToPlayer.damage(4, source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/v/VolcanicEruption.java b/Mage.Sets/src/mage/cards/v/VolcanicEruption.java index cf6c04bafe6..be3f0ca67ec 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicEruption.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicEruption.java @@ -1,7 +1,5 @@ package mage.cards.v; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -18,8 +16,10 @@ import mage.players.Player; import mage.target.common.TargetLandPermanent; import mage.target.targetadjustment.TargetAdjuster; +import java.util.List; +import java.util.UUID; + /** - * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ public final class VolcanicEruption extends CardImpl { @@ -94,7 +94,7 @@ class VolcanicEruptionEffect extends OneShotEffect { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(destroyedCount, source.getSourceId(), game, false, true); + player.damage(destroyedCount, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/w/WarstormSurge.java b/Mage.Sets/src/mage/cards/w/WarstormSurge.java index 747e7ea93bf..772327b1c0a 100644 --- a/Mage.Sets/src/mage/cards/w/WarstormSurge.java +++ b/Mage.Sets/src/mage/cards/w/WarstormSurge.java @@ -111,7 +111,7 @@ class WarstormSurgeEffect extends OneShotEffect { } Player player = game.getPlayer(target); if (player != null) { - player.damage(amount, creature.getId(), game, false, true); + player.damage(amount, creature.getId(), game); return true; } } diff --git a/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java b/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java index 51eef0567f0..2f9699a1d4f 100644 --- a/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java +++ b/Mage.Sets/src/mage/cards/w/WerewolfRansacker.java @@ -1,7 +1,5 @@ - package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; @@ -14,11 +12,7 @@ import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -26,14 +20,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** - * * @author BetaSteward */ public final class WerewolfRansacker extends CardImpl { public WerewolfRansacker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, ""); this.subtype.add(SubType.WEREWOLF); this.color.setRed(true); @@ -89,9 +84,7 @@ class WerewolfRansackerAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) { Permanent permanent = game.getPermanent(sourceId); - if (permanent != null && permanent.isTransformed()) { - return true; - } + return permanent != null && permanent.isTransformed(); } return false; } @@ -129,7 +122,7 @@ class WerewolfRansackerEffect extends OneShotEffect { if (game.getState().getZone(permanent.getId()) == Zone.GRAVEYARD) { Player player = game.getPlayer(permanent.getControllerId()); if (player != null) { - player.damage(3, source.getSourceId(), game, false, true); + player.damage(3, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/w/WingStorm.java b/Mage.Sets/src/mage/cards/w/WingStorm.java index 8639d89cb61..939f1487b98 100644 --- a/Mage.Sets/src/mage/cards/w/WingStorm.java +++ b/Mage.Sets/src/mage/cards/w/WingStorm.java @@ -1,7 +1,5 @@ - package mage.cards.w; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -14,14 +12,15 @@ import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author LevelX2 & L_J */ public final class WingStorm extends CardImpl { public WingStorm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{G}"); // Wing Storm deals damage to each player equal to twice the number of creatures with flying that player controls. this.getSpellAbility().addEffect(new WingStormEffect()); @@ -68,7 +67,7 @@ class WingStormEffect extends OneShotEffect { if (amount > 0) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(amount * 2, source.getSourceId(), game, false, true); + player.damage(amount * 2, source.getSourceId(), game); } } } diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWar.java b/Mage.Sets/src/mage/cards/w/WordsOfWar.java index 927d2d5b3e5..3d6f1ddba32 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWar.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWar.java @@ -1,7 +1,5 @@ - package mage.cards.w; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -18,14 +16,15 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetAnyTarget; +import java.util.UUID; + /** - * * @author emerald000 */ public final class WordsOfWar extends CardImpl { public WordsOfWar(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // {1}: The next time you would draw a card this turn, Words of War deals 2 damage to any target instead. @@ -45,57 +44,57 @@ public final class WordsOfWar extends CardImpl { } class WordsOfWarEffect extends ReplacementEffectImpl { - + WordsOfWarEffect() { super(Duration.EndOfTurn, Outcome.Damage); staticText = "The next time you would draw a card this turn, {this} deals 2 damage to any target instead."; } - + WordsOfWarEffect(final WordsOfWarEffect effect) { super(effect); } - + @Override public WordsOfWarEffect copy() { return new WordsOfWarEffect(this); } - + @Override public boolean apply(Game game, Ability source) { return true; } - + @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - player.damage(2, source.getSourceId(), game, false, true); - this.used = true; + player.damage(2, source.getSourceId(), game); + this.used = true; discard(); return true; } Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); if (permanent != null) { permanent.damage(2, source.getSourceId(), game, false, true); - this.used = true; + this.used = true; discard(); return true; } } return false; } - + @Override public boolean checksEventType(GameEvent event, Game game) { return event.getType() == GameEvent.EventType.DRAW_CARD; } - + @Override public boolean applies(GameEvent event, Ability source, Game game) { if (!this.used) { - return source.isControlledBy(event.getPlayerId()); + return source.isControlledBy(event.getPlayerId()); } return false; } diff --git a/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java b/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java index b6ea0e2a5d7..1dcb063095d 100644 --- a/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java +++ b/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java @@ -138,10 +138,10 @@ class WormsOfTheEarthDestroyEffect extends OneShotEffect { if (cost.canPay(source, source.getSourceId(), player.getId(), game) && player.chooseUse(Outcome.Sacrifice, "Will you sacrifice two lands? (otherwise you'll be dealt 5 damage)", source, game)) { if (!cost.pay(source, game, source.getSourceId(), player.getId(), false, null)) { - player.damage(5, source.getSourceId(), game, false, true); + player.damage(5, source.getSourceId(), game); } } else { - player.damage(5, source.getSourceId(), game, false, true); + player.damage(5, source.getSourceId(), game); } sourcePermanent = game.getPermanent(source.getSourceId()); if (sourcePermanent != null) { diff --git a/Mage.Sets/src/mage/cards/y/YawgmothDemon.java b/Mage.Sets/src/mage/cards/y/YawgmothDemon.java index 28a73a1869b..ce0fe2241de 100644 --- a/Mage.Sets/src/mage/cards/y/YawgmothDemon.java +++ b/Mage.Sets/src/mage/cards/y/YawgmothDemon.java @@ -1,7 +1,5 @@ - package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -11,24 +9,21 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** - * * @author MarcoMarin */ public final class YawgmothDemon extends CardImpl { public YawgmothDemon(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.subtype.add(SubType.DEMON); this.power = new MageInt(6); this.toughness = new MageInt(6); @@ -83,7 +78,7 @@ class YawgmothDemonEffect extends OneShotEffect { Permanent sourceObject = (Permanent) source.getSourceObjectIfItStillExists(game); if (sourceObject != null) { sourceObject.tap(game); - controller.damage(2, source.getSourceId(), game, false, true); + controller.damage(2, source.getSourceId(), game); } } return true; diff --git a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java index 2e59c4e012b..3a5fdc13bff 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java @@ -392,7 +392,7 @@ public class RandomPlayer extends ComputerPlayer { } else { Player player = game.getPlayer(targetId); if (player != null) { - player.damage(amount, sourceId, game, false, true); + player.damage(amount, sourceId, game); remainingDamage -= amount; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java index 68d1b93da62..0ca5d5b310e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java @@ -1,5 +1,3 @@ - - package mage.abilities.effects.common; import mage.abilities.Ability; @@ -13,7 +11,6 @@ import mage.game.permanent.Permanent; import mage.players.Player; /** - * * @author LoneFox */ public class DamageAttachedControllerEffect extends OneShotEffect { @@ -24,7 +21,7 @@ public class DamageAttachedControllerEffect extends OneShotEffect { super(Outcome.Damage); this.amount = StaticValue.get(amount); } - + public DamageAttachedControllerEffect(DynamicValue amount) { super(Outcome.Damage); this.amount = amount; @@ -43,16 +40,16 @@ public class DamageAttachedControllerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent enchantment = game.getPermanentOrLKIBattlefield(source.getSourceId()); - if(enchantment == null) { + if (enchantment == null) { return false; } Permanent enchanted = game.getPermanentOrLKIBattlefield(enchantment.getAttachedTo()); - if(enchanted == null) { + if (enchanted == null) { return false; } Player player = game.getPlayer(enchanted.getControllerId()); - if(player != null) { - player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + if (player != null) { + player.damage(amount.calculate(game, source, this), source.getSourceId(), game); return true; } return false; @@ -66,6 +63,6 @@ public class DamageAttachedControllerEffect extends OneShotEffect { if ("equal to".equals(amount.toString())) { return "{this} deals damage " + amount + " that creatures toughness to that creature's controller"; } - return "{this} deals " + amount + " damage to that creature's controller"; + return "{this} deals " + amount + " damage to that creature's controller"; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java index 42c78008cec..54db753781e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java @@ -1,22 +1,20 @@ - - package mage.abilities.effects.common; -import java.util.List; -import java.util.UUID; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.List; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public class DamageEverythingEffect extends OneShotEffect { @@ -48,7 +46,7 @@ public class DamageEverythingEffect extends OneShotEffect { public DamageEverythingEffect(DynamicValue amount, FilterPermanent filter) { this(amount, filter, null); } - + public DamageEverythingEffect(DynamicValue amount, FilterPermanent filter, UUID damageSource) { super(Outcome.Damage); this.amount = amount; @@ -78,13 +76,13 @@ public class DamageEverythingEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int damage = amount.calculate(game, source, this); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); - for (Permanent permanent: permanents) { - permanent.damage(damage, damageSource == null ? source.getSourceId(): damageSource, game, false, true); + for (Permanent permanent : permanents) { + permanent.damage(damage, damageSource == null ? source.getSourceId() : damageSource, game, false, true); } - for (UUID playerId: game.getState().getPlayersInRange(source.getControllerId(), game)) { + for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(damage, damageSource == null ? source.getSourceId(): damageSource, game, false, true); + player.damage(damage, damageSource == null ? source.getSourceId() : damageSource, game); } } return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java index df1c5397bbe..9dc0f94e177 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java @@ -63,11 +63,11 @@ public class DamageMultiEffect extends OneShotEffect { if (permanent != null) { if (permanent.damage(multiTarget.getTargetAmount(target), source.getSourceId(), game, false, true) > 0) { damagedSet.add(new MageObjectReference(permanent, game)); - } ; + } } else { Player player = game.getPlayer(target); if (player != null) { - player.damage(multiTarget.getTargetAmount(target), source.getSourceId(), game, false, true); + player.damage(multiTarget.getTargetAmount(target), source.getSourceId(), game); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java index 0b4c5395ef1..01d581c38e3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java @@ -1,18 +1,17 @@ - package mage.abilities.effects.common; -import java.util.UUID; -import mage.constants.Outcome; -import mage.constants.TargetController; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; +import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public class DamagePlayersEffect extends OneShotEffect { @@ -58,18 +57,18 @@ public class DamagePlayersEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { switch (controller) { case ANY: - for (UUID playerId: game.getState().getPlayersInRange(source.getControllerId(), game)) { + for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + player.damage(amount.calculate(game, source, this), source.getSourceId(), game); } } break; case OPPONENT: - for (UUID playerId: game.getOpponents(source.getControllerId())) { + for (UUID playerId : game.getOpponents(source.getControllerId())) { Player player = game.getPlayer(playerId); if (player != null) { - player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true); + player.damage(amount.calculate(game, source, this), source.getSourceId(), game); } } break; @@ -84,8 +83,7 @@ public class DamagePlayersEffect extends OneShotEffect { return new DamagePlayersEffect(this); } - private void setText() - { + private void setText() { StringBuilder sb = new StringBuilder().append(this.sourceName).append(" deals ").append(amount.toString()); switch (controller) { case ANY: diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java index d9441ac11aa..e61259cfdf4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java @@ -43,7 +43,7 @@ public class DamageWithPowerFromOneToAnotherTargetEffect extends OneShotEffect { anotherPermanent.damage(myPermanent.getPower().getValue(), myPermanent.getId(), game, false, true); return true; } else if (myPermanent != null && anotherPlayer != null) { - anotherPlayer.damage(myPermanent.getPower().getValue(), myPermanent.getId(), game, false, true); + anotherPlayer.damage(myPermanent.getPower().getValue(), myPermanent.getId(), game); return true; } return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java index 1e9b2ccde88..8dea757273d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromSourceToAnotherTargetEffect.java @@ -43,7 +43,7 @@ public class DamageWithPowerFromSourceToAnotherTargetEffect extends OneShotEffec anotherPermanent.damage(myPermanent.getPower().getValue(), myPermanent.getId(), game, false, true); return true; } else if (myPermanent != null && anotherPlayer != null) { - anotherPlayer.damage(myPermanent.getPower().getValue(), myPermanent.getId(), game, false, true); + anotherPlayer.damage(myPermanent.getPower().getValue(), myPermanent.getId(), game); return true; } return false; diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index cf2358d8f17..6cd06ee66b2 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -1535,7 +1535,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { game.fireEvent(GameEvent.getEvent(GameEvent.EventType.FIGHTED_PERMANENT, fightTarget.getId(), getId(), source.getControllerId())); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.FIGHTED_PERMANENT, getId(), fightTarget.getId(), source.getControllerId())); damage(fightTarget.getPower().getValue(), fightTarget.getId(), game, false, true); - fightTarget.damage(getPower().getValue(), getId(), game, false, true); + fightTarget.damage(getPower().getValue(), getId(), game); return true; } diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index b8dc7a8e88f..61a0954317f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -1,9 +1,5 @@ - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -21,13 +17,17 @@ import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.players.Player; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** - * * @author LoneFox */ public final class BelzenlokDemonToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); + static { tokenImageSets.addAll(Arrays.asList("DOM")); } @@ -95,7 +95,7 @@ class BelzenlokDemonTokenEffect extends OneShotEffect { } else { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - controller.damage(6, source.getSourceId(), game, false, true); + controller.damage(6, source.getSourceId(), game); } } return true;