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

so many text fixes

Browse source
This commit is contained in:
Evan Kranzler 2017-10-06 22:00:06 -04:00
parent bc2bfba02a
commit 0075535650
70 changed files with 163 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class CantBlockAbility extends SimpleStaticAbility {
@Override
public String getRule() {
return "{this} can't block";
return "{this} can't block.";
}
@Override

5
Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.condition.common;
import mage.abilities.Ability;
@ -45,4 +44,8 @@ public enum RaidCondition implements Condition {
PlayerAttackedWatcher watcher = (PlayerAttackedWatcher) game.getState().getWatchers().get(PlayerAttackedWatcher.class.getSimpleName());
return watcher != null && watcher.getNumberOfAttackersCurrentTurn(source.getControllerId()) > 0;
}
public String toString() {
return "if you attacked with a creature this turn";
}
}

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

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

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

@ -243,7 +243,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
sb.append(" cards ");
}
sb.append("of your Library");
sb.append("of your library");
if (numberLook == 0) {
sb.append(", where {X} is the number of cards ").append(numberOfCards.getMessage());
}

18
Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllPermanentsEffect.java
View file

@ -31,6 +31,7 @@ import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.PreventionEffectImpl;
import mage.constants.Duration;
import static mage.constants.Duration.EndOfTurn;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
@ -98,10 +99,19 @@ public class PreventAllDamageByAllPermanentsEffect extends PreventionEffectImpl
sb.append("combat ");
}
sb.append("damage ");
sb.append(duration.toString());
if (filter != null) {
sb.append(" dealt by ");
sb.append(filter.getMessage());
if (duration == EndOfTurn) {
if (filter != null) {
sb.append(filter.getMessage());
sb.append(" would deal this turn");
} else {
sb.append("that would be dealt this turn");
}
} else {
sb.append(duration.toString());
if (filter != null) {
sb.append(" dealt by ");
sb.append(filter.getMessage());
}
}
return sb.toString();
}

8
Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
View file

@ -31,6 +31,7 @@ import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.PreventionEffectImpl;
import mage.constants.Duration;
import static mage.constants.Duration.EndOfTurn;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -74,7 +75,12 @@ public class PreventDamageToSourceEffect extends PreventionEffectImpl {
} else {
sb.append("Prevent the next ").append(amountToPrevent).append(" damage that would be dealt to ");
}
sb.append("{source} ").append(duration.toString());
sb.append("{source} ");
if (duration == EndOfTurn) {
sb.append("this turn");
} else {
sb.append(duration.toString());
}
return sb.toString();
}
}

