From 7a2bc8b0ef2f914dbb84ab784131d24414b21d41 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 20 Mar 2014 00:58:33 +0100 Subject: [PATCH] Minor formatting and changes. --- .../championsofkamigawa/BudokaGardener.java | 14 +++++------ .../NezumiGraverobber.java | 14 ++++------- .../mage/sets/commander2013/WitchHunt.java | 4 ++-- .../src/mage/sets/gatecrash/Skullcrack.java | 4 ++-- .../sets/magic2011/LeylineOfPunishment.java | 4 ++-- .../sets/returntoravnica/HavocFestival.java | 4 ++-- Mage/src/mage/abilities/AbilitiesImpl.java | 23 +++++++++---------- ...Effect.java => CantGainLifeAllEffect.java} | 12 +++++----- 8 files changed, 36 insertions(+), 43 deletions(-) rename Mage/src/mage/abilities/effects/common/continious/{PlayersCantGainLifeEffect.java => CantGainLifeAllEffect.java} (86%) diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java index 8b4b205bbcc..a6c12bfaedc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java @@ -28,11 +28,6 @@ package mage.sets.championsofkamigawa; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +42,11 @@ import mage.abilities.effects.common.FlipSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; @@ -56,7 +56,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInHand; - /** * @author Loki */ @@ -103,8 +102,9 @@ class BudokaGardenerEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Target target = new TargetCardInHand(1, 1, new FilterLandCard()); + Target target = new TargetCardInHand(new FilterLandCard()); target.setRequired(true); + target.setNotTarget(true); if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.chooseUse(outcome, "Put land onto the battlefield?", game) && controller.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java index 1a77cb03831..ccd6809b4a1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java @@ -27,35 +27,29 @@ */ package mage.sets.championsofkamigawa; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.FlippedCondition; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.CopyTokenEffect; import mage.abilities.effects.common.ExileTargetEffect; +import mage.abilities.effects.common.FlipSourceEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInOpponentsGraveyard; -import java.util.UUID; -import mage.abilities.effects.common.FlipSourceEffect; - /** * @author Loki */ diff --git a/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java b/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java index 40cc11a8884..047a11122bf 100644 --- a/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java +++ b/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java @@ -34,7 +34,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamageControllerEffect; -import mage.abilities.effects.common.continious.PlayersCantGainLifeEffect; +import mage.abilities.effects.common.continious.CantGainLifeAllEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -62,7 +62,7 @@ public class WitchHunt extends CardImpl { this.color.setRed(true); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayersCantGainLifeEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); // At the beginning of your upkeep, Witch Hunt deals 4 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageControllerEffect(4), TargetController.YOU, false)); // At the beginning of your end step, target opponent chosen at random gains control of Witch Hunt. diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java index 200c86c834c..9833e9d5489 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.continious.PlayersCantGainLifeEffect; +import mage.abilities.effects.common.continious.CantGainLifeAllEffect; import mage.cards.CardImpl; import mage.constants.Duration; import mage.game.Game; @@ -55,7 +55,7 @@ public class Skullcrack extends CardImpl { this.color.setRed(true); // Players can't gain life this turn. Damage can't be prevented this turn. Skullcrack deals 3 damage to target player. - this.getSpellAbility().addEffect(new PlayersCantGainLifeEffect(Duration.EndOfTurn)); + this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DamageCantBePreventedEffect()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayer(true)); diff --git a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java index c4f9f6f111c..e3c91d4a17a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java @@ -40,7 +40,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.ReplacementEffectImpl; -import mage.abilities.effects.common.continious.PlayersCantGainLifeEffect; +import mage.abilities.effects.common.continious.CantGainLifeAllEffect; import mage.abilities.keyword.LeylineAbility; import mage.cards.CardImpl; import mage.game.Game; @@ -62,7 +62,7 @@ public class LeylineOfPunishment extends CardImpl { // If Leyline of Punishment is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayersCantGainLifeEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); // Damage can't be prevented. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfPunishmentEffect2())); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java b/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java index 92f209b8836..5dff3c67002 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java @@ -33,7 +33,7 @@ import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.continious.PlayersCantGainLifeEffect; +import mage.abilities.effects.common.continious.CantGainLifeAllEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Outcome; @@ -59,7 +59,7 @@ public class HavocFestival extends CardImpl { this.color.setRed(true); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayersCantGainLifeEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); // At the beginning of each player's upkeep, that player loses half his or her life, rounded up. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new HavocFestivalLoseLifeEffect(), TargetController.ANY, false); diff --git a/Mage/src/mage/abilities/AbilitiesImpl.java b/Mage/src/mage/abilities/AbilitiesImpl.java index 21cbe3cfb95..d23614a53a9 100644 --- a/Mage/src/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/mage/abilities/AbilitiesImpl.java @@ -33,15 +33,14 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.UUID; -import mage.constants.Zone; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.costs.AlternativeCost; import mage.abilities.costs.Cost; import mage.abilities.keyword.ProtectionAbility; import mage.abilities.mana.ManaAbility; +import mage.constants.Zone; import mage.game.Game; - /** * * @author BetaSteward_at_googlemail.com @@ -63,12 +62,12 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public AbilitiesImpl copy() { - return new AbilitiesImpl(this); + return new AbilitiesImpl<>(this); } @Override public List getRules(String source) { - List rules = new ArrayList(); + List rules = new ArrayList<>(); for (T ability:this) { if (!ability.getRuleVisible()) { @@ -121,7 +120,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getActivatedAbilities(Zone zone) { - Abilities zonedAbilities = new AbilitiesImpl(); + Abilities zonedAbilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof ActivatedAbility && ability.getZone().match(zone)) { zonedAbilities.add((ActivatedAbility)ability); @@ -132,7 +131,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getManaAbilities(Zone zone) { - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof ManaAbility && ability.getZone().match(zone)) { abilities.add((ManaAbility)ability); @@ -143,7 +142,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getAvailableManaAbilities(Zone zone, Game game) { - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof ManaAbility && ability.getZone().match(zone)) { if ((((ManaAbility)ability).canActivate(ability.getControllerId(), game))) { @@ -156,7 +155,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getEvasionAbilities() { - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof EvasionAbility) { abilities.add((EvasionAbility)ability); @@ -167,7 +166,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getStaticAbilities(Zone zone) { - Abilities zonedAbilities = new AbilitiesImpl(); + Abilities zonedAbilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof StaticAbility && ability.getZone().match(zone)) { zonedAbilities.add((StaticAbility)ability); @@ -178,7 +177,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getTriggeredAbilities(Zone zone) { - Abilities zonedAbilities = new AbilitiesImpl(); + Abilities zonedAbilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof TriggeredAbility && ability.getZone().match(zone)) { zonedAbilities.add((TriggeredAbility)ability); @@ -195,7 +194,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public Abilities getProtectionAbilities() { - Abilities abilities = new AbilitiesImpl(); + Abilities abilities = new AbilitiesImpl<>(); for (T ability: this) { if (ability instanceof ProtectionAbility) { abilities.add((ProtectionAbility)ability); @@ -305,7 +304,7 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public String getValue() { - List abilities = new ArrayList(); + List abilities = new ArrayList<>(); for (T ability: this) { if (ability.toString() != null) { abilities.add(ability.toString()); diff --git a/Mage/src/mage/abilities/effects/common/continious/PlayersCantGainLifeEffect.java b/Mage/src/mage/abilities/effects/common/continious/CantGainLifeAllEffect.java similarity index 86% rename from Mage/src/mage/abilities/effects/common/continious/PlayersCantGainLifeEffect.java rename to Mage/src/mage/abilities/effects/common/continious/CantGainLifeAllEffect.java index d7b9ed8a145..993f777b219 100644 --- a/Mage/src/mage/abilities/effects/common/continious/PlayersCantGainLifeEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/CantGainLifeAllEffect.java @@ -41,13 +41,13 @@ import mage.players.Player; * * @author LevelX2 */ -public class PlayersCantGainLifeEffect extends ContinuousEffectImpl { +public class CantGainLifeAllEffect extends ContinuousEffectImpl { - public PlayersCantGainLifeEffect() { + public CantGainLifeAllEffect() { this(Duration.WhileOnBattlefield); } - public PlayersCantGainLifeEffect(Duration duration) { + public CantGainLifeAllEffect(Duration duration) { super(duration, Layer.PlayerEffects, SubLayer.NA, Outcome.Benefit); StringBuilder sb = new StringBuilder("Players can't gain life"); if (!this.duration.toString().isEmpty()) { @@ -56,13 +56,13 @@ public class PlayersCantGainLifeEffect extends ContinuousEffectImpl