Remove use of card classes for duplicate cards. Remove set related information from being tied to card classes.

This commit is contained in:
JOAC69 2016-09-01 23:33:59 -05:00
parent 3c2189e7a1
commit e8230946af
32 changed files with 356 additions and 155 deletions

View file

@ -1,8 +1,12 @@
package org.mage.test.utils;
import mage.MageInt;
import mage.cards.CardSetInfo;
import mage.cards.basiclands.Island;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.constants.CardType;
import mage.constants.ColoredManaSymbol;
import mage.constants.Rarity;
@ -15,7 +19,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import mage.sets.unhinged.Island;
/**
@ -39,7 +42,7 @@ public class DeckBuilderTest {
@Override
public Card getBestBasicLand(ColoredManaSymbol color, List<String> setsToUse) {
Assert.assertNotNull(color);
return new Island(owner);
return new Island(owner, new CardSetInfo("Island", "MRD", "999", Rarity.LAND));
}
};
@ -54,7 +57,7 @@ public class DeckBuilderTest {
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}");
super(ownerId, new CardSetInfo(name, "MRD", String.valueOf(cardNumber), Rarity.COMMON), new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}");
this.expansionSetCode = "MRD";
this.power = new MageInt(1);
this.toughness = new MageInt(1);