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

small fixes

Browse source
This commit is contained in:
igoudt 2017-09-08 13:11:58 +02:00
parent 4d73ee6587
commit 2355d35e04
12 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ public class AttacksCreatureYouControlTriggeredAbility extends TriggeredAbilityI
@Override
public String getRule() {
return "Whenever a " + filter.getMessage() + " attacks, " + super.getRule();
return "Whenever a" + (filter.getMessage().startsWith("a") ? "n " : " ") + " attacks, " + super.getRule();
}
}

4
Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java
View file

@ -95,7 +95,7 @@ public class EntersBattlefieldAbility extends StaticAbility {
return;
}
}
super.addEffect(effect); //To change body of generated methods, choose Tools | Templates.
super.addEffect(effect);
}
@Override
@ -108,6 +108,6 @@ public class EntersBattlefieldAbility extends StaticAbility {
if (abilityRule != null && !abilityRule.isEmpty()) {
return abilityRule;
}
return (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") + " the battlefield " + super.getRule();
return (optional ? "you may have " : "") + "{this} enter" + (optional ? "" : "s") + " the battlefield" + super.getRule();
}
}

7
Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java
View file

@ -27,8 +27,6 @@
*/
package mage.abilities.effects.common;
import java.util.ArrayList;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
@ -43,6 +41,9 @@ import mage.game.permanent.token.Token;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
import java.util.ArrayList;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -151,7 +152,7 @@ public class CreateTokenEffect extends OneShotEffect {
}
sb.append(token.getDescription());
if (token.getDescription().endsWith("token")) {
sb.append("s ");
sb.append("s");
}
}
if (attacking) {

7
Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenControlledPermanentEffect.java
View file

@ -66,7 +66,12 @@ public class ReturnToHandChosenControlledPermanentEffect extends ReturnToHandCho
protected String getText() {
StringBuilder sb = new StringBuilder("return ");
if (!filter.getMessage().startsWith("another")) {
sb.append(CardUtil.numberToText(number, "a"));
if(filter.getMessage().startsWith("a")){
sb.append("an");
}
else {
sb.append(CardUtil.numberToText(number, "a"));
}
}
sb.append(' ').append(filter.getMessage());
if (number > 1) {