github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug of SetPowerToughnessAllEffect not using filter.

Browse source
This commit is contained in:
LevelX2 2013-05-24 20:34:48 +02:00
parent b09f8d9614
commit 2d9df9d0f4
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/mage/abilities/effects/common/continious/SetPowerToughnessAllEffect.java
View file

@ -28,6 +28,7 @@
package mage.abilities.effects.common.continious; package mage.abilities.effects.common.continious;
import java.util.Locale;
import mage.Constants.Duration; import mage.Constants.Duration;
import mage.Constants.Layer; import mage.Constants.Layer;
import mage.Constants.Outcome; import mage.Constants.Outcome;
@ -38,7 +39,6 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.ContinuousEffectImpl;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -52,22 +52,22 @@ public class SetPowerToughnessAllEffect extends ContinuousEffectImpl<SetPowerTou
private FilterPermanent filter; private FilterPermanent filter;
private DynamicValue power; private DynamicValue power;
private DynamicValue toughness; private DynamicValue toughness;
private boolean lockedIn; private boolean lockedInPT;
public SetPowerToughnessAllEffect(int power, int toughness, Duration duration) { public SetPowerToughnessAllEffect(int power, int toughness, Duration duration) {
this(new StaticValue(power), new StaticValue(toughness), duration, new FilterCreaturePermanent("Creatures"), true); this(new StaticValue(power), new StaticValue(toughness), duration, new FilterCreaturePermanent("Creatures"), true);
} }
public SetPowerToughnessAllEffect(int power, int toughness, Duration duration, FilterPermanent filter, boolean lockedIn) { public SetPowerToughnessAllEffect(int power, int toughness, Duration duration, FilterPermanent filter, boolean lockedInPT) {
this(new StaticValue(power), new StaticValue(toughness), duration, filter, lockedIn); this(new StaticValue(power), new StaticValue(toughness), duration, filter, lockedInPT);
} }
public SetPowerToughnessAllEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterPermanent filter, boolean lockedIn) { public SetPowerToughnessAllEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterPermanent filter, boolean lockedInPT) {
super(duration, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature); super(duration, Layer.PTChangingEffects_7, SubLayer.SetPT_7b, Outcome.BoostCreature);
this.power = power; this.power = power;
this.toughness = toughness; this.toughness = toughness;
this.filter = filter; this.filter = filter;
this.lockedIn = lockedIn; this.lockedInPT = lockedInPT;
} }
public SetPowerToughnessAllEffect(final SetPowerToughnessAllEffect effect) { public SetPowerToughnessAllEffect(final SetPowerToughnessAllEffect effect) {
@ -75,7 +75,7 @@ public class SetPowerToughnessAllEffect extends ContinuousEffectImpl<SetPowerTou
this.power = effect.power; this.power = effect.power;
this.toughness = effect.toughness; this.toughness = effect.toughness;
this.filter = effect.filter; this.filter = effect.filter;
this.lockedIn = effect.lockedIn; this.lockedInPT = effect.lockedInPT;
} }
@Override @Override
@ -86,10 +86,10 @@ public class SetPowerToughnessAllEffect extends ContinuousEffectImpl<SetPowerTou
@Override @Override
public void init(Ability source, Game game) { public void init(Ability source, Game game) {
super.init(source, game); super.init(source, game);
for (Permanent perm: game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), source.getControllerId(), source.getSourceId(), game)) { for (Permanent perm: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
objects.add(perm.getId()); objects.add(perm.getId());
} }
if (lockedIn) { if (lockedInPT) {
power = new StaticValue(power.calculate(game, source)); power = new StaticValue(power.calculate(game, source));
toughness = new StaticValue(toughness.calculate(game, source)); toughness = new StaticValue(toughness.calculate(game, source));
} }
@ -112,7 +112,7 @@ public class SetPowerToughnessAllEffect extends ContinuousEffectImpl<SetPowerTou
public String getText(Mode mode) { public String getText(Mode mode) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(filter.getMessage()); sb.append(filter.getMessage());
if (filter.getMessage().startsWith("Each ")) { if (filter.getMessage().toLowerCase(Locale.ENGLISH).startsWith("Each ")) {
sb.append(" becomes "); sb.append(" becomes ");
} else { } else {
sb.append(" become "); sb.append(" become ");