github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #498 from dustinconrad/feature/deck-generator-null-ptr

Browse source 
fix null pointer when the generated deck is all artifacts.
This commit is contained in:
LevelX2 2014-08-10 09:39:03 +02:00
commit a98b6c602c
2 changed files with 77 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Common/src/mage/utils/DeckBuilder.java
View file

@ -7,6 +7,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Random;
import mage.Mana;
import mage.cards.Card;
import mage.cards.decks.Deck;
@ -202,6 +203,10 @@ public class DeckBuilder {
// Add optimal basic lands to deck.
while (deck.getCards().size() < deckSize) {
ColoredManaSymbol bestColor = null;
//Default to a color in the allowed colors
if (allowedColors != null && !allowedColors.isEmpty()) {
bestColor = allowedColors.get(new Random().nextInt(allowedColors.size()));
}
int lowestRatio = Integer.MAX_VALUE;
for (final ColoredManaSymbol color : ColoredManaSymbol.values()) {

72
Mage.Tests/src/test/java/org/mage/test/utils/DeckBuilderTest.java Normal file
View file

@ -0,0 +1,72 @@
package org.mage.test.utils;
import mage.MageInt;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.ColoredManaSymbol;
import mage.constants.Rarity;
import mage.interfaces.rate.RateCallback;
import mage.sets.guru.Island;
import mage.utils.DeckBuilder;
import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
/**
* @author dustinconrad
*/
public class DeckBuilderTest {
@Test
public void testAllArtifacts() {
final List<Card> spellCardPool = new ArrayList<>();
final UUID owner = UUID.randomUUID();
final List<ColoredManaSymbol> allowedColors = Arrays.asList(ColoredManaSymbol.U);
final List<String> setsToUse = new ArrayList<>();
final List<Card> landCardPool = null;
final RateCallback rateCallback = new RateCallback() {
@Override
public int rateCard(Card card) {
return 6;
}
@Override
public Card getBestBasicLand(ColoredManaSymbol color, List<String> setsToUse) {
Assert.assertNotNull(color);
return new Island(owner);
}
};
for(int i = 0; i < 24; i++) {
Card c = new RandomArtifactCreature(owner, i, "Random Artifact " + i);
spellCardPool.add(c);
}
DeckBuilder.buildDeck(spellCardPool, allowedColors, setsToUse, landCardPool, 40, rateCallback);
}
private static class RandomArtifactCreature extends CardImpl {
public RandomArtifactCreature(UUID ownerId, int cardNumber, String name) {
super(ownerId, cardNumber, name, Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}");
this.expansionSetCode = "MRD";
this.power = new MageInt(1);
this.toughness = new MageInt(1);
}
public RandomArtifactCreature(final RandomArtifactCreature card) {
super(card);
}
@Override
public RandomArtifactCreature copy() {
return new RandomArtifactCreature(this);
}
}
}