External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[MOC] various text fixes

Browse source
This commit is contained in:
theelk801 2023-04-18 18:34:57 -04:00
parent 9b7dc33061
commit c4ebe4ae8b
20 changed files with 67 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java
View file

@ -1,24 +1,23 @@
package mage.abilities.common;
import mage.constants.Zone;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
/**
*
* @author nantuko
*/
public class BecomesTappedSourceTriggeredAbility extends TriggeredAbilityImpl {
public BecomesTappedSourceTriggeredAbility(Effect effect, boolean isOptional) {
super(Zone.BATTLEFIELD, effect, isOptional);
public BecomesTappedSourceTriggeredAbility(Effect effect) {
this(effect, false);
}
public BecomesTappedSourceTriggeredAbility(Effect effect) {
super(Zone.BATTLEFIELD, effect);
public BecomesTappedSourceTriggeredAbility(Effect effect, boolean isOptional) {
super(Zone.BATTLEFIELD, effect, isOptional);
setTriggerPhrase("Whenever {this} becomes tapped, ");
}

23
Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common;
import mage.MageObject;
@ -65,26 +64,28 @@ public class PreventDamageByTargetEffect extends PreventionEffectImpl {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();
if (amountToPrevent == Integer.MAX_VALUE) {
StringBuilder sb = new StringBuilder();
sb.append("Prevent all");
if (onlyCombat) {
sb.append(" combat");
}
sb.append(" damage target ");
sb.append(mode.getTargets().get(0).getTargetName()).append(" would deal ").append(duration.toString());
return sb.toString();
} else {
StringBuilder sb = new StringBuilder();
sb.append("Prevent the next ").append(amountToPrevent);
sb.append("Prevent the next ");
sb.append(amountToPrevent);
if (onlyCombat) {
sb.append("combat ");
sb.append(" combat");
}
sb.append(" damage that ");
sb.append(mode.getTargets().get(0).getTargetName()).append(" would deal ").append(duration.toString());
return sb.toString();
}
sb.append(mode.getTargets().get(0).getTargetName());
sb.append(" would deal ");
if (duration == Duration.EndOfTurn) {
sb.append("this turn");
} else {
sb.append(duration);
}
return sb.toString();
}
}

5
Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java
View file

@ -1,6 +1,7 @@
package mage.abilities.effects.common.continuous;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.Mode;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
@ -140,7 +141,9 @@ public class GainAbilityAttachedEffect extends ContinuousEffectImpl {
} else {
sb.append("gains ");
}
boolean quotes = (ability instanceof SimpleActivatedAbility) || (ability instanceof TriggeredAbility);
boolean quotes = ability instanceof SimpleActivatedAbility
|| ability instanceof TriggeredAbility
|| ability instanceof LoyaltyAbility;
if (quotes) {
sb.append('"');
}

2
Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java
View file

@ -95,7 +95,7 @@ public class BolsterEffect extends OneShotEffect {
} else {
sb.append("X, where X is the number of ");
sb.append(amount.getMessage());
sb.append(" (Choose a creature with the least toughness among creatures you control and put X +1/+1 counters on it.)");
sb.append(". (Choose a creature with the least toughness among creatures you control and put X +1/+1 counters on it.)");
}
return sb.toString();
}

2
Mage/src/main/java/mage/abilities/keyword/ImproviseAbility.java
View file

@ -70,7 +70,7 @@ public class ImproviseAbility extends SimpleStaticAbility implements AlternateMa
@Override
public String getRule() {
return "Improvise <i>(Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)</i>";
return "improvise <i>(Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)</i>";
}
@Override

2
Mage/src/main/java/mage/filter/FilterCard.java
View file

@ -83,7 +83,7 @@ public class FilterCard extends FilterObject<Card> {
}
public boolean hasPredicates() {
return !predicates.isEmpty();
return !predicates.isEmpty() || !extraPredicates.isEmpty();
}
@Override

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

@ -15,7 +15,7 @@ import java.util.Arrays;
public final class StoneTrapIdolToken extends TokenImpl {
public StoneTrapIdolToken() {
super("Construct Token", "6/12 colorless Construct artifact creature token with trample");
super("Construct Token", "6/12 colorless Construct artifact creature token with trample");
cardType.add(CardType.CREATURE);
cardType.add(CardType.ARTIFACT);
subtype.add(SubType.CONSTRUCT);