external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

deck import in drafted deck editor

Browse Source
This commit is contained in:
Nikolay Hidalgo Diaz
2017-12-30 07:46:10 +03:00
parent d3ff20484d
commit 45bebdff0c
7 changed files with 174 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
forge-core/src/main/java/forge/StaticData.java
View File

@@ -13,11 +13,7 @@ import forge.util.storage.IStorage;
import forge.util.storage.StorageBase;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.*;
/**
@@ -165,4 +161,28 @@ public class StaticData {
public CardDb getVariantCards() {
return variantCards;
}
public PaperCard getCardByEditionDate(PaperCard card, Date editionDate) {
PaperCard c = this.getCommonCards().getCardFromEdition(card.getName(), editionDate, CardDb.SetPreference.LatestCoreExp, card.getArtIndex());
if (null != c) {
return c;
}
c = this.getCommonCards().getCardFromEdition(card.getName(), editionDate, CardDb.SetPreference.LatestCoreExp, -1);
if (null != c) {
return c;
}
c = this.getCommonCards().getCardFromEdition(card.getName(), editionDate, CardDb.SetPreference.Latest, -1);
if (null != c) {
return c;
}
// I give up!
return card;
}
}

9
forge-core/src/main/java/forge/card/CardEdition.java
View File

@@ -469,6 +469,15 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
}
return UNKNOWN;
}
public Date getEarliestDateWithAllCards(CardPool cardPool) {
CardEdition earliestSet = StaticData.instance().getEditions().getEarliestEditionWithAllCards(cardPool);
Calendar cal = Calendar.getInstance();
cal.setTime(earliestSet.getDate());
cal.add(Calendar.DATE, 1);
return cal.getTime();
}
}
public static class Predicates {

38
forge-core/src/main/java/forge/deck/Deck.java
View File

@@ -23,7 +23,6 @@ import com.google.common.collect.Lists;
import forge.StaticData;
import forge.card.CardDb.SetPreference;
import forge.card.CardDb;
import forge.card.CardEdition;
import forge.item.IPaperCard;
import forge.item.PaperCard;
@@ -218,12 +217,7 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
}
private void convertByXitaxMethod() {
CardEdition earliestSet = StaticData.instance().getEditions().getEarliestEditionWithAllCards(getAllCardsInASinglePool());
Calendar cal = Calendar.getInstance();
cal.setTime(earliestSet.getDate());
cal.add(Calendar.DATE, 1);
Date dayAfterNewestSetRelease = cal.getTime();
Date dateWithAllCards = StaticData.instance().getEditions().getEarliestDateWithAllCards(getAllCardsInASinglePool());
for(Entry<DeckSection, CardPool> p : parts.entrySet()) {
if( p.getKey() == DeckSection.Planes || p.getKey() == DeckSection.Schemes || p.getKey() == DeckSection.Avatar)
@@ -232,22 +226,18 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
CardPool newPool = new CardPool();
for(Entry<PaperCard, Integer> cp : p.getValue()){
String cardName = cp.getKey().getName();
int artIndex = cp.getKey().getArtIndex();
PaperCard card = cp.getKey();
int count = cp.getValue();
PaperCard c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.LatestCoreExp, artIndex);
if( null == c ) {
c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.LatestCoreExp, -1);
if( c == null)
c = StaticData.instance().getCommonCards().getCardFromEdition(cardName, dayAfterNewestSetRelease, SetPreference.Latest, -1);
PaperCard replacementCard = StaticData.instance().getCardByEditionDate(card, dateWithAllCards);
if( c != null ) {
newPool.add(cardName, c.getEdition(), cp.getValue()); // this is to randomize art of all those cards
} else // I give up!
newPool.add(cp.getKey(), cp.getValue());
} else
newPool.add(c, cp.getValue());
if (replacementCard.getArtIndex() == card.getArtIndex()) {
newPool.add(card, count);
} else {
newPool.add(card.getName(), card.getEdition(), count); // this is to randomize art
}
}
parts.put(p.getKey(), newPool);
}
}
@@ -302,6 +292,14 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
return true;
}
@Override
public void importDeck(Deck deck) {
DeckSection[] sections = new DeckSection[] {DeckSection.Main, DeckSection.Sideboard};
for (DeckSection section: sections) {
this.putSection(section, deck.getOrCreate(section));
}
}
@Override
public String getImageKey(boolean altState) {
return null;

4
forge-core/src/main/java/forge/deck/DeckBase.java
View File

@@ -91,7 +91,7 @@ public abstract class DeckBase implements Serializable, Comparable<DeckBase>, In
/**
* Sets the comment.
*
* @param comment the new comment
* @param comment0 the new comment
*/
public void setComment(final String comment0) {
comment = comment0;
@@ -148,4 +148,6 @@ public abstract class DeckBase implements Serializable, Comparable<DeckBase>, In
}
public abstract boolean isEmpty();
public abstract void importDeck(Deck deck);
}

103
forge-core/src/main/java/forge/deck/DeckGroup.java
View File

@@ -18,11 +18,10 @@
package forge.deck;
import com.google.common.base.Function;
import forge.StaticData;
import forge.item.PaperCard;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.*;
/**
* TODO: Write javadoc for this type.
@@ -161,4 +160,100 @@ public class DeckGroup extends DeckBase {
public String getImageKey(boolean altState) {
return null;
}
@Override
public void importDeck(Deck deck) {
CardPool draftedCards = this.getHumanDeck().getAllCardsInASinglePool(false);
this.getHumanDeck().putSection(DeckSection.Main, new CardPool());
this.getHumanDeck().putSection(DeckSection.Sideboard, new CardPool());
HashMap<String, Integer> countByName = getCountByName(deck);
addFromDraftedCardPool(countByName, draftedCards);
addBasicLands(deck, countByName, draftedCards);
}
private HashMap<String, Integer> getCountByName(Deck deck) {
HashMap<String, Integer> result = new HashMap<String, Integer>();
for (Map.Entry<PaperCard, Integer> entry: deck.getMain()) {
PaperCard importedCard = entry.getKey();
Integer previousCount = result.getOrDefault(importedCard.getName(), 0);
int countToAdd = entry.getValue();
result.put(importedCard.getName(), countToAdd + previousCount);
}
return result;
}
private void addFromDraftedCardPool(HashMap<String, Integer> countByName, CardPool availableCards) {
for (Map.Entry<PaperCard, Integer> entry: availableCards) {
PaperCard availableCard = entry.getKey();
Integer availableCount = entry.getValue();
int countToAdd = countByName.getOrDefault(availableCard.getName(), 0);
if (availableCard.getRules().getType().isBasicLand()) {
// basic lands are added regardless from drafted cards
continue;
}
int countMain = Math.min(availableCount, countToAdd);
if (countMain > 0) {
this.getHumanDeck().getMain().add(availableCard, countMain);
countByName.put(availableCard.getName(), countToAdd - countMain);
}
int countSideboard = availableCount - countMain;
if (countSideboard > 0) {
CardPool sideboard = this.getHumanDeck().getOrCreate(DeckSection.Sideboard);
sideboard.add(availableCard, countSideboard);
}
}
}
private void addBasicLands(Deck deck, HashMap<String, Integer> countByName, CardPool availableCards) {
HashMap<String, PaperCard> basicLandsByName = getBasicLandsByName(deck, countByName);
Date dateWithAllCards = StaticData.instance().getEditions().getEarliestDateWithAllCards(availableCards);
for (String cardName: countByName.keySet()) {
PaperCard card = basicLandsByName.getOrDefault(cardName, null);
if (card == null) {
continue;
}
int countToAdd = countByName.get(cardName);
card = StaticData.instance().getCardByEditionDate(card, dateWithAllCards);
this.getHumanDeck().getMain().add(card.getName(), card.getEdition(), countToAdd);
}
}
private HashMap<String, PaperCard> getBasicLandsByName(Deck deck, HashMap<String, Integer> countByName) {
HashMap<String, PaperCard> result = new HashMap<String, PaperCard>();
for (Map.Entry<PaperCard, Integer> entry: deck.getMain()) {
PaperCard card = entry.getKey();
if (!card.getRules().getType().isBasicLand()) {
continue;
}
if (result.containsKey(card.getName())) {
continue;
}
result.put(card.getName(), card);
}
return result;
}
}

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
View File

@@ -33,6 +33,7 @@ import forge.deck.DeckRecognizer;
import forge.deck.DeckRecognizer.TokenType;
import forge.item.InventoryItem;
import forge.screens.deckeditor.controllers.ACEditorBase;
import forge.screens.deckeditor.controllers.DeckController;
import forge.toolbox.FButton;
import forge.toolbox.FCheckBox;
import forge.toolbox.FComboBox;
@@ -144,10 +145,15 @@ public class DeckImport<TItem extends InventoryItem, TModel extends DeckBase> ex
@SuppressWarnings("unchecked")
@Override
public void actionPerformed(final ActionEvent e) {
final Deck toSet = controller.accept();
if (toSet == null) { return; }
final Deck deck = controller.accept();
if (deck == null) { return; }
DeckController<TModel> controller = DeckImport.this.host.getDeckController();
TModel model = controller.getModel();
model.importDeck(deck);
controller.setModel(model);
DeckImport.this.host.getDeckController().setModel((TModel) toSet);
DeckImport.this.processWindowEvent(new WindowEvent(DeckImport.this, WindowEvent.WINDOW_CLOSING));
}
});

5
forge-gui/src/main/java/forge/limited/CustomLimited.java
View File

@@ -188,6 +188,11 @@ public class CustomLimited extends DeckBase {
return cardPool.isEmpty();
}
@Override
public void importDeck(Deck deck) {
throw new UnsupportedOperationException("CustomDraft does not support deck import");
}
@Override
public String getImageKey(boolean altState) {
return null;