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

Add allowedEvents support for adventure configs

Browse Source
This commit is contained in:
Jetz
2025-11-06 08:29:55 -05:00
parent 0bb67ec8d0
commit 50a98238d1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
View File

@@ -197,7 +197,11 @@ public class AdventureEventData implements Serializable {
ConfigData configData = Config.instance().getConfigData(); ConfigData configData = Config.instance().getConfigData();
Predicate<CardEdition> filter = CardEdition.Predicates.CAN_MAKE_BOOSTER.and(selectSetPool()); Predicate<CardEdition> filter = CardEdition.Predicates.CAN_MAKE_BOOSTER.and(selectSetPool());
if(configData.restrictedEvents != null) { if(configData.allowedEvents != null) {
Set<String> allowedEvents = Set.of(configData.allowedEvents);
filter = filter.and(q -> allowedEvents.contains(q.getCode()));
}
else if(configData.restrictedEvents != null) {
//Temporary restriction until rewards are more diverse - don't want to award restricted cards so these editions need different rewards added. //Temporary restriction until rewards are more diverse - don't want to award restricted cards so these editions need different rewards added.
//Also includes sets that use conspiracy or commander drafts. //Also includes sets that use conspiracy or commander drafts.
Set<String> restrictedEvents = Set.of(configData.restrictedEvents); Set<String> restrictedEvents = Set.of(configData.restrictedEvents);
@@ -206,7 +210,7 @@ public class AdventureEventData implements Serializable {
if (configData.allowedEditions != null) { if (configData.allowedEditions != null) {
Set<String> allowed = Set.of(configData.allowedEditions); Set<String> allowed = Set.of(configData.allowedEditions);
filter = filter.and(q -> allowed.contains(q.getCode())); filter = filter.and(q -> allowed.contains(q.getCode()));
} else { } else if(configData.restrictedEditions != null) {
List<String> restrictedList = Arrays.asList(configData.restrictedEditions); List<String> restrictedList = Arrays.asList(configData.restrictedEditions);
Set<String> restricted = new HashSet<>(restrictedList); //Would use Set.of but that throws an error if there's any duplicates, and users edit these lists all the time. Set<String> restricted = new HashSet<>(restrictedList); //Would use Set.of but that throws an error if there's any duplicates, and users edit these lists all the time.
filter = filter.and(q -> !restricted.contains(q.getCode())); filter = filter.and(q -> !restricted.contains(q.getCode()));

1
forge-gui-mobile/src/forge/adventure/data/ConfigData.java
View File

@@ -24,5 +24,6 @@ public class ConfigData {
public String[] restrictedEditions; public String[] restrictedEditions;
public String[] allowedEditions; public String[] allowedEditions;
public String[] restrictedEvents; public String[] restrictedEvents;
public String[] allowedEvents;
public String[] allowedJumpstart; public String[] allowedJumpstart;
} }