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

Fix formatting in several card files

Browse source
This commit is contained in:
Fenhl 2016-05-16 02:01:09 +00:00
parent eb50790b97
commit 77b32014f6
35 changed files with 493 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/championsofkamigawa/LongForgottenGohei.java
View file

@ -72,6 +72,7 @@ public class LongForgottenGohei extends CardImpl {
public LongForgottenGohei(final LongForgottenGohei card) {
super(card);
}
@Override
public LongForgottenGohei copy() {
return new LongForgottenGohei(this);

1
Mage.Sets/src/mage/sets/championsofkamigawa/YamabushisFlame.java
View file

@ -49,7 +49,6 @@ public class YamabushisFlame extends CardImpl {
super(ownerId, 198, "Yamabushi's Flame", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
this.expansionSetCode = "CHK";
// Yamabushi's Flame deals 3 damage to target creature or player.
this.getSpellAbility().addEffect(new DamageTargetEffect(3));
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());

4
Mage.Sets/src/mage/sets/coldsnap/ThrummingStone.java
View file

@ -73,7 +73,6 @@ public class ThrummingStone extends CardImpl {
public ThrummingStone copy() {
return new ThrummingStone(this);
}
}
class ThrummingStoneGainAbilitySpellsEffect extends ContinuousEffectImpl {
@ -81,7 +80,6 @@ class ThrummingStoneGainAbilitySpellsEffect extends ContinuousEffectImpl {
private final Ability ability;
private final FilterSpell filter;
public ThrummingStoneGainAbilitySpellsEffect(Ability ability, FilterSpell filter) {
super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
this.ability = ability;
@ -121,5 +119,3 @@ class ThrummingStoneGainAbilitySpellsEffect extends ContinuousEffectImpl {
return false;
}
}

53
Mage.Sets/src/mage/sets/eighthedition/Rhox.java
View file

@ -1 +1,52 @@
/* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */package mage.sets.eighthedition;import java.util.UUID;/** * * @author Backfir3 */public class Rhox extends mage.sets.tenthedition.Rhox { public Rhox(UUID ownerId) { super(ownerId); this.cardNumber = 277; this.expansionSetCode = "8ED"; } public Rhox(final Rhox card) { super(card); } @Override public Rhox copy() { return new Rhox(this); }}
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.eighthedition;
import java.util.UUID;
/**
*
* @author Backfir3
*/
public class Rhox extends mage.sets.tenthedition.Rhox {
public Rhox(UUID ownerId) {
super(ownerId);
this.cardNumber = 277;
this.expansionSetCode = "8ED";
}
public Rhox(final Rhox card) {
super(card);
}
@Override
public Rhox copy() {
return new Rhox(this);
}
}

1
Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java
View file

@ -50,7 +50,6 @@ public class AssembleTheLegion extends CardImpl {
super(ownerId, 142, "Assemble the Legion", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{W}");
this.expansionSetCode = "GTC";
// At the beginning of your upkeep, put a muster counter on Assemble the Legion. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on Assemble the Legion.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.MUSTER.createInstance()), TargetController.YOU, false);
ability.addEffect(new CreateTokenEffect(new SoldierTokenWithHaste(), new CountersCount(CounterType.MUSTER)));

1
Mage.Sets/src/mage/sets/gatecrash/NightveilSpecter.java
View file

@ -135,7 +135,6 @@ class NightveilSpecterEffect extends AsThoughEffectImpl {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
return true;

1
Mage.Sets/src/mage/sets/gatecrash/ThrullParasite.java
View file

@ -57,6 +57,7 @@ public class ThrullParasite extends CardImpl {
// Extort
this.addAbility(new ExtortAbility());
// {tap}, Pay 2 life: Remove a counter from target nonland permanent.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(), new TapSourceCost());
ability.addTarget(new TargetNonlandPermanent());

1
Mage.Sets/src/mage/sets/mercadianmasques/CateranBrute.java
View file

@ -81,5 +81,4 @@ public class CateranBrute extends CardImpl {
public CateranBrute copy() {
return new CateranBrute(this);
}
}

3
Mage.Sets/src/mage/sets/mercadianmasques/CateranEnforcer.java
View file

@ -68,7 +68,9 @@ public class CateranEnforcer extends CardImpl {
this.power = new MageInt(4);
this.toughness = new MageInt(3);
// Fear
this.addAbility(FearAbility.getInstance());
// {4}, {T}: Search your library for a Mercenary permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost());
ability.addManaCost(new GenericManaCost(4));
@ -83,5 +85,4 @@ public class CateranEnforcer extends CardImpl {
public CateranEnforcer copy() {
return new CateranEnforcer(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/CateranKidnappers.java
View file

@ -81,5 +81,4 @@ public class CateranKidnappers extends CardImpl {
public CateranKidnappers copy() {
return new CateranKidnappers(this);
}
}

2
Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java
View file

@ -73,6 +73,7 @@ public class CateranOverlord extends CardImpl {
// Sacrifice a creature: Regenerate Cateran Overlord.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent())));
// {6}, {T}: Search your library for a Mercenary permanent card with converted mana cost 6 or less and put it onto the battlefield. Then shuffle your library.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost());
ability.addManaCost(new GenericManaCost(6));
@ -87,5 +88,4 @@ public class CateranOverlord extends CardImpl {
public CateranOverlord copy() {
return new CateranOverlord(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/CateranPersuader.java
View file

@ -81,5 +81,4 @@ public class CateranPersuader extends CardImpl {
public CateranPersuader copy() {
return new CateranPersuader(this);
}
}

3
Mage.Sets/src/mage/sets/mercadianmasques/CateranSlaver.java
View file

@ -68,7 +68,9 @@ public class CateranSlaver extends CardImpl {
this.power = new MageInt(5);
this.toughness = new MageInt(5);
// Swampwalk
this.addAbility(new SwampwalkAbility());
// {5}, {T}: Search your library for a Mercenary permanent card with converted mana cost 5 or less and put it onto the battlefield. Then shuffle your library.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost());
ability.addManaCost(new GenericManaCost(5));
@ -83,5 +85,4 @@ public class CateranSlaver extends CardImpl {
public CateranSlaver copy() {
return new CateranSlaver(this);
}
}

2
Mage.Sets/src/mage/sets/mercadianmasques/CateranSummons.java
View file

@ -54,7 +54,6 @@ public class CateranSummons extends CardImpl {
super(ownerId, 126, "Cateran Summons", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}");
this.expansionSetCode = "MMQ";
// Search your library for a Mercenary card, reveal that card, and put it into your hand. Then shuffle your library.
this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true));
}
@ -67,5 +66,4 @@ public class CateranSummons extends CardImpl {
public CateranSummons copy() {
return new CateranSummons(this);
}
}

3
Mage.Sets/src/mage/sets/mercadianmasques/MoltingHarpy.java
View file

@ -54,7 +54,9 @@ public class MoltingHarpy extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Flying
this.addAbility(FlyingAbility.getInstance());
// At the beginning of your upkeep, sacrifice Molting Harpy unless you pay {2}.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{2}")), TargetController.YOU, false));
}
@ -67,5 +69,4 @@ public class MoltingHarpy extends CardImpl {
public MoltingHarpy copy() {
return new MoltingHarpy(this);
}
}

2
Mage.Sets/src/mage/sets/mercadianmasques/NightwindGlider.java
View file

@ -62,6 +62,7 @@ public class NightwindGlider extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Protection from black
this.addAbility(new ProtectionAbility(filter));
}
@ -74,5 +75,4 @@ public class NightwindGlider extends CardImpl {
public NightwindGlider copy() {
return new NightwindGlider(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/PrimevalShambler.java
View file

@ -66,5 +66,4 @@ public class PrimevalShambler extends CardImpl {
public PrimevalShambler copy() {
return new PrimevalShambler(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/RamosianCaptain.java
View file

@ -85,5 +85,4 @@ public class RamosianCaptain extends CardImpl {
public RamosianCaptain copy() {
return new RamosianCaptain(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/RamosianCommander.java
View file

@ -81,5 +81,4 @@ public class RamosianCommander extends CardImpl {
public RamosianCommander copy() {
return new RamosianCommander(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/RamosianLieutenant.java
View file

@ -81,5 +81,4 @@ public class RamosianLieutenant extends CardImpl {
public RamosianLieutenant copy() {
return new RamosianLieutenant(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/RamosianSergeant.java
View file

@ -81,5 +81,4 @@ public class RamosianSergeant extends CardImpl {
public RamosianSergeant copy() {
return new RamosianSergeant(this);
}
}

2
Mage.Sets/src/mage/sets/mercadianmasques/RampartCrawler.java
View file

@ -46,6 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
public class RampartCrawler extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls");
static {
filter.add(new SubtypePredicate("Wall"));
}
@ -71,5 +72,4 @@ public class RampartCrawler extends CardImpl {
public RampartCrawler copy() {
return new RampartCrawler(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/SkulkingFugitive.java
View file

@ -63,5 +63,4 @@ public class SkulkingFugitive extends CardImpl {
public SkulkingFugitive copy() {
return new SkulkingFugitive(this);
}
}

1
Mage.Sets/src/mage/sets/mercadianmasques/StrongarmThug.java
View file

@ -75,5 +75,4 @@ public class StrongarmThug extends CardImpl {
public StrongarmThug copy() {
return new StrongarmThug(this);
}
}

2
Mage.Sets/src/mage/sets/mercadianmasques/ThermalGlider.java
View file

@ -62,6 +62,7 @@ public class ThermalGlider extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Protection from red
this.addAbility(new ProtectionAbility(filter));
}
@ -74,5 +75,4 @@ public class ThermalGlider extends CardImpl {
public ThermalGlider copy() {
return new ThermalGlider(this);
}
}

1
Mage.Sets/src/mage/sets/planarchaos/HeroesRemembered.java
View file

@ -29,5 +29,4 @@ public class HeroesRemembered extends CardImpl{
public Card copy() {
return new HeroesRemembered(this);
}
}

2
Mage.Sets/src/mage/sets/planechase2012/ShardlessAgent.java
View file

@ -51,7 +51,6 @@ public class ShardlessAgent extends CardImpl {
// Cascade
this.addAbility(new CascadeAbility());
}
public ShardlessAgent(final ShardlessAgent card) {
@ -63,4 +62,3 @@ public class ShardlessAgent extends CardImpl {
return new ShardlessAgent(this);
}
}

2
Mage.Sets/src/mage/sets/ravnica/Overwhelm.java
View file

@ -45,7 +45,6 @@ public class Overwhelm extends CardImpl {
super(ownerId, 175, "Overwhelm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{5}{G}{G}");
this.expansionSetCode = "RAV";
// Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.)
this.addAbility(new ConvokeAbility());
@ -62,4 +61,3 @@ public class Overwhelm extends CardImpl {
return new Overwhelm(this);
}
}

1
Mage.Sets/src/mage/sets/saviorsofkamigawa/InnerCalmOuterStrength.java
View file

@ -49,7 +49,6 @@ public class InnerCalmOuterStrength extends CardImpl {
this.expansionSetCode = "SOK";
this.subtype.add("Arcane");
// Target creature gets +X/+X until end of turn, where X is the number of cards in your hand.
DynamicValue xValue= new CardsInControllerHandCount();
Effect effect = new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true);

1
Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java
View file

@ -52,7 +52,6 @@ public class CrownOfFlames extends CardImpl {
this.expansionSetCode = "TMP";
this.subtype.add("Aura");
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);

4
Mage.Sets/src/mage/sets/tenthedition/Condemn.java
View file

@ -55,9 +55,9 @@ public class Condemn extends CardImpl {
// Put target attacking creature on the bottom of its owner's library.
this.getSpellAbility().addTarget(new TargetAttackingCreature());
this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false));
// Its controller gains life equal to its toughness.
this.getSpellAbility().addEffect(new CondemnEffect());
}
public Condemn(final Condemn card) {
@ -68,7 +68,6 @@ public class Condemn extends CardImpl {
public Condemn copy() {
return new Condemn(this);
}
}
class CondemnEffect extends OneShotEffect {
@ -99,5 +98,4 @@ class CondemnEffect extends OneShotEffect {
}
return false;
}
}

4
Mage.Sets/src/mage/sets/theros/TriadOfFates.java
View file

@ -61,6 +61,7 @@ public class TriadOfFates extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
private static final FilterCreaturePermanent filterCounter = new FilterCreaturePermanent("creature that has a fate counter on it");
static {
filter.add(new AnotherPredicate());
filterCounter.add(new CounterPredicate(CounterType.FATE));
@ -82,6 +83,7 @@ public class TriadOfFates extends CardImpl {
Target target = new TargetCreaturePermanent(filter);
ability.addTarget(target);
this.addAbility(ability);
// {W}, {T}: Exile target creature that has a fate counter on it, then return it to the battlefield under its owner's control.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect(), new ManaCostsImpl("{W}"));
ability.addCost(new TapSourceCost());
@ -89,6 +91,7 @@ public class TriadOfFates extends CardImpl {
ability.addTarget(target);
ability.addEffect(new ReturnToBattlefieldUnderOwnerControlTargetEffect());
this.addAbility(ability);
// {B}, {T}: Exile target creature that has a fate counter on it. Its controller draws two cards.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{B}"));
ability.addCost(new TapSourceCost());
@ -96,7 +99,6 @@ public class TriadOfFates extends CardImpl {
ability.addTarget(target);
ability.addEffect(new DrawCardControllerTargetEffect());
this.addAbility(ability);
}
public TriadOfFates(final TriadOfFates card) {