External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Added a deck hash tag that's shown at the start of the game log to be able to identify a deck.

Browse source
This commit is contained in:
LevelX2 2015-04-11 00:47:54 +02:00
parent 3bdf2a7957
commit 0fb7cf8317
7 changed files with 95 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/utils/CardUtil.java
View file

@ -1,8 +1,8 @@
package mage.utils;
import mage.constants.CardType;
import mage.cards.Card;
import mage.cards.MagePermanent;
import mage.constants.CardType;
import mage.view.CardView;
/**

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

@ -44,8 +44,8 @@ public class DeckBuilder {
deckSize = deckCardSize;
deck = new Deck();
final Collection<MageScoredCard> remainingCards = new ArrayList<MageScoredCard>();
Set<String> names = new HashSet<String>();
final Collection<MageScoredCard> remainingCards = new ArrayList<>();
Set<String> names = new HashSet<>();
for (final Card card : spellCardPool) {
if (names.contains(card.getName())) {
continue;
@ -155,7 +155,7 @@ public class DeckBuilder {
private static void addLandsToDeck(List<ColoredManaSymbol> allowedColors, List<String> setsToUse, List<Card> landCardPool, RateCallback callback) {
// Calculate statistics per color.
final Map<String, Integer> colorCount = new HashMap<String, Integer>();
final Map<String, Integer> colorCount = new HashMap<>();
for (final Card card : deck.getCards()) {
for (String symbol : card.getManaCost().getSymbols()) {
@ -170,7 +170,7 @@ public class DeckBuilder {
if (count > 0) {
Integer typeCount = colorCount.get(symbol);
if (typeCount == null) {
typeCount = new Integer(0);
typeCount = 0;
}
typeCount += 1;
colorCount.put(symbol, typeCount);
@ -180,7 +180,7 @@ public class DeckBuilder {
}
// Add suitable non basic lands to deck in order of pack.
final Map<String, Integer> colorSource = new HashMap<String, Integer>();
final Map<String, Integer> colorSource = new HashMap<>();
for (final ColoredManaSymbol color : ColoredManaSymbol.values()) {
colorSource.put(color.toString(), 0);
}
@ -236,7 +236,7 @@ public class DeckBuilder {
private static class MageScoredCard {
private Card card;
private int score;
private final int score;
private static final int SINGLE_PENALTY[] = {0, 1, 1, 3, 6, 9};
//private static final int DOUBLE_PENALTY[] = { 0, 0, 1, 2, 4, 6 };
@ -266,10 +266,10 @@ public class DeckBuilder {
private int getManaCostScore(Card card, List<ColoredManaSymbol> allowedColors) {
int converted = card.getManaCost().convertedManaCost();
final Map<String, Integer> singleCount = new HashMap<String, Integer>();
final Map<String, Integer> singleCount = new HashMap<>();
int maxSingleCount = 0;
int multicolor = 0;
Set<String> colors = new HashSet<String>();
Set<String> colors = new HashSet<>();
for (String symbol : card.getManaCost().getSymbols()) {
int count = 0;
symbol = symbol.replace("{", "").replace("}", "");
@ -289,7 +289,7 @@ public class DeckBuilder {
}
Integer typeCount = singleCount.get(symbol);
if (typeCount == null) {
typeCount = new Integer(0);
typeCount = 0;
}
typeCount += 1;
singleCount.put(symbol, typeCount);