github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Warren Weirding - Fixed that created tokens got haste ability wrongly permanent instead only util end of turn.

Browse source
This commit is contained in:
LevelX2 2014-03-27 13:31:33 +01:00
parent 6724019a60
commit ad6898ca54
3 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java
View file

@ -30,10 +30,12 @@ package mage.sets.modernmasters;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenTargetEffect;
import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
@ -85,7 +87,7 @@ public class WarrenWeirding extends CardImpl<WarrenWeirding> {
class WarrenWeirdingEffect extends OneShotEffect<WarrenWeirdingEffect> {
private static final FilterCreaturePermanent filterGoblin = new FilterCreaturePermanent("creature an opponent controls");
private static final FilterCreaturePermanent filterGoblin = new FilterCreaturePermanent();
static {
filterGoblin.add(new SubtypePredicate("Goblin"));
}
@ -116,9 +118,19 @@ class WarrenWeirdingEffect extends OneShotEffect<WarrenWeirdingEffect> {
if (permanent != null) {
permanent.sacrifice(source.getSourceId(), game);
if (filterGoblin.match(permanent, game)) {
Effect effect = new CreateTokenTargetEffect(new WarrenWeirdingBlackGoblinRogueToken(), 2);
effect.setTargetPointer(new FixedTarget(player.getId()));
effect.apply(game, source);
for (int i = 0; i < 2; i++) {
Token token = new WarrenWeirdingBlackGoblinRogueToken();
Effect effect = new CreateTokenTargetEffect(token);
effect.setTargetPointer(new FixedTarget(player.getId()));
if (effect.apply(game, source)) {
Permanent tokenPermanent = game.getPermanent(token.getLastAddedToken());
if (tokenPermanent != null) {
ContinuousEffect hasteEffect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
hasteEffect.setTargetPointer(new FixedTarget(tokenPermanent.getId()));
game.addEffect(hasteEffect, source);
}
}
}
}
}
return true;
@ -142,8 +154,5 @@ class WarrenWeirdingBlackGoblinRogueToken extends Token {
subtype.add("Rogue");
power.setValue(1);
toughness.setValue(1);
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
ability.setRuleVisible(false);
this.addAbility(ability);
}
}

19
Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java
View file

@ -1,13 +1,17 @@
package mage.abilities.effects.common;
import java.util.Locale;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.token.Token;
import mage.players.Player;
import mage.util.CardUtil;
/**
* @author Loki
@ -55,8 +59,19 @@ public class CreateTokenTargetEffect extends OneShotEffect<CreateTokenTargetEffe
@Override
public boolean apply(Game game, Ability source) {
int value = amount.calculate(game, source);
token.putOntoBattlefield(value, game, source.getSourceId(), targetPointer.getFirst(game, source), tapped, attacking);
return true;
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
if (value < 1) {
return true;
}
if(token.putOntoBattlefield(value, game, source.getSourceId(), targetPointer.getFirst(game, source), tapped, attacking)) {
game.informPlayers(new StringBuilder(controller.getName())
.append(" puts ").append(CardUtil.numberToText(value,"a")).append(" ").append(token.getName())
.append(value == 1?" token":" tokens").append(" onto the Battlefield").toString());
return true;
}
}
return false;
}
@Override

2
Mage/src/mage/game/permanent/token/Token.java
View file

@ -72,7 +72,7 @@ public class Token extends MageObjectImpl<Token> {
this.description = description;
}
public Token(String name, String description, ObjectColor color, List<String> subtype, int power, int toughness, Abilities abilities) {
public Token(String name, String description, ObjectColor color, List<String> subtype, int power, int toughness, Abilities<Ability> abilities) {
this(name, description);
this.cardType.add(CardType.CREATURE);
this.color = color.copy();