9
Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.effects.common;
import java.util.List;
@ -60,10 +59,10 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
if(player != null) {
if (player != null) {
filter.add(new ControllerIdPredicate(player.getId()));
List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
for(Permanent p : permanents) {
for (Permanent p : permanents) {
p.tap(game);
}
return true;
@ -78,9 +77,9 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
if(staticText != null && !staticText.isEmpty()) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "tap all " + filter.getMessage() + " target player controls";
return "tap all " + filter.getMessage() + " target " + mode.getTargets().get(0).getMessage() + " controls";
}
}

5
Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java
View file

@ -31,6 +31,7 @@ import mage.abilities.Ability;
import mage.abilities.effects.RestrictionEffect;
import mage.constants.AttachmentType;
import mage.constants.Duration;
import static mage.constants.Duration.EndOfTurn;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -61,7 +62,9 @@ public class CantBlockAttachedEffect extends RestrictionEffect {
if (!filter.getMessage().equals("creature")) {
sb.append(' ').append(filter.getMessage());
}
if (!duration.toString().isEmpty()) {
if (duration == EndOfTurn) {
sb.append("this turn");
} else if (!duration.toString().isEmpty()) {
sb.append(' ').append(duration.toString());
}
staticText = sb.toString();

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 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";

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

@ -138,7 +138,6 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl {
if (duration.toString() != null && !duration.toString().isEmpty()) {
sb.append(duration.toString()).append(", ");
}
sb.append("all ");
sb.append(filter.getMessage());
if (duration.toString() != null && duration.toString().isEmpty()) {
sb.append(" are ");
@ -147,7 +146,7 @@ public class BecomesCreatureAllEffect extends ContinuousEffectImpl {
}
sb.append(token.getDescription());
if (type != null && !type.isEmpty()) {
sb.append(". They are still ").append(type);
sb.append(". They're still ").append(type);
}
return sb.toString();
}

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

@ -53,7 +53,7 @@ public class GainAbilityControlledSpellsEffect extends ContinuousEffectImpl {
super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
this.ability = ability;
this.filter = filter;
staticText = filter.getMessage() + " you cast have " + ability.getRule();
staticText = filter.getMessage() + " you cast have " + ability.getRule() + '.';
}
public GainAbilityControlledSpellsEffect(final GainAbilityControlledSpellsEffect effect) {

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

@ -36,6 +36,7 @@ import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
/**
*
@ -82,7 +83,7 @@ public class AddCountersAllEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder();
sb.append("put ");
if (counter.getCount() > 1) {
sb.append(Integer.toString(counter.getCount())).append(' ').append(counter.getName().toLowerCase()).append(" counters on each ");
sb.append(CardUtil.numberToText(counter.getCount(), "a")).append(' ').append(counter.getName().toLowerCase()).append(" counters on each ");
} else {
sb.append("a ").append(counter.getName().toLowerCase()).append(" counter on each ");
}

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

@ -57,7 +57,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect {
super(Outcome.Benefit);
this.filter = filter;
this.forceToSearchBoth = forceToSearchBoth;
staticText = "search your library and" + (forceToSearchBoth ? "" : "/or ") + " graveyard for a card named " + filter.getMessage()
staticText = "search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage()
+ ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle your library" : "If you search your library this way, shuffle it");
}

7
Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.keyword;
import mage.constants.Zone;
@ -40,7 +39,7 @@ import java.io.ObjectStreamException;
*/
public class DeathtouchAbility extends StaticAbility implements MageSingleton {
private static final DeathtouchAbility instance = new DeathtouchAbility();
private static final DeathtouchAbility instance = new DeathtouchAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
@ -56,7 +55,7 @@ public class DeathtouchAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
return "Deathtouch <i>(Any amount of damage this deals to a creature is enough to destroy it.)</i>";
return "deathtouch";
}
@Override
@ -64,6 +63,4 @@ public class DeathtouchAbility extends StaticAbility implements MageSingleton {
return instance;
}
}

10
Mage/src/main/java/mage/abilities/keyword/FearAbility.java
View file

@ -24,11 +24,9 @@
* 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.abilities.keyword;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.abilities.Ability;
import mage.abilities.EvasionAbility;
@ -45,7 +43,7 @@ import java.io.ObjectStreamException;
*/
public class FearAbility extends EvasionAbility implements MageSingleton {
private static final FearAbility instance = new FearAbility();
private static final FearAbility instance = new FearAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
@ -61,7 +59,7 @@ public class FearAbility extends EvasionAbility implements MageSingleton {
@Override
public String getRule() {
return "Fear";
return "fear";
}
@Override
@ -102,4 +100,4 @@ class FearEffect extends RestrictionEffect implements MageSingleton {
return new FearEffect(this);
}
}
}

21
Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java
View file

@ -32,15 +32,15 @@ import mage.constants.Zone;
import mage.abilities.StaticAbility;
/**
* OLD RULES:
* 700.4. If a permanent is indestructible, rules and effects can't destroy it. (See rule 701.6, "Destroy.")
* Such permanents are not destroyed by lethal damage, and they ignore the lethal-damage state-based action
* (see rule 704.5g). Rules or effects may cause an indestructible permanent to be sacrificed, put into a
* graveyard, or exiled. #
* OLD RULES: 700.4. If a permanent is indestructible, rules and effects can't
* destroy it. (See rule 701.6, "Destroy.") Such permanents are not destroyed by
* lethal damage, and they ignore the lethal-damage state-based action (see rule
* 704.5g). Rules or effects may cause an indestructible permanent to be
* sacrificed, put into a graveyard, or exiled. #
*
* 700.4a Although the text "[This permanent] is indestructible" is an ability, actually being
* indestructible is neither an ability nor a characteristic. It's just something that's true
* about a permanent.
* 700.4a Although the text "[This permanent] is indestructible" is an ability,
* actually being indestructible is neither an ability nor a characteristic.
* It's just something that's true about a permanent.
*
* NEW RULES
*
@ -48,10 +48,9 @@ import mage.abilities.StaticAbility;
*
*
*
*
*
* @author BetaSteward_at_googlemail.com
*/
public class IndestructibleAbility extends StaticAbility {
private static final IndestructibleAbility instance;
@ -79,7 +78,7 @@ public class IndestructibleAbility extends StaticAbility {
@Override
public String getRule() {
return "Indestructible";
return "indestructible";
}
}