From f562a4c0cf15e69d8be1923cc18b518ed0e6c6b9 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sun, 2 Oct 2016 21:00:41 +1100 Subject: [PATCH] spjspj - Update multiseat option to be multi-attack --- .../java/mage/game/tournament/TournamentSingleElimination.java | 2 ++ Mage/src/main/java/mage/game/tournament/TournamentSwiss.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java index 55ab5f8a0d5..742e288ea3d 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java @@ -31,6 +31,7 @@ package mage.game.tournament; import java.util.List; import java.util.Map; import java.util.UUID; +import mage.constants.MultiplayerAttackOption; import mage.game.events.TableEvent; /** @@ -60,6 +61,7 @@ public abstract class TournamentSingleElimination extends TournamentImpl { eliminatePlayers(round); } } else { + options.matchOptions.setAttackOption(MultiplayerAttackOption.MULTIPLE); MultiplayerRound round = new MultiplayerRound(0, this, options.matchOptions.getNumSeats()); for (TournamentPlayer player : getActivePlayers()) { round.addPlayer(player); diff --git a/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java b/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java index faf2ffc9285..5eb947c6920 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java @@ -30,6 +30,7 @@ package mage.game.tournament; import java.util.List; import java.util.Map.Entry; import java.util.UUID; +import mage.constants.MultiplayerAttackOption; import mage.constants.TournamentPlayerState; import mage.game.events.TableEvent; @@ -65,6 +66,7 @@ public abstract class TournamentSwiss extends TournamentImpl { playRound(round); } } else { + options.matchOptions.setAttackOption(MultiplayerAttackOption.MULTIPLE); MultiplayerRound round = createMultiplayerRound(); playMultiplayerRound(round); } @@ -114,6 +116,7 @@ public abstract class TournamentSwiss extends TournamentImpl { MultiplayerRound round = null; if (options.matchOptions.getNumSeats() > 2) { + options.matchOptions.setAttackOption(MultiplayerAttackOption.MULTIPLE); RoundPairings roundPairings; if (roundPlayers.size() <= 16) { SwissPairingMinimalWeightMatching swissPairing = new SwissPairingMinimalWeightMatching(roundPlayers, rounds, isLastRound);