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

Refactored counters on permanents counting

Browse source 
Added BecomeMonstrousTriggeredAbility 
Added Target and Filter class for creature an opponent controls
This commit is contained in:
Styxo 2016-09-03 12:38:58 +02:00
parent 0c89b81da0
commit 2aec9f2ca7
77 changed files with 331 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java
View file

@ -46,6 +46,11 @@ public class FightTargetsEffect extends OneShotEffect {
super(Outcome.Damage);
}
public FightTargetsEffect(String effectText) {
this();
this.staticText = effectText;
}
public FightTargetsEffect(final FightTargetsEffect effect) {
super(effect);
}

19
Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java
View file

@ -41,6 +41,7 @@ import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.util.CardUtil;
/**
@ -144,17 +145,21 @@ public class AddCountersTargetEffect extends OneShotEffect {
sb.append("s");
}
sb.append(" on ");
Target target = mode.getTargets().get(0);
if (target.getNumberOfTargets() == 0) {
sb.append("up to ");
}
// TODO: add normal text infrastructure for target pointers
if (mode.getTargets().size() > 0) {
String targetName = mode.getTargets().get(0).getTargetName();
if (!targetName.startsWith("another")) {
if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName());
} else {
if (!target.getTargetName().startsWith("another")) {
sb.append("target ");
}
sb.append(targetName);
} else {
sb.append("it");
sb.append(target.getTargetName());
}
if (amount.getMessage().length() > 0) {
sb.append(" for each ").append(amount.getMessage());
}