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

more text fixes

Browse source
This commit is contained in:
Evan Kranzler 2017-10-06 18:28:22 -04:00
parent 3baabe2534
commit bc2bfba02a
37 changed files with 124 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@ public class CantBeRegeneratedSourceEffect extends ContinuousRuleModifyingEffect
return staticText;
}
StringBuilder sb = new StringBuilder();
sb.append(" {this} can't be regenerated");
sb.append("{this} can't be regenerated");
if (!duration.toString().isEmpty()) {
sb.append(' ');
if (duration == Duration.EndOfTurn) {

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

@ -57,7 +57,7 @@ public class ExileSourceEffect extends OneShotEffect {
*/
public ExileSourceEffect(boolean toUniqueExileZone) {
super(Outcome.Exile);
staticText = "Exile {this}";
staticText = "exile {this}";
this.toUniqueExileZone = toUniqueExileZone;
}

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

@ -117,7 +117,7 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect {
}
private String setText() {
StringBuilder sb = new StringBuilder("Reveal the top ");
StringBuilder sb = new StringBuilder("reveal the top ");
sb.append(CardUtil.numberToText(amountCards.toString())).append(" cards of your library. Put all ");
sb.append(filter.getMessage());
sb.append(" revealed this way into your hand and the rest ");

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

@ -191,7 +191,7 @@ public class BecomesBasicLandTargetEffect extends ContinuousEffectImpl {
private String setText() {
StringBuilder sb = new StringBuilder();
if (chooseLandType) {
sb.append("Target land becomes the basic land type of your choice ");
sb.append("Target land becomes the basic land type of your choice");
} else {
sb.append("Target land becomes a ");
int i = 1;

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

@ -26,7 +26,7 @@ public class BecomesChosenCreatureTypeTargetEffect extends OneShotEffect {
super(Outcome.BoostCreature);
this.nonWall = nonWall;
if(nonWall) {
staticText = "choose a creature type other than wall, target creature's type becomes that type until end of turn";
staticText = "choose a creature type other than wall. Target creature becomes that type until end of turn";
}
else {
staticText = "target creature becomes the creature type of your choice until end of turn";

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

@ -52,12 +52,13 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
/**
* Set the color of a spell or permanent
*
* @param duration
*
* @param duration
*/
public BecomesColorTargetEffect(Duration duration) {
this(null, duration, null);
}
public BecomesColorTargetEffect(ObjectColor setColor, Duration duration) {
this(setColor, duration, null);
}
@ -78,7 +79,7 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
Player controller = game.getPlayer(source.getControllerId());
if (controller == null) {
return;
}
}
if (setColor == null) {
ChoiceColor choice = new ChoiceColor();
while (!choice.isChosen()) {
@ -95,9 +96,8 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
if (!game.isSimulation()) {
game.informPlayers(controller.getLogName() + " has chosen the color: " + setColor.toString());
}
}
}
super.init(source, game); //To change body of generated methods, choose Tools | Templates.
}
@ -109,11 +109,11 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
}
if (setColor != null) {
boolean objectFound = false;
for (UUID targetId :targetPointer.getTargets(game, source)) {
for (UUID targetId : targetPointer.getTargets(game, source)) {
MageObject targetObject = game.getObject(targetId);
if (targetObject != null) {
objectFound = true;
targetObject.getColor(game).setColor(setColor);
targetObject.getColor(game).setColor(setColor);
}
}
if (!objectFound && this.getDuration() == Duration.Custom) {
@ -143,7 +143,9 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
} else {
sb.append(setColor.getDescription());
}
sb.append(' ').append(duration.toString());
if (!duration.toString().equals("")) {
sb.append(' ').append(duration.toString());
}
return sb.toString();
}
}

3
Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java
View file

@ -32,7 +32,6 @@ import mage.MageObject;
import mage.ObjectColor;
import mage.abilities.StaticAbility;
import mage.cards.Card;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.Filter;
import mage.filter.FilterCard;
@ -90,7 +89,7 @@ public class ProtectionAbility extends StaticAbility {
@Override
public String getRule() {
return "Protection from " + filter.getMessage() + (removeAuras ? "" : ". This effect doesn't remove auras.");
return "protection from " + filter.getMessage() + (removeAuras ? "" : ". This effect doesn't remove auras.");
}
public boolean canTarget(MageObject source, Game game) {

8
Mage/src/main/java/mage/abilities/keyword/RippleAbility.java
View file

@ -56,13 +56,11 @@ public class RippleAbility extends TriggeredAbilityImpl {
return new RippleAbility(this);
}
@Override
public String getRule() {
return "Ripple " + rippleNumber + " <i>(When you cast this spell, you may reveal the top " + CardUtil.numberToText(rippleNumber) + " cards of your library. You may cast any revealed cards with the same name as this spell without paying their mana costs. Put the rest on the bottom of your library.)</i>";
return "ripple " + rippleNumber + " <i>(When you cast this spell, you may reveal the top " + CardUtil.numberToText(rippleNumber) + " cards of your library. You may cast any revealed cards with the same name as this spell without paying their mana costs. Put the rest on the bottom of your library.)</i>";
}
}
class RippleEffect extends OneShotEffect {
@ -84,13 +82,12 @@ class RippleEffect extends OneShotEffect {
return new RippleEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
MageObject sourceObject = game.getObject(source.getSourceId());
if (player != null) {
if (!player.chooseUse(Outcome.Neutral, "Reveal " + rippleNumber + " cards from the top of your library?", source, game)){
if (!player.chooseUse(Outcome.Neutral, "Reveal " + rippleNumber + " cards from the top of your library?", source, game)) {
return true; //fizzle
}
// reveal to/**/p cards from library
@ -123,4 +120,3 @@ class RippleEffect extends OneShotEffect {
}
}

1
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -69,6 +69,7 @@ public final class StaticFilters {
= (FilterSpell) new FilterSpell("noncreature spell").add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
public static final FilterSpell FILTER_SPELL = new FilterSpell();
public static final FilterSpell FILTER_A_SPELL = new FilterSpell("a spell");
public static final FilterSpell FILTER_INSTANT_OR_SORCERY_SPELL = new FilterSpell("instant or sorcery spell");
public static final FilterSpell FILTER_INSTANT_OR_SORCERY_SPELLS = new FilterSpell("instant or sorcery spells");

5
Mage/src/main/java/mage/filter/common/FilterBlockingCreature.java
View file

@ -24,8 +24,7 @@
* 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
* or implied, of BetaSteward_at_googlemail.com.
*/
*/
package mage.filter.common;
import mage.filter.predicate.permanent.BlockingPredicate;
@ -37,7 +36,7 @@ import mage.filter.predicate.permanent.BlockingPredicate;
public class FilterBlockingCreature extends FilterCreaturePermanent {
public FilterBlockingCreature() {
this("Blocking creature");
this("blocking creature");
}
public FilterBlockingCreature(String name) {