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

Merge branch 'master' into 7859-DisplayTextTooltip

Browse Source
This commit is contained in:
Eradev
2025-07-11 21:57:48 -04:00
committed by GitHub
parent 94babc2c53 f2ab574a3b
commit 9825bebb75
8 changed files with 89 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,24 +323,31 @@ public class AdventureEventData implements Serializable {
private CardBlock pickWeightedCardBlock() {
CardEdition.Collection editions = FModel.getMagicDb().getEditions();
ConfigData configData = Config.instance().getConfigData();
Iterable<CardBlock> src = FModel.getBlocks(); //all blocks
Predicate<CardEdition> filter = CardEdition.Predicates.CAN_MAKE_BOOSTER.and(selectSetPool());
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.
//Also includes sets that use conspiracy or commander drafts.
Set<String> restrictedEvents = Set.of(configData.restrictedEvents);
filter = filter.and((q) -> !restrictedEvents.contains(q.getCode()));
}
if (configData.allowedEditions != null) {
Set<String> allowed = Set.of(configData.allowedEditions);
filter = filter.and(q -> allowed.contains(q.getCode()));
} else {
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.
filter = filter.and(q -> !restricted.contains(q.getCode()));
}
List<CardEdition> allEditions = new ArrayList<>();
StreamUtil.stream(editions)
.filter(filter)
.filter(CardEdition::hasBoosterTemplate)
.forEach(allEditions::add);
//Temporary restriction until rewards are more diverse - don't want to award restricted cards so these editions need different rewards added.
List<String> restrictedDrafts = new ArrayList<>();
restrictedDrafts.add("LEA");
restrictedDrafts.add("LEB");
restrictedDrafts.add("2ED");
restrictedDrafts.add("30A");
restrictedDrafts.add("CNS");
restrictedDrafts.add("CN2");
allEditions.removeIf(q -> restrictedDrafts.contains(q.getCode()));
List<CardBlock> legalBlocks = new ArrayList<>();
for (CardBlock b : src) { // for each block
if (b.getSets().isEmpty() || (b.getCntBoostersDraft() < 1))
@@ -383,34 +390,40 @@ public class AdventureEventData implements Serializable {
}
}
ConfigData configData = Config.instance().getConfigData();
if (configData.allowedEditions != null) {
List<String> allowed = Arrays.asList(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);
}
private CardBlock pickJumpstartCardBlock() {
Iterable<CardBlock> src = FModel.getBlocks(); //all blocks
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();
if (configData.allowedJumpstart != null) {
Set<String> allowed = Set.of(configData.allowedJumpstart);
for (CardBlock b : src) { // for each block
if (allowed.contains(b.getName())) {
legalBlocks.add(b);
}
}
for (CardBlock b : FModel.getFantasyBlocks()) {
if (allowed.contains(b.getName())) {
legalBlocks.add(b);
}
}
}
ConfigData configData = Config.instance().getConfigData();
if (configData.allowedEditions != null) {
List<String> allowed = Arrays.asList(configData.allowedEditions);
legalBlocks.removeIf(q -> !allowed.contains(q.getName()));
} else {
for (String restricted : configData.restrictedEditions) {
legalBlocks.removeIf(q -> q.getName().equals(restricted));
else {
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);
}
}
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);

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

@@ -23,4 +23,6 @@ public class ConfigData {
public String[] restrictedCards;
public String[] restrictedEditions;
public String[] allowedEditions;
public String[] restrictedEvents;
public String[] allowedJumpstart;
}

7
forge-gui-mobile/src/forge/adventure/util/Config.java
View File

@@ -111,9 +111,12 @@ public class Config {
currentConfig = this;
if (FModel.getPreferences() != null)
Lang = FModel.getPreferences().getPref(ForgePreferences.FPref.UI_LANGUAGE);
FileHandle file = new FileHandle(prefix + "config.json");
//TODO: Plane's config file should be merged with the common config file.
if(!file.exists())
file = new FileHandle(commonPrefix + "config.json");
try {
configData = new Json().fromJson(ConfigData.class, new FileHandle(commonPrefix + "config.json"));
configData = new Json().fromJson(ConfigData.class, file);
} catch (Exception e) {
e.printStackTrace();
configData = new ConfigData();