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

Refactor logic for determining when a card can be a commander into CardRules

Browse Source
This commit is contained in:
drdev
2015-12-08 02:14:36 +00:00
parent d7d6fbc222
commit 64bc5e0484
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-core/src/main/java/forge/card/CardRules.java
View File

@@ -187,6 +187,14 @@ public final class CardRules implements ICardCharacteristics {
} }
} }
public boolean canBeCommander() {
CardType type = mainPart.getType();
if (type.isLegendary() && type.isCreature()) {
return true;
}
return mainPart.getOracleText().contains("can be your commander");
}
// public Set<String> getSets() { return this.setsPrinted.keySet(); } // public Set<String> getSets() { return this.setsPrinted.keySet(); }
// public CardInSet getEditionInfo(final String setCode) { // public CardInSet getEditionInfo(final String setCode) {
// final CardInSet result = this.setsPrinted.get(setCode); // final CardInSet result = this.setsPrinted.get(setCode);

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

@@ -328,10 +328,7 @@ public enum DeckFormat {
if (cardPoolFilter != null && !cardPoolFilter.apply(rules)) { if (cardPoolFilter != null && !cardPoolFilter.apply(rules)) {
return false; return false;
} }
if (rules.getType().isLegendary() && rules.getType().isCreature()) { return rules.canBeCommander();
return true;
}
return rules.getOracleText().contains("can be your commander");
} }
public Predicate<Deck> isLegalDeckPredicate() { public Predicate<Deck> isLegalDeckPredicate() {

8
forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
View File

@@ -24,7 +24,7 @@ import forge.assets.ISkinImage;
import forge.card.CardDb; import forge.card.CardDb;
import forge.card.CardEdition; import forge.card.CardEdition;
import forge.card.CardEdition.CardInSet; import forge.card.CardEdition.CardInSet;
import forge.card.CardType; import forge.card.CardRules;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.deck.generation.DeckGenPool; import forge.deck.generation.DeckGenPool;
@@ -226,14 +226,14 @@ public enum ConquestPlane {
if (!bannedCards.contains(card.name)) { if (!bannedCards.contains(card.name)) {
PaperCard pc = FModel.getMagicDb().getCommonCards().getCard(card.name, setCode); PaperCard pc = FModel.getMagicDb().getCommonCards().getCard(card.name, setCode);
if (pc != null) { if (pc != null) {
CardType type = pc.getRules().getType(); CardRules rules = pc.getRules();
boolean isCommander = type.isLegendary() && type.isCreature(); boolean isCommander = pc.getRules().canBeCommander();
cardPool.add(pc); cardPool.add(pc);
if (isCommander) { if (isCommander) {
commanders.add(pc); commanders.add(pc);
} }
int count = 0; int count = 0;
if (!type.isBasicLand()) { //add all basic lands to all regions below if (!rules.getType().isBasicLand()) { //add all basic lands to all regions below
for (Region region : regions) { for (Region region : regions) {
if (region.pred.apply(pc)) { if (region.pred.apply(pc)) {
region.cardPool.add(pc); region.cardPool.add(pc);