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

Optimize unlock card logic

Browse Source
This commit is contained in:
drdev
2016-01-04 02:03:23 +00:00
parent a43630062e
commit 33d051d6ab
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -74,7 +74,12 @@ public final class ConquestData {
ConquestCommander commander = new ConquestCommander(startingCommander0, startingPlane0.getCardPool(), false); ConquestCommander commander = new ConquestCommander(startingCommander0, startingPlane0.getCardPool(), false);
commanders.add(commander); commanders.add(commander);
unlockCard(startingCommander0); unlockCard(startingCommander0);
unlockCards(commander.getDeck().getMain().toFlatList()); for (Entry<PaperCard, Integer> entry : commander.getDeck().getMain()) {
PaperCard card = entry.getKey();
if (!card.getRules().getType().isBasicLand()) { //ignore basic lands
unlockCard(card);
}
}
} }
public ConquestData(File directory0) { public ConquestData(File directory0) {
@@ -151,8 +156,6 @@ public final class ConquestData {
} }
public void unlockCard(PaperCard card) { public void unlockCard(PaperCard card) {
if (card.getRules().getType().isBasicLand()) { return; } //ignore basic lands
if (unlockedCards.add(card)) { if (unlockedCards.add(card)) {
newCards.add(card); newCards.add(card);
} }

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

@@ -9,7 +9,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor;
import forge.deck.CardPool; import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckFormat; import forge.deck.DeckFormat;