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

Fixed #202 Simic Manipulator didn't work correct with (un)boosted P/T. Also fixed duration of control effect that only lasted while Simi Manipulator was on the battlefield.

Browse source
This commit is contained in:
LevelX2 2013-04-19 15:17:30 +02:00
parent 26499acbeb
commit 8220f404c6
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java
View file

@ -81,8 +81,8 @@ public class SimicManipulator extends CardImpl<SimicManipulator> {
// {tap}, Remove one or more +1/+1 counters from Simic Manipulator: Gain control of target creature with power less than or equal to the number of +1/+1 counters removed this way. // {tap}, Remove one or more +1/+1 counters from Simic Manipulator: Gain control of target creature with power less than or equal to the number of +1/+1 counters removed this way.
// TODO: Improve targeting, that only valid targets (power <= removed counters) can be choosen // TODO: Improve targeting, that only valid targets (power <= removed counters) can be choosen
// Disadvante now is, that a creature can be targeted that couldn't be targeted by rules. // Disadvantage now is, that a creature can be targeted that couldn't be targeted by rules.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SimicManipulatorGainControlTargetEffect(Duration.WhileOnBattlefield), new TapSourceCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SimicManipulatorGainControlTargetEffect(Duration.Custom), new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(filter)); ability.addTarget(new TargetCreaturePermanent(filter));
ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1.createInstance(),1)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1.createInstance(),1));
this.addAbility(ability); this.addAbility(ability);
@ -100,21 +100,19 @@ public class SimicManipulator extends CardImpl<SimicManipulator> {
class SimicManipulatorGainControlTargetEffect extends ContinuousEffectImpl<SimicManipulatorGainControlTargetEffect> { class SimicManipulatorGainControlTargetEffect extends ContinuousEffectImpl<SimicManipulatorGainControlTargetEffect> {
private boolean valid;
public SimicManipulatorGainControlTargetEffect(Duration duration) { public SimicManipulatorGainControlTargetEffect(Duration duration) {
super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
} }
public SimicManipulatorGainControlTargetEffect(final SimicManipulatorGainControlTargetEffect effect) { public SimicManipulatorGainControlTargetEffect(final SimicManipulatorGainControlTargetEffect effect) {
super(effect); super(effect);
this.valid = effect.valid;
} }
@Override @Override
public SimicManipulatorGainControlTargetEffect copy() { public void init(Ability source, Game game) {
return new SimicManipulatorGainControlTargetEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getFirstTarget()); Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null) { if (permanent != null) {
int maxPower = 0; int maxPower = 0;
@ -125,9 +123,22 @@ class SimicManipulatorGainControlTargetEffect extends ContinuousEffectImpl<Simic
} }
} }
if (permanent.getPower().getValue() <= maxPower) { if (permanent.getPower().getValue() <= maxPower) {
return permanent.changeControllerId(source.getControllerId(), game); valid = true;
} }
} }
}
@Override
public SimicManipulatorGainControlTargetEffect copy() {
return new SimicManipulatorGainControlTargetEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null && valid) {
return permanent.changeControllerId(source.getControllerId(), game);
}
return false; return false;
} }