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

Code cleanup

Browse Source
This commit is contained in:
austinio7116
2018-03-29 07:00:37 +01:00
committed by maustin
parent 08dc5f5654
commit 9e053865e1
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/deck/DeckFormat.java
View File

@@ -70,7 +70,7 @@ public enum DeckFormat {
} }
}), }),
Pauper ( Range.is(60), Range.between(0, 10), 1), Pauper ( Range.is(60), Range.between(0, 10), 1),
Brawl ( Range.is(59), Range.between(0, 15), 1, StaticData.instance().getStandardPredicate(), null), Brawl ( Range.is(59), Range.between(0, 15), 1, null, StaticData.instance().getStandardPredicate()),
TinyLeaders ( Range.is(49), Range.between(0, 10), 1, new Predicate<CardRules>() { TinyLeaders ( Range.is(49), Range.between(0, 10), 1, new Predicate<CardRules>() {
private final Set<String> bannedCards = new HashSet<String>(Arrays.asList( private final Set<String> bannedCards = new HashSet<String>(Arrays.asList(
"Ancestral Recall", "Balance", "Black Lotus", "Black Vise", "Channel", "Chaos Orb", "Contract From Below", "Counterbalance", "Darkpact", "Demonic Attorney", "Demonic Tutor", "Earthcraft", "Edric, Spymaster of Trest", "Falling Star", "Ancestral Recall", "Balance", "Black Lotus", "Black Vise", "Channel", "Chaos Orb", "Contract From Below", "Counterbalance", "Darkpact", "Demonic Attorney", "Demonic Tutor", "Earthcraft", "Edric, Spymaster of Trest", "Falling Star",
@@ -124,7 +124,7 @@ public enum DeckFormat {
private final static String ADVPROCLAMATION = "Advantageous Proclamation"; private final static String ADVPROCLAMATION = "Advantageous Proclamation";
private final static String SOVREALM = "Sovereign's Realm"; private final static String SOVREALM = "Sovereign's Realm";
private DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0, Predicate<PaperCard> paperCardPoolFilter0, Predicate<CardRules> cardPoolFilter0) { private DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0, Predicate<CardRules> cardPoolFilter0, Predicate<PaperCard> paperCardPoolFilter0) {
mainRange = mainRange0; mainRange = mainRange0;
sideRange = sideRange0; sideRange = sideRange0;
maxCardCopies = maxCardCopies0; maxCardCopies = maxCardCopies0;

22
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -92,7 +92,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
public Deck get() { public Deck get() {
return new Deck(); return new Deck();
} }
}), Predicates.and(DeckFormat.Brawl.isLegalCardPredicate(),FModel.getFormats().getStandard().getFilterPrinted())),//include standard format requirement }), DeckFormat.Brawl.isLegalCardPredicate()),
Archenemy(new DeckController<Deck>(FModel.getDecks().getScheme(), new Supplier<Deck>() { Archenemy(new DeckController<Deck>(FModel.getDecks().getScheme(), new Supplier<Deck>() {
@Override @Override
public Deck get() { public Deck get() {
@@ -920,21 +920,25 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
final List<PaperCard> commanders = parentScreen.getDeck().getCommanders(); final List<PaperCard> commanders = parentScreen.getDeck().getCommanders();
if (commanders.isEmpty()) { if (commanders.isEmpty()) {
//if no commander set for deck, only show valid commanders //if no commander set for deck, only show valid commanders
switch (editorType) {
case TinyLeaders:
case Commander:
additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate(); additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate();
if(editorType.equals(EditorType.Brawl)){ break;
//brawl commander filter case Brawl:
additionalFilter = Predicates.and(Predicates.compose(Predicates.or(CardRulesPredicates.Presets.IS_PLANESWALKER,Predicates.and( additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate();
CardRulesPredicates.Presets.IS_CREATURE,CardRulesPredicates.Presets.IS_LEGENDARY)), PaperCard.FN_GET_RULES),
FModel.getFormats().getStandard().getFilterPrinted());
} }
cardManager.setCaption("Commanders"); cardManager.setCaption("Commanders");
} }
else { else {
//if a commander has been set, only show cards that match its color identity //if a commander has been set, only show cards that match its color identity
switch (editorType) {
case TinyLeaders:
case Commander:
additionalFilter = DeckFormat.Commander.isLegalCardForCommanderOrLegalPartnerPredicate(commanders); additionalFilter = DeckFormat.Commander.isLegalCardForCommanderOrLegalPartnerPredicate(commanders);
if(editorType.equals(EditorType.Brawl)){ break;
additionalFilter = Predicates.and(additionalFilter,FModel.getFormats().getStandard().getFilterPrinted()); case Brawl:
additionalFilter = DeckFormat.Brawl.isLegalCardForCommanderOrLegalPartnerPredicate(commanders);
} }
cardManager.setCaption("Cards"); cardManager.setCaption("Cards");
} }

6
forge-gui/src/main/java/forge/deck/DeckProxy.java
View File

@@ -381,12 +381,6 @@ public class DeckProxy implements InventoryItem {
else { else {
filter = Predicates.and(DeckFormat.Brawl.hasLegalCardsPredicate(), filter); filter = Predicates.and(DeckFormat.Brawl.hasLegalCardsPredicate(), filter);
} }
filter = Predicates.and(new Predicate<Deck>() {
@Override
public boolean apply(Deck input) {
return FModel.getFormats().getStandard().isDeckLegal(input);
}
}, filter);
addDecksRecursivelly("Brawl", GameType.Brawl, result, "", FModel.getDecks().getBrawl(), filter); addDecksRecursivelly("Brawl", GameType.Brawl, result, "", FModel.getDecks().getBrawl(), filter);
return result; return result;
} }

2
forge-gui/src/main/java/forge/deck/DeckgenUtil.java
View File

@@ -542,7 +542,7 @@ public class DeckgenUtil {
PaperCard selectedPartner=null; PaperCard selectedPartner=null;
if(isCardGen){ if(isCardGen){
List<Map.Entry<PaperCard,Integer>> potentialCards = new ArrayList<>(); List<Map.Entry<PaperCard,Integer>> potentialCards = new ArrayList<>();
if(format.equals(DeckFormat.Brawl)){ if(format.equals(DeckFormat.Brawl)){//TODO: replace with actual Brawl based data
potentialCards.addAll(CardRelationMatrixGenerator.cardPools.get(FModel.getFormats().getStandard().getName()).get(commander.getName())); potentialCards.addAll(CardRelationMatrixGenerator.cardPools.get(FModel.getFormats().getStandard().getName()).get(commander.getName()));
}else { }else {
potentialCards.addAll(CardRelationMatrixGenerator.cardPools.get(DeckFormat.Commander.toString()).get(commander.getName())); potentialCards.addAll(CardRelationMatrixGenerator.cardPools.get(DeckFormat.Commander.toString()).get(commander.getName()));

2
forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
View File

@@ -80,6 +80,8 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
return DeckgenUtil.generateCommanderDeck(isAi, GameType.Commander); return DeckgenUtil.generateCommanderDeck(isAi, GameType.Commander);
case TinyLeaders: case TinyLeaders:
return DeckgenUtil.generateCommanderDeck(isAi, GameType.TinyLeaders); return DeckgenUtil.generateCommanderDeck(isAi, GameType.TinyLeaders);
case Brawl:
return DeckgenUtil.generateCommanderDeck(isAi, GameType.Brawl);
case Archenemy: case Archenemy:
return DeckgenUtil.generateSchemeDeck(); return DeckgenUtil.generateSchemeDeck();
case Planechase: case Planechase: