diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java index 227f788d4fa..846221fd23a 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java @@ -74,13 +74,9 @@ public class Brawl extends Constructed { } } } - banned.add("Attune with Aether"); // since 2018-01-15 - banned.add("Aetherworks Marvel"); - banned.add("Felidar Guardian"); - banned.add("Rampaging Ferocidon"); // since 2018-01-15 - banned.add("Ramunap Ruins"); // since 2018-01-15 - banned.add("Rogue Refiner"); // since 2018-01-15 + banned.add("Baral, Chief of Compliance"); banned.add("Smuggler's Copter"); + banned.add("Sorcerers' Spyglass"); } private static boolean isFallBlock(ExpansionSet set) { @@ -155,8 +151,20 @@ public class Brawl extends Constructed { } } } + + List basicsInDeck = new ArrayList<>(); + if (colorIdentity.isColorless()) { + for (Card card : deck.getCards()) { + if (basicLandNames.contains(card.getName())) { + basicsInDeck.add(card.getName()); + } + } + } for (Card card : deck.getCards()) { - if (!cardHasValidColor(colorIdentity, card)) { + if (!cardHasValidColor(colorIdentity, card) + && !(colorIdentity.isColorless() + && basicsInDeck.size() == 1 + && basicsInDeck.contains(card.getName()))) { invalid.put(card.getName(), "Invalid color (" + colorIdentity.toString() + ')'); valid = false; } diff --git a/Mage.Server.Plugins/Mage.Game.BrawlDuel/src/mage/game/BrawlDuelMatch.java b/Mage.Server.Plugins/Mage.Game.BrawlDuel/src/mage/game/BrawlDuelMatch.java index 1fee95c5e2c..f24fdd1259a 100644 --- a/Mage.Server.Plugins/Mage.Game.BrawlDuel/src/mage/game/BrawlDuelMatch.java +++ b/Mage.Server.Plugins/Mage.Game.BrawlDuel/src/mage/game/BrawlDuelMatch.java @@ -42,7 +42,7 @@ public class BrawlDuelMatch extends MatchImpl { @Override public void startGame() throws GameException { - int startLife = 30; + int startLife = 20; boolean alsoHand = true; BrawlDuel game = new BrawlDuel(options.getAttackOption(), options.getRange(), options.getFreeMulligans(), startLife); game.setCheckCommanderDamage(false);