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

- Fixed deck generation ignoring singleton mode when adding basic lands.

Browse Source
This commit is contained in:
Sloth
2014-03-04 19:59:46 +00:00
parent 1479e578ea
commit b4ccd24e75
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
View File

@@ -104,7 +104,7 @@ public abstract class DeckGeneratorBase {
} while (this.cardCounts.get(cp.getName()) > this.maxDuplicates - 1 && lc <= 100); } while (this.cardCounts.get(cp.getName()) > this.maxDuplicates - 1 && lc <= 100);
if (lc > 100) { if (lc > 100) {
throw new RuntimeException("Generate2ColorDeck : get2ColorDeck -- looped too much -- Cr12"); throw new RuntimeException("Generate2ColorDeck : get2ColorDeck -- looped too much, please try again -- Cr12");
} }
tDeck.add(cardDb.getCard(cp.getName())); tDeck.add(cardDb.getCard(cp.getName()));
@@ -125,9 +125,13 @@ public abstract class DeckGeneratorBase {
do { do {
s = source.get(this.r.nextInt(source.size())); s = source.get(this.r.nextInt(source.size()));
lc++; lc++;
} while ((this.cardCounts.get(s) > 3) && (lc <= 20)); } while ((this.cardCounts.get(s) >= maxDuplicates) && (lc <= 50));
// 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.
if (lc > 50) {
break;
}
tDeck.add(cardDb.getCard(s)); tDeck.add(cardDb.getCard(s));
final int n = this.cardCounts.get(s); final int n = this.cardCounts.get(s);