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

Fixed Quicksilver Amulet.

Browse source 
Fixed Druidic Satchel Effect outcome.
This commit is contained in:
North 2011-08-21 18:14:39 +03:00
parent 781738ecec
commit cd579f46fa
3 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/magic2010/Duress.java
View file

@ -37,7 +37,6 @@ import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.players.Player;

2
Mage.Sets/src/mage/sets/magic2012/DruidicSatchel.java
View file

@ -74,7 +74,7 @@ public class DruidicSatchel extends CardImpl<DruidicSatchel> {
class DruidicSatchelEffect extends OneShotEffect<DruidicSatchelEffect> {
public DruidicSatchelEffect() {
super(Outcome.DrawCard);
super(Outcome.Benefit);
staticText = "Reveal the top card of your library. If it's a creature card, put a 1/1 green Saproling creature token onto the battlefield. If it's a land card, put that card onto the battlefield under your control. If it's a noncreature, nonland card, you gain 2 life";
}

25
Mage.Sets/src/mage/sets/magic2012/QuicksilverAmulet.java
View file

@ -59,7 +59,6 @@ public class QuicksilverAmulet extends CardImpl<QuicksilverAmulet> {
new PutCreatureOnBattlefieldEffect(),
new ManaCostsImpl("{4}"));
ability.addCost(new TapSourceCost());
ability.addTarget(new TargetCardInHand(new FilterCreatureCard()));
this.addAbility(ability);
}
@ -75,9 +74,11 @@ public class QuicksilverAmulet extends CardImpl<QuicksilverAmulet> {
class PutCreatureOnBattlefieldEffect extends OneShotEffect<PutCreatureOnBattlefieldEffect> {
private static final String choiceText = "Put a creature card from your hand onto the battlefield?";
public PutCreatureOnBattlefieldEffect() {
super(Outcome.PutCreatureInPlay);
this.staticText = "You may put a creature card from your hand into play";
this.staticText = "You may put a creature card from your hand onto the battlefield";
}
public PutCreatureOnBattlefieldEffect(final PutCreatureOnBattlefieldEffect effect) {
@ -91,12 +92,20 @@ class PutCreatureOnBattlefieldEffect extends OneShotEffect<PutCreatureOnBattlefi
@Override
public boolean apply(Game game, Ability source) {
Card card = game.getCard(source.getFirstTarget());
Player player = game.getPlayer(card.getOwnerId());
if (card != null && player != null) {
player.removeFromHand(card, game);
card.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId());
return true;
Player player = game.getPlayer(source.getControllerId());
if (player == null || !player.chooseUse(Outcome.PutCreatureInPlay, choiceText, game)) {
return false;
}
TargetCardInHand target = new TargetCardInHand(new FilterCreatureCard());
target.setRequired(true);
if (player.choose(Outcome.Benefit, target, game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
player.removeFromHand(card, game);
card.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId());
return true;
}
}
return false;
}