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

lots of text fixes

Browse source
This commit is contained in:
xenohedron 2023-10-12 21:34:58 -04:00
parent 0081279d15
commit 2013895530
142 changed files with 261 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ public class SourcePhaseInTriggeredAbility extends TriggeredAbilityImpl {
public SourcePhaseInTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
setTriggerPhrase("When {this} phases in, ");
setTriggerPhrase("Whenever {this} phases in, ");
}
protected SourcePhaseInTriggeredAbility(final SourcePhaseInTriggeredAbility ability) {

6
Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
@ -85,7 +84,10 @@ public class ExileFromZoneTargetEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
return "target " + (mode.getTargets().isEmpty() ? "player" : mode.getTargets().get(0).getTargetName())
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return getTargetPointer().describeTargets(mode.getTargets(), "that player")
+ " exiles " + CardUtil.numberToText(amount, "a") + ' ' + filter.getMessage()
+ " from their " + zone.toString().toLowerCase();
}

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

@ -45,14 +45,9 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
if (!staticText.isEmpty()) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
if (mode.getTargets().isEmpty()) {
return "you may tap or untap it";
} else {
String targetName = mode.getTargets().get(0).getTargetName();
return "you may tap or untap " + (targetName.contains("target") ? "" : "target ") + targetName;
}
return "you may tap or untap " + getTargetPointer().describeTargets(mode.getTargets(), "it");
}
}

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

@ -9,6 +9,7 @@ import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
/**
* @author spjspj
@ -56,7 +57,7 @@ public class RollDiceEffect extends OneShotEffect {
if (!staticText.isEmpty()) {
return staticText;
}
return "Roll a " + numSides + " sided die";
return "Roll a " + CardUtil.numberToText(numSides) + "-sided die";
}
@Override

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

@ -1,4 +1,3 @@
package mage.abilities.effects.common.continuous;
import mage.MageObject;
@ -13,6 +12,7 @@ import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
/**
* @author LoneFox
@ -65,6 +65,7 @@ public class GainProtectionFromColorAllEffect extends GainAbilityAllEffect {
return staticText;
}
return "Choose a color. " + filter.getMessage() + " gain protection from the chosen color " + duration.toString();
return "Choose a color. " + CardUtil.getTextWithFirstCharUpperCase(filter.getMessage())
+ " gain protection from the chosen color " + duration.toString();
}
}

29
Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java
View file

@ -1,29 +0,0 @@
package mage.filter.common;
import mage.filter.predicate.permanent.TappedPredicate;
/**
* @author noxx
*/
public class FilterUntappedCreature extends FilterCreaturePermanent {
public FilterUntappedCreature() {
this("untapped creature");
}
public FilterUntappedCreature(String name) {
super(name);
this.add(TappedPredicate.UNTAPPED);
}
protected FilterUntappedCreature(final FilterUntappedCreature filter) {
super(filter);
}
@Override
public FilterUntappedCreature copy() {
return new FilterUntappedCreature(this);
}
}