ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added site block check to card filter

Browse Source 
When using a format filter, only sites legal in that format will appear
This commit is contained in:
PhallenCassidy
2018-03-26 12:25:53 -04:00
committed by GitHub
parent c82f0e9e5c
commit f5e91eafbf
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
View File

@@ -1,6 +1,7 @@
package com.gempukku.lotro.game;
import com.gempukku.lotro.cards.packs.SetDefinition;
import com.gempukku.lotro.common.Block;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
@@ -90,7 +91,7 @@ public class SortAndFilterCards {
final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId);
if (side == null || blueprint.getSide() == side)
if (rarity == null || isRarity(blueprintId, rarity, library, rarities))
if (sets == null || isInSets(blueprintId, sets, library, formatLibrary))
if (sets == null || isInSets(blueprintId, sets, library, formatLibrary, cardBlueprint))
if (cardTypes == null || cardTypes.contains(blueprint.getCardType()))
if (cultures == null || cultures.contains(blueprint.getCulture()))
if (containsAllKeywords(blueprint, keywords))
@@ -144,16 +145,40 @@ public class SortAndFilterCards {
return true;
}
private boolean isInSets(String blueprintId, String[] sets, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary) {
private boolean isInSets(String blueprintId, String[] sets, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary, Map<String, LotroCardBlueprint> cardBlueprint) {
for (String set : sets) {
LotroFormat format = formatLibrary.getFormat(set);
if (format != null) {
try {
format.validateCard(blueprintId);
return true;
} catch (DeckInvalidException exp) {
return false;
}
final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId);
if (blueprint.getCardType() == CardType.SITE) {
if (blueprint.getSiteBlock() == Block.FELLOWSHIP) {
if ("fotr_block".contains(set)) {
return true;
}
return false;
}
if (blueprint.getSiteBlock() == Block.TWO_TOWERS) {
if ("towers_standard,ttt_block".contains(set)) {
return true;
}
return false;
}
if (blueprint.getSiteBlock() == Block.KING) {
if ("king_block,rotk_sta,movie".contains(set)) {
return true;
}
return false;
}
return true;
} else {
return true;
}
} else {
if (blueprintId.startsWith(set + "_") || library.hasAlternateInSet(blueprintId, Integer.parseInt(set)))
return true;