external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'brawlfixes' into 'master'

Browse Source 
Brawl and Tiny Leader Android fixes

See merge request core-developers/forge!437
This commit is contained in:
Michael Kamensky
2018-04-19 18:01:38 +00:00
parent 3b50fde76e 0168a20e7e
commit 13b058ed1b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
View File

@@ -377,6 +377,8 @@ public class PlayerPanel extends FContainer {
private void onIsAiChanged(boolean isAi) { private void onIsAiChanged(boolean isAi) {
deckChooser.setIsAi(isAi); deckChooser.setIsAi(isAi);
lstCommanderDecks.setIsAi(isAi); lstCommanderDecks.setIsAi(isAi);
lstTinyLeadersDecks.setIsAi(isAi);
lstBrawlDecks.setIsAi(isAi);
lstPlanarDecks.setIsAi(isAi); lstPlanarDecks.setIsAi(isAi);
lstSchemeDecks.setIsAi(isAi); lstSchemeDecks.setIsAi(isAi);
lstVanguardAvatars.setIsAi(isAi); lstVanguardAvatars.setIsAi(isAi);

3
forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
View File

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.deck.DeckFormat; import forge.deck.DeckFormat;
import forge.deck.generation.DeckGenPool;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
@@ -17,7 +18,7 @@ import java.util.List;
public class CardThemedCommanderDeckBuilder extends CardThemedDeckBuilder { public class CardThemedCommanderDeckBuilder extends CardThemedDeckBuilder {
public CardThemedCommanderDeckBuilder(PaperCard commanderCard0, PaperCard partner0, final List<PaperCard> dList, boolean isForAI, DeckFormat format) { public CardThemedCommanderDeckBuilder(PaperCard commanderCard0, PaperCard partner0, final List<PaperCard> dList, boolean isForAI, DeckFormat format) {
super(FModel.getMagicDb().getCommonCards(), format); super(new DeckGenPool(FModel.getMagicDb().getCommonCards().getUniqueCards()), format);
this.availableList = dList; this.availableList = dList;
keyCard = commanderCard0; keyCard = commanderCard0;
secondKeyCard = partner0; secondKeyCard = partner0;

2
forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
View File

@@ -76,7 +76,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
* Cards to build the deck from. * Cards to build the deck from.
*/ */
public CardThemedDeckBuilder(PaperCard keyCard0, PaperCard secondKeyCard0, final List<PaperCard> dList, GameFormat format, boolean isForAI) { public CardThemedDeckBuilder(PaperCard keyCard0, PaperCard secondKeyCard0, final List<PaperCard> dList, GameFormat format, boolean isForAI) {
super(FModel.getMagicDb().getCommonCards(), DeckFormat.Constructed, format.getFilterPrinted()); super(new DeckGenPool(FModel.getMagicDb().getCommonCards().getUniqueCards()), DeckFormat.Constructed, format.getFilterPrinted());
this.availableList = dList; this.availableList = dList;
keyCard=keyCard0; keyCard=keyCard0;
secondKeyCard=secondKeyCard0; secondKeyCard=secondKeyCard0;