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

Deck now integrates validation of Deck Sections

Browse Source 
Validation of Deck Sections is applied only once per deck.
This commit is contained in:
leriomaggio
2021-08-22 23:28:48 +01:00
parent 057213342c
commit 89687a45ed
1 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@
package forge.deck;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import forge.StaticData;
import forge.card.CardDb;
@@ -232,8 +233,10 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
return; // deck loaded already - card with no set have been found, but no change since last time: all good!
Map<String, List<String>> referenceDeckLoadingMap;
if (deferredSections != null)
referenceDeckLoadingMap = new HashMap<>(deferredSections);
if (deferredSections != null) {
this.validateDeferredSections();
referenceDeckLoadingMap = new HashMap<>(this.deferredSections);
}
else
referenceDeckLoadingMap = new HashMap<>(loadedSections);
@@ -276,6 +279,56 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
}
private void validateDeferredSections(){
/*
Construct a temporary (DeckSection, CardPool) Maps, to be sanitise and finalised
before copying into `this.parts`. This sanitisation is applied because of the
validation schema introduced in DeckSections.
*/
for (Entry<String, List<String>> s : this.deferredSections.entrySet()) {
final DeckSection deckSection = DeckSection.smartValueOf(s.getKey());
if (deckSection == null)
continue;
final List<String> cardsInSection = s.getValue();
CardPool pool = CardPool.fromCardList(cardsInSection);
if (pool.countDistinct() == 0)
continue; // pool empty, no card has been found!
// Filter pool by applying DeckSection Validation schema for Card Types (to avoid inconsistencies)
CardPool filteredPool = pool.getFilteredPoolWithCardsCount(new Predicate<PaperCard>() {
@Override
public boolean apply(PaperCard input) {
return deckSection.validate(input);
}
});
if (filteredPool.countDistinct() != pool.countDistinct()) { // Some cards have been filtered
CardPool blackListPool = pool.getFilteredPoolWithCardsCount(new Predicate<PaperCard>() {
@Override
public boolean apply(PaperCard input) {
return !(deckSection.validate(input));
}
});
List<Entry<PaperCard, Integer>> blackList = Lists.newArrayList(blackListPool);
for (Entry<PaperCard, Integer> entry : blackList) {
PaperCard card = entry.getKey();
DeckSection cardSection = DeckSection.matchingSection(card);
if (cardSection == null)
continue; // No matching section could be found!
String cardRequest = CardDb.CardRequest.compose(card.getName(), card.getEdition(), card.getArtIndex());
String poolRequest = String.format("%d %s", entry.getValue(), cardRequest);
List<String> sectionCardList = this.deferredSections.getOrDefault(cardSection.name(), null);
if (sectionCardList == null)
sectionCardList = new ArrayList<>();
sectionCardList.add(poolRequest);
this.deferredSections.put(cardSection.name(), sectionCardList);
}
}
}
}
private ArrayList<String> getAllCardNamesWithNoSpecifiedEdition(List<String> cardsInSection) {
ArrayList<String> cardNamesWithNoEdition = new ArrayList<>();
List<Pair<String, Integer>> cardRequests = CardPool.processCardList(cardsInSection);