Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[40K] various text fixes

Browse source
This commit is contained in:
theelk801 2023-04-30 15:26:40 -04:00
parent b3a421d094
commit df322c680c
33 changed files with 105 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -2,6 +2,7 @@ package mage.abilities;
import mage.MageIdentifier;
import mage.MageObject;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.costs.*;
import mage.abilities.costs.common.PayLifeCost;
@ -821,7 +822,7 @@ public abstract class AbilityImpl implements Ability {
rule = ruleStart;
}
String prefix;
if (this instanceof TriggeredAbility) {
if (this instanceof TriggeredAbility || this instanceof EntersBattlefieldAbility) {
prefix = null;
} else if (abilityWord != null) {
prefix = abilityWord.formatWord();

34
Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java
View file

@ -6,9 +6,9 @@ import mage.abilities.condition.Condition;
import mage.abilities.effects.Effect;
import mage.abilities.effects.EntersBattlefieldEffect;
import mage.constants.Zone;
import mage.util.CardUtil;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class EntersBattlefieldAbility extends StaticAbility {
@ -21,9 +21,8 @@ public class EntersBattlefieldAbility extends StaticAbility {
}
/**
*
* @param effect effect that happens when the permanent enters the
* battlefield
* @param effect effect that happens when the permanent enters the
* battlefield
* @param optional
*/
public EntersBattlefieldAbility(Effect effect, boolean optional) {
@ -39,14 +38,13 @@ public class EntersBattlefieldAbility extends StaticAbility {
}
/**
*
* @param effect effect that happens when the permanent enters the
* battlefield
* @param effect effect that happens when the permanent enters the
* battlefield
* @param optional
* @param condition only if this condition is true, the effect will happen
* @param condition only if this condition is true, the effect will happen
* @param abilityRule rule for this ability (no text from effects will be
* added)
* @param effectText this text will be used for the EnterBattlefieldEffect
* added)
* @param effectText this text will be used for the EnterBattlefieldEffect
*/
public EntersBattlefieldAbility(Effect effect, boolean optional, Condition condition, String abilityRule, String effectText) {
super(Zone.ALL, new EntersBattlefieldEffect(effect, condition, effectText, true, optional));
@ -83,7 +81,19 @@ public class EntersBattlefieldAbility extends StaticAbility {
return abilityRule;
}
String superRule = super.getRule();
return (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") + " the battlefield"
+ (!superRule.isEmpty() && superRule.charAt(0) == ' ' ? "" : " ") + superRule;
String prefix;
if (abilityWord != null) {
prefix = abilityWord.formatWord();
} else if (flavorWord != null) {
prefix = CardUtil.italicizeWithEmDash(flavorWord);
} else {
prefix = null;
}
String rule = (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") +
" the battlefield" + (!superRule.isEmpty() && superRule.charAt(0) == ' ' ? "" : " ") + superRule;
if (prefix != null) {
return prefix + CardUtil.getTextWithFirstCharUpperCase(rule);
}
return rule;
}
}

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

@ -15,7 +15,7 @@ import mage.target.common.TargetAnyTarget;
public final class BlueHorrorToken extends TokenImpl {
public BlueHorrorToken() {
super("Blue Horror", "2/2 blue and red Demon Horror creature token named Blue Horror. It has \"Whenever you cast an instant or sorcery spell, this creature deals 1 damage to any target.\"");
super("Blue Horror", "2/2 blue and red Demon Horror creature token named Blue Horror with \"Whenever you cast an instant or sorcery spell, this creature deals 1 damage to any target.\"");
cardType.add(CardType.CREATURE);
color.setBlue(true);
color.setRed(true);

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

@ -13,7 +13,7 @@ import java.util.Arrays;
public final class TyranidGargoyleToken extends TokenImpl {
public TyranidGargoyleToken() {
super("Tyranid Gargoyle Token", "1/1 blue Tyranid creature token with flying");
super("Tyranid Gargoyle Token", "1/1 blue Tyranid Gargoyle creature token with flying");
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add(SubType.TYRANID);

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

@ -13,7 +13,7 @@ import java.util.Arrays;
public final class WhiteAstartesWarriorToken extends TokenImpl {
public WhiteAstartesWarriorToken() {
super("Astartes Warrior Token", "2/2 white Astartes Warrior creature tokens with vigilance");
super("Astartes Warrior Token", "2/2 white Astartes Warrior creature token with vigilance");
cardType.add(CardType.CREATURE);
color.setWhite(true);
subtype.add(SubType.ASTARTES);