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

Merge pull request #7017 from acabaca24/branch-for-issue6643

Browse source 
Correcting some M21 text issues
This commit is contained in:
Oleg Agafonov 2020-08-29 21:34:59 +02:00 • committed by GitHub
commit 0cad4acf31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/k/KaervekTheSpiteful.java
View file

@ -29,7 +29,7 @@ public final class KaervekTheSpiteful extends CardImpl {
// Other creatures get -1/-1. // Other creatures get -1/-1.
this.addAbility(new SimpleStaticAbility(new BoostAllEffect( this.addAbility(new SimpleStaticAbility(new BoostAllEffect(
-1, -1, Duration.WhileOnBattlefield, true -1, -1, Duration.WhileOnBattlefield, true
).setText("other creatures get +1/+1"))); ).setText("other creatures get -1/-1")));
} }
private KaervekTheSpiteful(final KaervekTheSpiteful card) { private KaervekTheSpiteful(final KaervekTheSpiteful card) {

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

@ -37,7 +37,8 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl {
sb.append(" Activate this ability only "); sb.append(" Activate this ability only ");
} }
if (!condition.toString().startsWith("during") if (!condition.toString().startsWith("during")
&& !condition.toString().startsWith("before")) { && !condition.toString().startsWith("before")
&& !condition.toString().startsWith("if")) {
sb.append("if "); sb.append("if ");
} }
sb.append(condition.toString()).append('.'); sb.append(condition.toString()).append('.');

4
Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java
View file

@ -73,7 +73,9 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
} }
String conditionText = condition.toString(); String conditionText = condition.toString();
String additionalText = "if "; String additionalText = "if ";
if (conditionText.startsWith("during")) { if (conditionText.startsWith("during")
|| conditionText.startsWith("before")
|| conditionText.startsWith("if")) {
additionalText = ""; additionalText = "";
} }
return super.getRule() + " Activate this ability only " + additionalText + condition.toString() + "."; return super.getRule() + " Activate this ability only " + additionalText + condition.toString() + ".";

13
Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
View file

@ -90,15 +90,13 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
} }
Target target = mode.getTargets().get(0); Target target = mode.getTargets().get(0);
StringBuilder sb = new StringBuilder("return "); StringBuilder sb = new StringBuilder("return ");
if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
sb.append("up to "); sb.append("up to ");
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())); sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
if (!target.getTargetName().contains("target")) { if (!target.getTargetName().contains("target")) {
sb.append(" target "); sb.append(" target ");
} }
sb.append(target.getTargetName()); sb.append(target.getTargetName());
sb.append(" to their owners' hand");
return sb.toString();
} else { } else {
if (target.getNumberOfTargets() > 1) { if (target.getNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' '); sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' ');
@ -106,9 +104,14 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
if (!target.getTargetName().startsWith("another")) { if (!target.getTargetName().startsWith("another")) {
sb.append("target "); sb.append("target ");
} }
sb.append(target.getTargetName()).append(" to its owner's hand");
return sb.toString();
} }
if(target.getMaxNumberOfTargets() > 1) {
sb.append(" to their owners' hand");
}
else {
sb.append(target.getTargetName()).append(" to its owner's hand");
}
return sb.toString();
} }
} }