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

some text fixes

Browse source
This commit is contained in:
Evan Kranzler 2017-10-06 16:55:46 -04:00
parent 17b7de4e87
commit 3baabe2534
28 changed files with 78 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -773,7 +773,7 @@ public abstract class AbilityImpl implements Ability {
}
if (!costs.isEmpty()) {
if (sbRule.length() > 0) {
sbRule.append(',');
sbRule.append(", ");
}
sbRule.append(costs.getText());
}

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

@ -15,7 +15,6 @@ import mage.game.events.GameEvent;
*
* @author LevelX2
*/
public class EndOfCombatTriggeredAbility extends TriggeredAbilityImpl {
public EndOfCombatTriggeredAbility(Effect effect, boolean optional) {
@ -35,7 +34,7 @@ public class EndOfCombatTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.END_COMBAT_STEP_PRE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return true;
@ -43,6 +42,6 @@ public class EndOfCombatTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "At the end of combat, " + super.getRule();
return "At end of combat, " + super.getRule();
}
}
}

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

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.effects.common;
import java.util.List;
@ -52,6 +51,7 @@ public class ExileAllEffect extends OneShotEffect {
public ExileAllEffect(FilterPermanent filter) {
this(filter, null, null);
}
public ExileAllEffect(FilterPermanent filter, UUID exileId, String exileZone) {
super(Outcome.Exile);
this.filter = filter;
@ -77,19 +77,18 @@ public class ExileAllEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
for (Permanent permanent: permanents) {
for (Permanent permanent : permanents) {
controller.moveCardToExileWithInfo(permanent, exileId, exileZone, source.getSourceId(), game, Zone.BATTLEFIELD, true);
}
return true;
}
return false;
}
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("Exile all ").append(filter.getMessage());
sb.append("exile all ").append(filter.getMessage());
staticText = sb.toString();
}
}

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

@ -106,7 +106,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect {
sb.append(CardUtil.numberToText(amount));
sb.append(" cards ");
} else {
sb.append(" card ");
sb.append("card ");
}
sb.append("of target player's library");
if (putToGraveyard) {

8
Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java
View file

@ -152,14 +152,20 @@ public class AddCountersSourceEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("put ");
boolean plural = true;
if (counter.getCount() > 1) {
sb.append(CardUtil.numberToText(counter.getCount())).append(' ');
} else if (amount.toString().equals("X") && amount.getMessage().isEmpty()) {
sb.append("X ");
} else {
sb.append("a ");
plural = false;
}
sb.append(counter.getName().toLowerCase()).append(" counter on {this}");
sb.append(counter.getName().toLowerCase()).append(" counter");
if (plural) {
sb.append('s');
}
sb.append(" on {this}");
if (!amount.getMessage().isEmpty()) {
sb.append(" for each ").append(amount.getMessage());
}

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

@ -108,7 +108,7 @@ public class DiscardTargetEffect extends OneShotEffect {
}
sb.append(" discards ");
if (amount.toString().equals("1")) {
sb.append(" a card");
sb.append("a card");
} else {
sb.append(CardUtil.numberToText(amount.toString())).append(" cards");
}

9
Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java
View file

@ -24,8 +24,7 @@
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
*/
package mage.abilities.keyword;
import mage.abilities.Ability;
@ -46,7 +45,7 @@ import java.io.ObjectStreamException;
*/
public class FlyingAbility extends EvasionAbility implements MageSingleton {
private static final FlyingAbility instance = new FlyingAbility();
private static final FlyingAbility instance = new FlyingAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
@ -62,7 +61,7 @@ public class FlyingAbility extends EvasionAbility implements MageSingleton {
@Override
public String getRule() {
return "Flying";
return "flying";
}
@Override
@ -91,7 +90,7 @@ class FlyingEffect extends RestrictionEffect implements MageSingleton {
public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) {
return blocker.getAbilities().containsKey(FlyingAbility.getInstance().getId())
|| blocker.getAbilities().containsKey(ReachAbility.getInstance().getId())
|| (game.getContinuousEffects().asThough(blocker.getId(), AsThoughEffectType.BLOCK_DRAGON, source, blocker.getControllerId(), game) && attacker.hasSubtype(SubType.DRAGON, game)) ;
|| (game.getContinuousEffects().asThough(blocker.getId(), AsThoughEffectType.BLOCK_DRAGON, source, blocker.getControllerId(), game) && attacker.hasSubtype(SubType.DRAGON, game));
}
@Override

2
Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java
View file

@ -56,7 +56,7 @@ public class ShroudAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
return "Shroud";
return "shroud";
}
@Override

5
Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.keyword;
import mage.constants.Zone;
@ -40,7 +39,7 @@ import java.io.ObjectStreamException;
*/
public class VigilanceAbility extends StaticAbility implements MageSingleton {
private static final VigilanceAbility instance = new VigilanceAbility();
private static final VigilanceAbility instance = new VigilanceAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
@ -56,7 +55,7 @@ public class VigilanceAbility extends StaticAbility implements MageSingleton {
@Override
public String getRule() {
return "Vigilance";
return "vigilance";
}
@Override