github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added effect.setText to Vorrac Battlehorns and Alpha Authority. Removed capitalization from black on Cho-Arrim Legate and Knight of Glory.

Browse source
This commit is contained in:
fireshoes 2015-07-22 01:46:00 -05:00
parent f1cac2954a
commit 929a95a74d
4 changed files with 226 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

286
Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java
View file

@ -1,142 +1,144 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets.gatecrash; package mage.sets.gatecrash;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability;
import mage.constants.AttachmentType; import mage.abilities.common.SimpleStaticAbility;
import mage.constants.CardType; import mage.abilities.effects.ContinuousEffectImpl;
import mage.constants.Duration; import mage.abilities.effects.Effect;
import mage.constants.Layer; import mage.abilities.effects.common.AttachEffect;
import mage.constants.Outcome; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
import mage.constants.Rarity; import mage.abilities.keyword.EnchantAbility;
import mage.constants.SubLayer; import mage.abilities.keyword.HexproofAbility;
import mage.constants.Zone; import mage.cards.CardImpl;
import mage.abilities.Ability; import mage.constants.AttachmentType;
import mage.abilities.common.SimpleStaticAbility; import mage.constants.CardType;
import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.Duration;
import mage.abilities.effects.common.AttachEffect; import mage.constants.Layer;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.constants.Outcome;
import mage.abilities.keyword.EnchantAbility; import mage.constants.Rarity;
import mage.abilities.keyword.HexproofAbility; import mage.constants.SubLayer;
import mage.cards.CardImpl; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import mage.util.CardUtil; import mage.util.CardUtil;
/** /**
* *
* @author LevelX2 * @author LevelX2
*/ */
public class AlphaAuthority extends CardImpl { public class AlphaAuthority extends CardImpl {
public AlphaAuthority(UUID ownerId) { public AlphaAuthority(UUID ownerId) {
super(ownerId, 114, "Alpha Authority", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); super(ownerId, 114, "Alpha Authority", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
this.expansionSetCode = "GTC"; this.expansionSetCode = "GTC";
this.subtype.add("Aura"); this.subtype.add("Aura");
// Enchant creature // Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent(); TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
Ability ability = new EnchantAbility(auraTarget.getTargetName()); Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability); this.addAbility(ability);
// Enchanted creature has hexproof and can't be blocked by more than one creature. // Enchanted creature has hexproof and can't be blocked by more than one creature.
ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield));
ability.addEffect(new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.AURA,1)); Effect effect = new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.AURA,1);
this.addAbility(ability); effect.setText(" and can't be blocked by more than one creature");
} ability.addEffect(effect);
this.addAbility(ability);
public AlphaAuthority(final AlphaAuthority card) { }
super(card);
} public AlphaAuthority(final AlphaAuthority card) {
super(card);
@Override }
public AlphaAuthority copy() {
return new AlphaAuthority(this); @Override
} public AlphaAuthority copy() {
} return new AlphaAuthority(this);
}
class CantBeBlockedByMoreThanOneAttachedEffect extends ContinuousEffectImpl { }
protected int amount; class CantBeBlockedByMoreThanOneAttachedEffect extends ContinuousEffectImpl {
protected AttachmentType attachmentType;
protected int amount;
public CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType attachmentType, int amount) { protected AttachmentType attachmentType;
this(attachmentType, amount, Duration.WhileOnBattlefield);
} public CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType attachmentType, int amount) {
this(attachmentType, amount, Duration.WhileOnBattlefield);
public CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType attachmentType, int amount, Duration duration) { }
super(duration, Outcome.Benefit);
this.amount = amount; public CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType attachmentType, int amount, Duration duration) {
this.attachmentType = attachmentType; super(duration, Outcome.Benefit);
staticText = (attachmentType.equals(AttachmentType.AURA) ? "Enchanted" : "Equipped") + " creature can't be blocked by more than " + CardUtil.numberToText(amount) + " creature" + (amount==1 ?"":"s"); this.amount = amount;
} this.attachmentType = attachmentType;
staticText = (attachmentType.equals(AttachmentType.AURA) ? "Enchanted" : "Equipped") + " creature can't be blocked by more than " + CardUtil.numberToText(amount) + " creature" + (amount==1 ?"":"s");
public CantBeBlockedByMoreThanOneAttachedEffect(final CantBeBlockedByMoreThanOneAttachedEffect effect) { }
super(effect);
this.amount = effect.amount; public CantBeBlockedByMoreThanOneAttachedEffect(final CantBeBlockedByMoreThanOneAttachedEffect effect) {
this.attachmentType = effect.attachmentType; super(effect);
} this.amount = effect.amount;
this.attachmentType = effect.attachmentType;
@Override }
public CantBeBlockedByMoreThanOneAttachedEffect copy() {
return new CantBeBlockedByMoreThanOneAttachedEffect(this); @Override
} public CantBeBlockedByMoreThanOneAttachedEffect copy() {
return new CantBeBlockedByMoreThanOneAttachedEffect(this);
@Override }
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
switch (layer) { @Override
case RulesEffects: public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Permanent attachment = game.getPermanent(source.getSourceId()); switch (layer) {
if (attachment != null && attachment.getAttachedTo() != null) { case RulesEffects:
Permanent perm = game.getPermanent(attachment.getAttachedTo()); Permanent attachment = game.getPermanent(source.getSourceId());
if (perm != null) { if (attachment != null && attachment.getAttachedTo() != null) {
perm.setMaxBlockedBy(amount); Permanent perm = game.getPermanent(attachment.getAttachedTo());
return true; if (perm != null) {
} perm.setMaxBlockedBy(amount);
} return true;
break; }
} }
return false; break;
} }
return false;
@Override }
public boolean apply(Game game, Ability source) {
return false; @Override
} public boolean apply(Game game, Ability source) {
return false;
@Override }
public boolean hasLayer(Layer layer) {
return layer == Layer.RulesEffects; @Override
} public boolean hasLayer(Layer layer) {
} return layer == Layer.RulesEffects;
}
}

