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

CreateTokenEffect already adds the article

Browse source 
don't want to end up with "a a 3/3 colorless Golem"

and also fixed fix tapped token rules text, which has changed
This commit is contained in:
Neil Gentleman 2016-07-15 22:17:13 -07:00
parent 296e0a9a49
commit 813c8cdd8a
79 changed files with 142 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java
View file

@ -111,19 +111,24 @@ public class CreateTokenEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder("create ");
if (amount.toString().equals("1")) {
sb.append("a ").append(token.getDescription());
sb.append("a ");
if (tapped && !attacking) {
sb.append("tapped ");
}
sb.append(token.getDescription());
} else {
sb.append(CardUtil.numberToText(amount.toString())).append(" ").append(token.getDescription());
sb.append(CardUtil.numberToText(amount.toString())).append(" ");
if (tapped && !attacking) {
sb.append("tapped ");
}
sb.append(token.getDescription());
if (token.getDescription().endsWith("token")) {
sb.append("s ");
}
}
if (tapped) {
sb.append(" tapped");
}
if (attacking) {
if (tapped) {
sb.append(" and");
sb.append(" tapped and");
}
sb.append(" attacking");
}

6
Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java
View file

@ -1,17 +1,11 @@
package mage.abilities.keyword;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.constants.CardType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.GermToken;
import mage.game.permanent.token.Token;
import mage.players.Player;
public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility {

2
Mage/src/main/java/mage/game/permanent/token/GolemToken.java
View file

@ -51,7 +51,7 @@ public class GolemToken extends Token {
}
public GolemToken(String setCode) {
super("Golem", "a 3/3 colorless Golem artifact creature token");
super("Golem", "3/3 colorless Golem artifact creature token");
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);

2
Mage/src/main/java/mage/game/permanent/token/WurmToken.java
View file

@ -36,7 +36,7 @@ import mage.constants.CardType;
public class WurmToken extends Token {
public WurmToken() {
super("Wurm", "a 6/6 green Wurm creature token");
super("Wurm", "6/6 green Wurm creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add("Wurm");