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

* Cube Draft/Sealed - Fixed that cards where taken from promo/special sets if they also did exist in Core or Expansion sets.

Browse source
This commit is contained in:
LevelX2 2015-08-06 15:29:50 +02:00
parent 2ee8fc62a3
commit f6075b32cf
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/mage/cards/repository/CardRepository.java
View file

@ -44,7 +44,10 @@ import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import mage.cards.ExpansionSet;
import mage.cards.Sets;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SetType;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -297,6 +300,25 @@ public enum CardRepository {
return null; return null;
} }
public CardInfo findPreferedCoreExpansionCard(String name) {
List<CardInfo> cards = findCards(name);
if (!cards.isEmpty()) {
CardInfo cardInfo = cards.get(random.nextInt(cards.size()));
ExpansionSet set = Sets.getInstance().get(cardInfo.getSetCode());
if (set.getSetType().equals(SetType.EXPANSION) || set.getSetType().equals(SetType.CORE)) {
return cardInfo;
}
for (CardInfo cardInfoToCheck : cards) {
set = Sets.getInstance().get(cardInfoToCheck.getSetCode());
if (set.getSetType().equals(SetType.CORE) || set.getSetType().equals(SetType.EXPANSION)) {
return cardInfoToCheck;
}
}
return cardInfo;
}
return null;
}
public List<CardInfo> findCards(String name) { public List<CardInfo> findCards(String name) {
try { try {
QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder(); QueryBuilder<CardInfo, Object> queryBuilder = cardDao.queryBuilder();

11
Mage/src/mage/game/draft/DraftCube.java
View file

@ -43,6 +43,7 @@ import org.apache.log4j.Logger;
public abstract class DraftCube { public abstract class DraftCube {
public class CardIdentity { public class CardIdentity {
private String name; private String name;
private String extension; private String extension;
@ -69,7 +70,7 @@ public abstract class DraftCube {
} }
private static final Logger logger = Logger.getLogger(DraftCube.class); private static final Logger logger = Logger.getLogger(DraftCube.class);
private static final Random rnd = new Random(); private static final Random rnd = new Random();
private final String name; private final String name;
private final int boosterSize = 15; private final int boosterSize = 15;
@ -88,13 +89,13 @@ public abstract class DraftCube {
public List<CardIdentity> getCubeCards() { public List<CardIdentity> getCubeCards() {
return cubeCards; return cubeCards;
} }
public List<Card> createBooster() { public List<Card> createBooster() {
List<Card> booster = new ArrayList<>(); List<Card> booster = new ArrayList<>();
if (leftCubeCards.isEmpty()) { if (leftCubeCards.isEmpty()) {
leftCubeCards.addAll(cubeCards); leftCubeCards.addAll(cubeCards);
} }
for (int i = 0; i < boosterSize; i++) { for (int i = 0; i < boosterSize; i++) {
boolean done = false; boolean done = false;
int notValid = 0; int notValid = 0;
@ -111,9 +112,9 @@ public abstract class DraftCube {
cardInfo = cardList.get(0); cardInfo = cardList.get(0);
} }
} else { } else {
cardInfo = CardRepository.instance.findCard(cardId.getName()); cardInfo = CardRepository.instance.findPreferedCoreExpansionCard(cardId.getName());
} }
if (cardInfo != null) { if (cardInfo != null) {
booster.add(cardInfo.getCard()); booster.add(cardInfo.getCard());
done = true; done = true;