Commit 7d569403 authored by Michael Kamensky's avatar Michael Kamensky

Merge branch 'brawl1v1update' into 'master'

Brawl 1v1 rules update

See merge request core-developers/forge!785
parents c19832a5 8db68d87
......@@ -1756,6 +1756,11 @@ public class GameAction {
boolean isMultiPlayer = game.getPlayers().size() > 2;
int mulliganDelta = isMultiPlayer ? 0 : 1;
// https://magic.wizards.com/en/articles/archive/feature/checking-brawl-2018-07-09
if (game.getRules().hasAppliedVariant(GameType.Brawl) && !isMultiPlayer){
mulliganDelta = 0;
}
boolean allKept;
do {
allKept = true;
......
......@@ -501,7 +501,7 @@ public abstract class GameLobby implements IHasGameType {
//override starting life for 1v1 Brawl
if (hasVariant(GameType.Brawl) && activeSlots.size() == 2){
for (RegisteredPlayer player : players){
player.setStartingLife(20);
player.setStartingLife(25);
}
}
playerToSlot.put(rp, slot);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment