diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json index 6253a7e76..2399b3580 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json @@ -105,7 +105,7 @@ "rarityFile":"/set20-rarity.txt", "originalSet":false, "merchantable":false, - "playable":false + "needsLoading": false }, { "setId":"30", diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java index 66a9ee675..b4756c5b9 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/CardSets.java @@ -32,7 +32,7 @@ public class CardSets { Set flags = new HashSet(); determineOriginalSetFlag(setDefinition, flags); determineMerchantableFlag(setDefinition, flags); - determinePlayableFlag(setDefinition, flags); + determineNeedsLoadingFlag(setDefinition, flags); DefaultSetDefinition rarity = new DefaultSetDefinition(setId, setName, flags); @@ -50,12 +50,12 @@ public class CardSets { } } - private void determinePlayableFlag(JSONObject setDefinition, Set flags) { - Boolean playable = (Boolean) setDefinition.get("playable"); - if (playable == null) - playable = true; - if (playable) - flags.add("playable"); + private void determineNeedsLoadingFlag(JSONObject setDefinition, Set flags) { + Boolean needsLoading = (Boolean) setDefinition.get("needsLoading"); + if (needsLoading == null) + needsLoading = true; + if (needsLoading) + flags.add("needsLoading"); } private void determineMerchantableFlag(JSONObject setDefinition, Set flags) { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java index 36581d5e0..b0ce219eb 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java @@ -55,7 +55,7 @@ public class LotroCardBlueprintLibrary { private void initCardSets(CardSets cardSets) { for (SetDefinition setDefinition : cardSets.getSetDefinitions().values()) { - if (setDefinition.hasFlag("playable")) { + if (setDefinition.hasFlag("needsLoading")) { logger.debug("Loading set " + setDefinition.getSetId()); final Set allCards = setDefinition.getAllCards(); for (String blueprintId : allCards) {