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

Update RewardData

Browse Source 
- exclude Online and Funny Card for Adventure Rewards
This commit is contained in:
Anthony Calosa
2022-04-19 21:54:14 +08:00
parent b7c0d60edc
commit 527997f5b2
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -872,6 +872,23 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
}));
}
public Collection<PaperCard> getUniqueCardsNoAltNoOnline() {
return Lists.newArrayList(Iterables.filter(getUniqueCardsNoAlt(), new Predicate<PaperCard>() {
@Override
public boolean apply(final PaperCard paperCard) {
CardEdition edition = null;
try {
edition = editions.getEditionByCodeOrThrow(paperCard.getEdition());
if (edition.getType() == Type.ONLINE||edition.getType() == Type.FUNNY)
return false;
} catch (Exception ex) {
return false;
}
return true;
}
}));
}
public Collection<PaperCard> getAllNonPromosNonReprintsNoAlt() {
return Lists.newArrayList(Iterables.filter(getAllCardsNoAlt(), new Predicate<PaperCard>() {
@Override

4
forge-gui-mobile/src/forge/adventure/data/RewardData.java
View File

@@ -78,11 +78,11 @@ public class RewardData {
RewardData legals=Config.instance().getConfigData().legalCards;
if(legals==null)
{
allCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt();
allCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline();
}
else
{
allCards = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt(), new CardUtil.CardPredicate(legals, true));
allCards = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline(), new CardUtil.CardPredicate(legals, true));
}
allEnemyCards=Iterables.filter(allCards, new Predicate<PaperCard>() {
@Override