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

- Randomly generated decks will now feature cards from random editions (so, no more "all lands Zendikar" etc.).

Browse Source
This commit is contained in:
Agetian
2012-12-06 08:39:27 +00:00
parent c553b67717
commit cfa9c60a0b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
View File

@@ -28,6 +28,7 @@ import java.util.TreeMap;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.Card;
import forge.Constant; import forge.Constant;
import forge.Singletons; import forge.Singletons;
@@ -114,7 +115,10 @@ public abstract class GenerateColoredDeckBase {
throw new RuntimeException("Generate2ColorDeck : get2ColorDeck -- looped too much -- Cr12"); throw new RuntimeException("Generate2ColorDeck : get2ColorDeck -- looped too much -- Cr12");
} }
tDeck.add(c); Card tCard = c.toForgeCard();
tCard.setCurSetCode(Aggregates.random(c.toForgeCard().getSets()).getCode());
tDeck.add(CardDb.instance().getCard(tCard));
final int n = this.cardCounts.get(c.getName()); final int n = this.cardCounts.get(c.getName());
this.cardCounts.put(c.getName(), n + 1); this.cardCounts.put(c.getName(), n + 1);
tmpDeck.append(c.getName() + " " + c.getCard().getManaCost() + "\n"); tmpDeck.append(c.getName() + " " + c.getCard().getManaCost() + "\n");
@@ -132,7 +136,10 @@ public abstract class GenerateColoredDeckBase {
} while ((this.cardCounts.get(s) > 3) && (lc <= 20)); } while ((this.cardCounts.get(s) > 3) && (lc <= 20));
// not an error if looped too much - could play singleton mode, with 6 slots for 3 non-basic lands. // not an error if looped too much - could play singleton mode, with 6 slots for 3 non-basic lands.
tDeck.add(CardDb.instance().getCard(s)); Card tCard = CardDb.instance().getCard(s).toForgeCard();
tCard.setCurSetCode(Aggregates.random(tCard.getSets()).getCode());
tDeck.add(CardDb.instance().getCard(tCard));
final int n = this.cardCounts.get(s); final int n = this.cardCounts.get(s);
this.cardCounts.put(s, n + 1); this.cardCounts.put(s, n + 1);
tmpDeck.append(s + "\n"); tmpDeck.append(s + "\n");
@@ -166,8 +173,10 @@ public abstract class GenerateColoredDeckBase {
// code // code
this.cardCounts.put(color, nLand); this.cardCounts.put(color, nLand);
Card tCard = CardDb.instance().getCard(color).toForgeCard();
tCard.setCurSetCode(Aggregates.random(tCard.getSets()).getCode());
for (int j = 0; j <= nLand; j++) { for (int j = 0; j <= nLand; j++) {
tDeck.add(CardDb.instance().getCard(color)); tDeck.add(CardDb.instance().getCard(tCard));
} }
} }
} }