Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Followup text fixes

Browse source
This commit is contained in:
xenohedron 2023-07-14 01:59:27 -04:00
parent 185fae28a4
commit 176a61190b
9 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ public class CastOnlyIfConditionIsTrueEffect extends ContinuousRuleModifyingEffe
}
private String setText() {
StringBuilder sb = new StringBuilder("cast this spell only ");
StringBuilder sb = new StringBuilder("cast this spell only if ");
if (condition != null) {
sb.append(condition);
}

9
Mage/src/main/java/mage/abilities/condition/common/ControlsPermanentsComparedToOpponentsCondition.java
View file

@ -40,12 +40,9 @@ public class ControlsPermanentsComparedToOpponentsCondition implements Condition
@Override
public String toString() {
switch (type) {
case EQUAL_TO: return String.format("equal %s to each opponent", filterPermanent.getMessage());
case FEWER_THAN: return String.format("fewer %s than each opponent", filterPermanent.getMessage());
case MORE_THAN: return String.format("more %s than each opponent", filterPermanent.getMessage());
case OR_LESS: return String.format("fewer or equal %s than each opponent", filterPermanent.getMessage());
case OR_GREATER: return String.format("more or equal %s than each opponent", filterPermanent.getMessage());
default: throw new IllegalArgumentException("comparison rules for " + type + " missing");
case FEWER_THAN: return String.format("you control fewer %s than each opponent", filterPermanent.getMessage());
case MORE_THAN: return String.format("you control more %s than each opponent", filterPermanent.getMessage());
default: return "";
}
}

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

@ -32,7 +32,8 @@ public class CantBeBlockedByMoreThanOneSourceEffect extends ContinuousEffectImpl
public CantBeBlockedByMoreThanOneSourceEffect(int amount, Duration duration) {
super(duration, Outcome.Benefit);
this.amount = amount;
staticText = "{this} can't be blocked by more than " + CardUtil.numberToText(amount) + " creature" + (amount > 1 ? "s" : "");
staticText = "{this} can't be blocked by more than " + CardUtil.numberToText(amount) + " creature" + (amount > 1 ? "s" : "")
+ (duration == Duration.EndOfTurn ? " each combat this turn" : "");
}
public CantBeBlockedByMoreThanOneSourceEffect(final CantBeBlockedByMoreThanOneSourceEffect effect) {
@ -49,10 +50,8 @@ public class CantBeBlockedByMoreThanOneSourceEffect extends ContinuousEffectImpl
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Permanent perm = game.getPermanent(source.getSourceId());
if (perm != null) {
switch (layer) {
case RulesEffects:
perm.setMaxBlockedBy(amount);
break;
if (layer == Layer.RulesEffects) {
perm.setMaxBlockedBy(amount);
}
return true;
}