mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 03:08:02 +00:00
Merge branch 'master' into fixes20250817
# Conflicts: # forge-gui-mobile/src/forge/itemmanager/ItemManager.java
This commit is contained in:
@@ -6906,7 +6906,7 @@
|
||||
"text": "Darkness and silence surrounds you. A vague sense of falling slows second by second.",
|
||||
"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.",
|
||||
"options": [
|
||||
{
|
||||
|
||||
@@ -5,6 +5,7 @@ import forge.game.GameFormat;
|
||||
import forge.game.GameType;
|
||||
import forge.game.IHasGameType;
|
||||
import forge.gamemodes.quest.QuestController;
|
||||
import forge.localinstance.properties.ForgePreferences;
|
||||
import forge.model.FModel;
|
||||
import forge.util.Aggregates;
|
||||
import forge.util.IterableUtil;
|
||||
@@ -173,8 +174,11 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
|
||||
if (Iterables.isEmpty(decks)) {
|
||||
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);
|
||||
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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user