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

Fixed booster generation in Deck Editor

Browse source
This commit is contained in:
North 2012-11-04 16:15:27 +02:00
parent 9ad2eff813
commit bc80844fbe
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -39,6 +39,7 @@ import mage.MageObject;
import mage.ObjectColor; import mage.ObjectColor;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.ExpansionSet; import mage.cards.ExpansionSet;
import mage.cards.Sets;
import mage.cards.repository.CardCriteria; import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo; import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository; import mage.cards.repository.CardRepository;
@ -783,9 +784,6 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
}//GEN-LAST:event_rdoPlaneswalkersActionPerformed }//GEN-LAST:event_rdoPlaneswalkersActionPerformed
private void cbExpansionSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbExpansionSetActionPerformed private void cbExpansionSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbExpansionSetActionPerformed
if (cbExpansionSet.getSelectedItem() instanceof ExpansionSet) {
filterCards();
} else {
if (this.cbExpansionSet.getSelectedItem().equals("-- Standard")) { if (this.cbExpansionSet.getSelectedItem().equals("-- Standard")) {
filterCards(); filterCards();
} else { } else {
@ -793,24 +791,29 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
jToggleListView.doClick(); jToggleListView.doClick();
jToggleListView.setSelected(true); jToggleListView.setSelected(true);
} }
}
}//GEN-LAST:event_cbExpansionSetActionPerformed }//GEN-LAST:event_cbExpansionSetActionPerformed
private void btnClearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnClearActionPerformed private void btnClearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnClearActionPerformed
cards.clear(); cards.clear();
this.limited = false;
filterCards(); filterCards();
}//GEN-LAST:event_btnClearActionPerformed }//GEN-LAST:event_btnClearActionPerformed
private void btnBoosterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnBoosterActionPerformed private void btnBoosterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnBoosterActionPerformed
if (cbExpansionSet.getSelectedItem() instanceof ExpansionSet) { List<String> sets = ConstructedFormats.getSetsByFormat(this.cbExpansionSet.getSelectedItem().toString());
List<Card> booster = ((ExpansionSet)this.cbExpansionSet.getSelectedItem()).createBooster(); if (sets.size() == 1) {
for (Card card: booster) { if (!this.limited) {
cards.add(card); this.limited = true;
cards.clear();
} }
ExpansionSet expansionSet = Sets.getInstance().get(sets.get(0));
if (expansionSet != null) {
List<Card> booster = expansionSet.createBooster();
cards.addAll(booster);
filterCards(); filterCards();
}
} else { } else {
JOptionPane.showMessageDialog(null, "It's not possible to generate booster for not Expansion Set \nChoose Expansion Set first."); JOptionPane.showMessageDialog(null, "An expansion set must be selected to be able to generate a booster.");
} }
}//GEN-LAST:event_btnBoosterActionPerformed }//GEN-LAST:event_btnBoosterActionPerformed