External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor formatting and changes.

Browse source
This commit is contained in:
LevelX2 2014-03-20 00:58:33 +01:00
parent b0fffd9f7e
commit 7a2bc8b0ef
8 changed files with 36 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/sets/championsofkamigawa/BudokaGardener.java
View file

@ -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<BudokaGardenerEffect> {
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)) {

14
Mage.Sets/src/mage/sets/championsofkamigawa/NezumiGraverobber.java
View file

@ -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
*/

4
Mage.Sets/src/mage/sets/commander2013/WitchHunt.java
View file

@ -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<WitchHunt> {
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.

4
Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java
View file

@ -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<Skullcrack> {
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));

4
Mage.Sets/src/mage/sets/magic2011/LeylineOfPunishment.java
View file

@ -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<LeylineOfPunishment> {
// 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()));
}

4
Mage.Sets/src/mage/sets/returntoravnica/HavocFestival.java
View file

@ -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<HavocFestival> {
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);

23
Mage/src/mage/abilities/AbilitiesImpl.java
View file

@ -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<T extends Ability> extends ArrayList<T> implements Ab
@Override
public AbilitiesImpl<T> copy() {
return new AbilitiesImpl<T>(this);
return new AbilitiesImpl<>(this);
}
@Override
public List<String> getRules(String source) {
List<String> rules = new ArrayList<String>();
List<String> rules = new ArrayList<>();
for (T ability:this) {
if (!ability.getRuleVisible()) {
@ -121,7 +120,7 @@ public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<ActivatedAbility> getActivatedAbilities(Zone zone) {
Abilities<ActivatedAbility> zonedAbilities = new AbilitiesImpl<ActivatedAbility>();
Abilities<ActivatedAbility> 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<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<ManaAbility> getManaAbilities(Zone zone) {
Abilities<ManaAbility> abilities = new AbilitiesImpl<ManaAbility>();
Abilities<ManaAbility> 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<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<ManaAbility> getAvailableManaAbilities(Zone zone, Game game) {
Abilities<ManaAbility> abilities = new AbilitiesImpl<ManaAbility>();
Abilities<ManaAbility> 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<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<EvasionAbility> getEvasionAbilities() {
Abilities<EvasionAbility> abilities = new AbilitiesImpl<EvasionAbility>();
Abilities<EvasionAbility> abilities = new AbilitiesImpl<>();
for (T ability: this) {
if (ability instanceof EvasionAbility) {
abilities.add((EvasionAbility)ability);
@ -167,7 +166,7 @@ public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<StaticAbility> getStaticAbilities(Zone zone) {
Abilities<StaticAbility> zonedAbilities = new AbilitiesImpl<StaticAbility>();
Abilities<StaticAbility> 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<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<TriggeredAbility> getTriggeredAbilities(Zone zone) {
Abilities<TriggeredAbility> zonedAbilities = new AbilitiesImpl<TriggeredAbility>();
Abilities<TriggeredAbility> 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<T extends Ability> extends ArrayList<T> implements Ab
@Override
public Abilities<ProtectionAbility> getProtectionAbilities() {
Abilities<ProtectionAbility> abilities = new AbilitiesImpl<ProtectionAbility>();
Abilities<ProtectionAbility> abilities = new AbilitiesImpl<>();
for (T ability: this) {
if (ability instanceof ProtectionAbility) {
abilities.add((ProtectionAbility)ability);
@ -305,7 +304,7 @@ public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Ab
@Override
public String getValue() {
List<String> abilities = new ArrayList<String>();
List<String> abilities = new ArrayList<>();
for (T ability: this) {
if (ability.toString() != null) {
abilities.add(ability.toString());

12
Mage/src/mage/abilities/effects/common/continious/PlayersCantGainLifeEffect.java → Mage/src/mage/abilities/effects/common/continious/CantGainLifeAllEffect.java
View file

@ -41,13 +41,13 @@ import mage.players.Player;
*
* @author LevelX2
*/
public class PlayersCantGainLifeEffect extends ContinuousEffectImpl<PlayersCantGainLifeEffect> {
public class CantGainLifeAllEffect extends ContinuousEffectImpl<CantGainLifeAllEffect> {
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<PlayersCantG
staticText = sb.toString();
}
public PlayersCantGainLifeEffect(final PlayersCantGainLifeEffect effect) {
public CantGainLifeAllEffect(final CantGainLifeAllEffect effect) {
super(effect);
}
@Override
public PlayersCantGainLifeEffect copy() {
return new PlayersCantGainLifeEffect(this);
public CantGainLifeAllEffect copy() {
return new CantGainLifeAllEffect(this);
}
@Override