Merge branch 'master' into fixes20250817

# Conflicts:
#	forge-gui-mobile/src/forge/itemmanager/ItemManager.java
This commit is contained in:
Jetz
2025-08-17 21:01:42 -04:00
8 changed files with 11207 additions and 11203 deletions

View File

@@ -6906,7 +6906,7 @@
"text": "Darkness and silence surrounds you. A vague sense of falling slows second by second.", "text": "Darkness and silence surrounds you. A vague sense of falling slows second by second.",
"options": [ "options": [
{ {
"name": "Where am I? What am I? What is going on? (Tutorial and main quest)", "name": "Where am I? What am I? What is going on? (Tutorial and main quest). NOTE: NOT UPDATED FOR THE PLANE YET. MAY BREAK.",
"text": "A flash of light brighter than anything you remember precedes a fall to a stone floor. This is almost as jarring as realizing that you actually don't remember much of anything at all.", "text": "A flash of light brighter than anything you remember precedes a fall to a stone floor. This is almost as jarring as realizing that you actually don't remember much of anything at all.",
"options": [ "options": [
{ {

View File

@@ -5,6 +5,7 @@ import forge.game.GameFormat;
import forge.game.GameType; import forge.game.GameType;
import forge.game.IHasGameType; import forge.game.IHasGameType;
import forge.gamemodes.quest.QuestController; import forge.gamemodes.quest.QuestController;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel; import forge.model.FModel;
import forge.util.Aggregates; import forge.util.Aggregates;
import forge.util.IterableUtil; import forge.util.IterableUtil;
@@ -173,8 +174,11 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
if (Iterables.isEmpty(decks)) { if (Iterables.isEmpty(decks)) {
return getGeneratedDeck(); //fall back to generated deck if no decks in filtered list return getGeneratedDeck(); //fall back to generated deck if no decks in filtered list
} }
if (isAi && FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_AUTO_AIDECK_SELECTION)) {
Iterable<DeckProxy> AIDecks = IterableUtil.filter(decks, deckProxy -> deckProxy.getAI().inMainDeck == 0); Iterable<DeckProxy> AIDecks = IterableUtil.filter(decks, deckProxy -> deckProxy.getAI().inMainDeck == 0);
if (isAi && Iterables.size(AIDecks) > 10) return Aggregates.random(AIDecks).getDeck(); if (Iterables.size(AIDecks) > 10)
return Aggregates.random(AIDecks).getDeck();
}
return Aggregates.random(decks).getDeck(); return Aggregates.random(decks).getDeck();
} }