changed buyback to put card in the graveyard when there was no legal target. part of issue 118
parent
5830f91610
commit
613269c56c
|
@ -39,18 +39,25 @@ public class Brush_with_Death {
|
||||||
final Object[] data,
|
final Object[] data,
|
||||||
final Object[] choiceResults) {
|
final Object[] choiceResults) {
|
||||||
final MagicCardOnStack cardOnStack = (MagicCardOnStack)data[0];
|
final MagicCardOnStack cardOnStack = (MagicCardOnStack)data[0];
|
||||||
event.processTargetPlayer(game,choiceResults,0,new MagicPlayerAction() {
|
final boolean hasTarget = event.processTargetPlayer(
|
||||||
|
game,
|
||||||
|
choiceResults,
|
||||||
|
0,
|
||||||
|
new MagicPlayerAction() {
|
||||||
public void doAction(final MagicPlayer player) {
|
public void doAction(final MagicPlayer player) {
|
||||||
game.doAction(new MagicChangeLifeAction(player,-2));
|
game.doAction(new MagicChangeLifeAction(player,-2));
|
||||||
game.doAction(new MagicChangeLifeAction((MagicPlayer)data[1],2));
|
game.doAction(new MagicChangeLifeAction((MagicPlayer)data[1],2));
|
||||||
|
if (MagicBuybackChoice.isYesChoice(choiceResults[1])) {
|
||||||
|
game.doAction(new MagicMoveCardAction(
|
||||||
|
cardOnStack.getCard(),
|
||||||
|
MagicLocationType.Stack,
|
||||||
|
MagicLocationType.OwnersHand));
|
||||||
|
} else {
|
||||||
|
game.doAction(new MagicMoveCardAction(cardOnStack));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (MagicBuybackChoice.isYesChoice(choiceResults[1])) {
|
if (!hasTarget) {
|
||||||
game.doAction(new MagicMoveCardAction(
|
|
||||||
cardOnStack.getCard(),
|
|
||||||
MagicLocationType.Stack,
|
|
||||||
MagicLocationType.OwnersHand));
|
|
||||||
} else {
|
|
||||||
game.doAction(new MagicMoveCardAction(cardOnStack));
|
game.doAction(new MagicMoveCardAction(cardOnStack));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,15 +52,18 @@ public class Corpse_Dance {
|
||||||
(MagicPlayer)data[1],
|
(MagicPlayer)data[1],
|
||||||
card,
|
card,
|
||||||
MagicPlayCardAction.HASTE_REMOVE_AT_END_OF_TURN));
|
MagicPlayCardAction.HASTE_REMOVE_AT_END_OF_TURN));
|
||||||
}
|
if (MagicBuybackChoice.isYesChoice(choiceResults[1])) {
|
||||||
if (MagicBuybackChoice.isYesChoice(choiceResults[1])) {
|
game.doAction(new MagicMoveCardAction(
|
||||||
game.doAction(new MagicMoveCardAction(
|
cardOnStack.getCard(),
|
||||||
cardOnStack.getCard(),
|
MagicLocationType.Stack,
|
||||||
MagicLocationType.Stack,
|
MagicLocationType.OwnersHand));
|
||||||
MagicLocationType.OwnersHand));
|
} else {
|
||||||
|
game.doAction(new MagicMoveCardAction(cardOnStack));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
game.doAction(new MagicMoveCardAction(cardOnStack));
|
game.doAction(new MagicMoveCardAction(cardOnStack));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,17 +38,24 @@ public class Mind_Peel {
|
||||||
final Object[] data,
|
final Object[] data,
|
||||||
final Object[] choiceResults) {
|
final Object[] choiceResults) {
|
||||||
final MagicCardOnStack cardOnStack = (MagicCardOnStack)data[0];
|
final MagicCardOnStack cardOnStack = (MagicCardOnStack)data[0];
|
||||||
event.processTargetPlayer(game,choiceResults,0,new MagicPlayerAction() {
|
final boolean hasTarget = event.processTargetPlayer(
|
||||||
|
game,
|
||||||
|
choiceResults,
|
||||||
|
0,
|
||||||
|
new MagicPlayerAction() {
|
||||||
public void doAction(final MagicPlayer player) {
|
public void doAction(final MagicPlayer player) {
|
||||||
game.addEvent(new MagicDiscardEvent(cardOnStack.getCard(),player,1,false));
|
game.addEvent(new MagicDiscardEvent(cardOnStack.getCard(),player,1,false));
|
||||||
|
if (MagicBuybackChoice.isYesChoice(choiceResults[1])) {
|
||||||
|
game.doAction(new MagicMoveCardAction(
|
||||||
|
cardOnStack.getCard(),
|
||||||
|
MagicLocationType.Stack,
|
||||||
|
MagicLocationType.OwnersHand));
|
||||||
|
} else {
|
||||||
|
game.doAction(new MagicMoveCardAction(cardOnStack));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (MagicBuybackChoice.isYesChoice(choiceResults[1])) {
|
if (!hasTarget) {
|
||||||
game.doAction(new MagicMoveCardAction(
|
|
||||||
cardOnStack.getCard(),
|
|
||||||
MagicLocationType.Stack,
|
|
||||||
MagicLocationType.OwnersHand));
|
|
||||||
} else {
|
|
||||||
game.doAction(new MagicMoveCardAction(cardOnStack));
|
game.doAction(new MagicMoveCardAction(cardOnStack));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue