github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

updated Brawl banlist, color identity rules, and 1v1 starting life total (closes #4931)

Browse source
This commit is contained in:
Evan Kranzler 2018-05-10 20:40:52 -04:00
parent fe32fc7cc3
commit d6ff7f851d
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Brawl.java
View file

@ -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<String> 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;
}

2
Mage.Server.Plugins/Mage.Game.BrawlDuel/src/mage/game/BrawlDuelMatch.java
View file

@ -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);