mirror of
https://github.com/correl/mage.git
synced 2024-12-26 03:00:11 +00:00
Merge pull request #5532 from magefree/coinFlips
Added support for multiple copies of Krark's Thumb
This commit is contained in:
commit
908d8acc9f
4 changed files with 75 additions and 60 deletions
|
@ -6,13 +6,13 @@ import mage.abilities.common.SimpleStaticAbility;
|
||||||
import mage.abilities.effects.ReplacementEffectImpl;
|
import mage.abilities.effects.ReplacementEffectImpl;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
import mage.cards.CardSetInfo;
|
import mage.cards.CardSetInfo;
|
||||||
import mage.constants.*;
|
import mage.constants.CardType;
|
||||||
|
import mage.constants.Duration;
|
||||||
|
import mage.constants.Outcome;
|
||||||
|
import mage.constants.SuperType;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.events.FlipCoinEvent;
|
import mage.game.events.FlipCoinEvent;
|
||||||
import mage.game.events.GameEvent;
|
import mage.game.events.GameEvent;
|
||||||
import mage.players.Player;
|
|
||||||
import mage.util.CardUtil;
|
|
||||||
import mage.util.RandomUtil;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ public final class KrarksThumb extends CardImpl {
|
||||||
addSuperType(SuperType.LEGENDARY);
|
addSuperType(SuperType.LEGENDARY);
|
||||||
|
|
||||||
// If you would flip a coin, instead flip two coins and ignore one.
|
// If you would flip a coin, instead flip two coins and ignore one.
|
||||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KrarksThumbEffect()));
|
this.addAbility(new SimpleStaticAbility(new KrarksThumbEffect()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private KrarksThumb(final KrarksThumb card) {
|
private KrarksThumb(final KrarksThumb card) {
|
||||||
|
@ -43,33 +43,22 @@ class KrarksThumbEffect extends ReplacementEffectImpl {
|
||||||
|
|
||||||
KrarksThumbEffect() {
|
KrarksThumbEffect() {
|
||||||
super(Duration.WhileOnBattlefield, Outcome.Benefit);
|
super(Duration.WhileOnBattlefield, Outcome.Benefit);
|
||||||
staticText = "If you would flip a coin, instead flip two coins and ignore one";
|
staticText = "If you would flip a coin, instead flip two coins and ignore one.";
|
||||||
}
|
}
|
||||||
|
|
||||||
private KrarksThumbEffect(final KrarksThumbEffect effect) {
|
private KrarksThumbEffect(final KrarksThumbEffect effect) {
|
||||||
super(effect);
|
super(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public KrarksThumbEffect copy() {
|
||||||
|
return new KrarksThumbEffect(this);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
|
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
|
||||||
Player player = game.getPlayer(event.getPlayerId());
|
FlipCoinEvent flipCoinEvent = (FlipCoinEvent) event;
|
||||||
if (player == null || !player.getId().equals(source.getControllerId())) {
|
flipCoinEvent.setFlipCount(2 * flipCoinEvent.getFlipCount());
|
||||||
return false;
|
|
||||||
}
|
|
||||||
FlipCoinEvent flipEvent = (FlipCoinEvent) event;
|
|
||||||
boolean secondFlip = RandomUtil.nextBoolean();
|
|
||||||
game.informPlayers(player.getLogName() + " flipped a " + flipEvent.getResultName()
|
|
||||||
+ " and a " + CardUtil.booleanToFlipName(secondFlip)
|
|
||||||
);
|
|
||||||
boolean chosenFlip = player.chooseUse(
|
|
||||||
Outcome.Benefit, "Choose which coin you want",
|
|
||||||
(flipEvent.isWinnable() ? "(You chose " + flipEvent.getChosenName() + ")" : null),
|
|
||||||
flipEvent.getResultName(), CardUtil.booleanToFlipName(secondFlip), source, game
|
|
||||||
);
|
|
||||||
if (!chosenFlip) {
|
|
||||||
flipEvent.setResult(secondFlip);
|
|
||||||
}
|
|
||||||
game.informPlayers(player.getLogName() + " chooses to keep " + flipEvent.getResultName());
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,9 +76,4 @@ class KrarksThumbEffect extends ReplacementEffectImpl {
|
||||||
public boolean apply(Game game, Ability source) {
|
public boolean apply(Game game, Ability source) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public KrarksThumbEffect copy() {
|
|
||||||
return new KrarksThumbEffect(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ public class FlipCoinEvent extends GameEvent {
|
||||||
private boolean result;
|
private boolean result;
|
||||||
private final boolean chosen;
|
private final boolean chosen;
|
||||||
private final boolean winnable;
|
private final boolean winnable;
|
||||||
|
private int flipCount = 1;
|
||||||
|
|
||||||
public FlipCoinEvent(UUID playerId, UUID sourceId, boolean result, boolean chosen, boolean winnable) {
|
public FlipCoinEvent(UUID playerId, UUID sourceId, boolean result, boolean chosen, boolean winnable) {
|
||||||
super(EventType.FLIP_COIN, playerId, sourceId, playerId);
|
super(EventType.FLIP_COIN, playerId, sourceId, playerId);
|
||||||
|
@ -43,6 +44,14 @@ public class FlipCoinEvent extends GameEvent {
|
||||||
return winnable;
|
return winnable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getFlipCount() {
|
||||||
|
return flipCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFlipCount(int flipCount) {
|
||||||
|
this.flipCount = flipCount;
|
||||||
|
}
|
||||||
|
|
||||||
public CoinFlippedEvent getFlippedEvent() {
|
public CoinFlippedEvent getFlippedEvent() {
|
||||||
return new CoinFlippedEvent(playerId, sourceId, result, chosen, winnable);
|
return new CoinFlippedEvent(playerId, sourceId, result, chosen, winnable);
|
||||||
}
|
}
|
||||||
|
|
|
@ -355,6 +355,7 @@ public interface Player extends MageItem, Copyable<Player> {
|
||||||
/**
|
/**
|
||||||
* Reveals all players' libraries. Useful for abilities like Jace, Architect of Thought's -8
|
* Reveals all players' libraries. Useful for abilities like Jace, Architect of Thought's -8
|
||||||
* that have effects that require information from all libraries.
|
* that have effects that require information from all libraries.
|
||||||
|
*
|
||||||
* @param source
|
* @param source
|
||||||
* @param game
|
* @param game
|
||||||
* @return
|
* @return
|
||||||
|
|
|
@ -2573,13 +2573,34 @@ public abstract class PlayerImpl implements Player, Serializable {
|
||||||
boolean chosen = false;
|
boolean chosen = false;
|
||||||
if (winnable) {
|
if (winnable) {
|
||||||
chosen = this.chooseUse(Outcome.Benefit, "Heads or tails?", "", "Heads", "Tails", source, game);
|
chosen = this.chooseUse(Outcome.Benefit, "Heads or tails?", "", "Heads", "Tails", source, game);
|
||||||
game.informPlayers(getLogName() + " chose " + (chosen ? "heads." : "tails."));
|
game.informPlayers(getLogName() + " chose " + CardUtil.booleanToFlipName(chosen));
|
||||||
}
|
}
|
||||||
boolean result = RandomUtil.nextBoolean();
|
boolean result = RandomUtil.nextBoolean();
|
||||||
FlipCoinEvent event = new FlipCoinEvent(playerId, source.getSourceId(), result, chosen, winnable);
|
FlipCoinEvent event = new FlipCoinEvent(playerId, source.getSourceId(), result, chosen, winnable);
|
||||||
event.addAppliedEffects(appliedEffects);
|
event.addAppliedEffects(appliedEffects);
|
||||||
game.replaceEvent(event);
|
game.replaceEvent(event);
|
||||||
game.informPlayers(getLogName() + " got " + (event.getResult() ? "heads" : "tails"));
|
game.informPlayers(getLogName() + " flipped " + CardUtil.booleanToFlipName(event.getResult()));
|
||||||
|
if (event.getFlipCount() > 1) {
|
||||||
|
boolean canChooseHeads = event.getResult();
|
||||||
|
boolean canChooseTails = !event.getResult();
|
||||||
|
for (int i = 1; i < event.getFlipCount(); i++) {
|
||||||
|
boolean tempFlip = RandomUtil.nextBoolean();
|
||||||
|
canChooseHeads = canChooseHeads || tempFlip;
|
||||||
|
canChooseTails = canChooseTails || !tempFlip;
|
||||||
|
game.informPlayers(getLogName() + " flipped " + CardUtil.booleanToFlipName(tempFlip));
|
||||||
|
}
|
||||||
|
if (canChooseHeads && canChooseTails) {
|
||||||
|
event.setResult(chooseUse(Outcome.Benefit, "Choose which flip to keep",
|
||||||
|
(event.isWinnable() ? "(You called " + event.getChosenName() + ")" : null),
|
||||||
|
"Heads", "Tails", source, game
|
||||||
|
));
|
||||||
|
} else if (canChooseHeads) {
|
||||||
|
event.setResult(true);
|
||||||
|
} else {
|
||||||
|
event.setResult(false);
|
||||||
|
}
|
||||||
|
game.informPlayers(getLogName() + " chose to keep " + CardUtil.booleanToFlipName(event.getResult()));
|
||||||
|
}
|
||||||
if (event.isWinnable()) {
|
if (event.isWinnable()) {
|
||||||
game.informPlayers(getLogName() + " " + (event.getResult() == event.getChosen() ? "won" : "lost") + " the flip");
|
game.informPlayers(getLogName() + " " + (event.getResult() == event.getChosen() ? "won" : "lost") + " the flip");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue