github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix text on some random cards

Browse source
This commit is contained in:
Neil Gentleman 2015-11-23 23:18:07 -08:00
parent b215e9c32c
commit 95f14536eb
18 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java
View file

@ -54,7 +54,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
*/
public class AboshanCephalidEmperor extends CardImpl {
static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("untapped Cephalid");
static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("untapped Cephalid you control");
static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures without flying");
static {

6
Mage.Sets/src/mage/cards/a/AcceptableLosses.java
View file

@ -28,12 +28,12 @@
package mage.cards.a;
import java.util.UUID;
import mage.abilities.costs.common.DiscardTargetCost;
import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.target.common.TargetCardInHand;
import mage.target.common.TargetCreaturePermanent;
/**
@ -47,7 +47,7 @@ public class AcceptableLosses extends CardImpl {
// As an additional cost to cast Acceptable Losses, discard a card at random.
this.getSpellAbility().addCost(new DiscardTargetCost(new TargetCardInHand(), true));
this.getSpellAbility().addCost(new DiscardCardCost(true));
// Acceptable Losses deals 5 damage to target creature.
this.getSpellAbility().addEffect(new DamageTargetEffect(5));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());

2
Mage.Sets/src/mage/cards/a/AgelessEntity.java
View file

@ -71,7 +71,7 @@ class AgelessEntityEffect extends OneShotEffect {
public AgelessEntityEffect() {
super(Outcome.Benefit);
this.staticText = "put that many +1/+1 counters on this creature";
this.staticText = "put that many +1/+1 counters on {this}";
}
public AgelessEntityEffect(final AgelessEntityEffect effect) {

3
Mage.Sets/src/mage/cards/a/AlphaKavu.java
View file

@ -45,11 +45,10 @@ import mage.target.common.TargetCreaturePermanent;
/**
*
* @author LoneFox
*/
public class AlphaKavu extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kavu");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kavu creature");
static {
filter.add(new SubtypePredicate("Kavu"));

2
Mage.Sets/src/mage/cards/a/AltarGolem.java
View file

@ -56,7 +56,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
*/
public class AltarGolem extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
static {
filter.add(Predicates.not(new TappedPredicate()));

2
Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java
View file

@ -67,7 +67,7 @@ public class AnyaMercilessAngel extends CardImpl {
// Anya, Merciless Angel gets +3/+3 for each opponent whose life total is less than half his or her starting life total.
DynamicValue dValue = new MultipliedValue(new AnyaMercilessAngelDynamicValue(), 3);
Effect effect = new BoostSourceEffect(dValue, dValue, Duration.WhileOnBattlefield);
effect.setText("{this{ gets +3/+3 for each opponent whose life total is less than half his or her starting life total");
effect.setText("{this} gets +3/+3 for each opponent whose life total is less than half his or her starting life total");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(dValue, dValue, Duration.WhileOnBattlefield)));
// As long as an opponent's life total is less than half his or her starting life total, Anya has indestructible.

2
Mage.Sets/src/mage/cards/a/ArachnusSpinner.java
View file

@ -60,7 +60,7 @@ import mage.target.common.TargetCreaturePermanent;
*/
public class ArachnusSpinner extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Spider");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Spider you control");
static {
filter.add(new SubtypePredicate("Spider"));

2
Mage.Sets/src/mage/cards/a/ArcadesSabboth.java
View file

@ -55,7 +55,7 @@ import mage.filter.predicate.permanent.TappedPredicate;
*/
public class ArcadesSabboth extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control");
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped nonattacking creatures you control");
static {
filter.add(new ControllerPredicate(TargetController.YOU));

2
Mage.Sets/src/mage/cards/a/AvatarOfMight.java
View file

@ -79,7 +79,7 @@ class AvatarOfMightCostReductionEffect extends CostModificationEffectImpl {
AvatarOfMightCostReductionEffect() {
super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST);
staticText = "If an opponent controls at least four more creatures than you, {this} will costs {6} less to cast";
staticText = "If an opponent controls at least four more creatures than you, {this} costs {6} less to cast";
}
AvatarOfMightCostReductionEffect(final AvatarOfMightCostReductionEffect effect) {

2
Mage.Sets/src/mage/cards/a/AvatarOfWill.java
View file

@ -78,7 +78,7 @@ class AvatarOfWillCostReductionEffect extends CostModificationEffectImpl {
AvatarOfWillCostReductionEffect() {
super(Duration.Custom, Outcome.Benefit, CostModificationType.REDUCE_COST);
staticText = "If an opponent has no cards in hand, {this} will costs {6} less to cast";
staticText = "If an opponent has no cards in hand, {this} costs {6} less to cast";
}
AvatarOfWillCostReductionEffect(final AvatarOfWillCostReductionEffect effect) {

4
Mage.Sets/src/mage/cards/b/BalancingAct.java
View file

@ -73,7 +73,7 @@ class BalancingActEffect extends OneShotEffect {
public BalancingActEffect() {
super(Outcome.Sacrifice);
staticText = "Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players sacrifice creatures and discard cards the same way";
staticText = "Each player chooses a number of permanents he or she controls equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way";
}
public BalancingActEffect(final BalancingActEffect effect) {
@ -90,7 +90,7 @@ class BalancingActEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
int minPermanent = Integer.MAX_VALUE, minCard = Integer.MAX_VALUE;
// count minimal permanets
// count minimal permanents
for(UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)){
Player player = game.getPlayer(playerId);
if(player != null){

2
Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java
View file

@ -58,7 +58,7 @@ public class BaneOfTheLiving extends CardImpl {
this.addAbility(new MorphAbility(this, new ManaCostsImpl("{X}{B}{B}")));
// When Bane of the Living is turned face up, all creatures get -X/-X until end of turn.
DynamicValue morphX = new SignInversionDynamicValue(new MorphManacostVariableValue());
this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostAllEffect(morphX, morphX, Duration.EndOfTurn, new FilterCreaturePermanent(), false, "", true)));
this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostAllEffect(morphX, morphX, Duration.EndOfTurn, new FilterCreaturePermanent("all creatures"), false, "", true)));
}
public BaneOfTheLiving(final BaneOfTheLiving card) {

3
Mage.Sets/src/mage/cards/b/BlurSliver.java
View file

@ -54,7 +54,8 @@ public class BlurSliver extends CardImpl {
// Sliver creatures you control have haste.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Sliver","Sliver creatures"))));
new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield,
new FilterControlledCreaturePermanent("Sliver", "Sliver creatures you control"))));
}

2
Mage.Sets/src/mage/cards/c/CoastalDiscovery.java
View file

@ -46,7 +46,7 @@ public class CoastalDiscovery extends CardImpl {
// Draw two cards.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2));
// Awaken 4 - {5}U}
// Awaken 4 - {5}{U}
this.addAbility(new AwakenAbility(this, 4, "{5}{U}"));
}

2
Mage.Sets/src/mage/cards/p/Pestilence.java
View file

@ -50,7 +50,7 @@ import mage.game.events.GameEvent;
*/
public class Pestilence extends CardImpl {
private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pestilence.";
private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice {this}.";
public Pestilence(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}");

2
Mage.Sets/src/mage/cards/p/Pyrohemia.java
View file

@ -49,7 +49,7 @@ import mage.game.events.GameEvent;
*/
public class Pyrohemia extends CardImpl {
private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pyrohemia.";
private static final String ruleText = "At the beginning of the end step, if no creatures are on the battlefield, sacrifice {this}.";
public Pyrohemia(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}");

8
Mage.Sets/src/mage/cards/z/ZoZuThePunisher.java
View file

@ -36,8 +36,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -51,12 +49,6 @@ import mage.target.targetpointer.FixedTarget;
*/
public class ZoZuThePunisher extends CardImpl {
private static final FilterCard filter = new FilterCard("legendary spell");
static {
filter.add(new SupertypePredicate("Legendary"));
}
public ZoZuThePunisher(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}");
this.supertype.add("Legendary");

10
Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java
View file

@ -83,6 +83,14 @@ public class RevealTargetPlayerLibraryEffect extends OneShotEffect {
}
private String setText() {
return "Reveal the top " + CardUtil.numberToText(amountCards.toString()) + " cards of target player's library.";
String number = amountCards.toString();
StringBuilder sb = new StringBuilder("Reveal the top ");
if ("1".equals(number)) {
sb.append("card");
} else {
sb.append(CardUtil.numberToText(number)).append(" cards");
}
sb.append(" of target player's library.");
return sb.toString();
}
}