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

Change allowedJumpstart to override default selection.

Browse Source
This commit is contained in:
Jetz
2025-07-02 08:57:19 -04:00
committed by Chris H
parent 89d1cffc12
commit eea9890f9d
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,23 +396,29 @@ public class AdventureEventData implements Serializable {
private CardBlock pickJumpstartCardBlock() { private CardBlock pickJumpstartCardBlock() {
Iterable<CardBlock> src = FModel.getBlocks(); //all blocks Iterable<CardBlock> src = FModel.getBlocks(); //all blocks
List<CardBlock> legalBlocks = new ArrayList<>(); List<CardBlock> legalBlocks = new ArrayList<>();
for (CardBlock b : src) { // for each block
//I hate doing this, but it seems like the simplest way to reliably filter out prereleases
if (b.getName().toUpperCase().contains("JUMPSTART")) {
legalBlocks.add(b);
}
}
ConfigData configData = Config.instance().getConfigData(); ConfigData configData = Config.instance().getConfigData();
if (configData.allowedJumpstart != null) { if (configData.allowedJumpstart != null) {
Set<String> allowed = Set.of(configData.allowedJumpstart); Set<String> allowed = Set.of(configData.allowedJumpstart);
legalBlocks.removeIf(q -> !allowed.contains(q.getName())); for (CardBlock b : src) { // for each block
if (allowed.contains(b.getName())) {
legalBlocks.add(b);
}
}
} }
else if (configData.allowedEditions != null) { else {
Set<String> allowed = Set.of(configData.allowedEditions); for (CardBlock b : src) { // for each block
legalBlocks.removeIf(q -> !allowed.contains(q.getName())); //I hate doing this, but it seems like the simplest way to reliably filter out prereleases
} else { if (b.getName().toUpperCase().contains("JUMPSTART")) {
for (String restricted : configData.restrictedEditions) { legalBlocks.add(b);
legalBlocks.removeIf(q -> q.getName().equals(restricted)); }
}
if (configData.allowedEditions != null) {
Set<String> allowed = Set.of(configData.allowedEditions);
legalBlocks.removeIf(q -> !allowed.contains(q.getName()));
} else {
for (String restricted : configData.restrictedEditions) {
legalBlocks.removeIf(q -> q.getName().equals(restricted));
}
} }
} }
return legalBlocks.isEmpty() ? null : Aggregates.random(legalBlocks); return legalBlocks.isEmpty() ? null : Aggregates.random(legalBlocks);