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

Avoid choosing a commander as a starting planeswalker

Browse Source
This commit is contained in:
drdev
2016-02-08 02:31:00 +00:00
parent fdf1fc749d
commit 99cc5a9602
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
View File

@@ -109,7 +109,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
} }
private static class SelectStartingPlaneswalkerStep extends WizardStep<NewConquestScreenModel> { private static class SelectStartingPlaneswalkerStep extends WizardStep<NewConquestScreenModel> {
private final FChoiceList<PaperCard> lstPlaneswalkers = add(new FChoiceList<PaperCard>(ConquestUtil.getAllPlaneswalkers()) { private final FChoiceList<PaperCard> lstPlaneswalkers = add(new FChoiceList<PaperCard>(ConquestUtil.getStartingPlaneswalkerOptions()) {
@Override @Override
protected void onItemActivate(Integer index, PaperCard value) { protected void onItemActivate(Integer index, PaperCard value) {
advance(); advance();

6
forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
View File

@@ -8,6 +8,7 @@ import java.util.Map.Entry;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.card.CardRules;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.deck.CardPool; import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
@@ -125,11 +126,12 @@ public class ConquestUtil {
return pool; return pool;
} }
public static Iterable<PaperCard> getAllPlaneswalkers() { public static Iterable<PaperCard> getStartingPlaneswalkerOptions() {
return Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCards(), new Predicate<PaperCard>() { return Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCards(), new Predicate<PaperCard>() {
@Override @Override
public boolean apply(PaperCard card) { public boolean apply(PaperCard card) {
return card.getRules().getType().isPlaneswalker(); CardRules rules = card.getRules();
return rules.getType().isPlaneswalker() && !rules.canBeCommander(); //don't allow picking a commander as a starting planeswalker
} }
}); });
} }