External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 21:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[KHM] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2021-01-29 17:37:56 -05:00
parent 7c68284173
commit d5822a7246
46 changed files with 97 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,6 @@ public enum ForetoldCondition implements Condition {
@Override
public String toString() {
return "this card was foretold";
return "this spell was foretold";
}
}

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

@ -27,7 +27,7 @@ public class RevealTargetFromHandCost extends CostImpl {
public RevealTargetFromHandCost(TargetCardInHand target) {
this.addTarget(target);
this.text = (target.getNumberOfTargets() == 0 ? "You may reveal " : "Reveal ") + target.getTargetName();
this.text = (target.getNumberOfTargets() == 0 ? "you may reveal " : "reveal ") + target.getTargetName();
this.revealedCards = new ArrayList<>();
}

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

@ -168,6 +168,7 @@ public class DoIfCostPaid extends OneShotEffect {
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("sacrifice")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("remove")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("tap")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("reveal")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("pay")) {
sb.append("pay ");
}

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

@ -88,6 +88,7 @@ public class DoWhenCostPaid extends OneShotEffect {
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("sacrifice")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("remove")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("tap")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("reveal")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("pay")) {
sb.append("pay ");
}

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

@ -107,7 +107,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect {
} else {
sb.append("that card");
}
sb.append(" into that player's graveyard");
sb.append(" into their graveyard");
}
if (mayShuffleAfter) {
sb.append(". You may then have that player shuffle that library");

14
Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java
View file

@ -11,6 +11,7 @@ import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
import java.util.UUID;
@ -70,8 +71,17 @@ public class SetPowerToughnessTargetEffect extends ContinuousEffectImpl {
if (!mode.getTargets().get(0).getTargetName().contains("target")) {
sb.append("target ");
}
sb.append(mode.getTargets().get(0).getTargetName()).append(" has base power and toughness ");
sb.append(power).append('/').append(toughness).append(' ').append(duration.toString());
sb.append(mode.getTargets().get(0).getTargetName());
if (mode.getTargets().stream().mapToInt(Target::getMaxNumberOfTargets).max().orElse(0) > 1) {
sb.append(" have");
} else {
sb.append(" has");
}
sb.append(" base power and toughness ");
sb.append(power).append('/').append(toughness);
if (!duration.toString().isEmpty()) {
sb.append(' ').append(duration.toString());
}
return sb.toString();
}

8
Mage/src/main/java/mage/game/command/emblems/TyvarKellEmblem.java
View file

@ -27,9 +27,11 @@ public final class TyvarKellEmblem extends Emblem {
this.setName("Emblem Tyvar");
this.setExpansionSetCodeForImage("KHM");
Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND,
new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, null, true),
filter, false, true, true
Ability ability = new SpellCastControllerTriggeredAbility(
Zone.COMMAND,
new GainAbilityTargetEffect(
HasteAbility.getInstance(), Duration.EndOfTurn, null, true
).setText("it gains haste until end of turn"), filter, false, true, true
);
ability.addEffect(new DrawCardSourceControllerEffect(2, "you").concatBy("and"));
this.getAbilities().add(ability);