External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[BRO] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-11-08 18:51:01 -05:00
parent 501e769691
commit 7e550f463f
31 changed files with 58 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java
View file

@ -1,7 +1,6 @@
package mage.abilities.effects.common;
import java.util.List;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
@ -9,8 +8,9 @@ import mage.constants.Outcome;
import mage.game.Game;
import mage.game.command.Emblem;
import java.util.List;
/**
*
* @author nantuko
*/
public class GetEmblemEffect extends OneShotEffect {
@ -47,18 +47,12 @@ public class GetEmblemEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder();
sb.append("you get an emblem with \"");
List<String> rules = emblem.getAbilities().getRules(null);
if (rules.size() == 1) {
for (String s : rules) {
sb.append(s);
}
sb.append('"');
} else if (rules.size() == 2) {
for (String s : rules) {
sb.append(s);
sb.append("\" and \"");
}
sb.append('"');
sb.append(rules.get(0));
if (rules.size() == 2) {
sb.append("\" and \"");
sb.append(rules.get(1));
}
sb.append('"');
return sb.toString();
}
}

3
Mage/src/main/java/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
View file

@ -9,6 +9,7 @@ import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
/**
*
@ -21,7 +22,7 @@ public class TapSourceUnlessPaysEffect extends OneShotEffect {
public TapSourceUnlessPaysEffect(Cost cost) {
super(Outcome.Tap);
this.cost = cost;
staticText = "tap {this} unless you " + cost.getText();
staticText = "tap {this} unless you " + CardUtil.addCostVerb(cost.getText());
}
public TapSourceUnlessPaysEffect(final TapSourceUnlessPaysEffect effect) {

2
Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java
View file

@ -113,6 +113,6 @@ public class BecomesColorSourceEffect extends ContinuousEffectImpl {
return staticText;
}
return "{this} becomes " + (setColor == null ? "the color of your choice" : setColor.getDescription())
+ ' ' + duration.toString();
+ (' ' + duration.toString()).trim();
}
}

7
Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java
View file

@ -1,7 +1,3 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package mage.abilities.effects.common.continuous;
import mage.abilities.Ability;
@ -14,7 +10,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author Noahsark
*/
public class LoseAbilitySourceEffect extends ContinuousEffectImpl {
@ -28,7 +23,7 @@ public class LoseAbilitySourceEffect extends ContinuousEffectImpl {
public LoseAbilitySourceEffect(Ability ability, Duration duration) {
super(duration, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.LoseAbility);
this.ability = ability;
staticText = "{this} loses " + ability.getRule() + ' ' + duration.toString();
staticText = ("{this} loses " + ability.getRule() + ' ' + duration.toString()).trim();
}
public LoseAbilitySourceEffect(final LoseAbilitySourceEffect effect) {

14
Mage/src/main/java/mage/game/command/emblems/SaheeliFiligreeMasterEmblem.java
View file

@ -1,6 +1,5 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect;
@ -18,15 +17,18 @@ public final class SaheeliFiligreeMasterEmblem extends Emblem {
public SaheeliFiligreeMasterEmblem() {
this.setName("Emblem Saheeli");
this.setExpansionSetCodeForImage("BRO");
Ability ability = new SimpleStaticAbility(
this.getAbilities().add(new SimpleStaticAbility(
Zone.COMMAND,
new BoostControlledEffect(
1, 1, Duration.EndOfGame,
StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE
).setText("Artifact creatures you control get +1/+1")
);
ability.addEffect(new SpellsCostReductionControllerEffect(StaticFilters.FILTER_CARD_ARTIFACT, 1)
.setText("Artifact spells you cast cost {1} less to cast"));
this.getAbilities().add(ability);
));
this.getAbilities().add(new SimpleStaticAbility(
Zone.COMMAND,
new SpellsCostReductionControllerEffect(
StaticFilters.FILTER_CARD_ARTIFACT, 1
).setText("Artifact spells you cast cost {1} less to cast")
));
}
}