154
Mage.Sets/src/mage/sets/magic2013/KnightOfGlory.java
View file

@ -1,77 +1,77 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets.magic2013; package mage.sets.magic2013;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType; import mage.MageInt;
import mage.constants.Rarity; import mage.ObjectColor;
import mage.MageInt; import mage.abilities.keyword.ExaltedAbility;
import mage.ObjectColor; import mage.abilities.keyword.ProtectionAbility;
import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl;
import mage.abilities.keyword.ProtectionAbility; import mage.constants.CardType;
import mage.cards.CardImpl; import mage.constants.Rarity;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
*/ */
public class KnightOfGlory extends CardImpl { public class KnightOfGlory extends CardImpl {
private static final FilterCard filter = new FilterCard("Black"); private static final FilterCard filter = new FilterCard("black");
static { static {
filter.add(new ColorPredicate(ObjectColor.BLACK)); filter.add(new ColorPredicate(ObjectColor.BLACK));
} }
public KnightOfGlory(UUID ownerId) { public KnightOfGlory(UUID ownerId) {
super(ownerId, 21, "Knight of Glory", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); super(ownerId, 21, "Knight of Glory", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.expansionSetCode = "M13"; this.expansionSetCode = "M13";
this.subtype.add("Human"); this.subtype.add("Human");
this.subtype.add("Knight"); this.subtype.add("Knight");
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Protection from black // Protection from black
this.addAbility(new ProtectionAbility(filter)); this.addAbility(new ProtectionAbility(filter));
// Exalted // Exalted
this.addAbility(new ExaltedAbility()); this.addAbility(new ExaltedAbility());
} }
public KnightOfGlory(final KnightOfGlory card) { public KnightOfGlory(final KnightOfGlory card) {
super(card); super(card);
} }
@Override @Override
public KnightOfGlory copy() { public KnightOfGlory copy() {
return new KnightOfGlory(this); return new KnightOfGlory(this);
} }
} }

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

@ -52,7 +52,7 @@ public class ChoArrimLegate extends CardImpl {
private static final FilterPermanent filterPlains = new FilterPermanent(); private static final FilterPermanent filterPlains = new FilterPermanent();
private static final FilterPermanent filterSwamp = new FilterPermanent(); private static final FilterPermanent filterSwamp = new FilterPermanent();
private static final FilterCard filter = new FilterCard("Black"); private static final FilterCard filter = new FilterCard("black");
static { static {
filterPlains.add(new SubtypePredicate(("Plains"))); filterPlains.add(new SubtypePredicate(("Plains")));

5
Mage.Sets/src/mage/sets/mirrodin/VorracBattlehorns.java
View file

@ -32,6 +32,7 @@ import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.EquipAbility;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TrampleAbility;
@ -61,7 +62,9 @@ public class VorracBattlehorns extends CardImpl {
// Equipped creature has trample and can't be blocked by more than one creature. // Equipped creature has trample and can't be blocked by more than one creature.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT));
ability.addEffect(new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.EQUIPMENT, 1)); Effect effect = new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.EQUIPMENT, 1);
effect.setText(" and can't be blocked by more than one creature");
ability.addEffect(effect);
this.addAbility(ability); this.addAbility(ability);
// Equip {1} // Equip {1}