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

Enhanced deck generator: monocolor decks, card pool 3 times bigger, bonus for multicolored cards, no duplicate cards.

Browse source
This commit is contained in:
magenoxx 2011-05-20 16:40:16 +04:00
parent 1eb65e8d13
commit 935bf45c57
3 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
View file

@ -1,26 +1,11 @@
package mage.client.deck.generator; package mage.client.deck.generator;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.util.*;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.ColoredManaSymbol; import mage.Constants.ColoredManaSymbol;
import mage.Mana; import mage.Mana;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.ExpansionSet;
import mage.cards.decks.Deck; import mage.cards.decks.Deck;
import mage.client.MageFrame;
import mage.client.cards.CardsStorage; import mage.client.cards.CardsStorage;
import mage.client.util.gui.ColorsChooser; import mage.client.util.gui.ColorsChooser;
import mage.interfaces.rate.RateCallback; import mage.interfaces.rate.RateCallback;
@ -28,6 +13,15 @@ import mage.sets.Sets;
import mage.utils.CardUtil; import mage.utils.CardUtil;
import mage.utils.DeckBuilder; import mage.utils.DeckBuilder;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.UUID;
/** /**
* Generates random card pool and builds a deck. * Generates random card pool and builds a deck.
* *
@ -38,7 +32,7 @@ public class DeckGenerator {
private static JDialog dlg; private static JDialog dlg;
private static String selectedColors; private static String selectedColors;
private static final int SPELL_CARD_POOL_SIZE = 60; private static final int SPELL_CARD_POOL_SIZE = 180;
private static final int DECK_LANDS = 16; private static final int DECK_LANDS = 16;
private static final int MAX_NON_BASIC_SOURCE = DECK_LANDS / 2; private static final int MAX_NON_BASIC_SOURCE = DECK_LANDS / 2;
@ -61,7 +55,8 @@ public class DeckGenerator {
JLabel text = new JLabel("Choose color for your deck: "); JLabel text = new JLabel("Choose color for your deck: ");
p0.add(text); p0.add(text);
p0.add(Box.createVerticalStrut(5)); p0.add(Box.createVerticalStrut(5));
final ColorsChooser colorsChooser = new ColorsChooser("bu"); String chosen = MageFrame.getPreferences().get("genDeckColor", "u");
final ColorsChooser colorsChooser = new ColorsChooser(chosen);
p0.add(colorsChooser); p0.add(colorsChooser);
final JButton btnGenerate = new JButton("Ok"); final JButton btnGenerate = new JButton("Ok");
@ -71,6 +66,7 @@ public class DeckGenerator {
colorsChooser.setEnabled(false); colorsChooser.setEnabled(false);
selectedColors = (String) colorsChooser.getSelectedItem(); selectedColors = (String) colorsChooser.getSelectedItem();
dlg.setVisible(false); dlg.setVisible(false);
MageFrame.getPreferences().put("genDeckColor", selectedColors);
} }
}); });
final JButton btnCancel = new JButton("Cancel"); final JButton btnCancel = new JButton("Cancel");

7
Mage.Client/src/main/java/mage/client/util/gui/ColorsChooser.java
View file

@ -27,6 +27,13 @@ public class ColorsChooser extends JComboBox implements ListCellRenderer {
this.setRenderer(this); this.setRenderer(this);
final DefaultComboBoxModel model = new DefaultComboBoxModel(); final DefaultComboBoxModel model = new DefaultComboBoxModel();
model.addElement("u");
model.addElement("r");
model.addElement("b");
model.addElement("g");
model.addElement("w");
model.addElement("bu"); model.addElement("bu");
model.addElement("bg"); model.addElement("bg");
model.addElement("br"); model.addElement("br");

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

@ -39,8 +39,13 @@ public class DeckBuilder {
deck = new Deck(); deck = new Deck();
final Collection<MageScoredCard> remainingCards = new ArrayList<MageScoredCard>(); final Collection<MageScoredCard> remainingCards = new ArrayList<MageScoredCard>();
Set<String> names = new HashSet<String>();
for (final Card card : spellCardPool) { for (final Card card : spellCardPool) {
if (names.contains(card.getName())) {
continue;
}
remainingCards.add(new MageScoredCard(card, allowedColors, callback)); remainingCards.add(new MageScoredCard(card, allowedColors, callback));
names.add(card.getName());
} }
int min = 0; int min = 0;
for (int index = 0; index < DECK_COUNT.length; index++) { for (int index = 0; index < DECK_COUNT.length; index++) {
@ -228,6 +233,8 @@ public class DeckBuilder {
int converted = card.getManaCost().convertedManaCost(); int converted = card.getManaCost().convertedManaCost();
final Map<String, Integer> singleCount = new HashMap<String, Integer>(); final Map<String, Integer> singleCount = new HashMap<String, Integer>();
int maxSingleCount = 0; int maxSingleCount = 0;
int multicolor = 0;
Set<String> colors = new HashSet<String>();
for (String symbol : card.getManaCost().getSymbols()) { for (String symbol : card.getManaCost().getSymbols()) {
int count = 0; int count = 0;
symbol = symbol.replace("{", "").replace("}", ""); symbol = symbol.replace("{", "").replace("}", "");
@ -240,6 +247,9 @@ public class DeckBuilder {
if (count == 0) { if (count == 0) {
return -30; return -30;
} }
if (!colors.contains(symbol)) {
multicolor += 1;
}
Integer typeCount = singleCount.get(symbol); Integer typeCount = singleCount.get(symbol);
if (typeCount == null) { if (typeCount == null) {
typeCount = new Integer(0); typeCount = new Integer(0);
@ -249,8 +259,9 @@ public class DeckBuilder {
maxSingleCount = Math.max(maxSingleCount, typeCount); maxSingleCount = Math.max(maxSingleCount, typeCount);
} }
} }
int multicolorBonus = multicolor > 1 ? 30 : 0;
maxSingleCount = Math.min(maxSingleCount, SINGLE_PENALTY.length - 1); maxSingleCount = Math.min(maxSingleCount, SINGLE_PENALTY.length - 1);
return 2 * converted + 3 * (10 - SINGLE_PENALTY[maxSingleCount]/*-DOUBLE_PENALTY[doubleCount]*/); return 2 * converted + 3 * (10 - SINGLE_PENALTY[maxSingleCount]/*-DOUBLE_PENALTY[doubleCount]*/) + multicolorBonus;
} }
public int getScore() { public int getScore() {